Merge branch 'main' into chore/replace-node-sass

.buildkite/ftr_configs.yml

@@ -232,8 +232,6 @@ enabled:
  - x-pack/test/cloud_security_posture_api/config.ts
  - x-pack/test/dataset_quality_api_integration/basic/config.ts
  - x-pack/test/detection_engine_api_integration/basic/config.ts
- - x-pack/test/detection_engine_api_integration/security_and_spaces/group1/config.ts
- - x-pack/test/detection_engine_api_integration/security_and_spaces/group10/config.ts
  - x-pack/test/disable_ems/config.ts
  - x-pack/test/encrypted_saved_objects_api_integration/config.ts
  - x-pack/test/examples/config.ts
@@ -499,5 +497,17 @@ enabled:
  - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/default_license/exception_lists_items/configs/ess.config.ts
  - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/default_license/lists_items/configs/serverless.config.ts
  - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/default_license/lists_items/configs/ess.config.ts
-
-
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_delete/configs/serverless.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_delete/configs/ess.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_update/configs/ess.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_update/configs/serverless.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_patch/configs/ess.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_patch/configs/serverless.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_import_export/configs/serverless.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_import_export/configs/ess.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_management/configs/serverless.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_management/configs/ess.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_read/configs/serverless.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_read/configs/ess.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_bulk_actions/configs/ess.config.ts
+ - x-pack/test/security_solution_api_integration/test_suites/detections_response/default_license/rule_bulk_actions/configs/serverless.config.ts

.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml

@@ -56,8 +56,8 @@ steps:
  - exit_status: '*'
  limit: 1
 
- - command: .buildkite/scripts/steps/functional/security_serverless.sh
- label: 'Serverless Security Cypress Tests'
+ - command: .buildkite/scripts/steps/functional/security_serverless_entity_analytics.sh
+ label: 'Serverless Entity Analytics - Security Solution Cypress Tests'
  if: "build.env('SKIP_CYPRESS') != '1' && build.env('SKIP_CYPRESS') != 'true'"
  agents:
  queue: n2-4-spot

.buildkite/pipelines/flaky_tests/groups.json

