Skip to content

Commit cdf8d6d

Browse files
author
Cairry
committed
🚧 fix(consume): recovered alarm notify tailed
1 parent 2968011 commit cdf8d6d

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

alert/consumer/consumer.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,19 @@ func (c *Consume) filterAlertEvents(faultCenter models.FaultCenter, alerts map[s
214214
continue
215215
}
216216

217-
// 过滤掉 非告警中 状态的事件
218-
if event.Status != models.StateAlerting {
219-
if event.IsRecovered {
220-
c.removeAlertFromCache(event)
221-
if err := process.RecordAlertHisEvent(c.ctx, *event); err != nil {
222-
logc.Error(c.ctx.Ctx, fmt.Sprintf("Failed to record alert history: %v", err))
223-
}
224-
}
225-
217+
// 过滤掉 非告警中, 非恢复 状态的事件
218+
if event.Status != models.StateAlerting && event.Status != models.StateRecovered {
226219
continue
227220
}
228221

222+
// 记录恢复状态的事件
223+
if event.IsRecovered {
224+
c.removeAlertFromCache(event)
225+
if err := process.RecordAlertHisEvent(c.ctx, *event); err != nil {
226+
logc.Error(c.ctx.Ctx, fmt.Sprintf("Failed to record alert history: %v", err))
227+
}
228+
}
229+
229230
if valid := c.validateEvent(event, faultCenter); valid {
230231
newEvents = append(newEvents, event)
231232
}

internal/repo/notice.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func (nr NoticeRepo) List(tenantId, noticeTmplId, query string) ([]models.AlertN
7676
db.Where("tenant_id = ?", tenantId)
7777
}
7878
if noticeTmplId != "" {
79-
db.Where("notice_tmpl_id = ?", noticeTmplId)
79+
db.Where("routes LIKE ?", "%"+noticeTmplId+"%")
8080
}
8181
if query != "" {
8282
db.Where("uuid LIKE ? OR name LIKE ? OR env LIKE ? OR notice_type LIKE ?", "%"+query+"%", "%"+query+"%", "%"+query+"%", "%"+query+"%")

0 commit comments

Comments
 (0)