Merge remote-tracking branch 'origin/master' into getting-started-panel-css2

2016-11-18 16:31:54 +01:00
parent 0c9001c7ae 61bb9cbc13
commit fd512457d8
93 changed files with 854 additions and 1344 deletions
@@ -35,11 +35,12 @@ type AlertTestCommand struct {
 }

 type AlertTestResult struct {
-	Firing      bool                  `json:"firing"`
-	TimeMs      string                `json:"timeMs"`
-	Error       string                `json:"error,omitempty"`
-	EvalMatches []*EvalMatch          `json:"matches,omitempty"`
-	Logs        []*AlertTestResultLog `json:"logs,omitempty"`
+	Firing         bool                  `json:"firing"`
+	ConditionEvals string                `json:"conditionEvals"`
+	TimeMs         string                `json:"timeMs"`
+	Error          string                `json:"error,omitempty"`
+	EvalMatches    []*EvalMatch          `json:"matches,omitempty"`
+	Logs           []*AlertTestResultLog `json:"logs,omitempty"`
 }

 type AlertTestResultLog struct {