Alertmanager: Allow for custom SMTP configs in Grafana email integrations #11755
+1,336
−475
Conversation
This file contains hidden or 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
force-pushed
the
santihernandezc/custom_smtp_config_remote_am
branch
from
f578c66 to
9c008d6
Compare
santihernandezc
added
the
changelog-not-needed
santihernandezc
force-pushed
the
santihernandezc/custom_smtp_config_remote_am
branch
3 times, most recently
from
6f30434 to
ffc7169
Compare
santihernandezc
force-pushed
the
santihernandezc/custom_smtp_config_remote_am
branch
from
ffc7169 to
60925a0
Compare
santihernandezc
changed the title
…custom_smtp_config_remote_am
rwwiv
approved these changes
Jun 25, 2025
56quarters
approved these changes
Jun 25, 2025
integration/alertmanager_test.go
Outdated
| "Header-1": "Value-1", | ||
| "Header-2": "Value-2", | ||
| smtpConfig := &alertmanager.SmtpConfig{ | ||
| FromAddress: "test@test.com", |
There was a problem hiding this comment.
Suggested change
| FromAddress: "test@test.com", | |
| FromAddress: "test@example.com", |
pkg/alertmanager/config_test.go
Outdated
| @@ -75,76 +76,170 @@ const grafanaConfigWithDuplicateReceiverName = `{ | |||
| }` | |||
|
|
|||
| func TestCreateUsableGrafanaConfig(t *testing.T) { | |||
| defaultFromAddress := "grafana@localhost.com" | |||
There was a problem hiding this comment.
Addresses in tests probably shouldn't use real domains except for example.com or localhost.
pkg/alertmanager/api_grafana_test.go
Outdated
| @@ -199,8 +199,11 @@ func TestMultitenantAlertmanager_GetUserGrafanaConfig(t *testing.T) { | |||
| logger: test.NewTestingLogger(t), | |||
| } | |||
|
|
|||
| smtpConfig := &alertspb.SmtpConfig{ | |||
| FromAddress: "test@grafana.com", | |||
There was a problem hiding this comment.
Suggested change
| FromAddress: "test@grafana.com", | |
| FromAddress: "test@example.com", |
pkg/alertmanager/config.go
Outdated
|
|
||
| // Patch the base config with the custom SMTP config sent by Grafana. | ||
| if gCfg.SmtpConfig != nil { | ||
| s := gCfg.SmtpConfig |
There was a problem hiding this comment.
nit: I get that this is more concise but I think the code is easier to read using the full gCfg.SmtpConfig instead of s
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.
Description
Grafana users can tweak their SMTP settings to customize how Grafana sends emails. However, when enabling the remote Alertmanager in remote primary mode, Mimir sends all email notifications, and any SMTP settings in Grafana are ignored.
This PR makes Mimir use SMTP settings configured in Grafana (except for those related to files) when using the remote Alertmanager feature.
How it works
When the remote Alertmanager feature is enabled, Grafana sends its SMTP settings over to Mimir. These SMTP settings are stored in object storage alongside the configuration.
When an Alertmanager is created for the Grafana tenant, any non-empty SMTP settings are used to patch the base
EmailSenderConfig. Grafana email integrations use this patched configuration to send notifications.Note for reviewers
We've added
StaticHeadersandSmtpFromfields in the past. These are now part ofSmtpConfig.Commit aed46ac has changes to test this PR locally using read-write mode.