IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 20:24:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(alerting): temp fix for broken AND condition

Browse Source 
This should be refactored. lets return condition results instead
of setting new value on the evalContext. The condition execution
should only be able to update its own state.

closes #6449
This commit is contained in:
bergquist 2016-11-03 07:14:34 +01:00
parent 89a3d023ce
commit ff5d4e8e0c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) {
}
emptySerieCount := 0
evalMatchCount := 0
for _, series := range seriesList {
reducedValue := c.Reducer.Reduce(series)
evalMatch := c.Evaluator.Eval(reducedValue)
@ -58,6 +59,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) {
}
if evalMatch {
evalMatchCount++
context.EvalMatches = append(context.EvalMatches, &alerting.EvalMatch{
Metric: series.Name,
Value: reducedValue.Float64,
@ -66,7 +68,7 @@ func (c *QueryCondition) Eval(context *alerting.EvalContext) {
}
context.NoDataFound = emptySerieCount == len(seriesList)
context.Firing = len(context.EvalMatches) > 0
context.Firing = evalMatchCount > 0
}
func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange *tsdb.TimeRange) (tsdb.TimeSeriesSlice, error) {