Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Alertmanager to f69a508 #7332

Merged
merged 10 commits into from
Feb 8, 2024
Merged

Update Alertmanager to f69a508 #7332

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0f5bff2
Update Alertmanager to f69a508
grobinson-grafana Feb 8, 2024
0fb4a22
Fix lint
grobinson-grafana Feb 8, 2024
33eff4b
Fix lint again
grobinson-grafana Feb 8, 2024
22c05e2
Use strings.Trim instead of subslice
grobinson-grafana Feb 8, 2024
7942be0
Remove integration test TestAlertmanagerMatchersMetrics
grobinson-grafana Feb 8, 2024
4a3bf33
Fix lint
grobinson-grafana Feb 8, 2024
39ba3b9
Prevent configurations with WebhookURLFile
grobinson-grafana Feb 8, 2024
a97f55b
Add additional checks and tests for HTTPConfig
grobinson-grafana Feb 8, 2024
a4182d7
Fix missing nil check
grobinson-grafana Feb 8, 2024
d3ea8ed
Check for embedded HTTPConfig is not needed
grobinson-grafana Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Check for embedded HTTPConfig is not needed
  • Loading branch information
@grobinson-grafana
grobinson-grafana committed Feb 8, 2024
commit d3ea8ed87e7a724ca0f3ac1fa8b4713cffeaabee
10 changes: 0 additions & 10 deletions pkg/alertmanager/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,11 +513,6 @@ func validateDiscordConfig(cfg config.DiscordConfig) error {
if cfg.WebhookURLFile != "" {
return errWebhookURLFileNotAllowed
}
if cfg.HTTPConfig != nil {
if err := validateReceiverHTTPConfig(*cfg.HTTPConfig); err != nil {
return err
}
}
return nil
}

Expand Down Expand Up @@ -589,11 +584,6 @@ func validateMSTeamsConfig(cfg config.MSTeamsConfig) error {
if cfg.WebhookURLFile != "" {
return errWebhookURLFileNotAllowed
}
if cfg.HTTPConfig != nil {
if err := validateReceiverHTTPConfig(*cfg.HTTPConfig); err != nil {
return err
}
}
return nil
}

Expand Down
Loading