Merge branch 'main' into 126314

.buildkite/pipelines/bazel_cache.yml

@@ -1,5 +1,7 @@
 steps:
   - label: ':pipeline: Create pipeline with priority'
+    agents:
+      queue: kibana-default
     concurrency_group: bazel_macos
     concurrency: 1
     concurrency_method: eager

.buildkite/pipelines/es_snapshots/promote.yml

@@ -10,3 +10,5 @@ steps:
         required: true
   - label: Promote Snapshot
     command: .buildkite/scripts/steps/es_snapshots/promote.sh
+    agents:
+      queue: kibana-default

.buildkite/pipelines/es_snapshots/verify.yml

@@ -14,6 +14,8 @@ steps:
   - command: .buildkite/scripts/lifecycle/pre_build.sh
     label: Pre-Build
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
 
   - wait
 
@@ -85,6 +87,8 @@ steps:
   - command: .buildkite/scripts/steps/es_snapshots/trigger_promote.sh
     label: Trigger promotion
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
     depends_on:
       - default-cigroup
       - default-cigroup-docker
@@ -98,3 +102,5 @@ steps:
   - command: .buildkite/scripts/lifecycle/post_build.sh
     label: Post-Build
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default

.buildkite/pipelines/flaky_tests/pipeline.js

@@ -51,6 +51,9 @@ const pipeline = {
     {
       command: '.buildkite/pipelines/flaky_tests/runner.sh',
       label: 'Create pipeline',
+      agents: {
+        queue: 'kibana-default',
+      },
     },
   ],
 };

.buildkite/pipelines/hourly.yml

@@ -2,6 +2,8 @@ steps:
   - command: .buildkite/scripts/lifecycle/pre_build.sh
     label: Pre-Build
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
 
   - wait
 
@@ -54,24 +56,44 @@ steps:
   - command: .buildkite/scripts/steps/functional/oss_accessibility.sh
     label: 'OSS Accessibility Tests'
     agents:
-      queue: ci-group-4d
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '*'
+        - exit_status: '1'
           limit: 1
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '130'
+          limit: 3
+        - exit_status: '137'
+          limit: 3
+        - exit_status: '143'
+          limit: 3
+        - exit_status: '255'
+          limit: 3
 
   - command: .buildkite/scripts/steps/functional/xpack_accessibility.sh
     label: 'Default Accessibility Tests'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '*'
+        - exit_status: '1'
           limit: 1
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '130'
+          limit: 3
+        - exit_status: '137'
+          limit: 3
+        - exit_status: '143'
+          limit: 3
+        - exit_status: '255'
+          limit: 3
 
   - command: .buildkite/scripts/steps/functional/oss_firefox.sh
     label: 'OSS Firefox Tests'
@@ -87,13 +109,23 @@ steps:
   - command: .buildkite/scripts/steps/functional/xpack_firefox.sh
     label: 'Default Firefox Tests'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '*'
+        - exit_status: '1'
           limit: 1
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '130'
+          limit: 3
+        - exit_status: '137'
+          limit: 3
+        - exit_status: '143'
+          limit: 3
+        - exit_status: '255'
+          limit: 3
 
   - command: .buildkite/scripts/steps/functional/oss_misc.sh
     label: 'OSS Misc Functional Tests'
@@ -109,13 +141,23 @@ steps:
   - command: .buildkite/scripts/steps/functional/xpack_saved_object_field_metrics.sh
     label: 'Saved Object Field Metrics'
     agents:
-      queue: n2-4
+      queue: n2-4-spot
     depends_on: build
     timeout_in_minutes: 120
     retry:
       automatic:
-        - exit_status: '*'
+        - exit_status: '1'
           limit: 1
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '130'
+          limit: 3
+        - exit_status: '137'
+          limit: 3
+        - exit_status: '143'
+          limit: 3
+        - exit_status: '255'
+          limit: 3
 
   - command: .buildkite/scripts/steps/test/jest.sh
     label: 'Jest Tests'
@@ -136,9 +178,23 @@ steps:
   - command: .buildkite/scripts/steps/test/api_integration.sh
     label: 'API Integration Tests'
     agents:
-      queue: n2-2
+      queue: n2-4-spot
     timeout_in_minutes: 120
     key: api-integration
+    retry:
+      automatic:
+        - exit_status: '1'
+          limit: 1
+        - exit_status: '-1'
+          limit: 3
+        - exit_status: '130'
+          limit: 3
+        - exit_status: '137'
+          limit: 3
+        - exit_status: '143'
+          limit: 3
+        - exit_status: '255'
+          limit: 3
 
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'
@@ -174,3 +230,5 @@ steps:
   - command: .buildkite/scripts/lifecycle/post_build.sh
     label: Post-Build
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default

.buildkite/pipelines/on_merge.yml

@@ -5,6 +5,8 @@ steps:
   - command: .buildkite/scripts/lifecycle/pre_build.sh
     label: Pre-Build
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
 
   - wait
 
