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

pkg/api/api.go

@@ -254,8 +254,6 @@ func Register(r *macaron.Macaron) {
 			r.Get("/", wrap(GetAlerts))
 		})
 
-		r.Get("/alert-history", wrap(GetAlertHistory))
-
 		r.Get("/alert-notifications", wrap(GetAlertNotifications))
 
 		r.Group("/alert-notifications", func() {
@@ -266,6 +264,8 @@ func Register(r *macaron.Macaron) {
 			r.Delete("/:notificationId", wrap(DeleteAlertNotification))
 		}, reqOrgAdmin)
 
+		r.Get("/annotations", wrap(GetAnnotations))
+
 		// error test
 		r.Get("/metrics/error", wrap(GenerateError))