remove wildcard rule when read init rule list

This commit is contained in:
liugq 2022-07-13 10:39:56 +08:00
parent 6b5178cb6f
commit a3d8e0bfd1
2 changed files with 3 additions and 2 deletions

View File

@ -288,7 +288,7 @@ func (engine *Engine) generateTimeFilter(rule *alerting.Rule, filterParam *alert
)
intervalDuration, err := time.ParseDuration(rule.Metrics.BucketSize)
if err != nil {
return nil, fmt.Errorf("parse bucket size [%s] of rule [%s] error: %v", rule.Metrics.BucketSize, rule.Name, err)
return nil, fmt.Errorf("parse bucket size of rule [%s] error: %v", rule.Name, err)
}
if intervalDuration / time.Hour >= 1 {
units = "h"
@ -596,6 +596,7 @@ func (engine *Engine) Do(rule *alerting.Rule) error {
Expression: rule.Metrics.Expression,
Objects: rule.Resource.Objects,
State: alerting.AlertStateError,
//Priority: "undefine",
Error: err.Error(),
}
}

View File

@ -17,7 +17,7 @@ func InitTasks() error {
//fetch alerting rules from es
q := orm.Query{
Size: 10000,
WildcardIndex: true,
//WildcardIndex: true,
}
q.Conds = orm.And(orm.Eq("enabled", true))
err, result := orm.Search(alerting.Rule{}, &q)