Merge into branch

.buildkite/ftr_configs.yml

@@ -32,6 +32,7 @@ disabled:
   - x-pack/plugins/observability_onboarding/e2e/ftr_config_runner.ts
   - x-pack/plugins/observability_onboarding/e2e/ftr_config.ts
   - x-pack/test/osquery_cypress/cli_config.ts
+  - x-pack/test/osquery_cypress/serverless_cli_config.ts
   - x-pack/test/osquery_cypress/config.ts
   - x-pack/test/osquery_cypress/visual_config.ts
   - x-pack/test/security_solution_cypress/cli_config.ts
@@ -265,6 +266,7 @@ enabled:
   - x-pack/test/functional_with_es_ssl/apps/cases/group2/config.ts
   - x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/config.ts
   - x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/config.ts
+  - x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/shared/config.ts
   - x-pack/test/functional/apps/advanced_settings/config.ts
   - x-pack/test/functional/apps/aiops/config.ts
   - x-pack/test/functional/apps/api_keys/config.ts
@@ -353,7 +355,6 @@ enabled:
   - x-pack/test/reporting_functional/reporting_and_deprecated_security.config.ts
   - x-pack/test/reporting_functional/reporting_and_security.config.ts
   - x-pack/test/reporting_functional/reporting_without_security.config.ts
-  - x-pack/test/reporting_functional/reporting_and_timeout.config.ts
   - x-pack/test/rule_registry/security_and_spaces/config_basic.ts
   - x-pack/test/rule_registry/security_and_spaces/config_trial.ts
   - x-pack/test/rule_registry/spaces_only/config_basic.ts
@@ -418,6 +419,7 @@ enabled:
   - x-pack/performance/journeys/ecommerce_dashboard_saved_search_only.ts
   - x-pack/performance/journeys/ecommerce_dashboard_tsvb_gauge_only.ts
   - x-pack/performance/journeys/dashboard_listing_page.ts
+  - x-pack/performance/journeys/tags_listing_page.ts
   - x-pack/performance/journeys/cloud_security_dashboard.ts
   - x-pack/performance/journeys/apm_service_inventory.ts
   - x-pack/test/custom_branding/config.ts

.buildkite/pipelines/on_merge_unsupported_ftrs.yml

@@ -55,25 +55,21 @@ steps:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
-    parallelism: 4
+    parallelism: 14
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
 
   - command: .buildkite/scripts/steps/functional/security_solution_investigations.sh
-    label: 'Investigations - Security Solution Tests'
+    label: 'Investigations - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
-    parallelism: 4
+    parallelism: 6
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
 
@@ -86,11 +82,9 @@ steps:
     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:
@@ -100,8 +94,6 @@ steps:
     parallelism: 2
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
     artifact_paths:
@@ -116,8 +108,6 @@ steps:
     parallelism: 6
     retry:
       automatic:
-        - exit_status: '-1'
-          limit: 3
         - exit_status: '*'
           limit: 1
     artifact_paths:

.buildkite/pipelines/pull_request/base.yml

@@ -101,7 +101,7 @@ steps:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 40
-    parallelism: 10
+    parallelism: 16
     soft_fail: true
     retry:
       automatic:
@@ -130,7 +130,7 @@ steps:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 40
-    parallelism: 4
+    parallelism: 6
     soft_fail: true
     retry:
       automatic:

.buildkite/pipelines/pull_request/defend_workflows.yml

@@ -16,10 +16,10 @@ steps:
   - command: .buildkite/scripts/steps/functional/defend_workflows_vagrant.sh
     label: 'Defend Workflows Endpoint Cypress Tests'
     agents:
-      queue: n2-16-virt
+      queue: n2-4-virt
     depends_on: build
     timeout_in_minutes: 120
-    parallelism: 6
+    parallelism: 5
     retry:
       automatic:
         - exit_status: '*'

.buildkite/pipelines/pull_request/osquery_cypress.yml

@@ -20,5 +20,21 @@ steps:
     depends_on: build
     timeout_in_minutes: 50
     soft_fail: true
+    retry:
+      automatic: false
+    artifact_paths:
+      - "target/kibana-osquery/**/*"
+
+  - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
+    label: 'Serverless Osquery Cypress Tests'
+    agents:
+      queue: n2-4-spot
+    depends_on: build
+    timeout_in_minutes: 50
+    parallelism: 6
+    retry:
+      automatic:
+        - exit_status: '*'
+          limit: 1
     artifact_paths:
       - "target/kibana-osquery/**/*"

.buildkite/pipelines/pull_request/security_solution.yml

@@ -5,41 +5,41 @@ steps:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 60
-    parallelism: 10
+    parallelism: 16
     retry:
       automatic:
         - exit_status: '*'
           limit: 1
     artifact_paths:
