fix merge conflicts

.buildkite/ftr_configs.yml

@@ -35,13 +35,10 @@ disabled:
   - x-pack/test/osquery_cypress/cli_config.ts
   - x-pack/test/osquery_cypress/config.ts
   - x-pack/test/osquery_cypress/visual_config.ts
-  - x-pack/test/security_solution_cypress/cases_cli_config.ts
   - x-pack/test/security_solution_cypress/ccs_config.ts
   - x-pack/test/security_solution_cypress/cli_config.ts
-  - x-pack/test/security_solution_cypress/cli_config_investigations_parallel.ts
   - x-pack/test/security_solution_cypress/config.firefox.ts
   - x-pack/test/security_solution_cypress/config.ts
-  - x-pack/test/security_solution_cypress/response_ops_cli_config.ts
   - x-pack/test/security_solution_cypress/upgrade_config.ts
   - x-pack/test/threat_intelligence_cypress/cli_config_parallel.ts
   - x-pack/test/threat_intelligence_cypress/config.ts

.buildkite/pipelines/flaky_tests/groups.json

@@ -8,6 +8,10 @@
       "key": "cypress/security_solution",
       "name": "Security Solution - Cypress"
     },
+    {
+      "key": "cypress/security_solution_explore",
+      "name": "Security Solution Explore - Cypress"
+    },
     {
       "key": "cypress/osquery_cypress",
       "name": "Osquery - Cypress"

.buildkite/pipelines/on_merge.yml

@@ -86,6 +86,14 @@ steps:
     agents:
       queue: 'kibana-default'
 
+  - command: '.buildkite/scripts/steps/functional/on_merge_serverless_ftrs.sh'
+    label: Trigger serverless ftr tests
+    timeout_in_minutes: 10
+    depends_on:
+      - build
+    agents:
+      queue: 'kibana-default'
+
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'
     agents:

.buildkite/pipelines/on_merge_unsupported_ftrs.yml

@@ -77,6 +77,36 @@ steps:
         - exit_status: '*'
           limit: 1
 
+  - command: .buildkite/scripts/steps/functional/security_solution_explore.sh
+    label: 'Explore - Security Solution Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 60
+    parallelism: 2
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/functional/defend_workflows.sh
+    label: 'Defend Workflows Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 120
+    parallelism: 2
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '*'
+          limit: 1
+    artifact_paths:
+      - "target/kibana-security-solution/**/*"
+
   - command: .buildkite/scripts/steps/functional/synthetics_plugin.sh
     label: 'Synthetics @elastic/synthetics Tests'
     agents:

.buildkite/pipelines/pull_request/base.yml

@@ -56,6 +56,58 @@ steps:
         - exit_status: '*'
           limit: 1
 
+  - command: SERVERLESS_ENVIRONMENT=common .buildkite/scripts/steps/functional/serverless_ftr.sh
+    label: 'Serverless Common Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 40
+    soft_fail:
+      - exit_status: 10
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
+  - command: SERVERLESS_ENVIRONMENT=observability .buildkite/scripts/steps/functional/serverless_ftr.sh
+    label: 'Serverless Observability Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 40
+    soft_fail:
+      - exit_status: 10
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
+  - command: SERVERLESS_ENVIRONMENT=search .buildkite/scripts/steps/functional/serverless_ftr.sh
+    label: 'Serverless Search Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 40
+    soft_fail:
+      - exit_status: 10
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
+  - command: SERVERLESS_ENVIRONMENT=security .buildkite/scripts/steps/functional/serverless_ftr.sh
+    label: 'Serverless Security Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 40
+    soft_fail:
+      - exit_status: 10
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'
     agents:

.buildkite/pipelines/pull_request/security_solution_explore.yml

@@ -0,0 +1,14 @@
+steps:
+  - command: .buildkite/scripts/steps/functional/security_solution_explore.sh
+    label: 'Explore - Security Solution Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 60
+    parallelism: 2
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '*'
+          limit: 1

.buildkite/pipelines/serverless.yml

@@ -0,0 +1,74 @@
+steps:
+  - command: .buildkite/scripts/lifecycle/pre_build.sh
+    label: Pre-Build
+    timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
+
+  - command: .buildkite/scripts/steps/build_kibana.sh
+    label: Build Kibana Distribution and Plugins
+    agents:
+      queue: n2-16-spot
+    key: build
+    if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
+    timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
+  - command: SERVERLESS_ENVIRONMENT=common .buildkite/scripts/steps/functional/serverless_ftr.sh
+    label: 'Serverless Common Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 40
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '*'
+          limit: 1
+
+  - command: SERVERLESS_ENVIRONMENT=observability .buildkite/scripts/steps/functional/serverless_ftr.sh
+    label: 'Serverless Observability Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 40
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '*'
+          limit: 1
+
+  - command: SERVERLESS_ENVIRONMENT=search .buildkite/scripts/steps/functional/serverless_ftr.sh
+    label: 'Serverless Search Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 40
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '*'
+          limit: 1
+
+  - command: SERVERLESS_ENVIRONMENT=security .buildkite/scripts/steps/functional/serverless_ftr.sh
+    label: 'Serverless Security Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 40
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '*'
+          limit: 1

.buildkite/scripts/lifecycle/post_command.sh

@@ -24,6 +24,8 @@ if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
   buildkite-agent artifact upload 'x-pack/test/**/screenshots/diff/*.png'
   buildkite-agent artifact upload 'x-pack/test/**/screenshots/failure/*.png'
   buildkite-agent artifact upload 'x-pack/test/**/screenshots/session/*.png'
+  buildkite-agent artifact upload 'x-pack/test_serverless/**/screenshots/failure/*.png'
+  buildkite-agent artifact upload 'x-pack/test_serverless/**/screenshots/session/*.png'
   buildkite-agent artifact upload 'x-pack/test/functional/apps/reporting/reports/session/*.pdf'
   buildkite-agent artifact upload 'x-pack/test/functional/failure_debug/html/*.html'
   buildkite-agent artifact upload '.es/**/*.hprof'

.buildkite/scripts/pipelines/pull_request/pipeline.ts

@@ -74,7 +74,8 @@ const uploadPipeline = (pipelineContent: string | object) => {
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/security_solution.yml'));
       pipeline.push(
-        getPipeline('.buildkite/pipelines/pull_request/security_solution_investigations.yml')
+        getPipeline('.buildkite/pipelines/pull_request/security_solution_investigations.yml'),
+        getPipeline('.buildkite/pipelines/pull_request/security_solution_explore.yml')
       );
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/defend_workflows.yml'));
     }

.buildkite/scripts/steps/functional/on_merge_serverless_ftrs.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -euo pipefail
+
+if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
+  echo "--- Trigger serverless ftr tests"
+  ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-serverless "$BUILDKITE_BRANCH" "$BUILDKITE_COMMIT" "$BUILDKITE_BUILD_ID"
+fi

.buildkite/scripts/steps/functional/security_solution_explore.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/steps/functional/common.sh
+
+export JOB=kibana-security-solution-chrome
+export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
+
+
+Xvfb :99 -screen 0 1600x1200x24 &
+
+export DISPLAY=:99
+
+echo "--- Explore Cypress Tests on Security Solution"
+
+yarn --cwd x-pack/plugins/security_solution cypress:explore:run

.buildkite/scripts/steps/functional/serverless_ftr.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/steps/functional/common.sh
+
+export JOB="kibana-serverless-$SERVERLESS_ENVIRONMENT"
+
+if [[ "$SERVERLESS_ENVIRONMENT" == "common" ]]; then
+  SERVERLESS_CONFIGS=(
+    "x-pack/test_serverless/api_integration/test_suites/common/config.ts"
+    "x-pack/test_serverless/functional/test_suites/common/config.ts"
+  )
+elif [[ "$SERVERLESS_ENVIRONMENT" == "search" ]]; then
+  SERVERLESS_CONFIGS=(
+    "x-pack/test_serverless/api_integration/test_suites/search/config.ts"
+    "x-pack/test_serverless/functional/test_suites/search/config.ts"
+  )
+elif [[ "$SERVERLESS_ENVIRONMENT" == "observability" ]]; then
+  SERVERLESS_CONFIGS=(
+    "x-pack/test_serverless/api_integration/test_suites/observability/config.ts"
+    "x-pack/test_serverless/functional/test_suites/observability/config.ts"
+  )
+elif [[ "$SERVERLESS_ENVIRONMENT" == "security" ]]; then
+  SERVERLESS_CONFIGS=(
+    "x-pack/test_serverless/api_integration/test_suites/security/config.ts"
+    "x-pack/test_serverless/functional/test_suites/security/config.ts"
+  )
+fi
+
+EXIT_CODE=0
+
+for CONFIG in "${SERVERLESS_CONFIGS[@]}"
+do
+  echo "--- $ node scripts/functional_tests --bail --config $CONFIG"
+  set +e;
+  node ./scripts/functional_tests \
+    --bail \
+    --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
+    --config="$CONFIG"
+  LAST_CODE=$?
+  set -e;
+
+  if [ $LAST_CODE -ne 0 ]; then
+    EXIT_CODE=10
+  fi
+done
+
+exit $EXIT_CODE

.eslintrc.js

@@ -972,7 +972,7 @@ module.exports = {
 
     /**
      * Security Solution overrides. These rules below are maintained and owned by
-     * the people within the security-solution-platform team. Please see ping them
+     * the people within the security-detection-engine team. Please see ping them
      * or check with them if you are encountering issues, have suggestions, or would
      * like to add, change, or remove any particular rule. Linters, Typescript, and rules
      * evolve and change over time just like coding styles, so please do not hesitate to
@@ -1180,7 +1180,7 @@ module.exports = {
 
     /**
      * Lists overrides. These rules below are maintained and owned by
-     * the people within the security-solution-platform team. Please see ping them
+     * the people within the security-detection-engine team. Please see ping them
      * or check with them if you are encountering issues, have suggestions, or would
      * like to add, change, or remove any particular rule. Linters, Typescript, and rules
      * evolve and change over time just like coding styles, so please do not hesitate to