@@ -34,3 +36,5 @@ steps:
   - command: .buildkite/scripts/lifecycle/post_build.sh
     label: Post-Build
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default

.buildkite/pipelines/performance/daily.yml

@@ -1,25 +1,27 @@
 steps:
-  - block: ":gear: Performance Tests Configuration"
-    prompt: "Fill out the details for performance test"
+  - block: ':gear: Performance Tests Configuration'
+    prompt: 'Fill out the details for performance test'
     fields:
-      - text: ":arrows_counterclockwise: Iterations"
-        key: "performance-test-iteration-count"
-        hint: "How many times you want to run tests? "
+      - text: ':arrows_counterclockwise: Iterations'
+        key: 'performance-test-iteration-count'
+        hint: 'How many times you want to run tests? '
         required: true
     if: build.env('PERF_TEST_COUNT') == null
 
-  - label: ":male-mechanic::skin-tone-2: Pre-Build"
+  - label: ':male-mechanic::skin-tone-2: Pre-Build'
     command: .buildkite/scripts/lifecycle/pre_build.sh
+    agents:
+      queue: kibana-default
 
   - wait
 
-  - label: ":factory_worker: Build Kibana Distribution and Plugins"
+  - label: ':factory_worker: Build Kibana Distribution and Plugins'
     command: .buildkite/scripts/steps/build_kibana.sh
     agents:
       queue: c2-16
     key: build
 
-  - label: ":muscle: Performance Tests with Playwright config"
+  - label: ':muscle: Performance Tests with Playwright config'
     command: .buildkite/scripts/steps/functional/performance_playwright.sh
     agents:
       queue: c2-16
@@ -28,6 +30,7 @@ steps:
   - wait: ~
     continue_on_failure: true
 
-  - label: ":male_superhero::skin-tone-2: Post-Build"
+  - label: ':male_superhero::skin-tone-2: Post-Build'
     command: .buildkite/scripts/lifecycle/post_build.sh
-
+    agents:
+      queue: kibana-default

.buildkite/pipelines/pull_request/base.yml

@@ -2,6 +2,8 @@ steps:
   - command: .buildkite/scripts/lifecycle/pre_build.sh
     label: Pre-Build
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
 
   - wait
 

.buildkite/pipelines/pull_request/post_build.yml

@@ -4,3 +4,5 @@ steps:
 
   - command: .buildkite/scripts/lifecycle/post_build.sh
     label: Post-Build
+    agents:
+      queue: kibana-default

.buildkite/pipelines/purge_cloud_deployments.yml

@@ -2,3 +2,5 @@ steps:
   - command: .buildkite/scripts/steps/cloud/purge.sh
     label: Purge old cloud deployments
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default

.buildkite/pipelines/update_demo_env.yml

@@ -2,6 +2,8 @@ steps:
   - command: .buildkite/scripts/steps/demo_env/es_and_init.sh
     label: Initialize Environment and Deploy ES
     timeout_in_minutes: 10
+    agents:
+      queue: kibana-default
 
   - command: .buildkite/scripts/steps/demo_env/kibana.sh
     label: Build and Deploy Kibana

.github/workflows/backport.yml

@@ -9,33 +9,19 @@ on:
 jobs:
   backport:
     name: Backport PR
+    runs-on: ubuntu-latest
     if: |
       github.event.pull_request.merged == true
       && contains(github.event.pull_request.labels.*.name, 'auto-backport')
       && (
         (github.event.action == 'labeled' && github.event.label.name == 'auto-backport')
         || (github.event.action == 'closed')
       )
-    runs-on: ubuntu-latest
     steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: 'elastic/kibana-github-actions'
-          ref: main
-          path: ./actions
-
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-
-      - name: Fix Version Label Gaps
-        uses: ./actions/fix-version-gaps
+      - name: Backport Action
+        uses: sqren/backport-github-action@v7.4.0
         with:
           github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
 
-      - name: Run Backport
-        uses: ./actions/backport
-        with:
-          github_token: ${{secrets.KIBANAMACHINE_TOKEN}}
-          commit_user: kibanamachine
-          commit_email: 42973632+kibanamachine@users.noreply.github.com
+      - name: Backport log
+        run: cat ~/.backport/backport.log

.gitignore

@@ -95,4 +95,3 @@ fleet-server-*
 elastic-agent.yml
 fleet-server.yml
 
-/x-pack/plugins/fleet/server/bundled_packages

.i18nrc.json

@@ -66,6 +66,7 @@
     "uiActions": "src/plugins/ui_actions",
     "uiActionsExamples": "examples/ui_action_examples",
     "usageCollection": "src/plugins/usage_collection",
+    "utils": "packages/kbn-securitysolution-utils/src",
     "visDefaultEditor": "src/plugins/vis_default_editor",
     "visTypeHeatmap": "src/plugins/vis_types/heatmap",
     "visTypeMarkdown": "src/plugins/vis_type_markdown",