public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update utils for determining paused state of a rule

Browse Source
This commit is contained in:
Tom Ratcliffe
2024-04-03 18:38:49 +01:00
committed by Tom Ratcliffe
parent 7fd9cbbfb5
commit a94c3d63cc
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/alerting/unified/components/rules/RulesTable.tsx
+1 -1
View File
@@ -157,7 +157,7 @@ function useColumns(showSummaryColumn: boolean, showGroupColumn: boolean, showNe
const isDeleting = !!(hasRuler(rulesSource) && rulerRulesLoaded(rulesSource) && promRule && !rulerRule);
const isCreating = !!(hasRuler(rulesSource) && rulerRulesLoaded(rulesSource) && rulerRule && !promRule);
const isPaused = isGrafanaRulerRulePaused(rule);
const isPaused = isGrafanaRulerRule(rule.rulerRule) && isGrafanaRulerRulePaused(rule.rulerRule);
return <RuleState rule={rule} isDeleting={isDeleting} isCreating={isCreating} isPaused={isPaused} />;
},
public/app/features/alerting/unified/utils/rules.ts
+2 -3
View File
@@ -5,7 +5,6 @@ import {
Alert,
AlertingRule,
CloudRuleIdentifier,
CombinedRule,
CombinedRuleGroup,
CombinedRuleWithLocation,
GrafanaRuleIdentifier,
@@ -57,8 +56,8 @@ export function isGrafanaRulerRule(rule?: RulerRuleDTO): rule is RulerGrafanaRul
return typeof rule === 'object' && 'grafana_alert' in rule;
}
export function isGrafanaRulerRulePaused(rule: CombinedRule) {
return rule.rulerRule && isGrafanaRulerRule(rule.rulerRule) && Boolean(rule.rulerRule.grafana_alert.is_paused);
export function isGrafanaRulerRulePaused(rule: RulerGrafanaRuleDTO) {
return rule && isGrafanaRulerRule(rule) && Boolean(rule.grafana_alert.is_paused);
}
export function alertInstanceKey(alert: Alert): string {