diff --git a/src/bean/vo/response/alert_rules.go b/src/bean/vo/response/alert_rules.go index c35a6a38c9a8e6dfb47ece2c5cffd781e5c98452..a64bcc19724208bc28cd161c9b94a9aebd98bcb3 100644 --- a/src/bean/vo/response/alert_rules.go +++ b/src/bean/vo/response/alert_rules.go @@ -4,6 +4,7 @@ import "gitlab.wodcloud.com/smart-operation/so-operation-api/src/bean/entity" type AlertRulesItem struct { entity.AlertRules `xorm:"extends"` + Expr string `json:"expr" form:"expr"` // 指标表达式(PromQL语句) AlertRuleType string `json:"alert_rule_type" xorm:"alert_rule_type"` // 预警规则类型 关联字典表 ClassParentName string `json:"class_parent_name" xorm:"class_parent_name"` ClassName string `json:"class_name" xorm:"class_name"` diff --git a/src/service/alert_rules.go b/src/service/alert_rules.go index 9ae340a10dd010dbd69abdab3bbfd4e771440d72..36495bde79b28ee8866b7e17d8298e40fca92d3d 100644 --- a/src/service/alert_rules.go +++ b/src/service/alert_rules.go @@ -213,7 +213,7 @@ func (a *AlertRulesSvc) List(req request.ListAlertRules) (resp response.AlertRul } session := db.NewSession() defer session.Close() - session.Table(new(entity.AlertRules)).Alias("r").Select("r.*,acp.class_name class_parent_name,ac.class_name,mc.metric_name metric_config_name,mc.alert_rule_type") + session.Table(new(entity.AlertRules)).Alias("r").Select("r.*,acp.class_name class_parent_name,ac.class_name,mc.expr,mc.metric_name metric_config_name,mc.alert_rule_type") session.Join("LEFT", "metric_config mc", "mc.id = r.metric_config_id") session.Join("LEFT", "alert_class ac", "ac.class_id = r.class_id") session.Join("LEFT", "alert_class acp", "acp.class_id = ac.parent_id")