diff --git a/model/alerting/alert.go b/model/alerting/alert.go index 8ff4b6d7..10b3421c 100644 --- a/model/alerting/alert.go +++ b/model/alerting/alert.go @@ -13,6 +13,7 @@ type Alert struct { Created time.Time `json:"created,omitempty" elastic_mapping:"created: { type: date }"` Updated time.Time `json:"updated,omitempty" elastic_mapping:"updated: { type: date }"` RuleID string `json:"rule_id" elastic_mapping:"rule_id: { type: keyword }"` + RuleName string `json:"rule_name" elastic_mapping:"rule_name: { type: keyword }"` ResourceID string `json:"resource_id" elastic_mapping:"resource_id: { type: keyword }"` ResourceName string `json:"resource_name" elastic_mapping:"resource_name: { type: keyword }"` Expression string `json:"expression" elastic_mapping:"expression: { type: keyword, copy_to:search_text }"` diff --git a/service/alerting/elasticsearch/engine.go b/service/alerting/elasticsearch/engine.go index b19b4cfb..b30b2dcc 100644 --- a/service/alerting/elasticsearch/engine.go +++ b/service/alerting/elasticsearch/engine.go @@ -542,6 +542,7 @@ func (engine *Engine) Do(rule *alerting.Rule) error { Created: time.Now(), Updated: time.Now(), RuleID: rule.ID, + RuleName: rule.Name, ResourceID: rule.Resource.ID, ResourceName: rule.Resource.Name, Expression: rule.Metrics.Expression, @@ -576,6 +577,7 @@ func (engine *Engine) Do(rule *alerting.Rule) error { Created: time.Now(), Updated: time.Now(), RuleID: rule.ID, + RuleName: rule.Name, ResourceID: rule.Resource.ID, ResourceName: rule.Resource.Name, Expression: rule.Metrics.Expression,