public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Alerting: Fix ConditionsCmd behavior when last is No Data (#58953)

Browse Source
This commit is contained in:
George Robinson
2022-11-28 21:56:22 +00:00
committed by GitHub
parent 7436872dab
commit 110fdf4da9
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/expr/classic/classic.go
-1
View File
@@ -146,7 +146,6 @@ func (cmd *ConditionsCmd) Execute(_ context.Context, _ time.Time, vars mathexp.V
matches = append(matches, EvalMatch{ matches = append(matches, EvalMatch{
Metric: "NoData", Metric: "NoData",
}) })
noDataFound = true
} }
firingCount = 0 firingCount = 0
pkg/expr/classic/classic_test.go
+1 -2
View File
@@ -502,7 +502,6 @@ func TestConditionsCmd(t *testing.T) {
return newResults(v) return newResults(v)
}, },
}, { }, {
// TODO: NoData behavior is different if the last condition is no data
name: "two queries with two conditions using and operator and last is No Data", name: "two queries with two conditions using and operator and last is No Data",
vars: mathexp.Vars{ vars: mathexp.Vars{
"A": mathexp.Results{ "A": mathexp.Results{
@@ -529,7 +528,7 @@ func TestConditionsCmd(t *testing.T) {
}, },
}, },
expected: func() mathexp.Results { expected: func() mathexp.Results {
v := newNumber(nil) v := newNumber(ptr.Float64(0))
v.SetMeta([]EvalMatch{{Value: ptr.Float64(5)}, {Metric: "NoData"}}) v.SetMeta([]EvalMatch{{Value: ptr.Float64(5)}, {Metric: "NoData"}})
return newResults(v) return newResults(v)
}, },