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: Update github.com/grafana/alerting (#64882)

Browse Source
This commit is contained in:
George Robinson
2023-03-16 13:59:35 +00:00
committed by GitHub
parent 998b035d52
commit 0b506b4ccc
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/services/ngalert/notifier/receivers.go
View File

@@ -61,24 +61,12 @@ func (am *Alertmanager) TestReceivers(ctx context.Context, c apimodels.TestRecei
for _, r := range c.Receivers {
greceivers := make([]*alertingNotify.GrafanaReceiver, 0, len(r.GrafanaManagedReceivers))
for _, gr := range r.PostableGrafanaReceivers.GrafanaManagedReceivers {
var settings map[string]interface{}
//TODO: We shouldn't need to do this marshalling.
j, err := gr.Settings.MarshalJSON()
if err != nil {
return nil, fmt.Errorf("unable to marshal settings to JSON: %v", err)
}
err = json.Unmarshal(j, &settings)
if err != nil {
return nil, fmt.Errorf("unable to marshal settings into map: %v", err)
}
greceivers = append(greceivers, &alertingNotify.GrafanaReceiver{
UID: gr.UID,
Name: gr.Name,
Type: gr.Type,
DisableResolveMessage: gr.DisableResolveMessage,
Settings: settings,
Settings: json.RawMessage(gr.Settings),
SecureSettings: gr.SecureSettings,
})
}