Skip to content

Commit 30035b2

Browse files
authored
Alerting: Fix invalid loading condition for vanilla Prometheus rules (grafana#92390)
Remove invalid loading condition
1 parent f990759 commit 30035b2

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

public/app/features/alerting/unified/hooks/useCombinedRule.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,7 @@ export function useCombinedRule({ ruleIdentifier, limitAlerts }: Props): Request
119119

120120
const [
121121
fetchRulerRuleGroup,
122-
{
123-
currentData: rulerRuleGroup,
124-
isLoading: isLoadingRulerGroup,
125-
error: rulerRuleGroupError,
126-
isUninitialized: rulerRuleGroupUninitialized,
127-
},
122+
{ currentData: rulerRuleGroup, isLoading: isLoadingRulerGroup, error: rulerRuleGroupError },
128123
] = alertRuleApi.endpoints.getRuleGroupForNamespace.useLazyQuery();
129124

130125
useEffect(() => {
@@ -166,7 +161,7 @@ export function useCombinedRule({ ruleIdentifier, limitAlerts }: Props): Request
166161
}, [ruleIdentifier, ruleSourceName, promRuleNs, rulerRuleGroup, ruleSource]);
167162

168163
return {
169-
loading: isLoadingDsFeatures || isLoadingPromRules || isLoadingRulerGroup || rulerRuleGroupUninitialized,
164+
loading: isLoadingDsFeatures || isLoadingPromRules || isLoadingRulerGroup,
170165
error: ruleLocationError ?? promRuleNsError ?? rulerRuleGroupError,
171166
result: rule,
172167
};

0 commit comments

Comments
 (0)