IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor(alerting): refactoring PR for OR conditions, #6579

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-11-17 15:48:15 +01:00
parent 457ae74343
commit 62e8a039a1
8 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/alerting/conditions/query.go
View File

@@ -173,7 +173,7 @@ func NewQueryCondition(model *simplejson.Json, index int) (*QueryCondition, erro
condition.Evaluator = evaluator
operatorJson := model.Get("operator")
operator := operatorJson.Get("type").MustString()
operator := operatorJson.Get("type").MustString("and")
condition.Operator = operator
return &condition, nil

3
pkg/services/alerting/eval_context.go
View File

@@ -17,8 +17,7 @@ type EvalContext struct {
EvalMatches []*EvalMatch
Logs []*ResultLogEntry
Error error
Description string
FiringEval string
ConditionEvals string
StartTime time.Time
EndTime time.Time
Rule *Rule

12
pkg/services/alerting/eval_handler.go
View File

@@ -2,6 +2,7 @@ package alerting
import (
"strconv"
"strings"
"time"
"github.com/grafana/grafana/pkg/log"
@@ -22,7 +23,8 @@ func NewEvalHandler() *DefaultEvalHandler {
func (e *DefaultEvalHandler) Eval(context *EvalContext) {
firing := true
firingEval := ""
conditionEvals := ""
for i := 0; i < len(context.Rule.Conditions); i++ {
condition := context.Rule.Conditions[i]
cr, err := condition.Eval(context)
@@ -36,24 +38,22 @@ func (e *DefaultEvalHandler) Eval(context *EvalContext) {
}
// calculating Firing based on operator
operator := "AND"
if cr.Operator == "or" {
firing = firing || cr.Firing
operator = "OR"
} else {
firing = firing && cr.Firing
}
if i > 0 {
firingEval = "[" + firingEval + " " + operator + " " + strconv.FormatBool(cr.Firing) + "]"
conditionEvals = "[" + conditionEvals + " " + strings.ToUpper(cr.Operator) + " " + strconv.FormatBool(cr.Firing) + "]"
} else {
firingEval = strconv.FormatBool(firing)
conditionEvals = strconv.FormatBool(firing)
}
context.EvalMatches = append(context.EvalMatches, cr.EvalMatches...)
}
context.FiringEval = firingEval + " = " + strconv.FormatBool(firing)
context.ConditionEvals = conditionEvals + " = " + strconv.FormatBool(firing)
context.Firing = firing
context.EndTime = time.Now()
elapsedTime := context.EndTime.Sub(context.StartTime) / time.Millisecond

16
pkg/services/alerting/eval_handler_test.go
View File

@@ -30,7 +30,7 @@ func TestAlertingExecutor(t *testing.T) {
handler.Eval(context)
So(context.Firing, ShouldEqual, true)
So(context.FiringEval, ShouldEqual, "true = true")
So(context.ConditionEvals, ShouldEqual, "true = true")
})
Convey("Show return false with not passing asdf", func() {
@@ -43,7 +43,7 @@ func TestAlertingExecutor(t *testing.T) {
handler.Eval(context)
So(context.Firing, ShouldEqual, false)
So(context.FiringEval, ShouldEqual, "[true AND false] = false")
So(context.ConditionEvals, ShouldEqual, "[true AND false] = false")
})
Convey("Show return true if any of the condition is passing with OR operator", func() {
@@ -56,7 +56,7 @@ func TestAlertingExecutor(t *testing.T) {
handler.Eval(context)
So(context.Firing, ShouldEqual, true)
So(context.FiringEval, ShouldEqual, "[true OR false] = true")
So(context.ConditionEvals, ShouldEqual, "[true OR false] = true")
})
Convey("Show return false if any of the condition is failing with AND operator", func() {
@@ -69,7 +69,7 @@ func TestAlertingExecutor(t *testing.T) {
handler.Eval(context)
So(context.Firing, ShouldEqual, false)
So(context.FiringEval, ShouldEqual, "[true AND false] = false")
So(context.ConditionEvals, ShouldEqual, "[true AND false] = false")
})
Convey("Show return true if one condition is failing with nested OR operator", func() {
@@ -83,7 +83,7 @@ func TestAlertingExecutor(t *testing.T) {
handler.Eval(context)
So(context.Firing, ShouldEqual, true)
So(context.FiringEval, ShouldEqual, "[[true AND true] OR false] = true")
So(context.ConditionEvals, ShouldEqual, "[[true AND true] OR false] = true")
})
Convey("Show return false if one condition is passing with nested OR operator", func() {
@@ -97,7 +97,7 @@ func TestAlertingExecutor(t *testing.T) {
handler.Eval(context)
So(context.Firing, ShouldEqual, false)
So(context.FiringEval, ShouldEqual, "[[true AND false] OR false] = false")
So(context.ConditionEvals, ShouldEqual, "[[true AND false] OR false] = false")
})
Convey("Show return false if a condition is failing with nested AND operator", func() {
@@ -111,7 +111,7 @@ func TestAlertingExecutor(t *testing.T) {
handler.Eval(context)
So(context.Firing, ShouldEqual, false)
So(context.FiringEval, ShouldEqual, "[[true AND false] AND true] = false")
So(context.ConditionEvals, ShouldEqual, "[[true AND false] AND true] = false")
})
Convey("Show return true if a condition is passing with nested OR operator", func() {
@@ -125,7 +125,7 @@ func TestAlertingExecutor(t *testing.T) {
handler.Eval(context)
So(context.Firing, ShouldEqual, true)
So(context.FiringEval, ShouldEqual, "[[true OR false] OR true] = true")
So(context.ConditionEvals, ShouldEqual, "[[true OR false] OR true] = true")
})
})
}