feat(alerting): remove dummie values from email notifier

bergquist · bergquist · commit 48e1a17ac2f2 · 2016-06-23T16:30:12.000+02:00
diff --git a/pkg/api/alerting.go b/pkg/api/alerting.go
@@ -82,7 +82,7 @@ func GetAlerts(c *middleware.Context) Response {
 
 	//TODO: should be possible to speed this up with lookup table
 	for _, alert := range alertDTOs {
-		for _, dash := range *dashboardsQuery.Result {
+		for _, dash := range dashboardsQuery.Result {
 			if alert.DashboardId == dash.Id {
 				alert.DashbboardUri = "db/" + dash.Slug
 			}
diff --git a/pkg/api/playlist_play.go b/pkg/api/playlist_play.go
@@ -18,7 +18,7 @@ func populateDashboardsById(dashboardByIds []int64) ([]m.PlaylistDashboardDto, e
 			return result, err
 		}
 
-		for _, item := range *dashboardQuery.Result {
+		for _, item := range dashboardQuery.Result {
 			result = append(result, m.PlaylistDashboardDto{
 				Id:    item.Id,
 				Slug:  item.Slug,
diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go
@@ -151,7 +151,7 @@ type GetDashboardTagsQuery struct {
 
 type GetDashboardsQuery struct {
 	DashboardIds []int64
-	Result       *[]Dashboard
+	Result       []*Dashboard
 }
 
 type GetDashboardSlugByIdQuery struct {
diff --git a/pkg/services/alerting/notifier.go b/pkg/services/alerting/notifier.go
@@ -2,6 +2,7 @@ package alerting
 
 import (
 	"fmt"
+	"strconv"
 
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -62,15 +63,38 @@ func (this *EmailNotifier) Dispatch(alertResult *AlertResult) {
 		grafanaUrl += "/" + setting.AppSubUrl
 	}
 
+	query := &m.GetDashboardsQuery{
+		DashboardIds: []int64{alertResult.AlertJob.Rule.DashboardId},
+	}
+
+	if err := bus.Dispatch(query); err != nil {
+		this.log.Error("Failed to load dashboard", "error", err)
+		return
+	}
+
+	if len(query.Result) != 1 {
+		this.log.Error("Can only support one dashboard", "result", len(query.Result))
+		return
+	}
+
+	dashboard := query.Result[0]
+
+	panelId := strconv.Itoa(int(alertResult.AlertJob.Rule.PanelId))
+
+	//TODO: get from alertrule and transforms to seconds
+	from := "1466169458375"
+	to := "1466171258375"
+
+	renderUrl := fmt.Sprintf("%s/render/dashboard-solo/db/%s?from=%s&to=%s&panelId=%s&width=1000&height=500", grafanaUrl, dashboard.Slug, from, to, panelId)
 	cmd := &m.SendEmailCommand{
 		Data: map[string]interface{}{
 			"Name":            "Name",
 			"State":           alertResult.State,
 			"Description":     alertResult.Description,
 			"TriggeredAlerts": alertResult.TriggeredAlerts,
-			"DashboardLink":   grafanaUrl + "/dashboard/db/alerting",
+			"DashboardLink":   grafanaUrl + "/dashboard/db/" + dashboard.Slug,
 			"AlertPageUrl":    grafanaUrl + "/alerting",
-			"DashboardImage":  grafanaUrl + "/render/dashboard-solo/db/alerting?from=1466169458375&to=1466171258375&panelId=1&width=1000&height=500",
+			"DashboardImage":  renderUrl,
 		},
 		To:       []string{this.To},
 		Template: "alert_notification.html",
diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go
@@ -249,10 +249,10 @@ func GetDashboards(query *m.GetDashboardsQuery) error {
 		return m.ErrCommandValidationFailed
 	}
 
-	var dashboards = make([]m.Dashboard, 0)
+	var dashboards = make([]*m.Dashboard, 0)
 
 	err := x.In("id", query.DashboardIds).Find(&dashboards)
-	query.Result = &dashboards
+	query.Result = dashboards
 
 	if err != nil {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func GetAlerts(c *middleware.Context) Response {`
`82`	`82`
`83`	`83`	`//TODO: should be possible to speed this up with lookup table`
`84`	`84`	`for _, alert := range alertDTOs {`
`85`		`- for _, dash := range *dashboardsQuery.Result {`
	`85`	`+ for _, dash := range dashboardsQuery.Result {`
`86`	`86`	`if alert.DashboardId == dash.Id {`
`87`	`87`	`alert.DashbboardUri = "db/" + dash.Slug`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func populateDashboardsById(dashboardByIds []int64) ([]m.PlaylistDashboardDto, e`
`18`	`18`	`return result, err`
`19`	`19`	`}`
`20`	`20`
`21`		`- for _, item := range *dashboardQuery.Result {`
	`21`	`+ for _, item := range dashboardQuery.Result {`
`22`	`22`	`result = append(result, m.PlaylistDashboardDto{`
`23`	`23`	`Id: item.Id,`
`24`	`24`	`Slug: item.Slug,`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ type GetDashboardTagsQuery struct {`
`151`	`151`
`152`	`152`	`type GetDashboardsQuery struct {`
`153`	`153`	`DashboardIds []int64`
`154`		`- Result *[]Dashboard`
	`154`	`+ Result []*Dashboard`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`type GetDashboardSlugByIdQuery struct {`