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: 404 error status when no alertmanager configuration (#32651)

Browse Source
This commit is contained in:
Sofia Papagiannaki 2021-04-05 17:03:00 +03:00 committed by GitHub
parent bc60991fae
commit a80f31a5c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,14 +60,15 @@ func (srv AlertmanagerSrv) RouteDeleteSilence(c *models.ReqContext) response.Res
func (srv AlertmanagerSrv) RouteGetAlertingConfig(c *models.ReqContext) response.Response { func (srv AlertmanagerSrv) RouteGetAlertingConfig(c *models.ReqContext) response.Response {
query := ngmodels.GetLatestAlertmanagerConfigurationQuery{} query := ngmodels.GetLatestAlertmanagerConfigurationQuery{}
err := srv.store.GetLatestAlertmanagerConfiguration(&query) if err := srv.store.GetLatestAlertmanagerConfiguration(&query); err != nil {
if err != nil { if errors.Is(err, store.ErrNoAlertmanagerConfiguration) {
return response.Error(http.StatusNotFound, err.Error(), nil)
}
return response.Error(http.StatusInternalServerError, "failed to get latest configuration", err) return response.Error(http.StatusInternalServerError, "failed to get latest configuration", err)
} }
cfg := apimodels.PostableUserConfig{} cfg := apimodels.PostableUserConfig{}
err = yaml.Unmarshal([]byte(query.Result.AlertmanagerConfiguration), &cfg) if err := yaml.Unmarshal([]byte(query.Result.AlertmanagerConfiguration), &cfg); err != nil {
if err != nil {
return response.Error(http.StatusInternalServerError, "failed to unmarshal alertmanager configuration", err) return response.Error(http.StatusInternalServerError, "failed to unmarshal alertmanager configuration", err)
} }