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

alert rule have to be pending before alerting is for is specified

Browse Source
This commit is contained in:
bergquist 2018-11-15 15:37:46 +01:00
parent 7ba04466a2
commit caec36e7ec
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/alerting/eval_context.go
View File

@ -126,7 +126,7 @@ func (c *EvalContext) GetNewState() m.AlertStateType {
} }
since := time.Now().Sub(c.Rule.LastStateChange) since := time.Now().Sub(c.Rule.LastStateChange)
if since > c.Rule.For { if c.PrevAlertState == m.AlertStatePending && since > c.Rule.For {
return m.AlertStateAlerting return m.AlertStateAlerting
} }

14
pkg/services/alerting/eval_context_test.go
View File

@ -66,8 +66,8 @@ func TestGetStateFromEvalContext(t *testing.T) {
}, },
}, },
{ {
name: "ok -> alerting. since its been firing for more than FOR", name: "ok -> pending. since it has to be pending longer than FOR and prev state is ok",
expected: models.AlertStateAlerting, expected: models.AlertStatePending,
applyFn: func(ec *EvalContext) { applyFn: func(ec *EvalContext) {
ec.PrevAlertState = models.AlertStateOK ec.PrevAlertState = models.AlertStateOK
ec.Firing = true ec.Firing = true
@ -75,6 +75,16 @@ func TestGetStateFromEvalContext(t *testing.T) {
ec.Rule.For = time.Minute * 2 ec.Rule.For = time.Minute * 2
}, },
}, },
{
name: "pending -> alerting. since its been firing for more than FOR and prev state is pending",
expected: models.AlertStateAlerting,
applyFn: func(ec *EvalContext) {
ec.PrevAlertState = models.AlertStatePending
ec.Firing = true
ec.Rule.LastStateChange = time.Now().Add(-(time.Hour * 5))
ec.Rule.For = time.Minute * 2
},
},
{ {
name: "alerting -> alerting. should not update regardless of FOR", name: "alerting -> alerting. should not update regardless of FOR",
expected: models.AlertStateAlerting, expected: models.AlertStateAlerting,