Alertmanager: Use the default email sender for Grafana receivers #8529
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
santihernandezc
requested review from
grafanabot,
a team and
stevesg
as code owners
|
Just a heads up that the build and tests will fail until #8525 is merged to main and you can rebase. I'm working to get a second review of it as soon as possible. |
Hi! 👋 You can rebase main as #8525 is closed. This will fix the build failure and tests 👍 |
…nandezc/use_default_email_sender
…nandezc/use_default_email_sender
…nandezc/use_default_email_sender
fayzal-g
reviewed
Jul 1, 2024
pkg/alertmanager/config.go
Outdated
| "github.com/grafana/mimir/pkg/alertmanager/alertspb" | ||
| ) | ||
|
|
||
| // parseGrafanaConfig creates an AlertConfigDesc from a GrafanaAlertConfigDesc. | ||
| func parseGrafanaConfig(cfg alertspb.GrafanaAlertConfigDesc) (alertspb.AlertConfigDesc, error) { | ||
| // It uses the global section from the Mimir config if it is provided. | ||
| func parseGrafanaConfig(gCfg alertspb.GrafanaAlertConfigDesc, mCfg *alertspb.AlertConfigDesc) (alertspb.AlertConfigDesc, error) { |
There was a problem hiding this comment.
I don't think parseGrafanaConfig is a suitable name anymore, something like parseConfig might be more appropriate?
pkg/alertmanager/multitenant.go
Outdated
| @@ -708,14 +708,14 @@ func (am *MultitenantAlertmanager) computeConfig(cfgs alertspb.AlertConfigDescs) | |||
| // Grafana configuration. | |||
| case cfgs.Mimir.RawConfig == am.fallbackConfig: | |||
| level.Debug(am.logger).Log("msg", "mimir configuration is default, using grafana config", "user", cfgs.Mimir.User) | |||
| cfg, err = parseGrafanaConfig(cfgs.Grafana) | |||
| cfg, err = parseGrafanaConfig(cfgs.Grafana, &cfgs.Mimir) | |||
There was a problem hiding this comment.
I'd also update the log message above
pkg/alertmanager/multitenant_test.go
Outdated
| @@ -394,7 +395,7 @@ templates: | |||
| require.Len(t, am.alertmanagers, 4) | |||
|
|
|||
| // The Mimir configuration was empty, so the Grafana configuration should be chosen for user 4. | |||
| parsed, err := parseGrafanaConfig(userGrafanaCfg) | |||
| parsed, err := parseGrafanaConfig(userGrafanaCfg, nil) | |||
There was a problem hiding this comment.
I know this isn't directly to do with this PR, but just a code quality change:
require.NoError(t, store.SetAlertConfig(ctx, emptyMimirConfig))
can be done on line 391 above.
pkg/alertmanager/multitenant_test.go
Outdated
| }, | ||
| expCfg: alertspb.AlertConfigDesc{ | ||
| User: "user", | ||
| RawConfig: string(simpleConfigOne), |
There was a problem hiding this comment.
simpleConfigOne doesn't need to be casted to string
fayzal-g
approved these changes
Jul 2, 2024
Ivaka
pushed a commit
to Ivaka/mimir
that referenced
this pull request
Jul 3, 2024
…fana#8529) * Alertmanager: Use the default email sender for Grafana receivers * tests, fix mimir global config not being used in Grafana * address code review comments * format
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR updates the Alertmanager to use the default email sender from grafana/alerting for sending notifications with Grafana's email integration.
If the Grafana Alertmanager configuration is to be used, we use the SMTP and HTTP settings from the
globalsection of Mimir's Alertmanager configuration to configure the email sender.Related PoC: #8376