admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update utils.go (#5615)

Browse Source 
* Update utils.go

All build alerting is not working

* Update utils.go
This commit is contained in:
chuan-you
2023-04-07 10:38:34 +08:00
committed by GitHub
parent f59ada60b6
commit 19909f731a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/models/alerting/rules/utils.go
View File

@@ -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
}