Merge branch '7.17' into 7.17-go-upgrade-1.23.8

mauri870 · web-flow · commit 228b8903494a · 2025-06-16T12:17:41.000-03:00
diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml
@@ -260,7 +260,7 @@ steps:
       - label: ":ubuntu: Auditbeat: Packaging Linux"
         key: "auditbeat-package-linux-x86"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh auditbeat
         retry:
@@ -278,8 +278,7 @@ steps:
       - label: ":linux: Auditbeat: Packaging Linux arm64"
         key: "auditbeat-package-linux-arm64"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         command: |
           .buildkite/scripts/packaging/packaging.sh auditbeat
         retry:
diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -302,7 +302,7 @@ steps:
       - label: ":ubuntu: Filebeat: Packaging Linux"
         key: "packaging-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh filebeat
         retry:
@@ -322,7 +322,7 @@ steps:
       - label: ":ubuntu: Filebeat: Packaging arm64"
         key: "packaging-arm"
         env:
-          PLATFORMS: "linux/arm64"
+          PLATFORMS: "+all linux/arm64"
           PACKAGES: "docker"
         command: |
           .buildkite/scripts/packaging/packaging.sh filebeat
diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml
@@ -277,7 +277,7 @@ steps:
       - label: ":ubuntu: Heartbeat: Packaging Linux"
         key: "heartbeat-package-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh heartbeat
         retry:
@@ -295,8 +295,7 @@ steps:
       - label: ":ubuntu: Heartbeat: Packaging Linux arm64"
         key: "heartbeat-package-linux-arm"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         command: |
           .buildkite/scripts/packaging/packaging.sh heartbeat
         retry:
diff --git a/.buildkite/libbeat/pipeline.libbeat.yml b/.buildkite/libbeat/pipeline.libbeat.yml
@@ -141,26 +141,6 @@ steps:
           - github_commit_status:
               context: "libbeat: next major"
 
-      - label: ":ubuntu: Libbeat: Crosscompile"
-        key: "mandatory-cross-compile"
-        command: |
-          set -euo pipefail
-          cd libbeat
-          make crosscompile
-        retry:
-          automatic:
-            - limit: 1
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "${GCP_HI_PERF_MACHINE_TYPE}"
-        artifact_paths:
-          - "libbeat/build/*.xml"
-          - "libbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "libbeat: Crosscompile"
-
       - label: ":ubuntu: Libbeat: Stress Tests"
         key: "mandatory-stress-test"
         command: |
diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml
@@ -143,25 +143,6 @@ steps:
           - github_commit_status:
               context: "metricbeat: Python Integration Tests"
 
-      - label: ":ubuntu: Metricbeat: Crosscompile"
-        key: "mandatory-cross-compile"
-        command: |
-          source .buildkite/scripts/qemu.sh
-          make -C metricbeat crosscompile
-        retry:
-          automatic:
-            - limit: 1
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
-        artifact_paths:
-          - "metricbeat/build/*.xml"
-          - "metricbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "metricbeat: Crosscompile"
-
       - label: ":windows: Metricbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path metricbeat
@@ -271,7 +252,7 @@ steps:
       - label: ":ubuntu: Metricbeat: Packaging Linux"
         key: "packaging-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh metricbeat
         retry:
@@ -291,8 +272,7 @@ steps:
       - label: ":ubuntu: Metricbeat: Packaging Linux arm64"
         key: "packaging-arm"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         command: |
           .buildkite/scripts/packaging/packaging.sh metricbeat
         retry:
diff --git a/.buildkite/packaging.pipeline.yml b/.buildkite/packaging.pipeline.yml
@@ -8,8 +8,8 @@ env:
   GCP_DEFAULT_MACHINE_TYPE: "c2d-highcpu-8"
   IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
 
