persist recovered events

This commit is contained in:
Ulric Qin 2022-03-03 10:44:06 +08:00
parent e515039ad4
commit 94a49c17f7
2 changed files with 24 additions and 24 deletions

View File

@ -44,10 +44,12 @@ func consume(events []interface{}, sema *semaphore.Semaphore) {
func consumeOne(event *models.AlertCurEvent) {
logEvent(event, "consume")
persist(event)
if event.NotifyRecovered == 1 {
fillUsers(event)
callback(event)
notify(event)
}
}
func persist(event *models.AlertCurEvent) {
has, err := models.AlertCurEventExists("hash=?", event.Hash)

View File

@ -352,7 +352,6 @@ func (r RuleEval) recoverRule(alertingKeys map[string]struct{}, now int64) {
delete(r.fires, hash)
delete(r.pendings, hash)
if r.rule.NotifyRecovered == 1 {
event.IsRecovered = true
event.LastEvalTime = now
// 可能是因为调整了promql才恢复的所以事件里边要体现最新的promql否则用户会比较困惑
@ -374,7 +373,6 @@ func (r RuleEval) recoverRule(alertingKeys map[string]struct{}, now int64) {
r.pushEventToQueue(event)
}
}
}
func (r RuleEval) pushEventToQueue(event *models.AlertCurEvent) {
if !event.IsRecovered {