Skip to content

[EDR Workflows] Fix Osquery tests#215507

Merged
tomsonpl merged 17 commits into
elastic:mainfrom
tomsonpl:fix-osquery-tests-march
Apr 15, 2025
Merged

[EDR Workflows] Fix Osquery tests#215507
tomsonpl merged 17 commits into
elastic:mainfrom
tomsonpl:fix-osquery-tests-march

Conversation

@tomsonpl
Copy link
Copy Markdown
Contributor

@tomsonpl tomsonpl commented Mar 21, 2025 •
edited by kibanamachine
Loading

Closes #197335
Closes #192128
Closes #181889
Closes #178404
Closes #169785

@tomsonpl tomsonpl self-assigned this Mar 21, 2025
@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Mar 21, 2025

/ci

@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Mar 21, 2025

/ci

tomsonpl
tomsonpl commented Mar 21, 2025
View reviewed changes
Comment thread x-pack/platform/plugins/shared/osquery/cypress/e2e/all/alerts_automated_action_results.cy.ts
'can add to timeline from response action results',
{ tags: ['@ess', '@serverless'] },
() => {
const timelineRegex = new RegExp(`Added ${UUID_REGEX} to Timeline`);
Copy link
Copy Markdown
Contributor Author

@tomsonpl tomsonpl Mar 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

changed timeline to Timeline

@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Mar 21, 2025

/ci

@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Mar 24, 2025

/ci

@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Mar 24, 2025

/ci

@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Mar 24, 2025

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#8089

[✅] [Serverless] Osquery - Cypress: 25/25 tests passed.
[❌] Osquery - Cypress: 24/25 tests passed.

see run history

@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Mar 24, 2025

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#8092

[❌] [Serverless] Osquery - Cypress: 22/25 tests passed.
[❌] Osquery - Cypress: 2/25 tests passed.

see run history

@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Apr 10, 2025

/ci

@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Apr 11, 2025

/ci

@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Apr 11, 2025

/ci

@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Apr 11, 2025

/ci

@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Apr 11, 2025

Flaky Test Runner Stats

🟠 Some tests failed. - kibana-flaky-test-suite-runner#8174

[❌] Osquery - Cypress: 3/25 tests passed.
[❌] [Serverless] Osquery - Cypress: 6/25 tests passed.

see run history

@tomsonpl tomsonpl marked this pull request as ready for review April 11, 2025 16:36
@tomsonpl tomsonpl requested a review from a team as a code owner April 11, 2025 16:36
@tomsonpl tomsonpl added release_note:skip Skip the PR/issue when compiling release notes Team:Defend Workflows “EDR Workflows” sub-team of Security Solution backport:version Backport to applied version labels v9.1.0 v8.18.1 labels Apr 13, 2025
@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Apr 14, 2025

@elasticmachine merge upstream

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 14, 2025

There are no new commits on the base branch.

@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Apr 14, 2025

/ci

@tomsonpl tomsonpl enabled auto-merge (squash) April 14, 2025 16:10
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 14, 2025

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

cc @tomsonpl

szwarckonrad
szwarckonrad approved these changes Apr 15, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@szwarckonrad szwarckonrad left a comment

Choose a reason for hiding this comment

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

LGTM

Comment thread x-pack/platform/plugins/shared/osquery/cypress/e2e/all/alerts_linked_apps.cy.ts
Comment on lines +77 to +81
// cy.contains('Save for later').click();
// cy.contains('Save query');
// cy.get('[data-test-subj="osquery-save-query-flyout"]').within(() => {
// cy.get('.euiButtonEmpty').contains('Cancel').click();
// });
Copy link
Copy Markdown
Contributor

@szwarckonrad szwarckonrad Apr 15, 2025

Choose a reason for hiding this comment

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

Please remove before merging

Comment thread x-pack/platform/plugins/shared/osquery/cypress/e2e/all/alerts_linked_apps.cy.ts
Comment on lines +85 to +87
// cy.getBySel(RESULTS_TABLE).within(() => {
// cy.getBySel(RESULTS_TABLE_BUTTON).should('not.exist');
// });
Copy link
Copy Markdown
Contributor

@szwarckonrad szwarckonrad Apr 15, 2025

Choose a reason for hiding this comment

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

Please remove before merging

Copy link
Copy Markdown
Contributor Author

@tomsonpl tomsonpl Apr 15, 2025

Choose a reason for hiding this comment

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

Sorry, automatic merge happened... I've opened a follow up PR. #218201

@tomsonpl tomsonpl merged commit 9595c1e into elastic:main Apr 15, 2025
9 checks passed
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Apr 15, 2025

Starting backport for target branches: 8.18

https://github.com/elastic/kibana/actions/runs/14463929281

@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Apr 15, 2025

💔 All backports failed

Status Branch Result
❌ 8.18 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 215507

Questions ?

Please refer to the Backport tool documentation

@kibanamachine kibanamachine mentioned this pull request Apr 15, 2025
Merged
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Apr 17, 2025
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Apr 17, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 215507 locally

1 similar comment
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Apr 18, 2025

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add a backport:* label or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 215507 locally

tomsonpl added a commit to tomsonpl/kibana that referenced this pull request Apr 18, 2025
@tomsonpl
[EDR Workflows] Fix Osquery tests (elastic#215507)
3aaa674 
Closes elastic#197335
Closes elastic#192128
Closes elastic#181889
Closes elastic#178404
Closes elastic#169785

(cherry picked from commit 9595c1e)

# Conflicts:
#	x-pack/platform/plugins/shared/osquery/cypress/e2e/all/alerts_automated_action_results.cy.ts
#	x-pack/platform/plugins/shared/osquery/cypress/e2e/all/alerts_cases.cy.ts
#	x-pack/platform/plugins/shared/osquery/cypress/e2e/all/alerts_linked_apps.cy.ts
#	x-pack/platform/plugins/shared/osquery/cypress/e2e/all/ecs_mappings.cy.ts
@tomsonpl tomsonpl mentioned this pull request Apr 18, 2025
Merged
@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented Apr 18, 2025

💚 All backports created successfully

Status Branch Result
✅ 8.18

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Apr 21, 2025

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

tomsonpl added a commit that referenced this pull request Apr 22, 2025
@tomsonpl
[8.18] [EDR Workflows] Fix Osquery tests (#215507) (#218643)
efd16d9 
# Backport

This will backport the following commits from `main` to `8.18`:
- [[EDR Workflows] Fix Osquery tests
(#215507)](#215507)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Tomasz
Ciecierski","email":"tomasz.ciecierski@elastic.co"},"sourceCommit":{"committedDate":"2025-04-15T07:37:58Z","message":"[EDR
Workflows] Fix Osquery tests (#215507)\n\nCloses #197335\nCloses
#192128\nCloses #181889\nCloses #178404 \nCloses
#169785","sha":"9595c1ebd519091ad3dba82f67613e6133c9a850","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport
missing","Team:Defend
Workflows","backport:version","v9.1.0","v8.18.1"],"title":"[EDR
Workflows] Fix Osquery
tests","number":215507,"url":"https://github.com/elastic/kibana/pull/215507","mergeCommit":{"message":"[EDR
Workflows] Fix Osquery tests (#215507)\n\nCloses #197335\nCloses
#192128\nCloses #181889\nCloses #178404 \nCloses
#169785","sha":"9595c1ebd519091ad3dba82f67613e6133c9a850"}},"sourceBranch":"main","suggestedTargetBranches":["8.18"],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/215507","number":215507,"mergeCommit":{"message":"[EDR
Workflows] Fix Osquery tests (#215507)\n\nCloses #197335\nCloses
#192128\nCloses #181889\nCloses #178404 \nCloses
#169785","sha":"9595c1ebd519091ad3dba82f67613e6133c9a850"}},{"branch":"8.18","label":"v8.18.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Apr 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@szwarckonrad szwarckonrad szwarckonrad approved these changes

@ashokaditya ashokaditya Awaiting requested review from ashokaditya ashokaditya is a code owner automatically assigned from elastic/security-defend-workflows

Assignees

@tomsonpl tomsonpl

Labels

backport:version Backport to applied version labels release_note:skip Skip the PR/issue when compiling release notes Team:Defend Workflows “EDR Workflows” sub-team of Security Solution v8.18.1 v9.1.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Failing test: Osquery Cypress.x-pack/plugins/osquery/cypress/e2e/all/alerts_automated_action_results·cy·ts - Alert Flyout Automated Action Results can visit discover from response action results can visit discover from response action results Failing test: Osquery Cypress.x-pack/plugins/osquery/cypress/e2e/all/ecs_mappings·cy·ts - EcsMapping "before each" hook for "should hide and show ecs mappings on Advanced accordion click" "before each" hook for "should hide and show ecs mappings on Advanced accordion click" Failing test: Osquery Cypress.x-pack/plugins/osquery/cypress/e2e/all/alerts_linked_apps·cy·ts - Alert Event Details "before each" hook for "should be able to run live query and add to timeline" "before each" hook for "should be able to run live query and add to timeline" Failing test: Osquery Cypress.x-pack/plugins/osquery/cypress/e2e/all/alerts_automated_action_results·cy·ts - Alert Flyout Automated Action Results can add to timeline from response action results can add to timeline from response action results Failing test: Osquery Cypress.x-pack/plugins/osquery/cypress/e2e/all/alerts_response_actions_form·cy·ts - Alert Event Details - Response Actions Form adds response actions with osquery with proper validation and form values adds response actions with osquery with proper validation and form values

4 participants

@tomsonpl @kibanamachine @elasticmachine @szwarckonrad