Merge branch 'main' into fix-logs-explorer-privilege-checks

elastic · Oct 31, 2024 · cda2e12 · cda2e12
2 parents 397fe48 + 40ddfbc
commit cda2e12
Show file tree

Hide file tree

Showing 1,145 changed files with 8,753 additions and 4,896 deletions.
diff --git a/.buildkite/ftr_security_serverless_configs.yml b/.buildkite/ftr_security_serverless_configs.yml
@@ -45,13 +45,23 @@ enabled:
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/serverless.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_types/basic_license_essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/float/basic_license_essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/integer/basic_license_essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/double/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/serverless.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/query/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_gaps/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/trial_license_complete_tier/configs/serverless.config.ts

diff --git a/.buildkite/ftr_security_stateful_configs.yml b/.buildkite/ftr_security_stateful_configs.yml
@@ -30,13 +30,23 @@ enabled:
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/ess.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_types/basic_license_essentials_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/float/basic_license_essentials_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/integer/basic_license_essentials_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/double/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/ess.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/query/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_gaps/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/trial_license_complete_tier/configs/ess.config.ts

diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
@@ -39,7 +39,6 @@ steps:
       provider: gcp
       machineType: n2-highcpu-8
       preemptible: true
-    key: quick_checks
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -54,7 +53,6 @@ steps:
       provider: gcp
       machineType: n2-standard-16
       preemptible: true
-    key: linting
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -69,8 +67,23 @@ steps:
       provider: gcp
       machineType: n2-standard-32
       preemptible: true
-    key: linting_with_types
-    timeout_in_minutes: 90
+    timeout_in_minutes: 60
+    retry:
+      automatic:
+        - exit_status: '-1'
+          limit: 3
+
+  - command: .buildkite/scripts/steps/check_types.sh
+    label: 'Check Types'
+    agents:
+      image: family/kibana-ubuntu-2004
+      imageProject: elastic-images-prod
+      provider: gcp
+      machineType: c4-standard-4
+      diskType: 'hyperdisk-balanced'
+      preemptible: true
+      spotZones: us-central1-a,us-central1-b,us-central1-c
+    timeout_in_minutes: 60
     retry:
       automatic:
         - exit_status: '-1'
@@ -136,11 +149,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 3
     retry:
@@ -156,11 +164,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -176,11 +179,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -196,11 +194,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -216,11 +209,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -236,11 +224,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 4
     retry:
@@ -256,11 +239,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -276,11 +254,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -296,11 +269,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -316,11 +284,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -336,11 +299,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -356,11 +314,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -376,11 +329,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -396,11 +344,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -416,11 +359,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -436,11 +374,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 6
     retry:
@@ -456,11 +389,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -476,11 +404,6 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -498,11 +421,6 @@ steps:
       localSsds: 1
       localSsdInterface: nvme
       machineType: n2-standard-4
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 20
     retry:
@@ -520,11 +438,6 @@ steps:
       localSsds: 1
       localSsdInterface: nvme
       machineType: n2-standard-4
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     timeout_in_minutes: 60
     parallelism: 14
     retry:
@@ -535,11 +448,6 @@ steps:
   - command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
     label: Trigger unsupported ftr tests
     timeout_in_minutes: 10
-    depends_on:
-      - build
-      - quick_checks
-      - linting
-      - linting_with_types
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
@@ -560,27 +468,13 @@ steps:
         - exit_status: '-1'
           limit: 3
 
-  - command: .buildkite/scripts/steps/check_types.sh
-    label: 'Check Types'
-    agents:
-      image: family/kibana-ubuntu-2004
-      imageProject: elastic-images-prod
-      provider: gcp
-      machineType: n2-standard-4
-      preemptible: true
-    timeout_in_minutes: 70
-    retry:
-      automatic:
-        - exit_status: '-1'
-          limit: 3
-
   - command: .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
     label: 'Check OAS Snapshot'
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-2
+      machineType: n2-standard-4
       preemptible: true
     timeout_in_minutes: 60
     retry:

diff --git a/.buildkite/pipelines/pull_request/apm_cypress.yml b/.buildkite/pipelines/pull_request/apm_cypress.yml
@@ -9,6 +9,7 @@ steps:
       - quick_checks
       - linting
       - linting_with_types
+      - check_types
     timeout_in_minutes: 120
     parallelism: 1 # TODO: Set parallelism when apm_cypress handles it
     retry: