From e0cb0a889b69402a4729b9d0655d77382c5ca88e Mon Sep 17 00:00:00 2001 From: junot <49136171+junotx@users.noreply.github.com> Date: Thu, 24 Nov 2022 16:08:48 +0800 Subject: [PATCH] fix rule status (#5381) Signed-off-by: junot Signed-off-by: junot --- pkg/models/alerting/rulegroup.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/models/alerting/rulegroup.go b/pkg/models/alerting/rulegroup.go index ff0dcc59d..71639d878 100644 --- a/pkg/models/alerting/rulegroup.go +++ b/pkg/models/alerting/rulegroup.go @@ -421,7 +421,7 @@ func (o *ruleGroupOperator) listClusterRuleGroups(ctx context.Context, selector } statusg, ok := statusRuleGroupMap[g.Name] specRules := g.Spec.Rules - if ok && len(statusg.Rules) == len(specRules) { + if ok && len(statusg.Rules) > 0 { var ruleIds = make([]string, len(specRules)) var ruleDisableFlags = make([]bool, len(specRules)) for j := range specRules { @@ -542,7 +542,7 @@ func (o *ruleGroupOperator) GetClusterRuleGroup(ctx context.Context, name string var setStatus bool specRules := resourceRuleGroup.Spec.Rules for _, g := range statusRuleGroups { - if g.Name == resourceRuleGroup.Name && len(g.Rules) == len(specRules) { + if g.Name == resourceRuleGroup.Name && len(g.Rules) > 0 { var ruleIds = make([]string, len(specRules)) var ruleDisableFlags = make([]bool, len(specRules)) for j := range specRules { @@ -616,7 +616,7 @@ func (o *ruleGroupOperator) listGlobalRuleGroups(ctx context.Context, selector l } statusg, ok := statusRuleGroupMap[g.Name] specRules := g.Spec.Rules - if ok && len(statusg.Rules) == len(specRules) { + if ok && len(statusg.Rules) > 0 { var ruleIds = make([]string, len(specRules)) var ruleDisableFlags = make([]bool, len(specRules)) for j := range specRules { @@ -791,7 +791,7 @@ func (o *ruleGroupOperator) GetGlobalRuleGroup(ctx context.Context, name string) var setStatus bool specRules := resourceRuleGroup.Spec.Rules for _, g := range statusRuleGroups { - if g.Name == resourceRuleGroup.Name && len(g.Rules) == len(specRules) { + if g.Name == resourceRuleGroup.Name && len(g.Rules) > 0 { var ruleIds = make([]string, len(specRules)) var ruleDisableFlags = make([]bool, len(specRules)) for j := range specRules {