Use grafana configuration in the Alertmanager #8066
Merged
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
force-pushed
the
santihernandezc/use_grafana_receivers
branch
from
5d3c136 to
38a3fb3
Compare
…nandezc/use_grafana_receivers
…nandezc/use_grafana_receivers
This was referenced May 13, 2024
…nandezc/use_grafana_receivers
…nandezc/use_grafana_receivers
…nd use helper functions, reduce diff
…nandezc/use_grafana_receivers
…nandezc/use_grafana_receivers
…nandezc/use_grafana_receivers
santihernandezc
changed the title
stevesg
reviewed
Jun 7, 2024
pkg/alertmanager/multitenant.go
Outdated
| // Both configurations. | ||
| // TODO: merge configurations. | ||
| default: | ||
| level.Debug(am.logger).Log("msg", "merging configurations not implemented, using mimir config", "user", cfgs.Mimir.User) |
There was a problem hiding this comment.
I think this should be at least warning, if not error.
Suggested change
| level.Debug(am.logger).Log("msg", "merging configurations not implemented, using mimir config", "user", cfgs.Mimir.User) | |
| level.Warn(am.logger).Log("msg", "merging configurations not implemented, using mimir config", "user", cfgs.Mimir.User) |
pkg/alertmanager/multitenant.go
Outdated
| level.Debug(am.logger).Log("msg", "grafana configuration is empty, using mimir config", "user", cfgs.Mimir.User) | ||
| cfg = cfgs.Mimir | ||
|
|
||
| // Grafana configuration. |
There was a problem hiding this comment.
Suggested change
| // Grafana configuration. | |
| // Grafana configuration. |
pkg/alertmanager/alertmanager.go
Outdated
Comment on lines
476
to
501
| // The decrypt functions and the context are used to decrypt the configuration. | ||
| // We don't need to decrypt anything, so we can pass a no-op decrypt func and a context.Background(). | ||
| rCfg, err := alertingNotify.BuildReceiverConfiguration(context.Background(), definition.PostableAPIReceiverToAPIReceiver(rcv), alertingNotify.NoopDecrypt) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| integrations, err := alertingNotify.BuildReceiverIntegrations( | ||
| rCfg, | ||
| tmpl, | ||
| &images.UnavailableProvider{}, // TODO: include images in notifications | ||
| loggerFactory, | ||
| whFn, | ||
| emailFn, | ||
| 1, // orgID is always 1. | ||
| version.Version, | ||
| ) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // TODO: use the nfstatus.Integration wrapper for all integrations. | ||
| upstreamIntegrations := make([]*notify.Integration, 0, len(integrations)) | ||
| for _, integration := range integrations { | ||
| upstreamIntegrations = append(upstreamIntegrations, integration.Integration()) | ||
| } |
There was a problem hiding this comment.
This would be nice pulled out into a function, e.g. buildGrafanaReceiverIntegrations
stevesg
approved these changes
Jun 7, 2024
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
This PR enables the Alertmanager to use the Grafana configuration, including Grafana receivers.
If the Grafana compatibility option is enabled, Mimir will look for Grafana Alertmanager configuration in object storage.
To be used, the Grafana configuration should be promoted, non-default, and non-empty. Otherwise, it will be ignored and only the Mimir AM configuration will be used.
If the Grafana configuration is promoted, non-default, and non-empty, and the Mimir AM configuration is either default or empty, only the Grafana configuration will be used.
If both configurations are neither default nor empty and the Grafana configuration is promoted, both configurations will be merged and the resulting configuration will be applied to the Alertmanager. This scenario is outside of the scope of this PR.