feat(alerting): moves getNewState to evalHandler

closes #7149
2017-01-13 11:02:24 +01:00
parent bccdd7cad1
commit 0873d493c2
6 changed files with 109 additions and 126 deletions
@@ -120,10 +120,10 @@ func AlertTest(c *middleware.Context, dto dtos.AlertTestCommand) Response {
 	}

 	res := backendCmd.Result
-
 	dtoRes := &dtos.AlertTestResult{
 		Firing:         res.Firing,
 		ConditionEvals: res.ConditionEvals,
+		State:          res.Rule.State,
 	}

 	if res.Error != nil {
@@ -36,6 +36,7 @@ type AlertTestCommand struct {

 type AlertTestResult struct {
 	Firing         bool                  `json:"firing"`
+	State          m.AlertStateType      `json:"state"`
 	ConditionEvals string                `json:"conditionEvals"`
 	TimeMs         string                `json:"timeMs"`
 	Error          string                `json:"error,omitempty"`