Skip to content
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.

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

[Security Solution] Setting a large default rule interval #171814

Draft
wants to merge 65 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
f6babd2
Update PULL_REQUEST_TEMPLATE.md
VidhiRambhia Nov 23, 2023
d914b2a
Security Solution | Updating minimumScheduleInterval for cypress to 2…
VidhiRambhia Nov 23, 2023
e48ef62
Revert : Update PULL_REQUEST_TEMPLATE.md
VidhiRambhia Nov 23, 2023
5e03410
Merge branch 'main' into main
VidhiRambhia Nov 27, 2023
9c16065
Merge branch 'main' into increase-schedule-interval
VidhiRambhia Nov 29, 2023
8e96abf
Merge branch 'main' into main
VidhiRambhia Nov 29, 2023
2020da4
Merge branch 'main' into main
VidhiRambhia Nov 30, 2023
99833e8
Merge branch 'main' into increase-schedule-interval
VidhiRambhia Nov 30, 2023
61a5e17
Security Solution | Updating minimumScheduleInterval for cypress to 2…
VidhiRambhia Dec 1, 2023
3fb0de8
Merge remote-tracking branch 'origin/main'
VidhiRambhia Dec 1, 2023
c925a7b
Security Solution | Updating minimumScheduleInterval for cypress to 2…
VidhiRambhia Dec 1, 2023
95c6479
Merge remote-tracking branch 'origin/increase-schedule-interval'
VidhiRambhia Dec 1, 2023
2950181
Security Solution | Revert redundant changes
VidhiRambhia Dec 1, 2023
8c6349d
Merge branch 'main' into increase-schedule-interval
VidhiRambhia Dec 7, 2023
e7fc117
Merge branch 'main' into increase-schedule-interval
jpdjere Dec 15, 2023
fe27ece
Merge branch 'elastic:main' into increase-schedule-interval
VidhiRambhia Dec 15, 2023
27e3b76
Addressing comments
VidhiRambhia Dec 15, 2023
c62a983
Addressing comments
VidhiRambhia Dec 15, 2023
1e57a36
Merge branch 'main' into increase-schedule-interval
jpdjere Dec 27, 2023
cb8eba3
Merge branch 'main' into increase-schedule-interval
jpdjere Jan 3, 2024
7584057
Merge branch 'main' into increase-schedule-interval
jpdjere Jan 26, 2024
53895f8
Merge branch 'main' into increase-schedule-interval
jpdjere Mar 12, 2024
72ae5b8
Merge branch 'main' into increase-schedule-interval
kibanamachine May 2, 2024
db3c038
Merge branch 'main' into increase-schedule-interval
kibanamachine May 2, 2024
730b718
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 23, 2024
837416a
Update "interval" value to "24h" in mocking functions
nikitaindik May 23, 2024
eae4d4a
Update interval in `getSimpleRule` to "24h"
nikitaindik May 23, 2024
d9a4ef4
Update interval in more mocking functions to fix tests
nikitaindik May 24, 2024
457f661
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 24, 2024
afd173e
Update in interval in `createLegacyRuleAction` as it has to be >= rul…
nikitaindik May 25, 2024
159902a
Override the 24h interval in a few tests
nikitaindik May 26, 2024
f954f57
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 26, 2024
33cb986
Update frequency in a Cypress test
nikitaindik May 26, 2024
c65e089
Update intervals in a few more tests
nikitaindik May 26, 2024
1eb3055
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 26, 2024
e9b2a5f
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 27, 2024
375a740
Update a few more tests
nikitaindik May 27, 2024
dc63004
Fix 3 more tests
nikitaindik May 27, 2024
01893ed
Update interval for `perform_bulk_action.ts`
nikitaindik May 27, 2024
24a50bf
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 27, 2024
10d1f9d
Temporary: Do not stop API integration test execution after first fai…
nikitaindik May 28, 2024
ff58135
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 28, 2024
bf8a1b6
Update interval in more tests
nikitaindik May 28, 2024
ce5d9f1
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 28, 2024
9e2e441
Remove .only
nikitaindik May 28, 2024
b32aabf
Increase intervals some more tests
nikitaindik May 28, 2024
ba0fd21
Update the "backfill information" API integration test
nikitaindik May 28, 2024
b2c0a90
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 28, 2024
cf0a24e
Revert "Temporary: Do not stop API integration test execution after f…
nikitaindik May 29, 2024
d766bf2
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 29, 2024
4890b53
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 29, 2024
00e53e5
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik May 29, 2024
0494a85
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik Jun 3, 2024
4e88e0f
Add a test to check default interval value if "interval" is not provided
nikitaindik Jun 3, 2024
520842d
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik Jun 4, 2024
557e61d
Merge branch 'main' into increase-schedule-interval
kibanamachine Jun 4, 2024
781c60c
Set interval to `24h` for read rules tests
nikitaindik Jun 4, 2024
4948132
Merge branch 'increase-schedule-interval' of github.com:VidhiRambhia/…
nikitaindik Jun 4, 2024
d9f3079
Merge branch 'main' into increase-schedule-interval
mistic Jun 4, 2024
9905d2e
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik Jun 5, 2024
adc38c6
Update interval to `24h` in `getCreateThreatMatchRulesSchemaMock` and…
nikitaindik Jun 5, 2024
3e49539
Merge branch 'increase-schedule-interval' of github.com:VidhiRambhia/…
nikitaindik Jun 5, 2024
fd3538b
Update `from` in accordance with `interval`
nikitaindik Jun 5, 2024
e52d5a5
Temporarily let CI run all API integration tests
nikitaindik Jun 5, 2024
ed0944d
Merge remote-tracking branch 'upstream/main' into VidhiRambhia_increa…
nikitaindik Jun 5, 2024
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
Prev Previous commit
Next Next commit
Set interval to 24h for read rules tests
  • Loading branch information
