public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Improve save dashboard error messages (#35780) (#35819)

Browse Source 
Includes panel and dashboard id in alert
extractor errors.
Logs all non-400 dashboard errors.

Fixes #35751

(cherry picked from commit 477d4197fb)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
This commit is contained in:
Grot (@grafanabot)
2021-06-16 15:19:27 +02:00
committed by GitHub
co-authored by Marcus Efraimsson
parent 3f0e41cd93
commit 1569452425
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/dashboard.go
+2 -2
View File
@@ -389,7 +389,7 @@ func (hs *HTTPServer) dashboardSaveErrorToApiResponse(err error) response.Respon
if body := dashboardErr.Body(); body != nil {
return response.JSON(dashboardErr.StatusCode, body)
}
if errors.Is(dashboardErr, models.ErrDashboardUpdateAccessDenied) {
if dashboardErr.StatusCode != 400 {
return response.Error(dashboardErr.StatusCode, dashboardErr.Error(), err)
}
return response.Error(dashboardErr.StatusCode, dashboardErr.Error(), nil)
@@ -401,7 +401,7 @@ func (hs *HTTPServer) dashboardSaveErrorToApiResponse(err error) response.Respon
var validationErr alerting.ValidationError
if ok := errors.As(err, &validationErr); ok {
return response.Error(422, validationErr.Error(), nil)
return response.Error(422, validationErr.Error(), err)
}
var pluginErr models.UpdatePluginDashboardError