feat(alerting): adds a result list to alertresult

Since one query can return multiple series we might be
interested in getting the result for each serie

pkg/services/alerting/executor.go

@@ -11,7 +11,7 @@ import (
 )
 
 var (
-	descriptionFmt = "Actual value: %1.2f for %s"
+	descriptionFmt = "Actual value: %1.2f for %s. "
 )
 
 type ExecutorImpl struct {
@@ -95,6 +95,8 @@ func (e *ExecutorImpl) GetRequestForAlertRule(rule *AlertRule, datasource *m.Dat
 func (e *ExecutorImpl) evaluateRule(rule *AlertRule, series tsdb.TimeSeriesSlice) *AlertResult {
 	e.log.Debug("Evaluating Alerting Rule", "seriesCount", len(series), "ruleName", rule.Name)
 
+	triggeredAlert := make([]*TriggeredAlert, 0)
+
 	for _, serie := range series {
 		e.log.Debug("Evaluating series", "series", serie.Name)
 		transformedValue, _ := rule.Transformer.Transform(serie)
@@ -102,23 +104,37 @@ func (e *ExecutorImpl) evaluateRule(rule *AlertRule, series tsdb.TimeSeriesSlice
 		critResult := evalCondition(rule.Critical, transformedValue)
 		e.log.Debug("Alert execution Crit", "name", serie.Name, "transformedValue", transformedValue, "operator", rule.Critical.Operator, "level", rule.Critical.Level, "result", critResult)
 		if critResult {
-			return &AlertResult{
+			triggeredAlert = append(triggeredAlert, &TriggeredAlert{
 				State:       alertstates.Critical,
 				ActualValue: transformedValue,
-				Description: fmt.Sprintf(descriptionFmt, transformedValue, serie.Name),
-			}
+				Name:        serie.Name,
+			})
 		}
 
 		warnResult := evalCondition(rule.Warning, transformedValue)
 		e.log.Debug("Alert execution Warn", "name", serie.Name, "transformedValue", transformedValue, "operator", rule.Warning.Operator, "level", rule.Warning.Level, "result", warnResult)
 		if warnResult {
-			return &AlertResult{
+			triggeredAlert = append(triggeredAlert, &TriggeredAlert{
 				State:       alertstates.Warn,
-				Description: fmt.Sprintf(descriptionFmt, transformedValue, serie.Name),
 				ActualValue: transformedValue,
-			}
+				Name:        serie.Name,
+			})
+		}
+	}
+
+	executionState := alertstates.Ok
+	description := ""
+	for _, raised := range triggeredAlert {
+		if raised.State == alertstates.Critical {
+			executionState = alertstates.Critical
 		}
+
+		if executionState != alertstates.Critical && raised.State == alertstates.Warn {
+			executionState = alertstates.Warn
+		}
+
+		description += fmt.Sprintf(descriptionFmt, raised.ActualValue, raised.Name)
 	}
 
-	return &AlertResult{State: alertstates.Ok, Description: "Alert is OK!"}
+	return &AlertResult{State: executionState, Description: description, TriggeredAlerts: triggeredAlert}
 }

pkg/services/alerting/models.go

@@ -9,12 +9,19 @@ type AlertJob struct {
 }
 
 type AlertResult struct {
-	State       string
+	State           string
+	ActualValue     float64
+	Duration        float64
+	TriggeredAlerts []*TriggeredAlert
+	Description     string
+	Error           error
+	AlertJob        *AlertJob
+}
+
+type TriggeredAlert struct {
 	ActualValue float64
-	Duration    float64
-	Description string
-	Error       error
-	AlertJob    *AlertJob
+	Name        string
+	State       string
 }
 
 type Level struct {