Merge pull request #7249 from grafana/alerting_test_alertrule

Enable error and no_data overrides when testing alerting.
2017-01-13 15:18:02 +01:00
parent d354f3a8af 0873d493c2
commit 1efeaafdbf
6 changed files with 109 additions and 126 deletions
@@ -37,6 +37,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"`