floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change event id from alert id to event message id

This commit is contained in:
liugq 2023-08-31 10:47:37 +08:00
parent 16b18e3ca5
commit a318284075
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
service/alerting/elasticsearch/engine.go
View File

@ -689,7 +689,7 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
recoverCfg := rule.RecoveryNotificationConfig recoverCfg := rule.RecoveryNotificationConfig
if recoverCfg != nil && recoverCfg.EventEnabled && recoverCfg.Enabled { if recoverCfg != nil && recoverCfg.EventEnabled && recoverCfg.Enabled {
paramsCtx = newParameterCtx(rule, checkResults, util.MapStr{ paramsCtx = newParameterCtx(rule, checkResults, util.MapStr{
alerting2.ParamEventID: alertItem.ID, alerting2.ParamEventID: alertMessage.ID,
alerting2.ParamTimestamp: alertItem.Created.Unix(), alerting2.ParamTimestamp: alertItem.Created.Unix(),
"duration": alertItem.Created.Sub(alertMessage.Created).String(), "duration": alertItem.Created.Sub(alertMessage.Created).String(),
"trigger_at": alertMessage.Created.Unix(), "trigger_at": alertMessage.Created.Unix(),
@ -722,7 +722,6 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
triggerAt = alertMessage.Created triggerAt = alertMessage.Created
} }
paramsCtx = newParameterCtx(rule, checkResults, util.MapStr{ paramsCtx = newParameterCtx(rule, checkResults, util.MapStr{
alerting2.ParamEventID: alertItem.ID,
alerting2.ParamTimestamp: alertItem.Created.Unix(), alerting2.ParamTimestamp: alertItem.Created.Unix(),
"duration": alertItem.Created.Sub(triggerAt).String(), "duration": alertItem.Created.Sub(triggerAt).String(),
"trigger_at": triggerAt.Unix(), "trigger_at": triggerAt.Unix(),
@ -789,6 +788,9 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
if alertMessage != nil && alertMessage.Status == alerting.MessageStateIgnored { if alertMessage != nil && alertMessage.Status == alerting.MessageStateIgnored {
return nil return nil
} }
if alertMessage != nil && paramsCtx != nil {
paramsCtx[alerting2.ParamEventID] = alertMessage.ID
}
// if channel is not enabled return // if channel is not enabled return
notifyCfg := rule.GetNotificationConfig() notifyCfg := rule.GetNotificationConfig()
if notifyCfg == nil || !notifyCfg.Enabled { if notifyCfg == nil || !notifyCfg.Enabled {
@ -815,12 +817,14 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
//log.Error(lastAlertItem.ID, period, periodDuration) //log.Error(lastAlertItem.ID, period, periodDuration)
if paramsCtx == nil { if paramsCtx == nil {
paramsCtx = newParameterCtx(rule, checkResults, util.MapStr{ paramsCtx = newParameterCtx(rule, checkResults, util.MapStr{
alerting2.ParamEventID: alertItem.ID,
alerting2.ParamTimestamp: alertItem.Created.Unix(), alerting2.ParamTimestamp: alertItem.Created.Unix(),
"priority": priority, "priority": priority,
"duration": alertItem.Created.Sub(alertMessage.Created).String(), "duration": alertItem.Created.Sub(alertMessage.Created).String(),
"trigger_at": alertMessage.Created.Unix(), "trigger_at": alertMessage.Created.Unix(),
}) })
if alertMessage != nil {
paramsCtx[alerting2.ParamEventID] = alertMessage.ID
}
} }
if alertMessage == nil || period > periodDuration { if alertMessage == nil || period > periodDuration {