From dfb1b1918c293c052ee286eefc020dc148172e73 Mon Sep 17 00:00:00 2001
From: utkarshcmu <utkarsh.cmu@gmail.com>
Date: Tue, 15 Nov 2016 06:35:25 -0800
Subject: [PATCH] Implemented operator based firiing in backend

---
 pkg/services/alerting/conditions/query.go | 8 +++++++-
 pkg/services/alerting/eval_handler.go     | 9 +++++----
 pkg/services/alerting/interfaces.go       | 1 +
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkg/services/alerting/conditions/query.go b/pkg/services/alerting/conditions/query.go
index b73db9d590e..394c1557490 100644
--- a/pkg/services/alerting/conditions/query.go
+++ b/pkg/services/alerting/conditions/query.go
@@ -23,6 +23,7 @@ type QueryCondition struct {
 	Query         AlertQuery
 	Reducer       QueryReducer
 	Evaluator     AlertEvaluator
+	Operator      string
 	HandleRequest tsdb.HandleRequestFunc
 }
 
@@ -72,6 +73,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) (*alerting.Conditio
 	return &alerting.ConditionResult{
 		Firing:      evalMatchCount > 0,
 		NoDataFound: emptySerieCount == len(seriesList),
+		Operator:    c.Operator,
 		EvalMatches: matches,
 	}, nil
 }
@@ -168,8 +170,12 @@ func NewQueryCondition(model *simplejson.Json, index int) (*QueryCondition, erro
 	if err != nil {
 		return nil, err
 	}
-
 	condition.Evaluator = evaluator
+
+	operatorJson := model.Get("operator")
+	operator := operatorJson.Get("type").MustString()
+	condition.Operator = operator
+
 	return &condition, nil
 }
 
diff --git a/pkg/services/alerting/eval_handler.go b/pkg/services/alerting/eval_handler.go
index 538c639abb8..7079eac5f38 100644
--- a/pkg/services/alerting/eval_handler.go
+++ b/pkg/services/alerting/eval_handler.go
@@ -32,10 +32,11 @@ func (e *DefaultEvalHandler) Eval(context *EvalContext) {
 			break
 		}
 
-		// break if result has not triggered yet
-		if cr.Firing == false {
-			firing = false
-			break
+		// calculating Firing based on operator
+		if cr.Operator == "or" {
+			firing = firing || cr.Firing
+		} else {
+			firing = firing && cr.Firing
 		}
 
 		context.EvalMatches = append(context.EvalMatches, cr.EvalMatches...)
diff --git a/pkg/services/alerting/interfaces.go b/pkg/services/alerting/interfaces.go
index cc2561473e3..566fbdb2898 100644
--- a/pkg/services/alerting/interfaces.go
+++ b/pkg/services/alerting/interfaces.go
@@ -24,6 +24,7 @@ type Notifier interface {
 type ConditionResult struct {
 	Firing      bool
 	NoDataFound bool
+	Operator    string
 	EvalMatches []*EvalMatch
 }