persist recovered events

src/server/engine/consume.go

@@ -44,9 +44,11 @@ func consume(events []interface{}, sema *semaphore.Semaphore) {
 func consumeOne(event *models.AlertCurEvent) {
 	logEvent(event, "consume")
 	persist(event)
-	fillUsers(event)
-	callback(event)
-	notify(event)
+	if event.NotifyRecovered == 1 {
+		fillUsers(event)
+		callback(event)
+		notify(event)
+	}
 }
 
 func persist(event *models.AlertCurEvent) {

src/server/engine/worker.go

@@ -352,27 +352,25 @@ 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，否则用户会比较困惑
-			// 当然，其实rule的各个字段都可能发生变化了，都更新一下吧
-			event.RuleName = r.rule.Name
-			event.RuleNote = r.rule.Note
-			event.Severity = r.rule.Severity
-			event.PromForDuration = r.rule.PromForDuration
-			event.PromQl = r.rule.PromQl
-			event.PromEvalInterval = r.rule.PromEvalInterval
-			event.Callbacks = r.rule.Callbacks
-			event.CallbacksJSON = r.rule.CallbacksJSON
-			event.RunbookUrl = r.rule.RunbookUrl
-			event.NotifyRecovered = r.rule.NotifyRecovered
-			event.NotifyChannels = r.rule.NotifyChannels
-			event.NotifyChannelsJSON = r.rule.NotifyChannelsJSON
-			event.NotifyGroups = r.rule.NotifyGroups
-			event.NotifyGroupsJSON = r.rule.NotifyGroupsJSON
-			r.pushEventToQueue(event)
-		}
+		event.IsRecovered = true
+		event.LastEvalTime = now
+		// 可能是因为调整了promql才恢复的，所以事件里边要体现最新的promql，否则用户会比较困惑
+		// 当然，其实rule的各个字段都可能发生变化了，都更新一下吧
+		event.RuleName = r.rule.Name
+		event.RuleNote = r.rule.Note
+		event.Severity = r.rule.Severity
+		event.PromForDuration = r.rule.PromForDuration
+		event.PromQl = r.rule.PromQl
+		event.PromEvalInterval = r.rule.PromEvalInterval
+		event.Callbacks = r.rule.Callbacks
+		event.CallbacksJSON = r.rule.CallbacksJSON
+		event.RunbookUrl = r.rule.RunbookUrl
+		event.NotifyRecovered = r.rule.NotifyRecovered
+		event.NotifyChannels = r.rule.NotifyChannels
+		event.NotifyChannelsJSON = r.rule.NotifyChannelsJSON
+		event.NotifyGroups = r.rule.NotifyGroups
+		event.NotifyGroupsJSON = r.rule.NotifyGroupsJSON
+		r.pushEventToQueue(event)
 	}
 }