Skip to content

[8.18](backport #43280) bk(packaging): use arm64 for darwin/arm64 #43396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
v1v merged 4 commits into from
Apr 8, 2025
Merged

[8.18](backport #43280) bk(packaging): use arm64 for darwin/arm64 #43396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
840ad0b
bk(packaging): use arm64 for darwin/arm64 (#43280)
v1v Mar 20, 2025
2152151
Merge branch '8.18' into mergify/bp/8.18/pr-43280
v1v Apr 8, 2025
4821111
Merge branch '8.18' into mergify/bp/8.18/pr-43280
v1v Apr 8, 2025
7350097
feat: bump go to 1.23.8
pkoutsovasilis Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .buildkite/auditbeat/auditbeat-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ steps:
- label: ":ubuntu: Auditbeat: Packaging Linux"
key: "auditbeat-package-linux-x86"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh auditbeat
retry:
Expand All @@ -336,7 +336,7 @@ steps:
- label: ":ubuntu: Auditbeat: Packaging Linux arm64"
key: "auditbeat-package-linux-arm64"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh auditbeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/filebeat/filebeat-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ steps:
- label: ":ubuntu: Filebeat: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh filebeat
retry:
Expand All @@ -323,7 +323,7 @@ steps:
- label: ":ubuntu: Filebeat: Packaging arm64"
key: "packaging-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh filebeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/heartbeat/heartbeat-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ steps:
- label: ":ubuntu: Heartbeat: Packaging Linux"
key: "heartbeat-package-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh heartbeat
retry:
Expand All @@ -309,7 +309,7 @@ steps:
- label: ":ubuntu: Heartbeat: Packaging Linux arm64"
key: "heartbeat-package-linux-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh heartbeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/metricbeat/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ steps:
- label: ":ubuntu: Metricbeat: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh metricbeat
retry:
Expand All @@ -307,7 +307,7 @@ steps:
- label: ":ubuntu: Metricbeat: Packaging Linux arm64"
key: "packaging-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh metricbeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/packaging.pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ env:
GCP_DEFAULT_MACHINE_TYPE: "c2d-standard-8"
IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"

PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS_ARM: "+all linux/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
PLATFORMS_ARM: "+all linux/arm64 darwin/arm64"

steps:
# we use concurrency gates (https://buildkite.com/blog/concurrency-gates)
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/packetbeat/pipeline.packetbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ steps:
- label: ":ubuntu: Packetbeat: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh packetbeat
retry:
Expand All @@ -274,7 +274,7 @@ steps:
- label: ":ubuntu: Packetbeat: Packaging Linux arm64"
key: "packaging-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh packetbeat
retry:
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/winlogbeat/pipeline.winlogbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ steps:
- label: ":ubuntu: Winlogbeat: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh winlogbeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.agentbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ steps:
depends_on:
- mandatory-win-2022-system-tests
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
SNAPSHOT: true
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/agentbeat
Expand Down Expand Up @@ -95,7 +95,7 @@ steps:
- agentbeat-package-linux
env:
ASDF_NODEJS_VERSION: 18.17.1
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
SNAPSHOT: true
command: |
set -euo pipefail
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.auditbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ steps:
- label: ":ubuntu: x-pack/auditbeat: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/auditbeat
retry:
Expand All @@ -284,7 +284,7 @@ steps:
- label: ":ubuntu: x-pack/auditbeat: Packaging Linux arm64"
key: "packaging-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/auditbeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ steps:
- label: ":ubuntu: x-pack/dockerlogbeat: Packaging Linux"
key: "auditbeat-package-linux-x86"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/dockerlogbeat
retry:
Expand All @@ -134,7 +134,7 @@ steps:
- label: ":ubuntu: x-pack/dockerlogbeat: Packaging Linux arm64"
key: "auditbeat-package-linux-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/dockerlogbeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.filebeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ steps:
- label: ":linux: x-pack/filebeat: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/filebeat
retry:
Expand All @@ -328,7 +328,7 @@ steps:
- label: ":linux: x-pack/filebeat: Packaging arm64"
key: "packaging-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/filebeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.heartbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ steps:
- label: ":ubuntu: x-pack/heartbeat: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/heartbeat
retry:
Expand All @@ -270,7 +270,7 @@ steps:
- label: ":ubuntu: x-pack/heartbeat: Packaging Linux arm64"
key: "packaging-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/heartbeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.metricbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ steps:
- label: ":ubuntu: x-pack/metricbeat: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/metricbeat
retry:
Expand All @@ -307,7 +307,7 @@ steps:
- label: ":ubuntu: x-pack/metricbeat: Packaging linux arm64"
key: "packaging-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/metricbeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.osquerybeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ steps:
- label: ":ubuntu: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/osquerybeat
retry:
Expand All @@ -255,7 +255,7 @@ steps:
- label: ":ubuntu: x-pack/osquerybeat: Packaging Linux arm64"
key: "packaging-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/osquerybeat
retry:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/x-pack/pipeline.xpack.packetbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ steps:
- label: ":ubuntu: x-pack/packetbeat: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/packetbeat
retry:
Expand All @@ -341,7 +341,7 @@ steps:
- label: ":ubuntu: x-pack/packetbeat: Packaging arm64"
key: "packaging-arm"
env:
PLATFORMS: "+all linux/arm64"
PLATFORMS: "+all linux/arm64 darwin/arm64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/packetbeat
retry:
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/x-pack/pipeline.xpack.winlogbeat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ steps:
- label: ":ubuntu: x-pack/winlogbeat: Packaging Linux"
key: "packaging-linux"
env:
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64"
PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64"
command: |
.buildkite/scripts/packaging/packaging.sh x-pack/winlogbeat
retry:
Expand Down
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.23.6
1.23.8
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ otherwise no tag is added. {issue}42208[42208] {pull}42403[42403]
- Add `uppercase` processor. {issue}22254[22254] {pull}41535[41535]
- Replace `compress/gzip` with https://github.com/klauspost/compress/gzip library for gzip compression {pull}41584[41584]
- Add regex pattern matching to add_kubernetes_metadata processor {pull}41903[41903]
- Update to Go 1.23.8. {pull}43396[43396]

*Auditbeat*

Expand Down
2 changes: 1 addition & 1 deletion auditbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.6
FROM golang:1.23.8

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/filebeat/Dockerfile.debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.6 as builder
FROM golang:1.23.8 as builder

ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/heartbeat/Dockerfile.debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.6 as builder
FROM golang:1.23.8 as builder

ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/metricbeat/Dockerfile.debug
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.6 as builder
FROM golang:1.23.8 as builder

ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/elastic/beats/v7

go 1.23.6
go 1.23.8

require (
cloud.google.com/go/bigquery v1.62.0
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.6
FROM golang:1.23.8

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/version.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:stack-version: 8.18.0
:doc-branch: 8.x
:go-version: 1.23.6
:go-version: 1.23.8
:release-state: unreleased
:python: 3.7
:docker: 1.12
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.6
FROM golang:1.23.8
COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/

RUN \
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/http/_meta/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.6
FROM golang:1.23.8

COPY test/main.go main.go

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/nats/_meta/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4
FROM nats:$NATS_VERSION

# build stage
FROM golang:1.23.6 AS build-env
FROM golang:1.23.8 AS build-env
RUN apt-get install git mercurial gcc
RUN git clone https://github.com/nats-io/nats.go.git /nats-go
RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build .
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/vsphere/_meta/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VSPHERE_GOLANG_VERSION
FROM golang:1.23.6
FROM golang:1.23.8

RUN apt-get install curl git
RUN go install github.com/vmware/govmomi/vcsim@v0.30.4
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.6
FROM golang:1.23.8

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/stan/_meta/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1
FROM nats-streaming:$STAN_VERSION

# build stage
FROM golang:1.23.6 AS build-env
FROM golang:1.23.8 AS build-env
RUN apt-get install git mercurial gcc
RUN git clone https://github.com/nats-io/stan.go.git /stan-go
RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build .
Expand Down
Loading