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

NGAlert: Fix GET for Alertmanager config (#33379)

Browse Source 
Signed-off-by: Ganesh Vernekar <ganeshvern@gmail.com>
This commit is contained in:
Ganesh Vernekar 2021-04-27 20:48:19 +05:30 committed by GitHub
parent 50795bc760
commit 467ab124dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/services/ngalert/api/api_alertmanager.go
View File

@ -66,13 +66,15 @@ func (srv AlertmanagerSrv) RouteGetAlertingConfig(c *models.ReqContext) response
return response.Error(http.StatusInternalServerError, "failed to unmarshal alertmanager configuration", err) return response.Error(http.StatusInternalServerError, "failed to unmarshal alertmanager configuration", err)
} }
var apiReceiverName string result := apimodels.GettableUserConfig{
var receivers []*apimodels.GettableGrafanaReceiver TemplateFiles: cfg.TemplateFiles,
alertmanagerCfg := cfg.AlertmanagerConfig AlertmanagerConfig: apimodels.GettableApiAlertingConfig{
if len(alertmanagerCfg.Receivers) > 0 { Config: cfg.AlertmanagerConfig.Config,
apiReceiverName = alertmanagerCfg.Receivers[0].Name },
receivers = make([]*apimodels.GettableGrafanaReceiver, 0, len(alertmanagerCfg.Receivers[0].PostableGrafanaReceivers.GrafanaManagedReceivers)) }
for _, pr := range alertmanagerCfg.Receivers[0].PostableGrafanaReceivers.GrafanaManagedReceivers { for _, recv := range cfg.AlertmanagerConfig.Receivers {
receivers := make([]*apimodels.GettableGrafanaReceiver, 0, len(recv.PostableGrafanaReceivers.GrafanaManagedReceivers))
for _, pr := range recv.PostableGrafanaReceivers.GrafanaManagedReceivers {
secureFields := make(map[string]bool, len(pr.SecureSettings)) secureFields := make(map[string]bool, len(pr.SecureSettings))
for k := range pr.SecureSettings { for k := range pr.SecureSettings {
secureFields[k] = true secureFields[k] = true
@ -90,22 +92,13 @@ func (srv AlertmanagerSrv) RouteGetAlertingConfig(c *models.ReqContext) response
} }
receivers = append(receivers, &gr) receivers = append(receivers, &gr)
} }
} gettableApiReceiver := apimodels.GettableApiReceiver{
GettableGrafanaReceivers: apimodels.GettableGrafanaReceivers{
gettableApiReceiver := apimodels.GettableApiReceiver{ GrafanaManagedReceivers: receivers,
GettableGrafanaReceivers: apimodels.GettableGrafanaReceivers{
GrafanaManagedReceivers: receivers,
},
}
gettableApiReceiver.Name = apiReceiverName
result := apimodels.GettableUserConfig{
TemplateFiles: cfg.TemplateFiles,
AlertmanagerConfig: apimodels.GettableApiAlertingConfig{
Config: alertmanagerCfg.Config,
Receivers: []*apimodels.GettableApiReceiver{
&gettableApiReceiver,
}, },
}, }
gettableApiReceiver.Name = recv.Name
result.AlertmanagerConfig.Receivers = append(result.AlertmanagerConfig.Receivers, &gettableApiReceiver)
} }
return response.JSON(http.StatusOK, result) return response.JSON(http.StatusOK, result)