From a75cef46af047309be1d352dfd8f076c4d32a2e1 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Tue, 21 Nov 2023 05:43:49 -0500
Subject: [PATCH] [8.11] [EDR Workflows] Fix Osquery cypress 11 (#171497)
 (#171564)

# Backport

This will backport the following commits from `main` to `8.11`:
- [[EDR Workflows] Fix Osquery cypress 11
(#171497)](https://github.com/elastic/kibana/pull/171497)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Tomasz
Ciecierski","email":"tomasz.ciecierski@elastic.co"},"sourceCommit":{"committedDate":"2023-11-20T17:02:20Z","message":"[EDR
Workflows] Fix Osquery cypress 11
(#171497)","sha":"d412e5789769a415916ee6cbef46e0931f2e222e","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","release_note:skip","Team:Defend
Workflows","Feature:Osquery","v8.12.0","v8.11.2"],"number":171497,"url":"https://github.com/elastic/kibana/pull/171497","mergeCommit":{"message":"[EDR
Workflows] Fix Osquery cypress 11
(#171497)","sha":"d412e5789769a415916ee6cbef46e0931f2e222e"}},"sourceBranch":"main","suggestedTargetBranches":["8.11"],"targetPullRequestStates":[{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/171497","number":171497,"mergeCommit":{"message":"[EDR
Workflows] Fix Osquery cypress 11
(#171497)","sha":"d412e5789769a415916ee6cbef46e0931f2e222e"}},{"branch":"8.11","label":"v8.11.2","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Tomasz Ciecierski <tomasz.ciecierski@elastic.co>
---
 x-pack/plugins/osquery/cypress/e2e/all/live_query.cy.ts | 5 ++++-
 x-pack/plugins/osquery/package.json                     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/osquery/cypress/e2e/all/live_query.cy.ts b/x-pack/plugins/osquery/cypress/e2e/all/live_query.cy.ts
index a5f9fdab66a9..fdc90e1b97a3 100644
--- a/x-pack/plugins/osquery/cypress/e2e/all/live_query.cy.ts
+++ b/x-pack/plugins/osquery/cypress/e2e/all/live_query.cy.ts
@@ -44,7 +44,10 @@ describe('ALL - Live Query', { tags: ['@ess', '@serverless'] }, () => {
     cy.contains('ECS field is required.').should('not.exist');
 
     checkResults();
-    cy.get('[data-gridcell-column-index="0"][data-gridcell-row-index="0"]').should('exist').click();
+    cy.get('[data-gridcell-column-index="0"][data-gridcell-row-index="0"]').should('exist');
+    cy.get(
+      '[data-gridcell-column-index="0"][data-gridcell-row-index="0"] [data-datagrid-interactable="true"]'
+    ).click();
     cy.url().should('include', 'app/fleet/agents/');
   });
 
diff --git a/x-pack/plugins/osquery/package.json b/x-pack/plugins/osquery/package.json
index b03b4ac4a5f6..e9ab128dd45f 100644
--- a/x-pack/plugins/osquery/package.json
+++ b/x-pack/plugins/osquery/package.json
@@ -12,7 +12,7 @@
     "cypress:run": "yarn cypress run",
     "cypress:serverless": "NODE_OPTIONS=--openssl-legacy-provider node ../security_solution/scripts/start_cypress_parallel --config-file ../osquery/cypress/serverless_cypress.config.ts --ftr-config-file ../../../x-pack/test/osquery_cypress/serverless_cli_config",
     "cypress:serverless:open": "yarn cypress:serverless open",
-    "cypress:serverless:run": "yarn cypress:serverless run --spec ./cypress/e2e/all/packs_integration.cy.ts",
+    "cypress:serverless:run": "yarn cypress:serverless run",
     "nyc": "../../../node_modules/.bin/nyc report --reporter=text-summary",
     "junit:merge": "../../../node_modules/.bin/mochawesome-merge ../../../target/kibana-osquery/cypress/results/mochawesome*.json > ../../../target/kibana-osquery/cypress/results/output.json && ../../../node_modules/.bin/marge ../../../target/kibana-osquery/cypress/results/output.json --reportDir ../../../target/kibana-osquery/cypress/results && yarn junit:transform && mkdir -p ../../../target/junit && cp ../../../target/kibana-osquery/cypress/results/*.xml ../../../target/junit/",
     "junit:transform": "node ../security_solution/scripts/junit_transformer --pathPattern '../../../target/kibana-osquery/cypress/results/*.xml' --rootDirectory ../../../ --reportName 'Osquery Cypress' --writeInPlace"