-      - "target/kibana-security-solution/**/*"
+      - 'target/kibana-security-solution/**/*'
 
   - command: .buildkite/scripts/steps/functional/security_solution_explore.sh
     label: 'Explore - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 60
-    parallelism: 2
+    parallelism: 4
     retry:
       automatic:
         - exit_status: '*'
           limit: 1
     artifact_paths:
-      - "target/kibana-security-solution/**/*"
+      - 'target/kibana-security-solution/**/*'
 
   - command: .buildkite/scripts/steps/functional/security_solution_investigations.sh
     label: 'Investigations - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
-    parallelism: 4
+    parallelism: 6
     retry:
       automatic:
         - exit_status: '*'
           limit: 1
     artifact_paths:
-      - "target/kibana-security-solution/**/*"
+      - 'target/kibana-security-solution/**/*'
 
   - command: .buildkite/scripts/steps/functional/security_solution_burn.sh
     label: 'Security Solution Cypress tests, burning changed specs'
@@ -48,6 +48,15 @@ steps:
     depends_on: build
     timeout_in_minutes: 120
     parallelism: 1
+    retry:
+      automatic: false
     soft_fail: true
     artifact_paths:
-      - "target/kibana-security-solution/**/*"
+      - 'target/kibana-security-solution/**/*'
+
+  - command: .buildkite/scripts/steps/code_generation/security_solution_codegen.sh
+    label: 'Security Solution OpenAPI codegen'
+    agents:
+      queue: n2-2-spot
+    timeout_in_minutes: 60
+    parallelism: 1

.buildkite/pipelines/quality-gates/pipeline.tests-production.yaml

@@ -1,11 +1,6 @@
 steps:
-  - label: ":pipeline::kibana::seedling: Trigger Kibana Tests for ${ENVIRONMENT}"
-    command: echo "replace me with Kibana specific tests"
-    agent:
-      image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
-
-  - label: ":pipeline::fleet::seedling: Trigger Fleet Kibana Tests for ${ENVIRONMENT}"
-    command: echo "replace me with Fleet specific Kibana tests"
+  - label: ":pipeline::fleet::seedling: Trigger Observability Kibana Tests for ${ENVIRONMENT}"
+    command: echo "replace me with Observability specific Kibana tests"
     agent:
       image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
 

.buildkite/pipelines/quality-gates/pipeline.tests-qa.yaml

@@ -13,3 +13,8 @@ steps:
     command: echo "replace me with Security specific Kibana tests"
     agent:
       image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
+
+  - label: ":pipeline::lock::seedling: Trigger Control Plane Kibana Tests for ${ENVIRONMENT}"
+    command: echo "replace me with Control Plane specific Kibana tests"
+    agent:
+      image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"

.buildkite/pipelines/quality-gates/pipeline.tests-staging.yaml

@@ -1,11 +1,6 @@
 steps:
-  - label: ":pipeline::kibana::seedling: Trigger Kibana Tests for ${ENVIRONMENT}"
-    command: echo "replace me with Kibana specific tests"
-    agent:
-      image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
-
-  - label: ":pipeline::fleet::seedling: Trigger Fleet Kibana Tests for ${ENVIRONMENT}"
-    command: echo "replace me with Fleet specific Kibana tests"
+  - label: ":pipeline::fleet::seedling: Trigger Observability Kibana Tests for ${ENVIRONMENT}"
+    command: echo "replace me with Observability specific Kibana tests"
     agent:
       image: "docker.elastic.co/ci-agent-images/basic-buildkite-agent:1688566364"
 

.buildkite/pipelines/serverless.yml

@@ -66,35 +66,7 @@ steps:
       queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 40
-    parallelism: 12
-    retry:
-      automatic:
-        - exit_status: '*'
-          limit: 1
-    artifact_paths:
-      - "target/kibana-security-serverless/**/*"
-
-  - command: .buildkite/scripts/steps/functional/security_serverless.sh
-    label: 'Explore - Security Solution Cypress Tests'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 40
-    parallelism: 12
-    retry:
-      automatic:
-        - exit_status: '*'
-          limit: 1
-    artifact_paths:
-      - "target/kibana-security-serverless/**/*"
-
-  - command: .buildkite/scripts/steps/functional/security_serverless.sh
-    label: 'Serverless Security Cypress Tests'
-    agents:
-      queue: n2-4-spot
-    depends_on: build
-    timeout_in_minutes: 40
-    parallelism: 12
+    parallelism: 16
     retry:
       automatic:
         - exit_status: '*'
@@ -103,7 +75,7 @@ steps:
       - "target/kibana-security-serverless/**/*"
 
   - command: .buildkite/scripts/steps/functional/security_serverless_explore.sh
-    label: 'Explore - Security Solution Cypress Tests'
+    label: 'Serverless Explore - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build
@@ -117,7 +89,7 @@ steps:
       - "target/kibana-security-serverless/**/*"
 
   - command: .buildkite/scripts/steps/functional/security_serverless_investigations.sh
