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: Remove extra field orgId from notifier.Alertmanager (#39870)

Browse Source
This commit is contained in:
Yuriy Tseretyan 2021-10-01 09:54:37 -04:00 committed by GitHub
parent e343b62665
commit 4dadb8fc51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/services/ngalert/notifier/alertmanager.go
View File

@ -66,7 +66,6 @@ type ClusterPeer interface {
type Alertmanager struct { type Alertmanager struct {
logger log.Logger logger log.Logger
gokitLogger gokit_log.Logger gokitLogger gokit_log.Logger
OrgID int64
Settings *setting.Cfg Settings *setting.Cfg
Store store.AlertingStore Store store.AlertingStore
@ -139,7 +138,7 @@ func newAlertmanager(orgID int64, cfg *setting.Cfg, store store.AlertingStore, k
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to initialize the notification log component of alerting: %w", err) return nil, fmt.Errorf("unable to initialize the notification log component of alerting: %w", err)
} }
c := am.peer.AddState(fmt.Sprintf("notificationlog:%d", am.OrgID), am.notificationLog, m.Registerer) c := am.peer.AddState(fmt.Sprintf("notificationlog:%d", am.orgID), am.notificationLog, m.Registerer)
am.notificationLog.SetBroadcast(c.Broadcast) am.notificationLog.SetBroadcast(c.Broadcast)
am.silences, err = newSilences(silencesFilePath, m.Registerer) am.silences, err = newSilences(silencesFilePath, m.Registerer)
@ -147,7 +146,7 @@ func newAlertmanager(orgID int64, cfg *setting.Cfg, store store.AlertingStore, k
return nil, fmt.Errorf("unable to initialize the silencing component of alerting: %w", err) return nil, fmt.Errorf("unable to initialize the silencing component of alerting: %w", err)
} }
c = am.peer.AddState(fmt.Sprintf("silences:%d", am.OrgID), am.silences, m.Registerer) c = am.peer.AddState(fmt.Sprintf("silences:%d", am.orgID), am.silences, m.Registerer)
am.silences.SetBroadcast(c.Broadcast) am.silences.SetBroadcast(c.Broadcast)
am.wg.Add(1) am.wg.Add(1)