Skip to content

[8.19] [Attack Discovery][Scheduling] Make "For each alert" a default action frequency (#225890) #226155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kibanamachine merged 2 commits into from
Jul 2, 2025
Merged

[8.19] [Attack Discovery][Scheduling] Make "For each alert" a default action frequency (#225890) #226155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9413303
[Attack Discovery][Scheduling] Make "For each alert" a default action…
e40pud Jul 2, 2025
9698d8a
Merge branch '8.19' into backport/8.19/pr-225890
e40pud Jul 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions ...ution/public/attack_discovery/pages/settings_flyout/schedule/edit_form/edit_form.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ const renderComponent = async () => {
const getBooleanValueMock = jest.fn();

describe('EditForm', () => {
const mockTriggersActionsUi = triggersActionsUiMock.createStart();

beforeEach(() => {
jest.clearAllMocks();

Expand All @@ -92,9 +94,7 @@ describe('EditForm', () => {
lens: {
EmbeddableComponent: () => <div data-test-subj="mockEmbeddableComponent" />,
},
triggersActionsUi: {
...triggersActionsUiMock.createStart(),
},
triggersActionsUi: mockTriggersActionsUi,
uiSettings: {
get: jest.fn(),
},
Expand Down Expand Up @@ -178,4 +178,20 @@ describe('EditForm', () => {

expect(onChangeMock).toHaveBeenCalled();
});

it('should override default action frequency to `for each alert` instead of `summary of alerts`', async () => {
mockTriggersActionsUi.getActionForm = jest.fn();

await renderComponent();

expect(mockTriggersActionsUi.getActionForm).toHaveBeenCalledWith(
expect.objectContaining({
defaultRuleFrequency: {
notifyWhen: 'onActiveAlert',
summary: false,
throttle: null,
},
})
);
});
});
6 changes: 6 additions & 0 deletions ...y_solution/public/attack_discovery/pages/settings_flyout/schedule/edit_form/edit_form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';

import { RuleNotifyWhen } from '@kbn/alerting-plugin/common';
import { ATTACK_DISCOVERY_SCHEDULES_ALERT_TYPE_ID } from '@kbn/elastic-assistant-common';
import { getSchema } from './schema';
import type { AttackDiscoveryScheduleSchema } from './types';
Expand Down Expand Up @@ -140,6 +141,11 @@ export const EditForm: React.FC<FormProps> = React.memo((props) => {
componentProps={{
ruleTypeId: ATTACK_DISCOVERY_SCHEDULES_ALERT_TYPE_ID,
messageVariables,
defaultRuleFrequency: {
notifyWhen: RuleNotifyWhen.ACTIVE,
throttle: null,
summary: false,
},
}}
/>
</EuiFlexItem>
Expand Down
10 changes: 7 additions & 3 deletions .../security/plugins/security_solution/public/common/components/rule_actions_field/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import type {
import type {
RuleAction,
RuleActionAlertsFilterProperty,
RuleActionFrequency,
RuleActionParam,
} from '@kbn/alerting-plugin/common';
import { SecurityConnectorFeatureId } from '@kbn/actions-plugin/common';
Expand Down Expand Up @@ -83,6 +84,7 @@ interface Props {
field: FieldHook;
messageVariables: ActionVariables;
summaryMessageVariables: ActionVariables;
defaultRuleFrequency?: RuleActionFrequency;
}

const DEFAULT_ACTION_GROUP_ID = 'default';
Expand Down Expand Up @@ -119,6 +121,7 @@ export const RuleActionsField: React.FC<Props> = ({
field,
messageVariables,
summaryMessageVariables,
defaultRuleFrequency = NOTIFICATION_DEFAULT_FREQUENCY,
}) => {
const [fieldErrors, setFieldErrors] = useState<string | null>(null);
const form = useFormContext();
Expand Down Expand Up @@ -224,14 +227,14 @@ export const RuleActionsField: React.FC<Props> = ({
updatedActions[index] = {
...updatedActions[index],
frequency: {
...(updatedActions[index].frequency ?? NOTIFICATION_DEFAULT_FREQUENCY),
...(updatedActions[index].frequency ?? defaultRuleFrequency),
[key]: value,
},
};
return updatedActions;
});
},
[field]
[defaultRuleFrequency, field]
);

const isFormValidated = isValid !== undefined;
Expand All @@ -255,7 +258,7 @@ export const RuleActionsField: React.FC<Props> = ({
hideActionHeader: true,
hasAlertsMappings: true,
notifyWhenSelectOptions: NOTIFY_WHEN_OPTIONS,
defaultRuleFrequency: NOTIFICATION_DEFAULT_FREQUENCY,
defaultRuleFrequency,
disableErrorMessages: !isFormValidated,
}),
[
Expand All @@ -269,6 +272,7 @@ export const RuleActionsField: React.FC<Props> = ({
setActionFrequency,
setActionAlertsFilterProperty,
ruleTypeId,
defaultRuleFrequency,
isFormValidated,
]
);
Expand Down