-  PLATFORMS: "+all linux/amd64 linux/386 linux/arm64 windows/amd64 windows/386 darwin/amd64"
-  PLATFORMS_ARM: "linux/arm64"
+  PLATFORMS: "+all linux/amd64 linux/386 windows/amd64 windows/386 darwin/amd64"
+  PLATFORMS_ARM: "+all linux/arm64"
 
 steps:
   # we use concurrency gates (https://buildkite.com/blog/concurrency-gates)
@@ -120,10 +120,9 @@ steps:
           - x-pack/packetbeat
           - x-pack/winlogbeat
 
-      - label: "SNAPSHOT: {{matrix}} docker Linux/arm64"
+      - label: "SNAPSHOT: {{matrix}} Linux/arm64"
         env:
           PLATFORMS: "${PLATFORMS_ARM}"
-          PACKAGES: "docker"
           SNAPSHOT: true
           DEV: true
         command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}"
@@ -189,10 +188,9 @@ steps:
           - x-pack/packetbeat
           - x-pack/winlogbeat
 
-      - label: "STAGING: {{matrix}} docker Linux/arm64"
+      - label: "STAGING: {{matrix}} Linux/arm64"
         env:
           PLATFORMS: "${PLATFORMS_ARM}"
-          PACKAGES: "docker"
           SNAPSHOT: false
           DEV: false
         command: ".buildkite/scripts/packaging/package-dra.sh {{matrix}}"
diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml
@@ -217,7 +217,7 @@ steps:
       - label: ":ubuntu: Packetbeat: Packaging Linux"
         key: "packaging-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh packetbeat
         retry:
@@ -237,8 +237,7 @@ steps:
       - label: ":ubuntu: Packetbeat: Packaging Linux arm64"
         key: "packaging-arm"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         command: |
           .buildkite/scripts/packaging/packaging.sh packetbeat
         retry:
diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
@@ -66,23 +66,6 @@ steps:
     key: "winlogbeat-mandatory-tests"
 
     steps:
-      - label: ":ubuntu: Winlogbeat: Crossccompile"
-        key: "mandatory-cross-compile"
-        command: "make -C winlogbeat crosscompile"
-        retry:
-          automatic:
-            - limit: 1
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "${GCP_DEFAULT_MACHINE_TYPE}"
-        artifact_paths:
-          - "winlogbeat/build/*.xml"
-          - "winlogbeat/build/*.json"
-        notify:
-          - github_commit_status:
-              context: "winlogbeat: Crosscompile"
-
       - label: ":windows: Winlogbeat: Win 2019 Unit Tests"
         command: |
           Set-Location -Path winlogbeat
@@ -186,7 +169,7 @@ steps:
       - label: ":ubuntu: Winlogbeat: Packaging Linux"
         key: "packaging-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh winlogbeat
         retry:
diff --git a/.buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.package.yml b/.buildkite/x-pack/elastic-agent/pipeline.xpack.elastic-agent.package.yml
@@ -71,8 +71,7 @@ steps:
 
       - label: "Package ARM elastic-agent"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         key: package_elastic-agent-arm
         command: |
           if [[ -z "$${MANIFEST_URL}" ]]; then
diff --git a/.buildkite/x-pack/elastic-agent/scripts/steps/setenv.sh b/.buildkite/x-pack/elastic-agent/scripts/steps/setenv.sh
@@ -9,8 +9,8 @@ SETUP_WIN_PYTHON_VERSION="3.11.0"
 NMAP_WIN_VERSION="7.12"           # Earlier versions of NMap provide WinPcap (the winpcap packages don't install nicely because they pop-up a UI)
 GO_VERSION=$(cat .go-version)
 ASDF_MAGE_VERSION="1.15.0"
-PACKAGING_PLATFORMS="+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
-PACKAGING_ARM_PLATFORMS="linux/arm64"
+PACKAGING_PLATFORMS="+all linux/amd64 windows/amd64 darwin/amd64"
+PACKAGING_ARM_PLATFORMS="+all linux/arm64"
 
 export SETUP_GVM_VERSION
 export DOCKER_COMPOSE_VERSION
diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml
@@ -239,7 +239,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/auditbeat: Packaging Linux"
@@ -257,8 +257,7 @@ steps:
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         notify:
           - github_commit_status:
               context: "x-pack/auditbeat: Packaging Linux arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
@@ -79,7 +79,7 @@ steps:
           - "x-pack/dockerlogbeat/build/*.json"
         notify:
           - github_commit_status:
-              context: "x-pack/dockerlogbeat: Ubuntu Unit Tests"
+              context: "x-pack/dockerlogbeat: Ubuntu x86_64 Unit Tests"
 
       # x-pack/dockerlogbeat has no modules yet
       - label: ":ubuntu: x-pack/dockerlogbeat: Go Integration Tests"
@@ -116,7 +116,7 @@ steps:
       - label: ":ubuntu: x-pack/dockerlogbeat: Packaging Linux"
         key: "auditbeat-package-linux-x86"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
           SNAPSHOT: true
         command: |
           .buildkite/scripts/packaging/packaging.sh x-pack/dockerlogbeat
@@ -135,8 +135,7 @@ steps:
       - label: ":linux: x-pack/dockerlogbeat: Packaging Linux arm64"
         key: "auditbeat-package-linux-arm"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
           SNAPSHOT: true
         command: |
           .buildkite/scripts/packaging/packaging.sh x-pack/dockerlogbeat
diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
@@ -326,7 +326,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/filebeat: Packaging Linux"
@@ -344,8 +344,7 @@ steps:
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         notify:
           - github_commit_status:
               context: "x-pack/filebeat: Packaging Linux arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml
@@ -253,7 +253,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/heartbeat: Packaging Linux"
@@ -271,8 +271,7 @@ steps:
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         notify:
           - github_commit_status:
               context: "x-pack/heartbeat: Packaging Linux arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml
@@ -286,7 +286,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/metricbeat: Packaging Linux"
@@ -304,8 +304,7 @@ steps:
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         notify:
           - github_commit_status:
               context: "x-pack/metricbeat: Packaging Linux arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml
@@ -229,7 +229,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/osquerybeat: Packaging Linux"
diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml
@@ -229,7 +229,7 @@ steps:
           disk_size: 100
           disk_type: "pd-ssd"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         notify:
           - github_commit_status:
               context: "x-pack/packetbeat: Packaging Linux"
@@ -247,8 +247,7 @@ steps:
           imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}"
           instanceType: "${AWS_ARM_INSTANCE_TYPE}"
         env:
-          PLATFORMS: "linux/arm64"
-          PACKAGES: "docker"
+          PLATFORMS: "+all linux/arm64"
         notify:
           - github_commit_status:
               context: "x-pack/packetbeat: Packaging Linux arm64"
diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
@@ -183,7 +183,7 @@ steps:
       - label: ":ubuntu: x-pack/winlogbeat Packaging Linux"
         key: "packaging-linux"
         env:
-          PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64"
+          PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
         command: |
           .buildkite/scripts/packaging/packaging.sh x-pack/winlogbeat
         retry:
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -26,7 +26,14 @@ jobs:
 
       - name: Install Apt Package
         if: runner.os == 'Linux'
-        run: sudo apt-get update && sudo apt-get install -y libpcap-dev librpm-dev
+        run: sudo apt-get update && sudo apt-get install -y libpcap-dev librpm-dev libsystemd-dev
+
+      # To please golangci-lint when linting https://github.com/tsg/gopacket
+      - name: Install pcap.h on Windows
+        if: runner.os == 'Windows'
+        run: |
+          Invoke-WebRequest -UseBasicParsing https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip -OutFile "${Env:TEMP}\wpd.zip"
+          Expand-Archive -LiteralPath "${Env:TEMP}\wpd.zip" -DestinationPath "C:\"
 
       - name: golangci-lint
         env:
diff --git a/.golangci.yml b/.golangci.yml
diff --git a/dev-tools/mage/crossbuild.go b/dev-tools/mage/crossbuild.go
diff --git a/testing/environments/Makefile b/testing/environments/Makefile
diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml
