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

Alerting: Fix panic in provisioning filter contacts by unknown name (#83070)

Browse Source
This commit is contained in:
Matthew Jacobson 2024-02-19 10:30:13 -05:00 committed by GitHub
parent b56f6ed0dc
commit 87ab98ea95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/ngalert/provisioning/contactpoints.go
View File

@ -80,7 +80,7 @@ func (ecp *ContactPointService) GetContactPoints(ctx context.Context, q ContactP
return nil, convertRecSvcErr(err) return nil, convertRecSvcErr(err)
} }
grafanaReceivers := []*apimodels.GettableGrafanaReceiver{} grafanaReceivers := []*apimodels.GettableGrafanaReceiver{}
if q.Name != "" { if q.Name != "" && len(res) > 0 {
grafanaReceivers = res[0].GettableGrafanaReceivers.GrafanaManagedReceivers // we only expect one receiver group grafanaReceivers = res[0].GettableGrafanaReceivers.GrafanaManagedReceivers // we only expect one receiver group
} else { } else {
for _, r := range res { for _, r := range res {

9
pkg/services/ngalert/provisioning/contactpoints_test.go
View File

@ -53,6 +53,15 @@ func TestContactPointService(t *testing.T) {
require.Equal(t, "slack receiver", cps[0].Name) require.Equal(t, "slack receiver", cps[0].Name)
}) })
t.Run("service filters contact points by name, returns empty when no match", func(t *testing.T) {
sut := createContactPointServiceSut(t, secretsService)
cps, err := sut.GetContactPoints(context.Background(), cpsQueryWithName(1, "unknown"), nil)
require.NoError(t, err)
require.Len(t, cps, 0)
})
t.Run("service stitches contact point into org's AM config", func(t *testing.T) { t.Run("service stitches contact point into org's AM config", func(t *testing.T) {
sut := createContactPointServiceSut(t, secretsService) sut := createContactPointServiceSut(t, secretsService)
newCp := createTestContactPoint() newCp := createTestContactPoint()