innov
/
nightingale
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix ForDuration (#999)

This commit is contained in:
zheng 2022-06-28 16:13:23 +08:00 committed by GitHub
parent 2e8ea354d7
commit 54cc981956
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/engine/worker.go
View File

@ -347,8 +347,7 @@ func (r RuleEval) handleNewEvent(event *models.AlertCurEvent) {
} else {
r.pendings[event.Hash] = event
}
if r.pendings[event.Hash].LastEvalTime-r.pendings[event.Hash].TriggerTime > int64(event.PromForDuration) {
if r.pendings[event.Hash].LastEvalTime-r.pendings[event.Hash].TriggerTime+int64(event.PromEvalInterval) >= int64(event.PromForDuration) {
r.fireEvent(event)
}
}
@ -399,7 +398,7 @@ func (r RuleEval) recoverRule(alertingKeys map[string]struct{}, now int64) {
}
// 如果配置了留观时长，就不能立马恢复了
if r.rule.RecoverDuration > 0 && now-event.LastEvalTime <= r.rule.RecoverDuration {
if r.rule.RecoverDuration > 0 && now-event.LastEvalTime < r.rule.RecoverDuration {
continue
}