nikitaindik committed Jun 4, 2024
commit 781c60c8e69adb0ff2e5f23979b54daddf934f77
Original file line number Diff line number Diff line change
@@ -144,16 +144,16 @@ export default ({ getService }: FtrProviderContext): void => {
// create rule with connector/action
const rule: ReturnType<typeof getSimpleRule> = {
...getSimpleRule('rule-1'),
throttle: '1h', // <-- throttle makes this a scheduled action
interval: '50m', // has to be less than "throttle"
throttle: '24h', // <-- throttle makes this a scheduled action
interval: '24h', // "interval" has to be equal to or less than "throttle"
actions: [action],
};
await createRule(supertest, log, rule);

// query the single rule from _find
const { body } = await securitySolutionApi.findRules({ query: {} }).expect(200);
const expectedRule = updateUsername(
{ ...getSimpleRuleOutput(), interval: '50m' },
{ ...getSimpleRuleOutput(), interval: '24h' },
ELASTICSEARCH_USERNAME
);

@@ -163,7 +163,7 @@ export default ({ getService }: FtrProviderContext): void => {
{
...action,
uuid: body.data[0].actions[0].uuid,
frequency: { summary: true, throttle: '1h', notifyWhen: 'onThrottleInterval' },
frequency: { summary: true, throttle: '24h', notifyWhen: 'onThrottleInterval' },
},
],
};
Original file line number Diff line number Diff line change
@@ -169,8 +169,8 @@ export default ({ getService }: FtrProviderContext) => {
// create rule with connector/action
const rule: ReturnType<typeof getSimpleRule> = {
...getSimpleRule('rule-1'),
throttle: '1h', // <-- throttle makes this a scheduled action
interval: '50m', // has to be less than "throttle"
throttle: '24h', // <-- throttle makes this a scheduled action
interval: '24h', // "interval" has to be equal to or less than "throttle"
actions: [action],
};

@@ -182,7 +182,7 @@ export default ({ getService }: FtrProviderContext) => {

const bodyToCompare = removeServerGeneratedProperties(body);
const expectedRule = updateUsername(
{ ...getSimpleRuleOutput(), interval: '50m' },
{ ...getSimpleRuleOutput(), interval: '24h' },
ELASTICSEARCH_USERNAME
);

@@ -192,7 +192,7 @@ export default ({ getService }: FtrProviderContext) => {
{
...action,
uuid: bodyToCompare.actions[0].uuid,
frequency: { summary: true, throttle: '1h', notifyWhen: 'onThrottleInterval' },
frequency: { summary: true, throttle: '24h', notifyWhen: 'onThrottleInterval' },
},
],
};