[Automation] Bump Golang version to 1.20.10 (#36846)

* chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Functionbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update from vsphere 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 * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat 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 NATS module Dockerfile Made with ❤️️ by updatecli * Add changelog. --------- Co-authored-by: apmmachine <apmmachine@users.noreply.github.com> Co-authored-by: Craig MacKenzie <craig.mackenzie@elastic.co> (cherry picked from commit 6be0d18) # Conflicts: # .go-version # .golangci.yml # auditbeat/Dockerfile # dev-tools/kubernetes/filebeat/Dockerfile.debug # dev-tools/kubernetes/heartbeat/Dockerfile.debug # dev-tools/kubernetes/metricbeat/Dockerfile.debug # heartbeat/Dockerfile # libbeat/docs/version.asciidoc # metricbeat/Dockerfile # metricbeat/module/http/_meta/Dockerfile # metricbeat/module/nats/_meta/Dockerfile # metricbeat/module/vsphere/_meta/Dockerfile # packetbeat/Dockerfile # x-pack/functionbeat/Dockerfile # x-pack/metricbeat/module/stan/_meta/Dockerfile
elastic · Oct 16, 2023 · a893d17 · a893d17
1 parent 69b29de
commit a893d17
Show file tree

Hide file tree

Showing 16 changed files with 135 additions and 0 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1,5 @@
+<<<<<<< HEAD
 1.19.12
+=======
+1.20.10
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
diff --git a/.golangci.yml b/.golangci.yml
@@ -102,7 +102,11 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.19.12"
+=======
+    go: "1.20.10"
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -120,19 +124,31 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.19.12"
+=======
+    go: "1.20.10"
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
+<<<<<<< HEAD
     go: "1.19.12"
+=======
+    go: "1.20.10"
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
     # 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.19.12"
+=======
+    go: "1.20.10"
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 
   gosec:
     excludes:

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -60,6 +60,16 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 *Affecting all Beats*
 
 
+- Upgrade to Go 1.20.10. {pull}36846[36846]
+- Added append Processor which will append concrete values or values from a field to target. {issue}29934[29934] {pull}33364[33364]
+- When running under Elastic-Agent the status is now reported per Unit instead of the whole Beat {issue}35874[35874] {pull}36183[36183]
+- Add warning message to SysV init scripts for RPM-based systems that lack `/etc/rc.d/init.d/functions`. {issue}35708[35708] {pull}36188[36188]
+- Mark `translate_sid` processor is GA. {issue}36279[36279] {pull}36280[36280]
+- dns processor: Add support for forward lookups (`A`, `AAAA`, and `TXT`). {issue}11416[11416] {pull}36394[36394]
+- Mark `syslog` processor as GA, improve docs about how processor handles syslog messages. {issue}36416[36416] {pull}36417[36417]
+- Add support for AWS external IDs. {issue}36321[36321] {pull}36322[36322]
+- [Enhanncement for host.ip and host.mac] Disabling netinfo.enabled option of add-host-metadata processor {pull}36506[36506]
+  Setting environmental variable ELASTIC_NETINFO:false in Elastic Agent pod will disable the netinfo.enabled option of add_host_metadata processor
 
 *Auditbeat*
 

diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.12
+=======
+FROM golang:1.20.10
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 
 RUN \
     apt-get update \

diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug
@@ -0,0 +1,21 @@
+FROM golang:1.20.10 as builder
+
+ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
+
+ENV CGO_ENABLED=0
+
+RUN go install github.com/go-delve/delve/cmd/dlv@v1.9.0
+
+COPY build/filebeat-debugger /usr/share/filebeat/filebeat-debugger
+
+FROM alpine:3.15
+
+ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin
+
+WORKDIR /usr/share/filebeat
+
+COPY --from=builder /go/bin/dlv /go/bin/dlv
+COPY --from=builder /usr/share/filebeat/filebeat-debugger /usr/share/filebeat/filebeat-debugger
+
+ENTRYPOINT ["dlv", "--headless", "--listen=:56268", "--api-version=2", "--log",  "--log-output", "debugger", "exec", "/usr/share/filebeat/filebeat-debugger", "--"]
+CMD [ "-e" ]
diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug
@@ -0,0 +1,21 @@
+FROM golang:1.20.10 as builder
+
+ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
+
+ENV CGO_ENABLED=0
+
+RUN go install github.com/go-delve/delve/cmd/dlv@v1.9.0
+
+COPY build/heartbeat-debugger /usr/share/heartbeat/heartbeat-debugger
+
+FROM alpine:3.16
+
+ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin
+
+WORKDIR /usr/share/heartbeat
+
+COPY --from=builder /go/bin/dlv /go/bin/dlv
+COPY --from=builder /usr/share/heartbeat/heartbeat-debugger /usr/share/heartbeat/heartbeat-debugger
+
+ENTRYPOINT ["dlv", "--headless", "--listen=:56268", "--api-version=2", "--log",  "--log-output", "debugger", "exec", "/usr/share/heartbeat/heartbeat-debugger", "--"]
+CMD [ "-e" ]
diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug
@@ -0,0 +1,21 @@
+FROM golang:1.20.10 as builder
+
+ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin
+
+ENV CGO_ENABLED=0
+
+RUN go install github.com/go-delve/delve/cmd/dlv@v1.9.0
+
+COPY build/metricbeat-debugger /usr/share/metricbeat/metricbeat-debugger
+
+FROM alpine:3.15
+
+ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin
+
+WORKDIR /usr/share/metricbeat
+
+COPY --from=builder /go/bin/dlv /go/bin/dlv
+COPY --from=builder /usr/share/metricbeat/metricbeat-debugger /usr/share/metricbeat/metricbeat-debugger
+
+ENTRYPOINT ["dlv", "--headless", "--listen=:56268", "--api-version=2", "--log",  "--log-output", "debugger", "exec", "/usr/share/metricbeat/metricbeat-debugger", "--"]
+CMD [ "-e" ]
diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.12
+=======
+FROM golang:1.20.10
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 
 RUN \
     apt-get update \

diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
 :stack-version: 7.17.14
 :doc-branch: 7.17
 :go-version: 1.19.12
+=======
+:stack-version: 8.11.0
+:doc-branch: main
+:go-version: 1.20.10
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12

diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.12
+=======
+FROM golang:1.20.10
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 
 RUN \
     apt update \

diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.12
+=======
+FROM golang:1.20.10
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 
 COPY test/main.go main.go
 

diff --git 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.19.12 AS build-env
+=======
+FROM golang:1.20.10 AS build-env
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 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
@@ -1,5 +1,9 @@
 ARG VSPHERE_GOLANG_VERSION
+<<<<<<< HEAD
 FROM golang:${VSPHERE_GOLANG_VERSION}
+=======
+FROM golang:1.20.10
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 
 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
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.12
+=======
+FROM golang:1.20.10
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 
 RUN \
     apt-get update \

diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 FROM golang:1.19.12
+=======
+FROM golang:1.20.10
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 
 RUN \
     apt-get update \

diff --git 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.19.12 AS build-env
+=======
+FROM golang:1.20.10 AS build-env
+>>>>>>> 6be0d18448 ([Automation] Bump Golang version to 1.20.10 (#36846))
 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 .