IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Fix crash when viewing alert group without interval (#53166)

Browse Source
This commit is contained in:
Gilles De Mey 2022-08-03 08:22:52 +02:00 committed by GitHub
parent e1bb23a2d7
commit b7e11358cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/alerting/unified/components/rules/RuleConfigStatus.tsx
View File

@ -15,7 +15,7 @@ interface RuleConfigStatusProps {
export function RuleConfigStatus({ rule }: RuleConfigStatusProps) {
const styles = useStyles2(getStyles);
const { exceedsLimit } = checkEvaluationIntervalGlobalLimit(rule.group.interval ?? '');
const { exceedsLimit } = checkEvaluationIntervalGlobalLimit(rule.group.interval);
if (!exceedsLimit) {
return null;

6
public/app/features/alerting/unified/utils/config.ts
View File

@ -5,7 +5,11 @@ export function getAllDataSources(): Array<DataSourceInstanceSettings<DataSource
return Object.values(config.datasources);
}
export function checkEvaluationIntervalGlobalLimit(alertGroupEvaluateEvery: string) {
export function checkEvaluationIntervalGlobalLimit(alertGroupEvaluateEvery?: string) {
if (!alertGroupEvaluateEvery) {
return { globalLimit: 0, exceedsLimit: false };
}
if (!isValidGoDuration(config.unifiedAlerting.minInterval)) {
return { globalLimit: 0, exceedsLimit: false };
}