From efd00b2deaeb4d17ca5040d6ed5c4c1c5799aeab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 10:18:42 -0500 Subject: [PATCH 1/4] [Automation] Bump Golang version to 1.22.10 (#42095) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * Update changelog. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig MacKenzie (cherry picked from commit 3cdd8564fb0d68975b976534f254c5ed082cd39a) # Conflicts: # .go-version # .golangci.yml # auditbeat/Dockerfile # dev-tools/kubernetes/filebeat/Dockerfile.debug # dev-tools/kubernetes/metricbeat/Dockerfile.debug # go.mod # heartbeat/Dockerfile # libbeat/docs/version.asciidoc # metricbeat/Dockerfile # metricbeat/module/http/_meta/Dockerfile # metricbeat/module/nats/_meta/Dockerfile # packetbeat/Dockerfile # x-pack/metricbeat/module/stan/_meta/Dockerfile --- .go-version | 4 ++++ .golangci.yml | 16 ++++++++++++++++ CHANGELOG.next.asciidoc | 2 +- auditbeat/Dockerfile | 4 ++++ dev-tools/kubernetes/filebeat/Dockerfile.debug | 4 ++++ dev-tools/kubernetes/metricbeat/Dockerfile.debug | 4 ++++ go.mod | 4 ++++ heartbeat/Dockerfile | 4 ++++ libbeat/docs/version.asciidoc | 6 ++++++ metricbeat/Dockerfile | 4 ++++ metricbeat/module/http/_meta/Dockerfile | 4 ++++ metricbeat/module/nats/_meta/Dockerfile | 4 ++++ metricbeat/module/vsphere/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 4 ++++ x-pack/metricbeat/module/stan/_meta/Dockerfile | 4 ++++ 15 files changed, 68 insertions(+), 2 deletions(-) diff --git a/.go-version b/.go-version index 229a27c6f204..bb9d9924560f 100644 --- a/.go-version +++ b/.go-version @@ -1 +1,5 @@ +<<<<<<< HEAD 1.22.8 +======= +1.22.10 +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) diff --git a/.golangci.yml b/.golangci.yml index 936215ea9092..1f50b345571f 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -152,7 +152,11 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.22.8" +======= + go: "1.22.10" +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -170,19 +174,31 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.22.8" +======= + go: "1.22.10" +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.22.8" +======= + go: "1.22.10" +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) # Disabled: # ST1005: error strings should not be capitalized checks: ["all", "-ST1005"] unused: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.22.8" +======= + go: "1.22.10" +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) gosec: excludes: diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 290ac1947267..1ae82246f772 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -153,7 +153,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - The environment variable `BEATS_ADD_CLOUD_METADATA_PROVIDERS` overrides configured/default `add_cloud_metadata` providers {pull}38669[38669] - When running under Elastic-Agent Kafka output allows dynamic topic in `topic` field {pull}40415[40415] - The script processor has a new configuration option that only uses the cached javascript sessions and prevents the creation of new javascript sessions. -- Update to Go 1.22.7. {pull}41018[41018] +- Update to Go 1.22.10. {pull}42095[42095] - Replace Ubuntu 20.04 with 24.04 for Docker base images {issue}40743[40743] {pull}40942[40942] - Reduce memory consumption of k8s autodiscovery and the add_kubernetes_metadata processor when Deployment metadata is enabled - Add `lowercase` processor. {issue}22254[22254] {pull}41424[41424] diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 2241aa16ad1d..e9be392c6094 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.22.8 +======= +FROM golang:1.22.10 +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) RUN \ apt-get update \ diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index dd5b128cacaa..7aa8a1af797b 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.22.8 as builder +======= +FROM golang:1.22.10 as builder +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug index a8c567b9da95..3aab12d636b6 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.22.8 as builder +======= +FROM golang:1.22.10 as builder +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/go.mod b/go.mod index 6bcf5e1013e2..f73c3cb807c6 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,12 @@ module github.com/elastic/beats/v7 +<<<<<<< HEAD go 1.22.8 toolchain go1.22.9 +======= +go 1.22.10 +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) require ( cloud.google.com/go/bigquery v1.62.0 diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index a30644dd04a6..9ce34d2c365f 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.22.8 +======= +FROM golang:1.22.10 +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index a3f212db64b5..744a8e9ceec1 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,12 @@ +<<<<<<< HEAD :stack-version: 8.16.2 :doc-branch: 8.16 :go-version: 1.22.8 +======= +:stack-version: 9.0.0 +:doc-branch: main +:go-version: 1.22.10 +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index d163510a06e2..8adc5faf7fb6 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.22.8 +======= +FROM golang:1.22.10 +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/ RUN \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 324b026ef9df..938368214812 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.22.8 +======= +FROM golang:1.22.10 +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) COPY test/main.go main.go diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index 4dd2715b4aef..7de62272d0f0 100644 --- a/metricbeat/module/nats/_meta/Dockerfile +++ b/metricbeat/module/nats/_meta/Dockerfile @@ -2,7 +2,11 @@ ARG NATS_VERSION=2.0.4 FROM nats:$NATS_VERSION # build stage +<<<<<<< HEAD FROM golang:1.22.8 AS build-env +======= +FROM golang:1.22.10 AS build-env +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) 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 . diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index 374f02453f93..44a5afac6d5b 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,5 +1,5 @@ ARG VSPHERE_GOLANG_VERSION -FROM golang:1.22.8 +FROM golang:1.22.10 RUN apt-get install curl git RUN go install github.com/vmware/govmomi/vcsim@v0.30.4 diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index e739ac9efd19..70cfe93ca300 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.22.8 +======= +FROM golang:1.22.10 +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) RUN \ apt-get update \ diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index 8150094a78bf..f89ae28a99b1 100644 --- a/x-pack/metricbeat/module/stan/_meta/Dockerfile +++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile @@ -2,7 +2,11 @@ ARG STAN_VERSION=0.15.1 FROM nats-streaming:$STAN_VERSION # build stage +<<<<<<< HEAD FROM golang:1.22.8 AS build-env +======= +FROM golang:1.22.10 AS build-env +>>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) 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 . From a334cc2424866722f6dd8a965eb8e6c2d24ccb9f Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Wed, 18 Dec 2024 11:15:10 -0500 Subject: [PATCH 2/4] Fix conflicts. --- auditbeat/Dockerfile | 4 ---- dev-tools/kubernetes/filebeat/Dockerfile.debug | 4 ---- dev-tools/kubernetes/metricbeat/Dockerfile.debug | 4 ---- go.mod | 6 ------ heartbeat/Dockerfile | 4 ---- libbeat/docs/version.asciidoc | 6 ------ metricbeat/Dockerfile | 4 ---- metricbeat/module/http/_meta/Dockerfile | 4 ---- metricbeat/module/nats/_meta/Dockerfile | 4 ---- packetbeat/Dockerfile | 4 ---- x-pack/metricbeat/module/stan/_meta/Dockerfile | 4 ---- 11 files changed, 48 deletions(-) diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index e9be392c6094..e0fb8e2d12ed 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.22.8 -======= FROM golang:1.22.10 ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) RUN \ apt-get update \ diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index 7aa8a1af797b..f4cd253c18e6 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.22.8 as builder -======= FROM golang:1.22.10 as builder ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug index 3aab12d636b6..5e7be279b7fc 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.22.8 as builder -======= FROM golang:1.22.10 as builder ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/go.mod b/go.mod index f73c3cb807c6..cbb855140358 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,6 @@ module github.com/elastic/beats/v7 -<<<<<<< HEAD -go 1.22.8 - -toolchain go1.22.9 -======= go 1.22.10 ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) require ( cloud.google.com/go/bigquery v1.62.0 diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index 9ce34d2c365f..c932aeae20d5 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.22.8 -======= FROM golang:1.22.10 ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 744a8e9ceec1..41ee1fc8e231 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,12 +1,6 @@ -<<<<<<< HEAD -:stack-version: 8.16.2 -:doc-branch: 8.16 -:go-version: 1.22.8 -======= :stack-version: 9.0.0 :doc-branch: main :go-version: 1.22.10 ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index 8adc5faf7fb6..34245a45c453 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.22.8 -======= FROM golang:1.22.10 ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/ RUN \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 938368214812..2027eaebc81d 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.22.8 -======= FROM golang:1.22.10 ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) COPY test/main.go main.go diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index 7de62272d0f0..26d6f3c11f4e 100644 --- a/metricbeat/module/nats/_meta/Dockerfile +++ b/metricbeat/module/nats/_meta/Dockerfile @@ -2,11 +2,7 @@ ARG NATS_VERSION=2.0.4 FROM nats:$NATS_VERSION # build stage -<<<<<<< HEAD -FROM golang:1.22.8 AS build-env -======= FROM golang:1.22.10 AS build-env ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) 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 . diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 70cfe93ca300..ae9891871590 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.22.8 -======= FROM golang:1.22.10 ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) RUN \ apt-get update \ diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index f89ae28a99b1..b791bdf6e9d2 100644 --- a/x-pack/metricbeat/module/stan/_meta/Dockerfile +++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile @@ -2,11 +2,7 @@ ARG STAN_VERSION=0.15.1 FROM nats-streaming:$STAN_VERSION # build stage -<<<<<<< HEAD -FROM golang:1.22.8 AS build-env -======= FROM golang:1.22.10 AS build-env ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) 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 . From 63fbc9ce382bc12fe64dff2b06eaee130ed29dfe Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Wed, 18 Dec 2024 11:40:25 -0500 Subject: [PATCH 3/4] Fix conflicts in dot files --- .go-version | 4 ---- .golangci.yml | 16 ---------------- 2 files changed, 20 deletions(-) diff --git a/.go-version b/.go-version index bb9d9924560f..f5ae945712e9 100644 --- a/.go-version +++ b/.go-version @@ -1,5 +1 @@ -<<<<<<< HEAD -1.22.8 -======= 1.22.10 ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) diff --git a/.golangci.yml b/.golangci.yml index 1f50b345571f..0fbcef63646a 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -152,11 +152,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.22.8" -======= go: "1.22.10" ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -174,31 +170,19 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.22.8" -======= go: "1.22.10" ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.22.8" -======= go: "1.22.10" ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) # Disabled: # ST1005: error strings should not be capitalized checks: ["all", "-ST1005"] unused: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.22.8" -======= go: "1.22.10" ->>>>>>> 3cdd8564f ([Automation] Bump Golang version to 1.22.10 (#42095)) gosec: excludes: From 26d388a67f5b35cff4d0a07aff1c89ca9443218c Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Wed, 18 Dec 2024 12:04:14 -0500 Subject: [PATCH 4/4] Fix version.asciidoc --- libbeat/docs/version.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 41ee1fc8e231..5472a896af08 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,5 +1,5 @@ -:stack-version: 9.0.0 -:doc-branch: main +:stack-version: 8.16.2 +:doc-branch: 8.16 :go-version: 1.22.10 :release-state: unreleased :python: 3.7