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: Inherit new policy grouping from parent (#64956)

Browse Source
This commit is contained in:
Gilles De Mey 2023-03-20 07:58:23 +01:00 committed by GitHub
parent 2897ee37bf
commit fd6e97d52d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/alerting/unified/components/notification-policies/EditNotificationPolicyForm.tsx
View File

@ -43,9 +43,16 @@ export interface AmRoutesExpandedFormProps {
route?: RouteWithID; route?: RouteWithID;
onSubmit: (route: Partial<FormAmRoute>) => void; onSubmit: (route: Partial<FormAmRoute>) => void;
actionButtons: ReactNode; actionButtons: ReactNode;
defaults?: Partial<FormAmRoute>;
} }
export const AmRoutesExpandedForm = ({ actionButtons, receivers, route, onSubmit }: AmRoutesExpandedFormProps) => { export const AmRoutesExpandedForm = ({
actionButtons,
receivers,
route,
onSubmit,
defaults,
}: AmRoutesExpandedFormProps) => {
const styles = useStyles2(getStyles); const styles = useStyles2(getStyles);
const formStyles = useStyles2(getFormStyles); const formStyles = useStyles2(getFormStyles);
const [groupByOptions, setGroupByOptions] = useState(stringsToSelectableValues(route?.group_by)); const [groupByOptions, setGroupByOptions] = useState(stringsToSelectableValues(route?.group_by));
@ -53,7 +60,10 @@ export const AmRoutesExpandedForm = ({ actionButtons, receivers, route, onSubmit
const receiversWithOnCallOnTop = receivers.sort(onCallFirst); const receiversWithOnCallOnTop = receivers.sort(onCallFirst);
const formAmRoute = amRouteToFormAmRoute(route); const formAmRoute = {
...amRouteToFormAmRoute(route),
...defaults,
};
const emptyMatcher = [{ name: '', operator: MatcherOperator.equal, value: '' }]; const emptyMatcher = [{ name: '', operator: MatcherOperator.equal, value: '' }];

3
public/app/features/alerting/unified/components/notification-policies/Modals.tsx
View File

@ -55,6 +55,9 @@ const useAddPolicyModal = (
> >
<AmRoutesExpandedForm <AmRoutesExpandedForm
receivers={AmRouteReceivers} receivers={AmRouteReceivers}
defaults={{
groupBy: parentRoute?.group_by,
}}
onSubmit={(newRoute) => parentRoute && handleAdd(newRoute, parentRoute)} onSubmit={(newRoute) => parentRoute && handleAdd(newRoute, parentRoute)}
actionButtons={ actionButtons={
<Modal.ButtonRow> <Modal.ButtonRow>