feat(alerting): added eval match to test results

pkg/api/alerting.go

@@ -106,6 +106,9 @@ func AlertTest(c *middleware.Context, dto dtos.AlertTestCommand) Response {
 	for _, log := range res.Logs {
 		dtoRes.Logs = append(dtoRes.Logs, &dtos.AlertTestResultLog{Message: log.Message, Data: log.Data})
 	}
+	for _, match := range res.EvalMatches {
+		dtoRes.EvalMatches = append(dtoRes.EvalMatches, &dtos.EvalMatch{Metric: match.Metric, Value: match.Value})
+	}
 
 	dtoRes.TimeMs = fmt.Sprintf("%1.3fms", res.GetDurationMs())
 

pkg/api/dtos/alerting.go

@@ -35,10 +35,11 @@ type AlertTestCommand struct {
 }
 
 type AlertTestResult struct {
-	Firing bool                  `json:"firing"`
-	TimeMs string                `json:"timeMs"`
-	Error  string                `json:"error,omitempty"`
-	Logs   []*AlertTestResultLog `json:"logs,omitempty"`
+	Firing      bool                  `json:"firing"`
+	TimeMs      string                `json:"timeMs"`
+	Error       string                `json:"error,omitempty"`
+	EvalMatches []*EvalMatch          `json:"matches,omitempty"`
+	Logs        []*AlertTestResultLog `json:"logs,omitempty"`
 }
 
 type AlertTestResultLog struct {
@@ -46,7 +47,8 @@ type AlertTestResultLog struct {
 	Data    interface{} `json:"data"`
 }
 
-type AlertEvent struct {
-	Metric string  `json:"metric"`
-	Value  float64 `json:"value"`
+type EvalMatch struct {
+	Tags   map[string]string `json:"tags,omitempty"`
+	Metric string            `json:"metric"`
+	Value  float64           `json:"value"`
 }