Merge branch 'main' into bump-libs

elastic · Feb 28, 2025 · 7521142 · 7521142
2 parents dbb42db + e41d266
commit 7521142
Show file tree

Hide file tree

Showing 155 changed files with 2,527 additions and 7,012 deletions.
diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -454,9 +454,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          set -euo pipefail
-          cd auditbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh auditbeat
         retry:
           automatic:
             - limit: 1
@@ -475,9 +473,7 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
-          set -euo pipefail
-          cd auditbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh auditbeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -399,8 +399,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd filebeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh filebeat
         retry:
           automatic:
             - limit: 1
@@ -421,8 +420,7 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
-          cd filebeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh filebeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -343,8 +343,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd heartbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh heartbeat
         retry:
           automatic:
             - limit: 1
@@ -363,8 +362,7 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
-          cd heartbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh heartbeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml
@@ -399,8 +399,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd metricbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh metricbeat
         retry:
           automatic:
             - limit: 1
@@ -421,8 +420,7 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
-          cd metricbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh metricbeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml
@@ -366,8 +366,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd packetbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh packetbeat
         retry:
           automatic:
             - limit: 1
@@ -388,8 +387,7 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
-          cd packetbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh packetbeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -6,6 +6,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - auditbeat/
@@ -40,6 +41,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - heartbeat/
@@ -74,6 +76,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - filebeat/
@@ -109,6 +112,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - filebeat/
@@ -146,6 +150,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - x-pack/dockerlogbeat/
@@ -180,6 +185,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - metricbeat/
@@ -214,6 +220,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - metricbeat/
@@ -251,6 +258,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - x-pack/osquerybeat/**
@@ -288,6 +296,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - winlogbeat/
@@ -323,6 +332,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - .buildkite/deploy/kubernetes/**
@@ -353,6 +363,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - libbeat/
@@ -386,6 +397,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - libbeat/
@@ -421,6 +433,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - auditbeat/
@@ -457,6 +470,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - heartbeat/
@@ -493,6 +507,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - packetbeat/
@@ -529,6 +544,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - winlogbeat/
@@ -563,6 +579,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - packetbeat/
@@ -597,6 +614,7 @@ steps:
     plugins:
       - monorepo-diff#v1.0.1:
           diff: "git diff --name-only origin/${GITHUB_PR_TARGET_BRANCH}...HEAD"
+          interpolation: false
           watch:
             - path:
                 - auditbeat/

diff --git a/.buildkite/scripts/packaging/packaging.sh b/.buildkite/scripts/packaging/packaging.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# Centralise the mage package for a given beat in Buildkite.
+# It enables multi-arch builds to avoid the exec format errors when 
+# attempting to build arm64 inside arm64 workers.
+# For further details, see https://github.com/elastic/elastic-agent/pull/6948
+# and https://github.com/elastic/golang-crossbuild/pull/507
+#
+
+set -ueo pipefail
+
+
+BEAT_DIR=${1:?-"Error: Beat directory must be specified."}
+
+#Use newer multiarch support for packaging
+docker run --privileged --rm tonistiigi/binfmt:master --install all
+
+cd $BEAT_DIR
+mage package
diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
@@ -209,8 +209,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd winlogbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh winlogbeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/x-pack/pipeline.xpack.agentbeat.yml b/.buildkite/x-pack/pipeline.xpack.agentbeat.yml
@@ -70,9 +70,7 @@ steps:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
           SNAPSHOT: true
         command: |
-          set -euo pipefail
-          cd x-pack/agentbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/agentbeat
         artifact_paths:
           - x-pack/agentbeat/build/distributions/**/*
           - "x-pack/agentbeat/build/*.xml"

diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
@@ -374,8 +374,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd x-pack/auditbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/auditbeat
         retry:
           automatic:
             - limit: 1
@@ -396,8 +395,7 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
-          cd x-pack/auditbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/auditbeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
@@ -117,8 +117,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd x-pack/dockerlogbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/dockerlogbeat
         retry:
           automatic:
             - limit: 1
@@ -137,8 +136,7 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
-          cd x-pack/dockerlogbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/dockerlogbeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
@@ -430,8 +430,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd x-pack/filebeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/filebeat
         retry:
           automatic:
             - limit: 1
@@ -452,8 +451,7 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
-          cd x-pack/filebeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/filebeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
@@ -361,8 +361,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd x-pack/heartbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/heartbeat
         retry:
           automatic:
             - limit: 1
@@ -383,8 +382,7 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
-          cd x-pack/heartbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/heartbeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -408,8 +408,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd x-pack/metricbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/metricbeat
         retry:
           automatic:
             - limit: 1
@@ -430,8 +429,7 @@ steps:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
-          cd x-pack/metricbeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/metricbeat
         retry:
           automatic:
             - limit: 1

diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
@@ -283,8 +283,7 @@ steps:
         env:
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
         command: |
-          cd x-pack/osquerybeat
-          mage package
+          .buildkite/scripts/packaging/packaging.sh x-pack/osquerybeat
         retry:
           automatic:
             - limit: 1