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

This commit is contained in:
George Robinson 2022-11-28 21:56:22 +00:00 committed by GitHub
parent 7436872dab
commit 110fdf4da9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions

View File

@ -146,7 +146,6 @@ func (cmd *ConditionsCmd) Execute(_ context.Context, _ time.Time, vars mathexp.V
matches = append(matches, EvalMatch{
Metric: "NoData",
})
noDataFound = true
}
firingCount = 0

View File

@ -502,7 +502,6 @@ func TestConditionsCmd(t *testing.T) {
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",
vars: mathexp.Vars{
"A": mathexp.Results{
@ -529,7 +528,7 @@ func TestConditionsCmd(t *testing.T) {
},
},
expected: func() mathexp.Results {
v := newNumber(nil)
v := newNumber(ptr.Float64(0))
v.SetMeta([]EvalMatch{{Value: ptr.Float64(5)}, {Metric: "NoData"}})
return newResults(v)
},