IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: log external alertmanager URLs #54127

Browse Source
This commit is contained in:
Santiago 2022-08-24 17:52:39 +00:00 committed by GitHub
parent c8f2148f75
commit 4fad827acd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/services/ngalert/sender/router.go
View File

@ -127,27 +127,41 @@ func (d *AlertsRouter) SyncAndApplyConfigFromDatabase() error {
continue continue
} }
d.logger.Debug("alertmanagers found in the configuration", "alertmanagers", cfg.Alertmanagers) // Avoid logging sensitive data
var redactedAMs []string
for _, am := range cfg.Alertmanagers {
parsedAM, err := url.Parse(am)
if err != nil {
d.logger.Error("failed to parse alertmanager string",
"org", cfg.OrgID,
"err", err)
continue
}
redactedAMs = append(redactedAMs, parsedAM.Redacted())
}
d.logger.Debug("alertmanagers found in the configuration", "alertmanagers", redactedAMs)
// We have a running sender, check if we need to apply a new config. // We have a running sender, check if we need to apply a new config.
amHash := cfg.AsSHA256()
if ok { if ok {
if d.externalAlertmanagersCfgHash[cfg.OrgID] == cfg.AsSHA256() { if d.externalAlertmanagersCfgHash[cfg.OrgID] == amHash {
d.logger.Debug("sender configuration is the same as the one running, no-op", "org", cfg.OrgID, "alertmanagers", cfg.Alertmanagers) d.logger.Debug("sender configuration is the same as the one running, no-op", "org", cfg.OrgID, "alertmanagers", redactedAMs)
continue continue
} }
d.logger.Debug("applying new configuration to sender", "org", cfg.OrgID, "alertmanagers", cfg.Alertmanagers) d.logger.Debug("applying new configuration to sender", "org", cfg.OrgID, "alertmanagers", redactedAMs)
err := existing.ApplyConfig(cfg) err := existing.ApplyConfig(cfg)
if err != nil { if err != nil {
d.logger.Error("failed to apply configuration", "err", err, "org", cfg.OrgID) d.logger.Error("failed to apply configuration", "err", err, "org", cfg.OrgID)
continue continue
} }
d.externalAlertmanagersCfgHash[cfg.OrgID] = cfg.AsSHA256() d.externalAlertmanagersCfgHash[cfg.OrgID] = amHash
continue continue
} }
// No sender and have Alertmanager(s) to send to - start a new one. // No sender and have Alertmanager(s) to send to - start a new one.
d.logger.Info("creating new sender for the external alertmanagers", "org", cfg.OrgID, "alertmanagers", cfg.Alertmanagers) d.logger.Info("creating new sender for the external alertmanagers", "org", cfg.OrgID, "alertmanagers", redactedAMs)
s, err := NewExternalAlertmanagerSender() s, err := NewExternalAlertmanagerSender()
if err != nil { if err != nil {
d.logger.Error("unable to start the sender", "err", err, "org", cfg.OrgID) d.logger.Error("unable to start the sender", "err", err, "org", cfg.OrgID)
@ -163,7 +177,7 @@ func (d *AlertsRouter) SyncAndApplyConfigFromDatabase() error {
continue continue
} }
d.externalAlertmanagersCfgHash[cfg.OrgID] = cfg.AsSHA256() d.externalAlertmanagersCfgHash[cfg.OrgID] = amHash
} }
sendersToStop := map[int64]*ExternalAlertmanager{} sendersToStop := map[int64]*ExternalAlertmanager{}