Merge branch 'main' into uptime_jwt_shared_secret_reload

.buildkite/hooks/pre-command

@@ -74,3 +74,8 @@ if [[ "${USE_SNYK_CREDENTIALS:-}" == "true" ]]; then
   SNYK_TOKEN=$(vault read -field=token secret/ci/elastic-elasticsearch/migrated/snyk)
   export SNYK_TOKEN
 fi
+
+if [[ "$BUILDKITE_AGENT_META_DATA_PROVIDER" != *"k8s"* ]]; then
+  # Run in the background, while the job continues
+  nohup .buildkite/scripts/setup-monitoring.sh </dev/null >/dev/null 2>&1 &
+fi

.buildkite/pipelines/intake.yml

@@ -40,7 +40,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.14", "8.9.3", "8.10.0", "8.11.0"]
+            BWC_VERSION: ["7.17.14", "8.10.2", "8.11.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic-packaging.yml

@@ -1584,8 +1584,8 @@ steps:
         env:
           BWC_VERSION: 8.9.2
 
-      - label: "{{matrix.image}} / 8.9.3 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.9.3
+      - label: "{{matrix.image}} / 8.10.0 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.0
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -1598,10 +1598,10 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.9.3
+          BWC_VERSION: 8.10.0
 
-      - label: "{{matrix.image}} / 8.10.0 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.0
+      - label: "{{matrix.image}} / 8.10.1 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.1
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -1614,7 +1614,23 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.10.0
+          BWC_VERSION: 8.10.1
+
+      - label: "{{matrix.image}} / 8.10.2 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.2
+        timeout_in_minutes: 300
+        matrix:
+          setup:
+            image:
+              - rocky-8
+              - ubuntu-2004
+        agents:
+          provider: gcp
+          image: family/elasticsearch-{{matrix.image}}
+          machineType: custom-16-32768
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 8.10.2
 
       - label: "{{matrix.image}} / 8.11.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.11.0

.buildkite/pipelines/periodic-platform-support.yml

@@ -27,7 +27,7 @@ steps:
           provider: gcp
           image: family/elasticsearch-{{matrix.image}}
           diskSizeGb: 350
-          machineType: custom-32-98304
+          machineType: n1-standard-32
         env: {}
   - group: platform-support-windows
     steps:
@@ -50,7 +50,7 @@ steps:
         agents:
           provider: gcp
           image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-32-98304
+          machineType: n1-standard-32
           diskType: pd-ssd
           diskSizeGb: 350
         env:

.buildkite/pipelines/periodic.yml

@@ -972,26 +972,36 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 8.9.2
-      - label: 8.9.3 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.9.3#bwcTest
+      - label: 8.10.0 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.0#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
           machineType: custom-32-98304
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.9.3
-      - label: 8.10.0 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.0#bwcTest
+          BWC_VERSION: 8.10.0
+      - label: 8.10.1 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.1#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
           machineType: custom-32-98304
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.10.0
+          BWC_VERSION: 8.10.1
+      - label: 8.10.2 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.2#bwcTest
+        timeout_in_minutes: 300
+        agents:
+          provider: gcp
+          image: family/elasticsearch-ubuntu-2004
+          machineType: custom-32-98304
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 8.10.2
       - label: 8.11.0 / bwc
         command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.11.0#bwcTest
         timeout_in_minutes: 300

.buildkite/pull-requests.json

@@ -0,0 +1,20 @@
+{
+  "jobs": [
+    {
+      "enabled": true,
+      "pipeline_slug": "elasticsearch-pull-request",
+      "allow_org_users": true,
+      "allowed_repo_permissions": [
+        "admin",
+        "write"
+      ],
+      "set_commit_status": false,
+      "build_on_commit": true,
+      "build_on_comment": true,
+      "trigger_comment_regex": "buildkite\\W+elasticsearch-ci.+",
+      "labels": ["buildkite-opt-in"],
+      "cancel_intermediate_builds": true,
+      "cancel_intermediate_builds_on_comment": false
+    }
+  ]
+}

.buildkite/scripts/periodic.trigger.sh

@@ -2,8 +2,6 @@
 
 set -euo pipefail
 
-exit 0
-
 echo "steps:"
 
 source .buildkite/scripts/branches.sh
@@ -14,23 +12,33 @@ for BRANCH in "${BRANCHES[@]}"; do
   LAST_GOOD_COMMIT=$(echo "${BUILD_JSON}" | jq -r '.commit')
 
   cat <<EOF
-  - trigger: elasticsearch-periodic
-    label: Trigger periodic pipeline for $BRANCH
-    async: true
-    build:
-      branch: "$BRANCH"
-      commit: "$LAST_GOOD_COMMIT"
-  - trigger: elasticsearch-periodic-packaging
-    label: Trigger periodic-packaging pipeline for $BRANCH
-    async: true
-    build:
-      branch: "$BRANCH"
-      commit: "$LAST_GOOD_COMMIT"
   - trigger: elasticsearch-periodic-platform-support
     label: Trigger periodic-platform-support pipeline for $BRANCH
     async: true
     build:
       branch: "$BRANCH"
       commit: "$LAST_GOOD_COMMIT"
 EOF
+
+### Only platform-support enabled for right now
+#   cat <<EOF
+#   - trigger: elasticsearch-periodic
+#     label: Trigger periodic pipeline for $BRANCH
+#     async: true
+#     build:
+#       branch: "$BRANCH"
+#       commit: "$LAST_GOOD_COMMIT"
+#   - trigger: elasticsearch-periodic-packaging
+#     label: Trigger periodic-packaging pipeline for $BRANCH
+#     async: true
+#     build:
+#       branch: "$BRANCH"
+#       commit: "$LAST_GOOD_COMMIT"
+#   - trigger: elasticsearch-periodic-platform-support
+#     label: Trigger periodic-platform-support pipeline for $BRANCH
+#     async: true
+#     build:
+#       branch: "$BRANCH"
+#       commit: "$LAST_GOOD_COMMIT"
+# EOF
 done

.buildkite/scripts/setup-monitoring.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -euo pipefail
+
+ELASTIC_AGENT_URL=$(vault read -field=url secret/ci/elastic-elasticsearch/elastic-agent-token)
+ELASTIC_AGENT_TOKEN=$(vault read -field=token secret/ci/elastic-elasticsearch/elastic-agent-token)
+
+if [[ ! -d /opt/elastic-agent ]]; then
+  sudo mkdir /opt/elastic-agent
+  sudo chown -R buildkite-agent:buildkite-agent /opt/elastic-agent
+  cd /opt/elastic-agent
+
+  archive=elastic-agent-8.10.1-linux-x86_64.tar.gz
+  if [ "$(uname -m)" = "arm64" ] || [ "$(uname -m)" = "aarch64" ]; then
+    archive=elastic-agent-8.10.1-linux-arm64.tar.gz
+  fi
+
+  curl -L -O "https://artifacts.elastic.co/downloads/beats/elastic-agent/$archive"
+
+  tar xzf "$archive" --directory=. --strip-components=1
+fi
+
+cd /opt/elastic-agent
+sudo ./elastic-agent install -f --url="$ELASTIC_AGENT_URL" --enrollment-token="$ELASTIC_AGENT_TOKEN"

.ci/bwcVersions

@@ -96,6 +96,7 @@ BWC_VERSION:
   - "8.9.0"
   - "8.9.1"
   - "8.9.2"
-  - "8.9.3"
   - "8.10.0"
+  - "8.10.1"
+  - "8.10.2"
   - "8.11.0"

.ci/jobs.t/elastic+elasticsearch+pull-request+build-benchmark-part1.yml

@@ -34,6 +34,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'build-benchmark'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+build-benchmark-part2.yml

@@ -34,6 +34,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'build-benchmark'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+bwc-snapshots-windows.yml

@@ -29,6 +29,7 @@
             - 'test-windows'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: slave

.ci/jobs.t/elastic+elasticsearch+pull-request+bwc-snapshots.yml

@@ -26,6 +26,7 @@
           black-list-labels:
             - '>test-mute'
             - 'test-full-bwc'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: slave

.ci/jobs.t/elastic+elasticsearch+pull-request+cloud-deploy.yml

@@ -26,6 +26,8 @@
             - ^x-pack/docs/.*
           white-list-labels:
             - 'cloud-deploy'
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+docs-check.yml

@@ -23,6 +23,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+eql-correctness.yml

@@ -25,6 +25,7 @@
             - ^x-pack/docs/.*
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+example-plugins.yml

@@ -23,6 +23,8 @@
             - build-tools/.*
             - build-tools-internal/.*
             - plugins/examples/.*
+          black-list-labels:
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+full-bwc.yml

@@ -27,6 +27,7 @@
             - 'test-full-bwc'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: slave

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix-sample.yml

@@ -27,6 +27,7 @@
           black-list-labels:
             - '>test-mute'
             - ':Delivery/Packaging'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix.yml

@@ -28,6 +28,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-nojdk.yml

@@ -32,6 +32,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample-nojdk.yml

@@ -31,6 +31,7 @@
           black-list-labels:
             - '>test-mute'
             - ':Delivery/Packaging'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample.yml

@@ -30,6 +30,7 @@
           black-list-labels:
             - '>test-mute'
             - ':Delivery/Packaging'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows.yml

@@ -32,6 +32,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-upgrade-tests.yml

@@ -29,6 +29,7 @@
             - ':Delivery/Packaging'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     axes:
       - axis:
           type: label-expression

.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml

@@ -27,6 +27,7 @@
             - 'Team:Security'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           # Use FIPS-specific Java versions

.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-windows.yml

@@ -28,6 +28,7 @@
             - 'test-windows'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           properties-file: '.ci/java-versions.properties'

.ci/jobs.t/elastic+elasticsearch+pull-request+part-2-fips.yml

@@ -27,6 +27,7 @@
             - 'Team:Security'
           black-list-labels:
             - '>test-mute'
+            - 'buildkite-opt-in'
     builders:
       - inject:
           # Use FIPS-specific Java versions