From 4edc26025ef4831bd4005d6d9f944a9b10d0cbd5 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:38:59 +0000 Subject: [PATCH 01/35] chore: Update Metricbeat debug Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/kubernetes/metricbeat/Dockerfile.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug index 00df9d9be1d..0fb84220fc0 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.21.6 as builder +FROM golang:1.20.13 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin From 85f85cb409f0fc53cc8de1b0f734e9b3e6a3a67a Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:39:20 +0000 Subject: [PATCH 02/35] chore: Update .golangci.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .golangci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 03a01e24c4f..5ce1ed49eef 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -114,7 +114,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. - go: "1.21.6" + go: "1.20.13" nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -132,19 +132,19 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. - go: "1.21.6" + go: "1.20.13" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.21.6" + go: "1.20.13" # 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.6" + go: "1.20.13" gosec: excludes: From 6b9aa96440e2fec92ed99a8120a9eb8f77ca297b Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:39:40 +0000 Subject: [PATCH 03/35] chore: Update from vsphere Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- metricbeat/module/vsphere/_meta/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index 1f0881c14ec..a31de92a866 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.6 +FROM golang:1.20.13 RUN apt-get install curl git RUN go install github.com/vmware/govmomi/vcsim@v0.30.4 From 8c3950d819c647916120d2b2a0e2ecdb8c01bc10 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:40:01 +0000 Subject: [PATCH 04/35] chore: Update Metricbeat Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- metricbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index baf372f1859..e36d67f10a1 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6 +FROM golang:1.20.13 RUN \ apt update \ From b22ebcdc791dd3b8ce5f41a58a039bee7024f4de Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:40:22 +0000 Subject: [PATCH 05/35] chore: Update .go-version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .go-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.go-version b/.go-version index c262b1f0dfd..5009c3e6728 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.21.6 +1.20.13 From 12a4b968f5056f2343ca71526ddb7d8a32e8ef5d Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:40:43 +0000 Subject: [PATCH 06/35] chore: Update Packetbeat Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- packetbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 6e5c1d0bab4..9f982787891 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6 +FROM golang:1.20.13 RUN \ apt-get update \ From bb49f51873420b0208f0e7862903755e565df773 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:41:04 +0000 Subject: [PATCH 07/35] chore: Update Auditbeat Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- auditbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 59eb4860b40..39bcc37d6bc 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6 +FROM golang:1.20.13 RUN \ apt-get update \ From 12b013c2bc764814bc32f9759670d38bfc1e979d Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:41:25 +0000 Subject: [PATCH 08/35] chore: Update stan Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- x-pack/metricbeat/module/stan/_meta/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index b4da8bf79a3..7810f107050 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.6 AS build-env +FROM golang:1.20.13 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 4171d6a3fa7b4ddd91ede35c0e8666df9da00601 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:41:46 +0000 Subject: [PATCH 09/35] chore: Update Functionbeat Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- x-pack/functionbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index aec1914698c..d0ed74d7ecb 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6 +FROM golang:1.20.13 RUN \ apt-get update \ From e69397aaf5891aa6a3b6c944e8e5ec2274c5e7eb Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:42:07 +0000 Subject: [PATCH 10/35] chore: Update go.mod MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index af936d4063e..bce54dbb7a3 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/beats/v7 -go 1.21 +go 1.20 require ( cloud.google.com/go/bigquery v1.55.0 From 6e0a2ee0df396c881448223a39bdabe0568a65c5 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:42:28 +0000 Subject: [PATCH 11/35] chore: Update HTTP module Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- metricbeat/module/http/_meta/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 55df10b1294..8d32c82bd7c 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6 +FROM golang:1.20.13 COPY test/main.go main.go From 647b002bc7dc5a6311987d12de1e4370e8f04512 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:42:49 +0000 Subject: [PATCH 12/35] chore: Update .devcontainer/devcontainer.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7fdf17e76ef..571faef670a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ { "name": "Beats Development Container", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/go:1-1.21-bullseye", + "image": "mcr.microsoft.com/devcontainers/go:1-1.20-bullseye", // Features to add to the dev container. More info: https://containers.dev/features. "features": { "ghcr.io/devcontainers/features/node:1": {}, From 168551258a3e06f339394162a10e211067e5517c Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:43:10 +0000 Subject: [PATCH 13/35] chore: Update Heartbeat debug Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/kubernetes/heartbeat/Dockerfile.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug index fd9970a5b08..8e31b365764 100644 --- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.21.6 as builder +FROM golang:1.20.13 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin From 2d79af5d710d63b667d1bdde23ab3ef67e28654a Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:43:31 +0000 Subject: [PATCH 14/35] chore: Update version.asciidoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- libbeat/docs/version.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 13456f9cd18..ae372e0079c 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,6 @@ :stack-version: 8.13.0 :doc-branch: main -:go-version: 1.21.6 +:go-version: 1.20.13 :release-state: unreleased :python: 3.7 :docker: 1.12 From 3923bf8b969188de016e3a2f1f576df629b947b5 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:43:52 +0000 Subject: [PATCH 15/35] chore: Update NATS module Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- metricbeat/module/nats/_meta/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index ef6e428ae87..a33a7b60ac9 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.6 AS build-env +FROM golang:1.20.13 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 . From 61d12bbc46be4474237e0e1f42da9a056679b90e Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:44:12 +0000 Subject: [PATCH 16/35] chore: Update Filebeat debug Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/kubernetes/filebeat/Dockerfile.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index 842da44f3ab..73405080214 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.21.6 as builder +FROM golang:1.20.13 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin From d3a1ebfae186fff57d410672a1e72b54c8775037 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 24 Jan 2024 20:44:33 +0000 Subject: [PATCH 17/35] chore: Update Heartbeat Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- heartbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index 335bf29256e..3d275011342 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.6 +FROM golang:1.20.13 RUN \ apt-get update \ From 54f55a2f709e1735b79b51448141b68fe2428cbc Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:05:31 +0000 Subject: [PATCH 18/35] chore: Update Metricbeat Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- metricbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index e36d67f10a1..31f13aeea2c 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.13 +FROM golang:1.21.7 RUN \ apt update \ From 28d7342747e88329bde1c85ba0f7f426228149e7 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:05:55 +0000 Subject: [PATCH 19/35] chore: Update Functionbeat Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- x-pack/functionbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index d0ed74d7ecb..b2c85869921 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.13 +FROM golang:1.21.7 RUN \ apt-get update \ From 8824e6ff5f6d0461c805e03791ceefa5d8a34994 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:06:20 +0000 Subject: [PATCH 20/35] chore: Update Heartbeat Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- heartbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index 3d275011342..eb52ad4d130 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.13 +FROM golang:1.21.7 RUN \ apt-get update \ From 34ce789738e004003611956541f43f84f715e574 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:06:44 +0000 Subject: [PATCH 21/35] chore: Update go.mod MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index bce54dbb7a3..af936d4063e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/beats/v7 -go 1.20 +go 1.21 require ( cloud.google.com/go/bigquery v1.55.0 From d9adafe0a9b08c2aa78f4b1bc585ae56a26bfc4d Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:07:09 +0000 Subject: [PATCH 22/35] chore: Update NATS module Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- metricbeat/module/nats/_meta/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index a33a7b60ac9..4df0b81a912 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.20.13 AS build-env +FROM golang:1.21.7 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 . From 8243b085d5b96b5238965867f5a2663836fcc63d Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:07:33 +0000 Subject: [PATCH 23/35] chore: Update Metricbeat debug Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/kubernetes/metricbeat/Dockerfile.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug index 0fb84220fc0..8adf8a45901 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.20.13 as builder +FROM golang:1.21.7 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin From 9f0dc9135a48793a24b82f86c4cd64d1b9c1336d Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:07:58 +0000 Subject: [PATCH 24/35] chore: Update Heartbeat debug Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/kubernetes/heartbeat/Dockerfile.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug index 8e31b365764..473ce7484c8 100644 --- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.20.13 as builder +FROM golang:1.21.7 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin From b519d74a40e67eda69f3c1b229aee5c3a48fac14 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:08:22 +0000 Subject: [PATCH 25/35] chore: Update from vsphere Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- metricbeat/module/vsphere/_meta/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index a31de92a866..3db3cccbab2 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,5 +1,5 @@ ARG VSPHERE_GOLANG_VERSION -FROM golang:1.20.13 +FROM golang:1.21.7 RUN apt-get install curl git RUN go install github.com/vmware/govmomi/vcsim@v0.30.4 From 6071982a82c4bce838509ffce463f012a8b1d262 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:08:48 +0000 Subject: [PATCH 26/35] chore: Update stan Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- x-pack/metricbeat/module/stan/_meta/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index 7810f107050..ffce883a60c 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.20.13 AS build-env +FROM golang:1.21.7 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 42c99be0f4d34f884cd8c4704e3bf8909b775e30 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:09:12 +0000 Subject: [PATCH 27/35] chore: Update Packetbeat Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- packetbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 9f982787891..17075d9da65 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.13 +FROM golang:1.21.7 RUN \ apt-get update \ From c4a951b0c4865b430193a09f2801c005b3bb9e5e Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:09:36 +0000 Subject: [PATCH 28/35] chore: Update HTTP module Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- metricbeat/module/http/_meta/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 8d32c82bd7c..a46a3dbb3e2 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.13 +FROM golang:1.21.7 COPY test/main.go main.go From 59a855b88d0f27cb4d2f18391be128356835f40c Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:10:01 +0000 Subject: [PATCH 29/35] chore: Update .golangci.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .golangci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 5ce1ed49eef..79b77eab0d1 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -114,7 +114,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. - go: "1.20.13" + go: "1.21.7" nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -132,19 +132,19 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. - go: "1.20.13" + go: "1.21.7" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.20.13" + go: "1.21.7" # 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.20.13" + go: "1.21.7" gosec: excludes: From 79ed6d3cb9705ef6c8c7edfdff2d5b7fb241d543 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:10:26 +0000 Subject: [PATCH 30/35] chore: Update .go-version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .go-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.go-version b/.go-version index 5009c3e6728..8819d012cee 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20.13 +1.21.7 From 9786c34ad81a3155d76089d2ec9ed58cdb3b12ad Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:10:50 +0000 Subject: [PATCH 31/35] chore: Update Filebeat debug Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- dev-tools/kubernetes/filebeat/Dockerfile.debug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index 73405080214..e8dfaf392ab 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.20.13 as builder +FROM golang:1.21.7 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin From fdbda0371598ec15f059f4e7b1ea3921fabcd5d9 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:11:15 +0000 Subject: [PATCH 32/35] chore: Update version.asciidoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- libbeat/docs/version.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index ae372e0079c..1cae4fe1ad8 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,6 @@ :stack-version: 8.13.0 :doc-branch: main -:go-version: 1.20.13 +:go-version: 1.21.7 :release-state: unreleased :python: 3.7 :docker: 1.12 From b72f2854fe268047f2317b5e21d538ac9379e0a6 Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:11:39 +0000 Subject: [PATCH 33/35] chore: Update .devcontainer/devcontainer.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 571faef670a..7fdf17e76ef 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ { "name": "Beats Development Container", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/go:1-1.20-bullseye", + "image": "mcr.microsoft.com/devcontainers/go:1-1.21-bullseye", // Features to add to the dev container. More info: https://containers.dev/features. "features": { "ghcr.io/devcontainers/features/node:1": {}, From 6e1dfc63d6ab919f55ffaa1bfd0a8614e93a94ef Mon Sep 17 00:00:00 2001 From: apmmachine Date: Wed, 7 Feb 2024 20:12:04 +0000 Subject: [PATCH 34/35] chore: Update Auditbeat Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made with ❤️️ by updatecli --- auditbeat/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 39bcc37d6bc..df038d2edf8 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20.13 +FROM golang:1.21.7 RUN \ apt-get update \ From e5355a376bbb09564a451d8507cc4ad3d81264a1 Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Wed, 7 Feb 2024 15:29:44 -0500 Subject: [PATCH 35/35] Update changelog. --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index c6b4b4e6e4f..c00d18691e6 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -10,7 +10,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] *Affecting all Beats* -- Upgrade to Go 1.21.6. Removes support for Windows 8.1. See https://tip.golang.org/doc/go1.21#windows. {pull}37615[37615] +- Upgrade to Go 1.21.7. Removes support for Windows 8.1. See https://tip.golang.org/doc/go1.21#windows. {pull}37913[37913] *Auditbeat*