@@ -1,12 +1,12 @@
 {
  "groups": [
  {
- "key": "cypress/security_solution",
- "name": "Security Solution - Cypress"
+ "key": "cypress/security_solution_entity_analytics",
+ "name": "Security Solution Entity Analytics - Cypress"
  },
  {
- "key": "cypress/security_serverless",
- "name": "[Serverless] Security Solution - Cypress"
+ "key": "cypress/security_serverless_entity_analytics",
+ "name": "[Serverless] Security Solution Entity Analytics - Cypress"
  },
  {
  "key": "cypress/security_solution_investigations",
@@ -32,7 +32,6 @@
  "key": "cypress/security_serverless_rule_management",
  "name": "[Serverless] Security Solution Rule Management - Cypress"
  },
-
  {
  "key": "cypress/security_solution_rule_management_prebuilt_rules",
  "name": "Security Solution Rule Management - Prebuilt Rules - Cypress"

.buildkite/pipelines/on_merge.yml

@@ -79,8 +79,8 @@ steps:
  - exit_status: '*'
  limit: 1
 
- - command: .buildkite/scripts/steps/functional/security_serverless.sh
- label: 'Serverless Security Cypress Tests'
+ - command: .buildkite/scripts/steps/functional/security_serverless_entity_analytics.sh
+ label: 'Serverless Entity Analytics - Security Cypress Tests'
  agents:
  queue: n2-4-spot
  depends_on: build
@@ -235,13 +235,13 @@ steps:
  - exit_status: '*'
  limit: 1
 
- - command: .buildkite/scripts/steps/functional/security_solution.sh
- label: 'Security Solution Cypress Tests'
+ - command: .buildkite/scripts/steps/functional/security_solution_entity_analytics.sh
+ label: 'Entity Analytics - Security Solution Cypress Tests'
  agents:
  queue: n2-4-spot
  depends_on: build
  timeout_in_minutes: 60
- parallelism: 8
+ parallelism: 2
  retry:
  automatic:
  - exit_status: '*'

.buildkite/pipelines/pull_request/base.yml

@@ -57,8 +57,8 @@ steps:
  - exit_status: '*'
  limit: 1
 
- - command: .buildkite/scripts/steps/functional/security_serverless.sh
- label: 'Serverless Security Cypress Tests'
+ - command: .buildkite/scripts/steps/functional/security_serverless_entity_analytics.sh
+ label: 'Serverless Entity Analytics - Security Cypress Tests'
  agents:
  queue: n2-4-spot
  depends_on: build
@@ -153,13 +153,13 @@ steps:
  - exit_status: '*'
  limit: 1 
 
- - command: .buildkite/scripts/steps/functional/security_solution.sh
- label: 'Security Solution Cypress Tests'
+ - command: .buildkite/scripts/steps/functional/security_solution_entity_analytics.sh
+ label: 'Entity Analytics - Security Solution Cypress Tests'
  agents:
  queue: n2-4-spot
  depends_on: build
  timeout_in_minutes: 60
- parallelism: 8
+ parallelism: 2
  retry:
  automatic:
  - exit_status: '*'

.buildkite/pipelines/pull_request/cypress_burn.yml

@@ -1,6 +1,6 @@
 steps:
  - command: .buildkite/scripts/steps/functional/defend_workflows_burn.sh
- label: 'Defend Workflows Cypress Tests, burning changed specs'
+ label: '[Soft fail] Defend Workflows Cypress Tests, burning changed specs'
  agents:
  queue: n2-4-virt
  depends_on: build
@@ -11,7 +11,7 @@ steps:
  automatic: false
 
  - command: .buildkite/scripts/steps/functional/defend_workflows_serverless_burn.sh
- label: 'Defend Workflows Cypress Tests on Serverless, burning changed specs'
+ label: '[Soft fail] Defend Workflows Cypress Tests on Serverless, burning changed specs'
  agents:
  queue: n2-4-virt
  depends_on: build
@@ -22,7 +22,7 @@ steps:
  automatic: false
 
  - command: .buildkite/scripts/steps/functional/security_solution_burn.sh
- label: 'Security Solution Cypress tests, burning changed specs'
+ label: '[Soft fail] Security Solution Cypress tests, burning changed specs'
  agents:
  queue: n2-4-spot
  depends_on: build
@@ -33,7 +33,7 @@ steps:
  soft_fail: true
 
  - command: .buildkite/scripts/steps/functional/osquery_cypress_burn.sh
- label: 'Osquery Cypress Tests, burning changed specs'
+ label: '[Soft fail] Osquery Cypress Tests, burning changed specs'
  agents:
  queue: n2-4-spot
  depends_on: build

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

@@ -10,6 +10,11 @@
 #
 # Docs: https://docs.elastic.dev/serverless/qualitygates
 
+agents:
+ cpu: 2
+ ephemeralStorage: "20G"
+ memory: "8G"
+
 env:
  TEAM_CHANNEL: "#kibana-mission-control"
  ENVIRONMENT: ${ENVIRONMENT?}

.buildkite/pipelines/security_solution/api_integration.yml

@@ -15,7 +15,7 @@ steps:
  key: exception_operators_date_numeric_types:qa:serverless
  agents:
  queue: n2-4-spot
- timeout_in_minutes: 120 
+ timeout_in_minutes: 120
  retry:
  automatic:
  - exit_status: '*'
@@ -31,7 +31,7 @@ steps:
  automatic:
  - exit_status: '*'
  limit: 2
- 
+
  - label: Running exception_operators_ips:qa:serverless
  command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh exception_operators_ips:qa:serverless
  key: exception_operators_ips:qa:serverless
@@ -53,7 +53,6 @@ steps:
  automatic:
  - exit_status: '1'
  limit: 2
-
 
  - label: Running exception_operators_text:qa:serverless
  command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh exception_operators_text:qa:serverless
@@ -76,7 +75,7 @@ steps:
  automatic:
  - exit_status: '1'
  limit: 2
- 
+
  - label: Running actions:qa:serverless
  command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh actions:qa:serverless
  key: actions:qa:serverless
@@ -97,7 +96,7 @@ steps:
  retry:
  automatic:
  - exit_status: '1'
- limit: 2 
+ limit: 2
 
  - label: Running prebuilt_rules_management:qa:serverless
  command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh prebuilt_rules_management:qa:serverless
@@ -119,7 +118,7 @@ steps:
  retry:
  automatic:
  - exit_status: '1'
- limit: 2 
+ limit: 2
 
  - label: Running prebuilt_rules_large_prebuilt_rules_package:qa:serverless
  command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh prebuilt_rules_large_prebuilt_rules_package:qa:serverless
@@ -130,7 +129,7 @@ steps:
  retry:
  automatic:
  - exit_status: '1'
- limit: 2 
+ limit: 2
 
  - label: Running prebuilt_rules_update_prebuilt_rules_package:qa:serverless
  command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh prebuilt_rules_update_prebuilt_rules_package:qa:serverless
@@ -152,8 +151,8 @@ steps:
  retry:
  automatic:
  - exit_status: '1'
- limit: 2 
- 
+ limit: 2
+
  - label: Running user_roles:qa:serverless
  command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh user_roles:qa:serverless
  key: user_roles:qa:serverless
@@ -163,7 +162,7 @@ steps:
  retry:
  automatic:
  - exit_status: '1'
- limit: 2 
+ limit: 2
 
  - label: Running telemetry:qa:serverless
  command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh telemetry:qa:serverless
@@ -175,4 +174,80 @@ steps:
  automatic:
  - exit_status: '1'
  limit: 2
-
+
+ - label: Running rule_delete:qa:serverless
+ command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh rule_delete:qa:serverless
+ key: rule_delete:qa:serverless
+ agents:
+ queue: n2-4-spot
+ timeout_in_minutes: 120
+ retry:
+ automatic:
+ - exit_status: '1'
+ limit: 2
+
+ - label: Running rule_update:qa:serverless
+ command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh rule_update:qa:serverless
+ key: rule_update:qa:serverless
+ agents:
+ queue: n2-4-spot
+ timeout_in_minutes: 120
+ retry:
+ automatic:
+ - exit_status: '1'
+ limit: 2
+
+ - label: Running rule_patch:qa:serverless
+ command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh rule_patch:qa:serverless
+ key: rule_patch:qa:serverless
+ agents:
+ queue: n2-4-spot
+ timeout_in_minutes: 120
+ retry:
+ automatic:
+ - exit_status: '1'
+ limit: 2
+
+ - label: Running rule_import_export:qa:serverless
+ command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh rule_import_export:qa:serverless
+ key: rule_import_export:qa:serverless
+ agents:
+ queue: n2-4-spot
+ timeout_in_minutes: 120
+ retry:
+ automatic:
+ - exit_status: '1'
+ limit: 2
+
+ - label: Running rule_management:qa:serverless
+ command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh rule_management:qa:serverless
+ key: rule_management:qa:serverless
+ agents:
+ queue: n2-4-spot
+ timeout_in_minutes: 120
+ retry:
+ automatic:
+ - exit_status: '1'
+ limit: 2
+
+ - label: Running rule_bulk_actions:qa:serverless
+ command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh rule_bulk_actions:qa:serverless
+ key: rule_bulk_actions:qa:serverless
+ agents:
+ queue: n2-4-spot
+ timeout_in_minutes: 120
+ retry:
+ automatic:
+ - exit_status: '1'
+ limit: 2
+
+ - label: Running rule_read:qa:serverless
+ command: .buildkite/scripts/pipelines/security_solution_quality_gate/api-integration-tests.sh rule_read:qa:serverless
+ key: rule_read:qa:serverless
+ agents:
+ queue: n2-4-spot
+ timeout_in_minutes: 120
+ retry:
+ automatic:
+ - exit_status: '1'
+ limit: 2

.buildkite/pipelines/security_solution/security_solution_cypress.yml

@@ -93,4 +93,16 @@ steps:
  retry:
  automatic:
  - exit_status: '*'
- limit: 1 
+ limit: 1 
+
+ - command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:entity_analytics
+ label: 'Serverless MKI QA Entity Analytics - Security Solution Cypress Tests'
+ agents:
+ queue: n2-4-spot
+ # TODO : Revise the timeout when the pipeline will be officially integrated with the quality gate.
+ timeout_in_minutes: 300
+ parallelism: 2
+ retry:
+ automatic:
+ - exit_status: '*'
+ limit: 1 

.buildkite/pull_requests.json

@@ -13,6 +13,7 @@
  "commit_status_context": "kibana-ci",
  "build_on_commit": true,
  "build_on_comment": true,
+ "build_drafts": false,
  "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^\\/ci$",
  "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))|^\\/ci$",
  "skip_ci_labels": ["skip-ci", "jenkins-ci"],
@@ -64,7 +65,6 @@
  "build_on_commit": true,
  "build_on_comment": false,
  "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
- "always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
  "skip_ci_labels": [],
  "labels": ["kme-test"],
  "skip_target_branches": ["6.8", "7.11", "7.12"],

.buildkite/scripts/steps/functional/security_serverless.sh → .buildkite/scripts/steps/functional/security_serverless_entity_analytics.sh

@@ -8,9 +8,9 @@ source .buildkite/scripts/steps/functional/common_cypress.sh
 export JOB=kibana-serverless-security-cypress
 export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
-echo "--- Security Serverless Cypress Tests"
+echo "--- Entity Analytics Cypress Tests on Serverless"
 
 cd x-pack/test/security_solution_cypress
 
 set +e
-yarn cypress:run:serverless; status=$?; yarn junit:merge || :; exit $status
+yarn cypress:entity_analytics:run:serverless; status=$?; yarn junit:merge || :; exit $status

.buildkite/scripts/steps/functional/security_solution.sh → .buildkite/scripts/steps/functional/security_solution_entity_analytics.sh

@@ -8,9 +8,9 @@ source .buildkite/scripts/steps/functional/common_cypress.sh
 export JOB=kibana-security-solution-chrome
 export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 
-echo "--- Security Solution Cypress tests (Chrome)"
+echo "--- Entity Analytics - Security Solution Cypress Tests"
 
 cd x-pack/test/security_solution_cypress
 
 set +e
-yarn cypress:run:ess; status=$?; yarn junit:merge || :; exit $status
+yarn cypress:entity_analytics:run:ess; status=$?; yarn junit:merge || :; exit $status