feat(annotations): added support to show grafana stored annotations in graphs, #5982

pkg/api/dtos/alerting.go

@@ -54,17 +54,6 @@ type EvalMatch struct {
 	Value  float64           `json:"value"`
 }
 
-type AlertHistory struct {
-	AlertId   int64     `json:"alertId"`
-	NewState  string    `json:"newState"`
-	Timestamp time.Time `json:"timestamp"`
-	Title     string    `json:"title"`
-	Text      string    `json:"text"`
-	Metric    string    `json:"metric"`
-
-	Data *simplejson.Json `json:"data"`
-}
-
 type NotificationTestCommand struct {
 	Name     string           `json:"name"`
 	Type     string           `json:"type"`

pkg/api/dtos/annotations.go

@@ -0,0 +1,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"`
+
+	Data *simplejson.Json `json:"data"`
+}