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

save last alert notification time to kv

This commit is contained in:
liugq 2022-04-27 09:45:28 +08:00
parent 0f19e0ce7e
commit 0b88aba906
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/alerting/constants.go Normal file
View File

@ -0,0 +1,11 @@
/* Copyright © INFINI Ltd. All rights reserved.
* web: https://infinilabs.com
* mail: hello#infini.ltd */
package alerting
const (
KVLastNotificationTime = "alert_last_notification_time"
KVLastTermStartTime = "alert_last_term_start_time"
KVLastEscalationTime = "alert_last_escalation_time"
)

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

@ -13,8 +13,10 @@ import (
log "github.com/cihub/seelog" log "github.com/cihub/seelog"
"github.com/valyala/fasttemplate" "github.com/valyala/fasttemplate"
"infini.sh/console/model/alerting" "infini.sh/console/model/alerting"
alerting2 "infini.sh/console/service/alerting"
"infini.sh/console/service/alerting/action" "infini.sh/console/service/alerting/action"
"infini.sh/framework/core/elastic" "infini.sh/framework/core/elastic"
"infini.sh/framework/core/kv"
"infini.sh/framework/core/orm" "infini.sh/framework/core/orm"
"infini.sh/framework/core/util" "infini.sh/framework/core/util"
"io" "io"
@ -534,6 +536,7 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
Objects: rule.Resource.Objects, Objects: rule.Resource.Objects,
ConditionResult: checkResults, ConditionResult: checkResults,
Conditions: rule.Conditions, Conditions: rule.Conditions,
State: alerting.AlertStateNormal,
} }
if err != nil { if err != nil {
return err return err
@ -575,7 +578,18 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
alertItem.Error = err.Error() alertItem.Error = err.Error()
return err return err
} }
period := time.Now().Sub(rule.LastNotificationTime) if rule.LastNotificationTime.IsZero() {
timeBytes, err := kv.GetValue(alerting2.KVLastNotificationTime, []byte(rule.ID))
if err != nil {
return fmt.Errorf("get last notification time from kv error: %w", err)
}
rule.LastNotificationTime, err = time.ParseInLocation(time.RFC3339, string(timeBytes), time.UTC)
if err != nil {
return fmt.Errorf("parse last notification time from kv error: %w", err)
}
}
period := time.Now().Sub(rule.LastNotificationTime.Local())
//log.Error(lastAlertItem.ID, period, periodDuration) //log.Error(lastAlertItem.ID, period, periodDuration)
if lastAlertItem.ID == "" || period > periodDuration { if lastAlertItem.ID == "" || period > periodDuration {
@ -583,6 +597,8 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
alertItem.ActionExecutionResults = actionResults alertItem.ActionExecutionResults = actionResults
//todo init last notification time when create task (by last alert item is notified) //todo init last notification time when create task (by last alert item is notified)
rule.LastNotificationTime = time.Now() rule.LastNotificationTime = time.Now()
strTime := time.Now().UTC().Format(time.RFC3339)
kv.AddValue(alerting2.KVLastNotificationTime, []byte(rule.ID), []byte(strTime))
alertItem.IsNotified = true alertItem.IsNotified = true
//kv.AddValue(alerting2.KVLastNotificationTime, []byte(rule.ID), []byte(rule.LastNotificationTime.Format(time.RFC3339))) //kv.AddValue(alerting2.KVLastNotificationTime, []byte(rule.ID), []byte(rule.LastNotificationTime.Format(time.RFC3339)))
} }