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

Alerting: Do not check evaluation interval for external rulers (#89354)

Browse Source
This commit is contained in:
Gilles De Mey
2024-06-19 16:28:46 +02:00
committed by GitHub
parent 86ac40418d
commit 64e134c601
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
+2 -1
View File
@@ -338,7 +338,8 @@ export function EditCloudGroupModal(props: ModalProps): React.ReactElement {
</Stack> </Stack>
</Field> </Field>
{checkEvaluationIntervalGlobalLimit(watch('groupInterval')).exceedsLimit && ( {/* if we're dealing with a Grafana-managed group, check if the evaluation interval is valid / permitted */}
{isGrafanaManagedGroup && checkEvaluationIntervalGlobalLimit(watch('groupInterval')).exceedsLimit && (
<EvaluationIntervalLimitExceeded /> <EvaluationIntervalLimitExceeded />
)} )}
public/app/features/alerting/unified/components/rules/RuleConfigStatus.tsx
+5 -4
View File
@@ -7,6 +7,7 @@ import { Icon, Tooltip, useStyles2 } from '@grafana/ui/src';
import { CombinedRule } from '../../../../../types/unified-alerting'; import { CombinedRule } from '../../../../../types/unified-alerting';
import { checkEvaluationIntervalGlobalLimit } from '../../utils/config'; import { checkEvaluationIntervalGlobalLimit } from '../../utils/config';
import { isGrafanaRulerRule } from '../../utils/rules';
interface RuleConfigStatusProps { interface RuleConfigStatusProps {
rule: CombinedRule; rule: CombinedRule;
@@ -14,11 +15,11 @@ interface RuleConfigStatusProps {
export function RuleConfigStatus({ rule }: RuleConfigStatusProps) { export function RuleConfigStatus({ rule }: RuleConfigStatusProps) {
const styles = useStyles2(getStyles); const styles = useStyles2(getStyles);
const isGrafanaManagedRule = isGrafanaRulerRule(rule.rulerRule);
const { exceedsLimit } = useMemo( const exceedsLimit = useMemo(() => {
() => checkEvaluationIntervalGlobalLimit(rule.group.interval), return isGrafanaManagedRule ? checkEvaluationIntervalGlobalLimit(rule.group.interval).exceedsLimit : false;
[rule.group.interval] }, [rule.group.interval, isGrafanaManagedRule]);
);
if (!exceedsLimit) { if (!exceedsLimit) {
return null; return null;