From 385afc699898fc2b2e36c4643bf38d062993da60 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 08:57:32 -0400 Subject: [PATCH 1/3] [Automation] Bump Golang version to 1.21.11 (#39851) 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 Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update Functionbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * Update changelog. * Run go mod tidy. * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update Functionbeat Dockerfile Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * Exclude Dockerfile from module detection Signed-off-by: Alexandros Sapranidis * Update go.mod Signed-off-by: Alexandros Sapranidis * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Functionbeat Dockerfile Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update .golangci.yml Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * go mod tidy --------- Signed-off-by: Alexandros Sapranidis Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Craig MacKenzie Co-authored-by: Alexandros Sapranidis (cherry picked from commit b5155a177edea5ca97b6f5aaecc020d95d8350f7) # Conflicts: # libbeat/docs/version.asciidoc --- .buildkite/scripts/changesets.sh | 2 +- .go-version | 2 +- .golangci.yml | 8 +++---- CHANGELOG.next.asciidoc | 23 +++++++++++++++++++ auditbeat/Dockerfile | 2 +- .../kubernetes/filebeat/Dockerfile.debug | 2 +- .../kubernetes/heartbeat/Dockerfile.debug | 2 +- .../kubernetes/metricbeat/Dockerfile.debug | 2 +- go.mod | 2 +- heartbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 6 +++++ metricbeat/Dockerfile | 2 +- metricbeat/module/http/_meta/Dockerfile | 2 +- metricbeat/module/nats/_meta/Dockerfile | 2 +- metricbeat/module/vsphere/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 2 +- x-pack/functionbeat/Dockerfile | 2 +- .../metricbeat/module/stan/_meta/Dockerfile | 2 +- 18 files changed, 48 insertions(+), 19 deletions(-) diff --git a/.buildkite/scripts/changesets.sh b/.buildkite/scripts/changesets.sh index 7e79d2d3164..1ab80edc585 100644 --- a/.buildkite/scripts/changesets.sh +++ b/.buildkite/scripts/changesets.sh @@ -15,7 +15,7 @@ definePattern() { } defineExclusions() { - exclude="^$beatPath\/module\/(.*(?>>>>>> b5155a177e ([Automation] Bump Golang version to 1.21.11 (#39851)) :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index ce43c81c312..de48ddeff9d 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.10 +FROM golang:1.21.11 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 0a5646a9d75..b6517fea093 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.10 +FROM golang:1.21.11 COPY test/main.go main.go diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index f3cab807dfd..f443a51dd3a 100644 --- a/metricbeat/module/nats/_meta/Dockerfile +++ b/metricbeat/module/nats/_meta/Dockerfile @@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4 FROM nats:$NATS_VERSION # build stage -FROM golang:1.21.10 AS build-env +FROM golang:1.21.11 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 . diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index 9dea6777c57..6301d44f4e2 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,5 +1,5 @@ ARG VSPHERE_GOLANG_VERSION -FROM golang:1.21.10 +FROM golang:1.21.11 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 912cd87cc43..22c50eeb430 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.10 +FROM golang:1.21.11 RUN \ apt-get update \ diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 3b3a785a0ca..d1c4d5af3cd 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.10 +FROM golang:1.21.11 RUN \ apt-get update \ diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index 5023acb7b46..e7fd7774af8 100644 --- a/x-pack/metricbeat/module/stan/_meta/Dockerfile +++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile @@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1 FROM nats-streaming:$STAN_VERSION # build stage -FROM golang:1.21.10 AS build-env +FROM golang:1.21.11 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 . From 63b136bd883964a548a4a17f9dac6664ac8e40ec Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Thu, 13 Jun 2024 13:09:56 -0400 Subject: [PATCH 2/3] Fix changelog merge conflict CHANGELOG.next.asciidoc --- CHANGELOG.next.asciidoc | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 6249d637cc6..a0e25971bf6 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -112,28 +112,6 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Raise up logging level to warning when attempting to configure beats with unknown fields from autodiscovered events/environments - elasticsearch output now supports `idle_connection_timeout`. {issue}35616[35615] {pull}36843[36843] - Update to Go 1.21.11. {pull}39851[39851] -- Enable early event encoding in the Elasticsearch output, improving cpu and memory use {pull}38572[38572] -- The environment variable `BEATS_ADD_CLOUD_METADATA_PROVIDERS` overrides configured/default `add_cloud_metadata` providers {pull}38669[38669] -- Introduce log message for not supported annotations for Hints based autodiscover {pull}38213[38213] -- Add persistent volume claim name to volume if available {pull}38839[38839] -- Raw events are now logged to a different file, this prevents potentially sensitive information from leaking into log files {pull}38767[38767] - -*Auditbeat* - -- Added `add_session_metadata` processor, which enables session viewer on Auditbeat data. {pull}37640[37640] -- Add linux capabilities to processes in the system/process. {pull}37453[37453] -- Add opt-in eBPF backend for file_integrity module. {pull}37223[37223] -- Add linux capabilities to processes in the system/process. {pull}37453[37453] -- Add opt-in eBPF backend for file_integrity module. {pull}37223[37223] -- Add process data to file events (Linux only, eBPF backend). {pull}38199[38199] -- Add container id to file events (Linux only, eBPF backend). {pull}38328[38328] -- Add procfs backend to the `add_session_metadata` processor. {pull}38799[38799] -- Add process.entity_id, process.group.name and process.group.id in add_process_metadata processor. Make fim module with kprobes backend to always add an appropriately configured add_process_metadata processor to enrich file events {pull}38776[38776] -- Reduce data size for add_session_metadata processor by removing unneeded fields {pull}39500[39500] -- Enrich process events with user and group names, with add_session_metadata processor {pull}39537[39537] - -*Auditbeat* - *Auditbeat* From da2710464297b80e04b22d9f605715d4c7ab31d6 Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Thu, 13 Jun 2024 13:10:43 -0400 Subject: [PATCH 3/3] Fix merge conflict in libbeat/docs/version.asciidoc --- libbeat/docs/version.asciidoc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index fa7176ac21f..8e5cc8488a7 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,12 +1,6 @@ -<<<<<<< HEAD :stack-version: 8.14.1 :doc-branch: 8.14 -:go-version: 1.21.10 -======= -:stack-version: 8.15.0 -:doc-branch: main :go-version: 1.21.11 ->>>>>>> b5155a177e ([Automation] Bump Golang version to 1.21.11 (#39851)) :release-state: unreleased :python: 3.7 :docker: 1.12