Change response type for Cortex/Loki alerts

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/prometheus/alertmanager v0.21.1-0.20210211203738-a7ca7b1d2951
 	github.com/prometheus/client_golang v1.9.0
 	github.com/prometheus/common v0.15.0
+	github.com/prometheus/prometheus v1.8.2-0.20201014093524-73e2ce1bd643
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
 	golang.org/x/oauth2 v0.0.0-20210210192628-66670185b0cd // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect

pkg/api/testing.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/prometheus/alertmanager/config"
+	"github.com/prometheus/prometheus/promql"
 )
 
 // swagger:route Get /api/v1/receiver/test testing RouteTestReceiverConfig
@@ -71,7 +72,7 @@ type EvalAlertConditionCommand struct {
 
 // swagger:model
 type TestRuleResponse struct {
-	Alerts                interface{}            `json:"alerts"`
+	Alerts                promql.Vector          `json:"alerts"`
 	GrafanaAlertInstances AlertInstancesResponse `json:"grafana_alert_instances"`
 }
 

spec.json

@@ -1611,6 +1611,17 @@
       "type": "object",
       "x-go-package": "github.com/grafana/grafana/pkg/components/simplejson"
     },
+    "Label": {
+      "type": "object",
+      "title": "Label is a key/value pair of strings.",
+      "properties": {
+        "Name": {
+          "type": "string",
+          "x-go-name": "Value"
+        }
+      },
+      "x-go-package": "github.com/prometheus/prometheus/pkg/labels"
+    },
     "LabelName": {
       "description": "A LabelName is a key for a LabelSet or Metric.  It has a value associated\ntherewith.",
       "type": "string",
@@ -1624,6 +1635,14 @@
       },
       "x-go-package": "github.com/prometheus/common/model"
     },
+    "Labels": {
+      "description": "Labels is a sorted set of labels. Order has to be guaranteed upon\ninstantiation.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Label"
+      },
+      "x-go-package": "github.com/prometheus/prometheus/pkg/labels"
+    },
     "LotexQuery": {
       "type": "object",
       "properties": {
@@ -1895,6 +1914,21 @@
       },
       "x-go-package": "github.com/grafana/alerting-api/pkg/api"
     },
+    "Point": {
+      "type": "object",
+      "title": "Point represents a single data point for a given timestamp.",
+      "properties": {
+        "T": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "V": {
+          "type": "number",
+          "format": "double"
+        }
+      },
+      "x-go-package": "github.com/prometheus/prometheus/promql"
+    },
     "PushoverConfig": {
       "type": "object",
       "properties": {
@@ -2261,6 +2295,24 @@
       "title": "RuleType models the type of a rule.",
       "x-go-package": "github.com/prometheus/client_golang/api/prometheus/v1"
     },
+    "Sample": {
+      "type": "object",
+      "title": "Sample is a single sample belonging to a metric.",
+      "properties": {
+        "Metric": {
+          "$ref": "#/definitions/Labels"
+        },
+        "T": {
+          "type": "integer",
+          "format": "int64"
+        },
+        "V": {
+          "type": "number",
+          "format": "double"
+        }
+      },
+      "x-go-package": "github.com/prometheus/prometheus/promql"
+    },
     "Secret": {
       "type": "string",
       "title": "Secret special type for storing secrets.",
@@ -2554,8 +2606,7 @@
       "type": "object",
       "properties": {
         "alerts": {
-          "type": "object",
-          "x-go-name": "Alerts"
+          "$ref": "#/definitions/Vector"
         },
         "grafana_alert_instances": {
           "$ref": "#/definitions/AlertInstancesResponse"
@@ -2564,9 +2615,8 @@
       "x-go-package": "github.com/grafana/alerting-api/pkg/api"
     },
     "URL": {
-      "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use RawPath, an optional field which only gets\nset if the default encoding is different from Path.\n\nURL's String method uses the EscapedPath method to obtain the path. See the\nEscapedPath method for more details.",
       "type": "object",
-      "title": "A URL represents a parsed URL (technically, a URI reference).",
+      "title": "URL is a custom URL type that allows validation at configuration load time.",
       "properties": {
         "ForceQuery": {
           "type": "boolean"
@@ -2599,7 +2649,7 @@
           "$ref": "#/definitions/Userinfo"
         }
       },
-      "x-go-package": "net/url"
+      "x-go-package": "github.com/prometheus/common/config"
     },
     "UpdateDashboardAclCommand": {
       "type": "object",
@@ -2615,7 +2665,9 @@
       "x-go-package": "github.com/grafana/grafana/pkg/api/dtos"
     },
     "UpsertAlertDefinitionCommand": {
+      "description": "https://github.com/grafana/grafana/blob/debb82e12417e82a0e2bd09e1a450065f884c1bc/pkg/services/ngalert/models.go#L85",
       "type": "object",
+      "title": "UpsertAlertDefinitionCommand is copy of the unexported struct:",
       "properties": {
         "condition": {
           "description": "Condition is the refID of the query or expression to be evaluated",
@@ -2673,6 +2725,14 @@
       },
       "x-go-package": "github.com/grafana/alerting-api/pkg/api"
     },
+    "Vector": {
+      "description": "Vector is basically only an alias for model.Samples, but the\ncontract is that in a Vector, all Samples have the same timestamp.",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/Sample"
+      },
+      "x-go-package": "github.com/prometheus/prometheus/promql"
+    },
     "VictorOpsConfig": {
       "type": "object",
       "title": "VictorOpsConfig configures notifications via VictorOps.",