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

2016-09-09 11:30:55 +02:00
parent 0ac4ece00d
commit 4a2f2fba73
15 changed files with 156 additions and 114 deletions
@@ -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()