feat(alerting): show panel specific alert annotations, #5694

pkg/api/annotations.go

@@ -9,11 +9,14 @@ import (
 func GetAnnotations(c *middleware.Context) Response {
 
 	query := &annotations.ItemQuery{
-		From:  c.QueryInt64("from") / 1000,
-		To:    c.QueryInt64("to") / 1000,
-		Type:  annotations.ItemType(c.Query("type")),
-		OrgId: c.OrgId,
-		Limit: c.QueryInt64("limit"),
+		From:        c.QueryInt64("from") / 1000,
+		To:          c.QueryInt64("to") / 1000,
+		Type:        annotations.ItemType(c.Query("type")),
+		OrgId:       c.OrgId,
+		AlertId:     c.QueryInt64("alertId"),
+		DashboardId: c.QueryInt64("dashboardId"),
+		PanelId:     c.QueryInt64("panelId"),
+		Limit:       c.QueryInt64("limit"),
 	}
 
 	repo := annotations.GetRepository()

pkg/api/dtos/annotations.go

@@ -3,13 +3,15 @@ package dtos
 import "github.com/grafana/grafana/pkg/components/simplejson"
 
 type Annotation struct {
-	AlertId   int64  `json:"alertId"`
-	NewState  string `json:"newState"`
-	PrevState string `json:"prevState"`
-	Time      int64  `json:"time"`
-	Title     string `json:"title"`
-	Text      string `json:"text"`
-	Metric    string `json:"metric"`
+	AlertId     int64  `json:"alertId"`
+	DashboardId int64  `json:"dashboardId"`
+	PanelId     int64  `json:"panelId"`
+	NewState    string `json:"newState"`
+	PrevState   string `json:"prevState"`
+	Time        int64  `json:"time"`
+	Title       string `json:"title"`
+	Text        string `json:"text"`
+	Metric      string `json:"metric"`
 
 	Data *simplejson.Json `json:"data"`
 }