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 OrgID() from the Alertmanager interface (#77398)

Browse Source
This commit is contained in:
Santiago
2023-10-31 10:58:47 +01:00
committed by GitHub
parent b8105caa05
commit a6b9b27673
5 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/ngalert/remote/alertmanager.go
View File

@@ -297,10 +297,6 @@ func (am *Alertmanager) Ready() bool {
// We don't have files on disk, no-op.
func (am *Alertmanager) CleanUp() {}
func (am *Alertmanager) OrgID() int64 {
return am.orgID
}
type roundTripper struct {
tenantID string
basicAuthPassword string

2
pkg/services/ngalert/remote/alertmanager_test.go
View File

@@ -59,7 +59,7 @@ func TestNewAlertmanager(t *testing.T) {
require.NoError(tt, err)
require.Equal(tt, am.tenantID, test.tenantID)
require.Equal(tt, am.url, test.url)
require.Equal(tt, am.OrgID(), test.orgID)
require.Equal(tt, am.orgID, test.orgID)
require.NotNil(tt, am.amClient)
require.NotNil(tt, am.httpClient)
})