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

fix(alerting): move backend to seperate file

Browse Source
This commit is contained in:
bergquist 2016-06-01 11:23:30 +02:00
parent 4e1f801f6c
commit 69229211b2
3 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/services/alerting/datasources/backends.go Normal file
View File

@ -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)
}

0
pkg/services/alerting/graphite/graphite.go → pkg/services/alerting/datasources/graphite.go
View File

29
pkg/services/alerting/executor.go
View File

@ -2,8 +2,10 @@ package alerting
import ( import (
"fmt" "fmt"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models" 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" "math"
) )
@ -11,6 +13,10 @@ type Executor interface {
Execute(rule *m.AlertJob, responseQueue chan *m.AlertResult) Execute(rule *m.AlertJob, responseQueue chan *m.AlertResult)
} }
var (
ResultLogFmt = "%s executor: %s %1.2f %s %1.2f : %v"
)
type ExecutorImpl struct{} type ExecutorImpl struct{}
type compareFn func(float64, float64) bool 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 num1 <= num2 },
"": func(num1, num2 float64) bool { return false }, "": func(num1, num2 float64) bool { return false },
} }
var aggregator map[string]aggregationFn = map[string]aggregationFn{ var aggregator map[string]aggregationFn = map[string]aggregationFn{
"avg": func(series *m.TimeSeries) float64 { "avg": func(series *m.TimeSeries) float64 {
sum := float64(0) 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) { func (this *ExecutorImpl) Execute(job *m.AlertJob, responseQueue chan *m.AlertResult) {
response, err := this.GetSeries(job) response, err := b.GetSeries(job)
if err != nil { if err != nil {
responseQueue <- &m.AlertResult{State: "PENDING", Id: job.Rule.Id, Rule: job.Rule} 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 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{ return &m.AlertResult{
State: m.AlertStateCritical, State: m.AlertStateCritical,
Id: rule.Id, 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{ return &m.AlertResult{
State: m.AlertStateWarn, State: m.AlertStateWarn,
Id: rule.Id, Id: rule.Id,