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: Show unknown badge instead of Error in group rule modal in case of Mimir unknown interval (#60515)

Browse Source 
* Show unknown badge instead of Error in group rule modal in case of  Mimir unknown interval

* Use red Badge with xclamation-circle icon in case of Error in ForBadge

* Fix typo
This commit is contained in:
Sonia Aguilar
2022-12-19 15:22:08 +01:00
committed by GitHub
parent 785c857ec7
commit a812818457
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx
View File

@@ -29,8 +29,12 @@ interface AlertInfo {
forDuration: string;
evaluationsToFire: number;
}
function ForError({ message }: { message: string }) {
return <Badge color="orange" icon="exclamation-triangle" text={'Error'} tooltip={message} />;
function ForBadge({ message, error }: { message: string; error?: boolean }) {
if (error) {
return <Badge color="red" icon="exclamation-circle" text={'Error'} tooltip={message} />;
} else {
return <Badge color="orange" icon="exclamation-triangle" text={'Unknown'} tooltip={message} />;
}
}
export const getNumberEvaluationsToStartAlerting = (forDuration: string, currentEvaluation: string) => {
@@ -132,6 +136,7 @@ export const RulesForGroupTable = ({
const { watch } = useFormContext<FormValues>();
const currentInterval = watch('groupInterval');
const unknownCurrentInterval = !Boolean(currentInterval);
const rows: AlertsWithForTableProps[] = rules
.slice()
@@ -165,19 +170,25 @@ export const RulesForGroupTable = ({
id: 'numberEvaluations',
label: '#Evaluations',
renderCell: ({ data: { evaluationsToFire: numberEvaluations } }) => {
if (!isValidEvaluation(currentInterval)) {
return <ForError message={'Invalid evaluation interval format'} />;
}
if (numberEvaluations === 0) {
return <ForError message="Invalid 'For' value: it should be greater or equal to evaluation interval." />;
if (unknownCurrentInterval) {
return <ForBadge message="#Evaluations not available." />;
} else {
return <>{numberEvaluations}</>;
if (!isValidEvaluation(currentInterval)) {
return <ForBadge message={'Invalid evaluation interval format'} error />;
}
if (numberEvaluations === 0) {
return (
<ForBadge message="Invalid 'For' value: it should be greater or equal to evaluation interval." error />
);
} else {
return <>{numberEvaluations}</>;
}
}
},
size: 0.6,
},
];
}, [currentInterval]);
}, [currentInterval, unknownCurrentInterval]);
return (
<div className={styles.tableWrapper}>