opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

optmized(monitor): query alertrecord by res_id (#22320)

Browse Source
This commit is contained in:
Zexi Li
2025-03-25 10:03:39 +08:00
committed by GitHub
parent 4b171f5045
commit 3dfb39cce9
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/monitor/models/alertrecord.go
+27 -2
View File
@@ -58,6 +58,7 @@ type SAlertRecord struct {
EvalData jsonutils.JSONObject `list:"user" update:"user" length:"medium"`
AlertRule jsonutils.JSONObject `list:"user" update:"user" length:"medium"`
ResType string `width:"36" list:"user" update:"user"`
ResIds string `length:"medium" list:"user"`
}
func init() {
@@ -130,6 +131,9 @@ func (manager *SAlertRecordManager) ListItemFilter(
if len(query.ResType) != 0 {
q.Filter(sqlchemy.Equals(q.Field("res_type"), query.ResType))
}
if len(query.ResId) != 0 {
q.Filter(sqlchemy.ContainsAny(q.Field("res_ids"), []string{query.ResId}))
}
if len(query.Filter) != 0 {
for i, _ := range query.Filter {
if strings.Contains(query.Filter[i], "trigger_time") {
@@ -159,7 +163,7 @@ func (man *SAlertRecordManager) getAlertingRecordQuery() *sqlchemy.SQuery {
}
func (man *SAlertRecordManager) CustomizeFilterList(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*db.CustomizeListFilters, error) {
/*func (man *SAlertRecordManager) CustomizeFilterList(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query jsonutils.JSONObject) (*db.CustomizeListFilters, error) {
filters := db.NewCustomizeListFilters()
input := new(monitor.AlertRecordListInput)
@@ -186,7 +190,7 @@ func (man *SAlertRecordManager) CustomizeFilterList(ctx context.Context, q *sqlc
})
}
return filters, nil
}
}*/
func (man *SAlertRecordManager) GetAlertRecord(id string) (*SAlertRecord, error) {
obj, err := man.FetchById(id)
@@ -339,6 +343,27 @@ func (record *SAlertRecord) CustomizeCreate(
return errors.Wrap(err, "unionEvalMatch error")
}
}
// fill res_ids
matches, err := record.GetEvalData()
if err != nil {
return errors.Wrap(err, "GetEvalData error")
}
resIds := []string{}
for _, match := range matches {
for k, v := range match.Tags {
switch k {
case "vm_id":
if record.ResType == monitor.METRIC_RES_TYPE_AGENT || record.ResType == monitor.METRIC_RES_TYPE_GUEST {
resIds = append(resIds, v)
}
case "host_id":
if record.ResType == monitor.METRIC_RES_TYPE_HOST {
resIds = append(resIds, v)
}
}
}
}
record.ResIds = strings.Join(resIds, ",")
return nil
}