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

sort condition results by severity, result_value

This commit is contained in:
liugq 2022-05-26 18:25:36 +08:00
parent 5069e4cf39
commit 1d8cd16774
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -623,7 +623,6 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
paramsCtx = newParameterCtx(rule, checkResults, util.MapStr{ paramsCtx = newParameterCtx(rule, checkResults, util.MapStr{
alerting2.ParamEventID: alertItem.ID, alerting2.ParamEventID: alertItem.ID,
alerting2.ParamTimestamp: alertItem.Created.Unix(), alerting2.ParamTimestamp: alertItem.Created.Unix(),
"severity": severity,
}) })
alertItem.Severity = severity alertItem.Severity = severity
@ -766,8 +765,28 @@ func newParameterCtx(rule *alerting.Rule, checkResults *alerting.ConditionResult
conditionParams []util.MapStr conditionParams []util.MapStr
firstGroupValue string firstGroupValue string
firstThreshold string firstThreshold string
severity string
) )
if len(checkResults.ResultItems) > 0 {
severity = checkResults.ResultItems[0].ConditionItem.Severity
sort.Slice(checkResults.ResultItems, func(i, j int) bool {
if alerting.SeverityWeights[checkResults.ResultItems[i].ConditionItem.Severity] > alerting.SeverityWeights[checkResults.ResultItems[j].ConditionItem.Severity] {
return true
}
return false
})
sort.Slice(checkResults.ResultItems, func(i, j int) bool {
if vi, ok := checkResults.ResultItems[i].ResultValue.(float64); ok {
if vj, ok := checkResults.ResultItems[j].ResultValue.(float64); ok {
return vi > vj
}
}
return false
})
}
for i, resultItem := range checkResults.ResultItems { for i, resultItem := range checkResults.ResultItems {
if i == 0 { if i == 0 {
firstGroupValue = strings.Join(resultItem.GroupValues, ",") firstGroupValue = strings.Join(resultItem.GroupValues, ",")
firstThreshold = strings.Join(resultItem.ConditionItem.Values, ",") firstThreshold = strings.Join(resultItem.ConditionItem.Values, ",")
@ -789,6 +808,7 @@ func newParameterCtx(rule *alerting.Rule, checkResults *alerting.ConditionResult
"first_group_value": firstGroupValue, "first_group_value": firstGroupValue,
"first_threshold": firstThreshold, "first_threshold": firstThreshold,
"rule_name": rule.Name, "rule_name": rule.Name,
"severity": severity,
} }
err := util.MergeFields(paramsCtx, extraParams, true) err := util.MergeFields(paramsCtx, extraParams, true)
if err != nil { if err != nil {
@ -803,21 +823,10 @@ func (engine *Engine) Test(rule *alerting.Rule) ([]alerting.ActionExecutionResul
return nil, fmt.Errorf("check condition error:%w", err) return nil, fmt.Errorf("check condition error:%w", err)
} }
var actionResults []alerting.ActionExecutionResult var actionResults []alerting.ActionExecutionResult
var (
severity = "warning"
)
if len(checkResults.ResultItems) > 0 {
for _, conditionResult := range checkResults.ResultItems {
if alerting.SeverityWeights[severity] < alerting.SeverityWeights[conditionResult.ConditionItem.Severity] {
severity = conditionResult.ConditionItem.Severity
}
}
}
paramsCtx := newParameterCtx(rule, checkResults,util.MapStr{ paramsCtx := newParameterCtx(rule, checkResults,util.MapStr{
alerting2.ParamEventID: util.GetUUID(), alerting2.ParamEventID: util.GetUUID(),
alerting2.ParamTimestamp: time.Now().Unix(), alerting2.ParamTimestamp: time.Now().Unix(),
"severity": severity,
} ) } )
err = attachTitleMessageToCtx(rule, paramsCtx) err = attachTitleMessageToCtx(rule, paramsCtx)
if err != nil { if err != nil {