From bc819dee752d5ca67d3f31d74b299aac08ea0a16 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 19:02:49 -0400
Subject: [PATCH] [Automation][7.17] Bump Golang version to 1.21.11 (#39832)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Update from vsphere Dockerfile

Made with ❤️️ by updatecli

* chore: Update Metricbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update Packetbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update x-pack/libbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Heartbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update .go-version

Made with ❤️️ by updatecli

* chore: Update .golangci.yml

Made with ❤️️ by updatecli

* chore: Update version.asciidoc

Made with ❤️️ by updatecli

* chore: Update libbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Filebeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update Auditbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Heartbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Functionbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update stan Dockerfile

Made with ❤️️ by updatecli

* chore: Update NATS module Dockerfile

Made with ❤️️ by updatecli

* chore: Update Metricbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Filebeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update HTTP module Dockerfile

Made with ❤️️ by updatecli

* Add changelog.

* chore: Update libbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Auditbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Functionbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update .go-version

Made with ❤️️ by updatecli

* chore: Update Heartbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update Metricbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update NATS module Dockerfile

Made with ❤️️ by updatecli

* chore: Update x-pack/libbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update stan Dockerfile

Made with ❤️️ by updatecli

* chore: Update Heartbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update HTTP module Dockerfile

Made with ❤️️ by updatecli

* chore: Update Filebeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Packetbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update from vsphere Dockerfile

Made with ❤️️ by updatecli

* chore: Update version.asciidoc

Made with ❤️️ by updatecli

* chore: Update Metricbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update Filebeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update .golangci.yml

Made with ❤️️ by updatecli

* chore: Update .golangci.yml

Made with ❤️️ by updatecli

* chore: Update Functionbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Auditbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update NATS module Dockerfile

Made with ❤️️ by updatecli

* chore: Update x-pack/libbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Metricbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Metricbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update version.asciidoc

Made with ❤️️ by updatecli

* chore: Update from vsphere Dockerfile

Made with ❤️️ by updatecli

* chore: Update libbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Filebeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Filebeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update Heartbeat debug Dockerfile

Made with ❤️️ by updatecli

* chore: Update .go-version

Made with ❤️️ by updatecli

* chore: Update HTTP module Dockerfile

Made with ❤️️ by updatecli

* chore: Update stan Dockerfile

Made with ❤️️ by updatecli

* chore: Update Heartbeat Dockerfile

Made with ❤️️ by updatecli

* chore: Update Packetbeat Dockerfile

Made with ❤️️ by updatecli

* Use same changeset exclusions as main.

https://github.com/elastic/beats/pull/39851

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co>
---
 .buildkite/scripts/changesets.sh                 | 2 +-
 .go-version                                      | 2 +-
 .golangci.yml                                    | 8 ++++----
 CHANGELOG.next.asciidoc                          | 1 +
 auditbeat/Dockerfile                             | 2 +-
 dev-tools/kubernetes/filebeat/Dockerfile.debug   | 2 +-
 dev-tools/kubernetes/heartbeat/Dockerfile.debug  | 2 +-
 dev-tools/kubernetes/metricbeat/Dockerfile.debug | 2 +-
 filebeat/Dockerfile                              | 2 +-
 heartbeat/Dockerfile                             | 2 +-
 libbeat/Dockerfile                               | 2 +-
 libbeat/docs/version.asciidoc                    | 2 +-
 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 +-
 x-pack/libbeat/Dockerfile                        | 2 +-
 x-pack/metricbeat/module/stan/_meta/Dockerfile   | 2 +-
 20 files changed, 23 insertions(+), 22 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\/(.*(?<!\.asciidoc|\.png))$"
+  exclude="^$beatPath\/module\/(.*(?<!\.asciidoc|\.png|Dockerfile))$"
 }
 
 defineFromCommit() {
diff --git a/.go-version b/.go-version
index ae7bbdf047a..88863fd8e36 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.10
+1.21.11
diff --git a/.golangci.yml b/.golangci.yml
index eba028867c2..dbb8d7a128f 100755
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -102,7 +102,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.10"
+    go: "1.21.11"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -120,19 +120,19 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.10"
+    go: "1.21.11"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.10"
+    go: "1.21.11"
     # Disabled:
     # ST1005: error strings should not be capitalized
     checks: ["all", "-ST1005"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.10"
+    go: "1.21.11"
 
   gosec:
     excludes:
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 5cc785f66d5..2c09e68ebe7 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -62,6 +62,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Affecting all Beats*
 
+- Upgrade to Go 1.21.11. {pull}39832[39832]
 
 *Auditbeat*
 
diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
index 3f71118e8e5..fdfbc699147 100644
--- a/auditbeat/Dockerfile
+++ b/auditbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug
index 0054c34fb14..de570e4624f 100644
--- a/dev-tools/kubernetes/filebeat/Dockerfile.debug
+++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.21.10 as builder
+FROM golang:1.21.11 as builder
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 
diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug
index 387525941b8..4820d67dc6d 100644
--- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug
+++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.21.10 as builder
+FROM golang:1.21.11 as builder
 
 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 0e353a3b748..438c3690dcd 100644
--- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug
+++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug
@@ -1,4 +1,4 @@
-FROM golang:1.21.10 as builder
+FROM golang:1.21.11 as builder
 
 ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
 
diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
index 93b6e5186f0..f003772a2e8 100644
--- a/filebeat/Dockerfile
+++ b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile
index f8765612d4b..0a1e0501ab4 100644
--- a/heartbeat/Dockerfile
+++ b/heartbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
index b6b676cc0ef..3e09cc79f16 100644
--- a/libbeat/Dockerfile
+++ b/libbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.10
+FROM golang:1.21.11
 
 RUN \
     apt-get update \
diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
index 931446a22a2..4715e636d4e 100644
--- a/libbeat/docs/version.asciidoc
+++ b/libbeat/docs/version.asciidoc
@@ -1,6 +1,6 @@
 :stack-version: 7.17.22
 :doc-branch: 7.17
-:go-version: 1.21.10
+:go-version: 1.21.11
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12
diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
index 70a3494d436..554b9df0b60 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/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile
index 2901fa41c12..e09893cca6a 100644
--- a/x-pack/libbeat/Dockerfile
+++ b/x-pack/libbeat/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 .