-    label: 'Investigations - Security Solution Cypress Tests'
+    label: 'Serverless Investigations - Security Solution Cypress Tests'
     agents:
       queue: n2-4-spot
     depends_on: build

.buildkite/scripts/common/util.sh

@@ -31,7 +31,7 @@ check_for_changed_files() {
 
   SHOULD_AUTO_COMMIT_CHANGES="${2:-}"
   CUSTOM_FIX_MESSAGE="${3:-}"
-  GIT_CHANGES="$(git ls-files --modified -- . ':!:.bazelrc')"
+  GIT_CHANGES="$(git status --porcelain -- . ':!:.bazelrc')"
 
   if [ "$GIT_CHANGES" ]; then
     if ! is_auto_commit_disabled && [[ "$SHOULD_AUTO_COMMIT_CHANGES" == "true" && "${BUILDKITE_PULL_REQUEST:-}" ]]; then
@@ -54,7 +54,7 @@ check_for_changed_files() {
       git config --global user.name kibanamachine
       git config --global user.email '[email protected]'
       gh pr checkout "${BUILDKITE_PULL_REQUEST}"
-      git add -u -- . ':!.bazelrc'
+      git add -A -- . ':!.bazelrc'
 
       git commit -m "$NEW_COMMIT_MESSAGE"
       git push

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

@@ -10,6 +10,7 @@ import { execSync } from 'child_process';
 import fs from 'fs';
 import prConfigs from '../../../pull_requests.json';
 import { areChangesSkippable, doAnyChangesMatch } from '#pipeline-utils';
+
 const prConfig = prConfigs.jobs.find((job) => job.pipelineSlug === 'kibana-pull-request');
 
 if (!prConfig) {

.buildkite/scripts/steps/add_gh_labels_to_bk_metadata.ts

@@ -27,15 +27,15 @@ const fetchLabels = (prNumber: PrNumber) =>
 
 try {
   const labels = pipe(head, firstMatch, parseInt10, fetchLabels)(`${process.env[parseTarget]}`);
-  execSync(`buildkite-agent meta-data set gh_labels ${labels}`);
-  if (alsoAnnotate)
-    execSync(
-      `buildkite-agent annotate --context 'default' --style 'info' "Github Labels: ${labels}"`
-    );
+  if (labels) {
+    execSync(`buildkite-agent meta-data set gh_labels ${labels}`);
+    if (alsoAnnotate)
+      execSync(
+        `buildkite-agent annotate --context 'default' --style 'info' "Github Labels: ${labels}"`
+      );
+  }
 } catch (e) {
-  console.error(
-    `\n!!! Error fetching Github Labels (stringified): \n${JSON.stringify(e, null, 2)}`
-  );
+  console.error(`Error fetching Github Labels for issue ${firstMatch}`);
 }
 
 export {};

.buildkite/scripts/steps/code_generation/security_solution_codegen.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common/util.sh
+
+.buildkite/scripts/bootstrap.sh
+
+echo --- Security Solution OpenAPI Code Generation
+
+(cd x-pack/plugins/security_solution && yarn openapi:generate)
+check_for_changed_files "yarn openapi:generate" true

.buildkite/scripts/steps/functional/apm_cypress.sh

@@ -16,7 +16,7 @@ GH_APM_TEAM_LABEL="Team:APM"
 if (! is_pr); then
   echo "--- Add GH labels to buildkite metadata"
   ts-node .buildkite/scripts/steps/add_gh_labels_to_bk_metadata.ts BUILDKITE_MESSAGE true
-  GH_ON_MERGE_LABELS="$(buildkite-agent meta-data get gh_labels)"
+  GH_ON_MERGE_LABELS="$(buildkite-agent meta-data get gh_labels --default '')"
 fi
 
 # Enabling cypress dashboard recording when PR is labeled with `apm:cypress-record` and we are not using the flaky test runner OR on merge with Team:APM label applied

.buildkite/scripts/steps/functional/defend_workflows.sh

@@ -10,4 +10,6 @@ export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
 echo "--- Defend Workflows Cypress tests"
 
-yarn --cwd x-pack/plugins/security_solution cypress:dw:run
+cd x-pack/plugins/security_solution
+
+yarn cypress:dw:run; status=$?; yarn junit:merge && exit $status

.buildkite/scripts/steps/functional/defend_workflows_vagrant.sh

@@ -8,7 +8,8 @@ source .buildkite/scripts/steps/functional/common_cypress.sh
 export JOB=kibana-defend-workflows-endpoint-cypress
 export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
-
 echo "--- Defend Workflows Endpoint Cypress tests"
 
-yarn --cwd x-pack/plugins/security_solution cypress:dw:endpoint:run
+cd x-pack/plugins/security_solution
+
+yarn cypress:dw:endpoint:run; status=$?; yarn junit:merge && exit $status