Skip to content

[SIEM] Unskips and fixes 'Detection rules, custom' test #70693

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
MadameSheema merged 5 commits into from
Jul 6, 2020
Merged

[SIEM] Unskips and fixes 'Detection rules, custom' test #70693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f64c58a
unskips and fixes 'Detection rules, custom' test
MadameSheema Jul 3, 2020
b314a82
deletes comment
MadameSheema Jul 3, 2020
fcc0e32
Merge branch 'master' into fixes-alerts-test
elasticmachine Jul 3, 2020
26d898a
Merge branch 'master' into fixes-alerts-test
elasticmachine Jul 6, 2020
da7e00f
Merge branch 'master' into fixes-alerts-test
elasticmachine Jul 6, 2020
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
7 changes: 3 additions & 4 deletions x-pack/plugins/security_solution/cypress/integration/alerts_detection_rules_custom.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { newRule, totalNumberOfPrebuiltRulesInEsArchive } from '../objects/rule';
import { newRule, totalNumberOfPrebuiltRulesInEsArchiveCustomRule } from '../objects/rule';

import {
CUSTOM_RULES_BTN,
Expand Down Expand Up @@ -64,8 +64,7 @@ import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';

import { ALERTS_URL } from '../urls/navigation';

// // Skipped as was causing failures on master
describe.skip('Detection rules, custom', () => {
describe('Detection rules, custom', () => {
before(() => {
esArchiverLoad('custom_rule_with_timeline');
});
Expand All @@ -90,7 +89,7 @@ describe.skip('Detection rules, custom', () => {
changeToThreeHundredRowsPerPage();
waitForRulesToBeLoaded();

const expectedNumberOfRules = totalNumberOfPrebuiltRulesInEsArchive + 1;
const expectedNumberOfRules = totalNumberOfPrebuiltRulesInEsArchiveCustomRule + 1;
cy.get(RULES_TABLE).then(($table) => {
cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
});
Expand Down
6 changes: 4 additions & 2 deletions x-pack/plugins/security_solution/cypress/objects/rule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export const totalNumberOfPrebuiltRules = rawRules.length;

export const totalNumberOfPrebuiltRulesInEsArchive = 127;

export const totalNumberOfPrebuiltRulesInEsArchiveCustomRule = 145;
Copy link
Copy Markdown
Contributor

@rylnd rylnd Jul 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe I'm dense, but the link between this name and the archive isn't super clear, here. Not a blocker, but perhaps we should qualify it with ...InCustomRuleWithTimelineArchive or something like that.

Copy link
Copy Markdown
Contributor

@rylnd rylnd Jul 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similarly, totalNumberofPrebuildRulesInEsArchive is also unclear now for a similar reason: which archives does that number pertain to?


interface Mitre {
tactic: string;
techniques: string[];
Expand Down Expand Up @@ -57,7 +59,7 @@ const mitre2: Mitre = {
};

export const newRule: CustomRule = {
customQuery: 'host.name: *',
customQuery: 'host.name: * ',
name: 'New Rule Test',
description: 'The new rule description.',
severity: 'High',
Expand All @@ -67,7 +69,7 @@ export const newRule: CustomRule = {
falsePositivesExamples: ['False1', 'False2'],
mitre: [mitre1, mitre2],
note: '# test markdown',
timelineId: '352c6110-9ffb-11ea-b3d8-857d6042d9bd',
timelineId: '3270f530-bc84-11ea-b73f-89980a6a1ce7',
};

export const machineLearningRule: MachineLearningRule = {
Expand Down
Binary file modified x-pack/test/security_solution_cypress/es_archives/custom_rule_with_timeline/data.json.gz
View file
Open in desktop
Binary file not shown.
Loading