public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

alerting: redact alertmanagers in scheduler logs (#54183) (#54186)

Browse Source 
(cherry picked from commit 438c95892f)

Co-authored-by: Santiago <santiagohernandez.1997@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2022-08-24 17:07:26 -04:00
committed by GitHub
co-authored by Santiago
parent f997ac8532
commit 5260d264fb
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ngalert/schedule/schedule.go
+20 -6
View File
@@ -246,25 +246,39 @@ func (sch *schedule) SyncAndApplyConfigFromDatabase() error {
continue
}
// Avoid logging sensitive data
var redactedAMs []string
for _, am := range cfg.Alertmanagers {
parsedAM, err := url.Parse(am)
if err != nil {
sch.log.Error("failed to parse alertmanager string",
"org", cfg.OrgID,
"err", err)
continue
}
redactedAMs = append(redactedAMs, parsedAM.Redacted())
}
// We have a running sender, check if we need to apply a new config.
amHash := cfg.AsSHA256()
if ok {
if sch.sendersCfgHash[cfg.OrgID] == cfg.AsSHA256() {
sch.log.Debug("sender configuration is the same as the one running, no-op", "org", cfg.OrgID, "alertmanagers", cfg.Alertmanagers)
if sch.sendersCfgHash[cfg.OrgID] == amHash {
sch.log.Debug("sender configuration is the same as the one running, no-op", "org", cfg.OrgID, "alertmanagers", redactedAMs)
continue
}
sch.log.Debug("applying new configuration to sender", "org", cfg.OrgID, "alertmanagers", cfg.Alertmanagers)
sch.log.Debug("applying new configuration to sender", "org", cfg.OrgID, "alertmanagers", redactedAMs)
err := existing.ApplyConfig(cfg)
if err != nil {
sch.log.Error("failed to apply configuration", "err", err, "org", cfg.OrgID)
continue
}
sch.sendersCfgHash[cfg.OrgID] = cfg.AsSHA256()
sch.sendersCfgHash[cfg.OrgID] = amHash
continue
}
// No sender and have Alertmanager(s) to send to - start a new one.
sch.log.Info("creating new sender for the external alertmanagers", "org", cfg.OrgID, "alertmanagers", cfg.Alertmanagers)
sch.log.Info("creating new sender for the external alertmanagers", "org", cfg.OrgID, "alertmanagers", redactedAMs)
s, err := sender.New(sch.metrics)
if err != nil {
sch.log.Error("unable to start the sender", "err", err, "org", cfg.OrgID)
@@ -280,7 +294,7 @@ func (sch *schedule) SyncAndApplyConfigFromDatabase() error {
continue
}
sch.sendersCfgHash[cfg.OrgID] = cfg.AsSHA256()
sch.sendersCfgHash[cfg.OrgID] = amHash
}
sendersToStop := map[int64]*sender.Sender{}