From 69229211b23ed828e39a6c080a39dd18ea23073e Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Wed, 1 Jun 2016 11:23:30 +0200
Subject: [PATCH] fix(alerting): move backend to seperate file

---
 pkg/services/alerting/datasources/backends.go | 14 +++++++++
 .../{graphite => datasources}/graphite.go     |  0
 pkg/services/alerting/executor.go             | 29 ++++++++++---------
 3 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 pkg/services/alerting/datasources/backends.go
 rename pkg/services/alerting/{graphite => datasources}/graphite.go (100%)

diff --git a/pkg/services/alerting/datasources/backends.go b/pkg/services/alerting/datasources/backends.go
new file mode 100644
index 00000000000..45ba587e572
--- /dev/null
+++ b/pkg/services/alerting/datasources/backends.go
@@ -0,0 +1,14 @@
+package graphite
+
+import (
+	"fmt"
+	m "github.com/grafana/grafana/pkg/models"
+)
+
+func GetSeries(job *m.AlertJob) (m.TimeSeriesSlice, error) {
+	if job.Datasource.Type == m.DS_GRAPHITE {
+		return GraphiteClient{}.GetSeries(job)
+	}
+
+	return nil, fmt.Errorf("Grafana does not support alerts for %s", job.Datasource.Type)
+}
diff --git a/pkg/services/alerting/graphite/graphite.go b/pkg/services/alerting/datasources/graphite.go
similarity index 100%
rename from pkg/services/alerting/graphite/graphite.go
rename to pkg/services/alerting/datasources/graphite.go
diff --git a/pkg/services/alerting/executor.go b/pkg/services/alerting/executor.go
index ad62c0d822f..f300f67d632 100644
--- a/pkg/services/alerting/executor.go
+++ b/pkg/services/alerting/executor.go
@@ -2,8 +2,10 @@ package alerting
 
 import (
 	"fmt"
+
+	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/alerting/graphite"
+	b "github.com/grafana/grafana/pkg/services/alerting/datasources"
 	"math"
 )
 
@@ -11,6 +13,10 @@ type Executor interface {
 	Execute(rule *m.AlertJob, responseQueue chan *m.AlertResult)
 }
 
+var (
+	ResultLogFmt = "%s executor: %s  %1.2f %s %1.2f : %v"
+)
+
 type ExecutorImpl struct{}
 
 type compareFn func(float64, float64) bool
@@ -23,7 +29,6 @@ var operators map[string]compareFn = map[string]compareFn{
 	"<=": func(num1, num2 float64) bool { return num1 <= num2 },
 	"":   func(num1, num2 float64) bool { return false },
 }
-
 var aggregator map[string]aggregationFn = map[string]aggregationFn{
 	"avg": func(series *m.TimeSeries) float64 {
 		sum := float64(0)
@@ -71,16 +76,8 @@ var aggregator map[string]aggregationFn = map[string]aggregationFn{
 	},
 }
 
-func (this *ExecutorImpl) GetSeries(job *m.AlertJob) (m.TimeSeriesSlice, error) {
-	if job.Datasource.Type == m.DS_GRAPHITE {
-		return graphite.GraphiteClient{}.GetSeries(job)
-	}
-
-	return nil, fmt.Errorf("Grafana does not support alerts for %s", job.Datasource.Type)
-}
-
 func (this *ExecutorImpl) Execute(job *m.AlertJob, responseQueue chan *m.AlertResult) {
-	response, err := this.GetSeries(job)
+	response, err := b.GetSeries(job)
 
 	if err != nil {
 		responseQueue <- &m.AlertResult{State: "PENDING", Id: job.Rule.Id, Rule: job.Rule}
@@ -96,8 +93,11 @@ func (this *ExecutorImpl) ValidateRule(rule m.AlertRule, series m.TimeSeriesSlic
 		}
 
 		var aggValue = aggregator[rule.Aggregator](serie)
+		var critOperartor = operators[rule.CritOperator]
+		var critResult = critOperartor(aggValue, rule.CritLevel)
 
-		if operators[rule.CritOperator](aggValue, rule.CritLevel) {
+		log.Debug(ResultLogFmt, "Crit", serie.Name, aggValue, rule.CritOperator, rule.CritLevel, critResult)
+		if critResult {
 			return &m.AlertResult{
 				State:       m.AlertStateCritical,
 				Id:          rule.Id,
@@ -107,7 +107,10 @@ func (this *ExecutorImpl) ValidateRule(rule m.AlertRule, series m.TimeSeriesSlic
 			}
 		}
 
-		if operators[rule.WarnOperator](aggValue, rule.WarnLevel) {
+		var warnOperartor = operators[rule.CritOperator]
+		var warnResult = warnOperartor(aggValue, rule.CritLevel)
+		log.Debug(ResultLogFmt, "Warn", serie.Name, aggValue, rule.WarnOperator, rule.WarnLevel, warnResult)
+		if warnResult {
 			return &m.AlertResult{
 				State:       m.AlertStateWarn,
 				Id:          rule.Id,