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

read last term start time from kv

This commit is contained in:
liugq 2022-04-27 11:23:07 +08:00
parent 56227db850
commit 57d5dbc662
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,6 +555,8 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
}else{ }else{
if lastAlertItem.State == "" || lastAlertItem.State == alerting.AlertStateNormal { if lastAlertItem.State == "" || lastAlertItem.State == alerting.AlertStateNormal {
rule.LastTermStartTime = time.Now() rule.LastTermStartTime = time.Now()
strTime := rule.LastTermStartTime.UTC().Format(time.RFC3339)
kv.AddValue(alerting2.KVLastTermStartTime, []byte(rule.ID), []byte(strTime))
} }
log.Debugf("check condition result of rule %s is %v", conditionResults, rule.ID ) log.Debugf("check condition result of rule %s is %v", conditionResults, rule.ID )
var ( var (
@ -579,16 +581,12 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
return err return err
} }
if rule.LastNotificationTime.IsZero() { if rule.LastNotificationTime.IsZero() {
timeBytes, err := kv.GetValue(alerting2.KVLastNotificationTime, []byte(rule.ID)) tm, err := readTimeFromKV(alerting2.KVLastNotificationTime, []byte(rule.ID))
if err != nil { if err != nil {
return fmt.Errorf("get last notification time from kv error: %w", err) return fmt.Errorf("get last notification time from kv error: %w", err)
} }
timeStr := string(timeBytes) if !tm.IsZero(){
if timeStr != ""{ rule.LastNotificationTime = tm
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()) period := time.Now().Sub(rule.LastNotificationTime.Local())
@ -603,7 +601,6 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
strTime := time.Now().UTC().Format(time.RFC3339) strTime := time.Now().UTC().Format(time.RFC3339)
kv.AddValue(alerting2.KVLastNotificationTime, []byte(rule.ID), []byte(strTime)) 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)))
} }
isAck, err := hasAcknowledgedRule(rule.ID, rule.LastTermStartTime) isAck, err := hasAcknowledgedRule(rule.ID, rule.LastTermStartTime)
if err != nil { if err != nil {
@ -616,13 +613,33 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
return err return err
} }
//todo init last term start time when create task (by last alert item of state normal) //todo init last term start time when create task (by last alert item of state normal)
if time.Now().Sub(rule.LastTermStartTime) > throttlePeriod { if rule.LastTermStartTime.IsZero(){
if time.Now().Sub(rule.LastEscalationTime) > periodDuration { tm, err := readTimeFromKV(alerting2.KVLastTermStartTime, []byte(rule.ID))
if err != nil {
return fmt.Errorf("get last term start time from kv error: %w", err)
}
if !tm.IsZero(){
rule.LastTermStartTime = tm
}
}
if time.Now().Sub(rule.LastTermStartTime.Local()) > throttlePeriod {
if rule.LastEscalationTime.IsZero(){
tm, err := readTimeFromKV(alerting2.KVLastEscalationTime, []byte(rule.ID))
if err != nil {
return fmt.Errorf("get last escalation time from kv error: %w", err)
}
if !tm.IsZero(){
rule.LastEscalationTime = tm
}
}
if time.Now().Sub(rule.LastEscalationTime.Local()) > periodDuration {
actionResults := performChannels(rule.Channels.Escalation, conditionResults) actionResults := performChannels(rule.Channels.Escalation, conditionResults)
alertItem.ActionExecutionResults = append(alertItem.ActionExecutionResults, actionResults...) alertItem.ActionExecutionResults = append(alertItem.ActionExecutionResults, actionResults...)
//todo init last escalation time when create task (by last alert item is escalated) //todo init last escalation time when create task (by last alert item is escalated)
rule.LastEscalationTime = time.Now() rule.LastEscalationTime = time.Now()
alertItem.IsEscalated = true alertItem.IsEscalated = true
strTime := rule.LastEscalationTime.UTC().Format(time.RFC3339)
kv.AddValue(alerting2.KVLastEscalationTime, []byte(rule.ID), []byte(strTime))
} }
} }
@ -852,4 +869,17 @@ func hasAcknowledgedRule(ruleID string, startTime time.Time) (bool, error){
return false, nil return false, nil
} }
return true, nil return true, nil
}
func readTimeFromKV(bucketKey string, key []byte)(time.Time, error){
timeBytes, err := kv.GetValue(bucketKey, key)
zeroTime := time.Time{}
if err != nil {
return zeroTime, err
}
timeStr := string(timeBytes)
if timeStr != ""{
return time.ParseInLocation(time.RFC3339, string(timeBytes), time.UTC)
}
return zeroTime, nil
} }