From 19909f731ac2c52cdaa07ac55a575b5bc94b2fcb Mon Sep 17 00:00:00 2001 From: chuan-you <117634014+chuan-you@users.noreply.github.com> Date: Fri, 7 Apr 2023 10:38:34 +0800 Subject: [PATCH] Update utils.go (#5615) * Update utils.go All build alerting is not working * Update utils.go --- pkg/models/alerting/rules/utils.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/models/alerting/rules/utils.go b/pkg/models/alerting/rules/utils.go index d72e4db90..c71f3dfb9 100644 --- a/pkg/models/alerting/rules/utils.go +++ b/pkg/models/alerting/rules/utils.go @@ -173,8 +173,13 @@ func GetAlertingRulesStatus(ruleNamespace string, ruleChunk *ResourceRuleChunk, if !strings.HasPrefix(fileShort, ruleNamespace+"-") { continue } - resourceRules, ok := ruleChunk.ResourceRulesMap[strings.TrimPrefix(fileShort, ruleNamespace+"-")] - if !ok { + var resourceRules *ResourceRuleCollection + for resourceName, rules := range ruleChunk.ResourceRulesMap { + if strings.Contains(strings.TrimPrefix(fileShort, ruleNamespace+"-"), resourceName) { + resourceRules = rules + } + } + if resourceRules == nil { continue } if _, ok := resourceRules.GroupSet[group.Name]; !ok { @@ -244,7 +249,7 @@ out: if !strings.HasPrefix(fileShort, ruleNamespace+"-") { continue } - if strings.TrimPrefix(fileShort, ruleNamespace+"-") != rule.ResourceName { + if !strings.Contains(strings.TrimPrefix(fileShort, ruleNamespace+"-"), rule.ResourceName) { continue }