alerting: propagate alert validation issues to the user instead of just 'invalid alert data' message

2018-10-12 23:03:54 -07:00
parent 7051a150cf
commit ec4698fb96
8 changed files with 23 additions and 19 deletions
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path"

+	"github.com/grafana/grafana/pkg/services/alerting"
 	"github.com/grafana/grafana/pkg/services/dashboards"

 	"github.com/grafana/grafana/pkg/api/dtos"
@@ -251,8 +252,8 @@ func PostDashboard(c *m.ReqContext, cmd m.SaveDashboardCommand) Response {
 		return Error(403, err.Error(), err)
 	}

-	if err == m.ErrDashboardContainsInvalidAlertData {
-		return Error(500, "Invalid alert data. Cannot save dashboard", err)
+	if validationErr, ok := err.(alerting.ValidationError); ok {
+		return Error(422, validationErr.Error(), nil)
 	}

 	if err != nil {