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

feat: include bucket conditions information in rule detail API response (#125)

This commit is contained in:
silenceqi 2025-02-13 16:20:44 +08:00 committed by GitHub
parent 60eac5ebf6
commit b8138de666
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugin/api/alerting/rule.go
View File

@ -201,9 +201,13 @@ func (alertAPI *AlertAPI) getRuleDetail(w http.ResponseWriter, req *http.Request
return return
} }
metricExpression, _ := obj.Metrics.GenerateExpression() metricExpression, _ := obj.Metrics.GenerateExpression()
for i, cond := range obj.Conditions.Items { conditions := obj.Conditions
if obj.BucketConditions != nil {
conditions = *obj.BucketConditions
}
for i, cond := range conditions.Items {
expression, _ := cond.GenerateConditionExpression() expression, _ := cond.GenerateConditionExpression()
obj.Conditions.Items[i].Expression = strings.ReplaceAll(expression, "result", metricExpression) conditions.Items[i].Expression = strings.ReplaceAll(expression, "result", metricExpression)
} }
alertNumbers, err := alertAPI.getRuleAlertMessageNumbers([]string{obj.ID}) alertNumbers, err := alertAPI.getRuleAlertMessageNumbers([]string{obj.ID})
if err != nil { if err != nil {
@ -329,6 +333,7 @@ func (alertAPI *AlertAPI) getRuleDetail(w http.ResponseWriter, req *http.Request
"bucket_size": obj.Metrics.BucketSize, //统计周期 "bucket_size": obj.Metrics.BucketSize, //统计周期
"updated": obj.Updated, "updated": obj.Updated,
"conditions": obj.Conditions, "conditions": obj.Conditions,
"bucket_conditions": obj.BucketConditions,
"message_count": alertNumbers[obj.ID], //所有关联告警消息数（包括已恢复的） "message_count": alertNumbers[obj.ID], //所有关联告警消息数（包括已恢复的）
"state": state, "state": state,
"enabled": obj.Enabled, "enabled": obj.Enabled,