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 ConfigHash() from the Alertmanager interface (#77134)

Browse Source
This commit is contained in:
Santiago 2023-10-25 17:11:53 +02:00 committed by GitHub
parent 6ee52ac80c
commit f9fc2e4568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/services/ngalert/api/api_alertmanager_test.go
View File

@ -2,6 +2,7 @@ package api
import (
"context"
"crypto/md5"
"encoding/json"
"math/rand"
"net/http"
@ -230,21 +231,21 @@ func TestAlertmanagerConfig(t *testing.T) {
r := sut.RoutePostAlertingConfig(&rc, request)
require.Equal(t, 202, r.Status())
am, err := sut.mam.AlertmanagerFor(1)
require.NoError(t, err)
hash := am.ConfigHash()
getResponse := sut.RouteGetAlertingConfig(&rc)
require.Equal(t, 200, getResponse.Status())
postable, err := notifier.Load(getResponse.Body())
body := getResponse.Body()
hash := md5.Sum(body)
postable, err := notifier.Load(body)
require.NoError(t, err)
r = sut.RoutePostAlertingConfig(&rc, *postable)
require.Equal(t, 202, r.Status())
am, err = sut.mam.AlertmanagerFor(1)
require.NoError(t, err)
newHash := am.ConfigHash()
getResponse = sut.RouteGetAlertingConfig(&rc)
require.Equal(t, 200, getResponse.Status())
newHash := md5.Sum(getResponse.Body())
require.Equal(t, hash, newHash)
})

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

@ -395,10 +395,6 @@ func (am *alertmanager) PutAlerts(_ context.Context, postableAlerts apimodels.Po
return am.Base.PutAlerts(alerts)
}
func (am *alertmanager) ConfigHash() [16]byte {
return am.Base.ConfigHash()
}
func (am *alertmanager) OrgID() int64 {
return am.orgID
}

1
pkg/services/ngalert/notifier/multiorg_alertmanager.go
View File

@ -58,7 +58,6 @@ type Alertmanager interface {
StopAndWait()
Ready() bool
OrgID() int64
ConfigHash() [16]byte
}
type MultiOrgAlertmanager struct {

1
pkg/services/ngalert/notifier/multiorg_alertmanager_test.go
View File

@ -288,7 +288,6 @@ func TestMultiOrgAlertmanager_AlertmanagerFor(t *testing.T) {
require.NoError(t, err)
require.Equal(t, "N/A", *am.GetStatus().VersionInfo.Version)
require.Equal(t, int64(2), am.OrgID())
require.NotNil(t, am.ConfigHash())
}
// Let's now remove the previous queried organization.

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

@ -301,10 +301,6 @@ func (am *Alertmanager) OrgID() int64 {
return am.orgID
}
func (am *Alertmanager) ConfigHash() [16]byte {
return [16]byte{}
}
type roundTripper struct {
tenantID string
basicAuthPassword string