elastic · ghost · Jul 25, 2022 · Aug 10, 2022 · Aug 10, 2022
@@ -26,24 +26,24 @@ jobs:
           GOOS: ${{ matrix.GOOS }}
         run: echo Go GOOS=$GOOS
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       # Uses Go version from the repository.
       - name: Read .go-version file
         id: goversion
         run: echo "::set-output name=version::$(cat .go-version)"
 
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
           go-version: "${{ steps.goversion.outputs.version }}"
 
       - name: golangci-lint
         env:
           GOOS: ${{ matrix.GOOS }}
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.44.2
+          version: v1.47.2
 
           # Give the job more time to execute.
           # Regarding `--whole-files`, the linter is supposed to support linting of changed a patch only but,

@@ -1 +1 @@
-1.17.12
+1.18.4
@@ -1,6 +1,3 @@
-# DO NOT EDIT!
-# This file is a rendered template, the source can be found in "./dev-tools/templates/.golangci.yml"
-#
 # options for analysis running
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
@@ -105,7 +102,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.17.12"
+    go: "1.18.4"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -125,19 +122,19 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.17.12"
+    go: "1.18.4"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.17.12"
+    go: "1.18.4"
     # 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.17.12"
+    go: "1.18.4"
 
   gosec:
     excludes:

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -10,7 +10,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 
 *Affecting all Beats*
 
-- Fix namespacing on self-monitoring {pull}32336[32336]
+* Upgrade to Go 1.18. Certificates signed with SHA-1 are now rejected. See the Go 1.18 https://tip.golang.org/doc/go1.18#sha1[release notes] for details. {pull}32493[32493]
 
 
 *Auditbeat*
@@ -23,7 +23,6 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 - Browser monitors (beta) no write to the `synthetics-*` index prefix. {pull}32064[32064]
 - Setting a custom index for a given monitor is now deprecated. Streams are preferred. {pull}32064[32064]
 
-
 *Metricbeat*
 
 
@@ -40,6 +39,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 
 *Affecting all Beats*
 
+- Fix namespacing on self-monitoring {pull}32336[32336]
 - Expand fields in `decode_json_fields` if target is set. {issue}31712[31712] {pull}32010[32010]
 - Fix OS name reported by add_host_metadata on Windows 11. {issue}30833[30833] {pull}32259[32259]
 - Fix race condition when reloading runners {pull}32309[32309]

@@ -9858,11 +9858,11 @@ SOFTWARE
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.2.9
+Version: v0.2.11
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.2.9/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.2.11/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004

@@ -1,4 +1,4 @@
-FROM golang:1.17.12
+FROM golang:1.18.4
 
 RUN \
     apt-get update \

@@ -202,7 +202,7 @@ require (
 	github.com/awslabs/kinesis-aggregation/go/v2 v2.0.0-20220623125934-28468a6701b5
 	github.com/elastic/bayeux v1.0.5
 	github.com/elastic/elastic-agent-autodiscover v0.2.1
-	github.com/elastic/elastic-agent-libs v0.2.9
+	github.com/elastic/elastic-agent-libs v0.2.11
 	github.com/elastic/elastic-agent-shipper-client v0.2.0
 	github.com/elastic/elastic-agent-system-metrics v0.4.2 // do not upgrade until https://github.com/elastic/beats/issues/32467 is fixed
 	github.com/elastic/go-elasticsearch/v8 v8.2.0

@@ -600,8 +600,8 @@ github.com/elastic/elastic-agent-client/v7 v7.0.0-20210727140539-f0905d9377f6/go
 github.com/elastic/elastic-agent-libs v0.2.2/go.mod h1:1xDLBhIqBIjhJ7lr2s+xRFFkQHpitSp8q2zzv1Dqg+s=
 github.com/elastic/elastic-agent-libs v0.2.5/go.mod h1:chO3rtcLyGlKi9S0iGVZhYCzDfdDsAQYBc+ui588AFE=
 github.com/elastic/elastic-agent-libs v0.2.7/go.mod h1:chO3rtcLyGlKi9S0iGVZhYCzDfdDsAQYBc+ui588AFE=
-github.com/elastic/elastic-agent-libs v0.2.9 h1:7jOCqNqEWG0kJb3fa8/SC6beSiys1TmAylH9+hWTnrM=
-github.com/elastic/elastic-agent-libs v0.2.9/go.mod h1:chO3rtcLyGlKi9S0iGVZhYCzDfdDsAQYBc+ui588AFE=
+github.com/elastic/elastic-agent-libs v0.2.11 h1:ZeYn35Kxt+IdtMPmE01TaDeaahCg/z7MkGPVWUo6Lp4=
+github.com/elastic/elastic-agent-libs v0.2.11/go.mod h1:chO3rtcLyGlKi9S0iGVZhYCzDfdDsAQYBc+ui588AFE=
 github.com/elastic/elastic-agent-shipper-client v0.2.0 h1:p+5ep48YCOe+3nICeWmiLwQV11yDLad2n4NunI66Shg=
 github.com/elastic/elastic-agent-shipper-client v0.2.0/go.mod h1:OyI2W+Mv3JxlkEF3OeT7K0dbuxvwew8ke2Cf4HpLa9Q=
 github.com/elastic/elastic-agent-system-metrics v0.4.2 h1:tM24imnCLNrgrO74myzSF6RhJ3ikeF8VIxKdXB5RHzk=

@@ -1,4 +1,4 @@
-FROM golang:1.17.12
+FROM golang:1.18.4
 
 RUN \
     apt-get update \

@@ -1,6 +1,6 @@
 :stack-version: 8.4.0
 :doc-branch: main
-:go-version: 1.17.12
+:go-version: 1.18.4
 :release-state: unreleased
 :python: 3.7
 :docker: 1.12

@@ -69,7 +69,7 @@ func TestKafkaPublish(t *testing.T) {
 		events []eventInfo
 	}{
 		{
-			"publish single event to test topic",
+			"publish single event to test topic with nil config",
 			nil,
 			testTopic,
 			single(mapstr.M{
@@ -186,7 +186,7 @@ func TestKafkaPublish(t *testing.T) {
 			}),
 		},
 		{
-			"publish single event to test topic",
+			"publish single event to test topic with empty config",
 			map[string]interface{}{},
 			testTopic,
 			single(mapstr.M{
@@ -199,7 +199,7 @@ func TestKafkaPublish(t *testing.T) {
 			// that added a full 30sec to the test. Instead most tests run
 			// in plaintext, and individual tests can switch to SCRAM
 			// by inserting the config in this example:
-			"publish single event to test topic over SASL/SCRAM",
+			"SASL/SCRAM publish single event to test topic",
 			map[string]interface{}{
 				"hosts":          []string{getTestSASLKafkaHost()},
 				"protocol":       "https",

@@ -1,4 +1,4 @@
-FROM golang:1.17.12
+FROM golang:1.18.4
 
 RUN \
     apt update \

@@ -1,4 +1,4 @@
-FROM golang:1.17.12
+FROM golang:1.18.4
 
 RUN \
     apt-get update \

@@ -1,4 +1,4 @@
-FROM debian:stretch
+FROM debian:buster
 
 ENV KAFKA_HOME /kafka
 # Controls the hostname advertised within the Docker network, should generally match the container
@@ -10,7 +10,7 @@ ENV KAFKA_VERSION 2.2.2
 ENV _JAVA_OPTIONS "-Djava.net.preferIPv4Stack=true"
 ENV TERM=linux
 
-RUN apt-get update && apt-get install -y curl openjdk-8-jre-headless netcat
+RUN apt-get update && apt-get install -y curl openjdk-11-jre-headless netcat
 
 RUN mkdir -p ${KAFKA_LOGS_DIR} && mkdir -p ${KAFKA_HOME} && \
     curl -J -L -s -f -o - https://github.com/kadwanev/retry/releases/download/1.0.1/retry-1.0.1.tar.gz | tar xfz - -C /usr/local/bin && \

@@ -10,23 +10,23 @@ The files in the `certs` directory were generated with these commands:
 
 ```sh
 # create the broker's key
-keytool -keystore broker.keystore.jks -storepass KafkaTest -alias broker -validity 5000 -keyalg RSA -genkey
+keytool -keystore broker.keystore.jks -storepass KafkaTest -alias broker -validity 5000 -keyalg RSA -sigalg SHA256withRSA -genkey
 
 What is your first and last name?
   [Unknown]:  kafka
   ...
 
-# create a new certificate authority
+# create a new certificate authority, use passphrase KafkaTest
 openssl req -new -x509 -keyout ca-key -out ca-cert -days 5000
 
 # add the CA to the kafka client's trust store
-keytool -keystore client.truststore.jks -storepass KafkaTest -alias CARoot -keyalg RSA -import -file ca-cert
+keytool -keystore client.truststore.jks -storepass KafkaTest -alias CARoot -keyalg RSA -sigalg SHA256withRSA -import -file ca-cert
 
 # export the server certificate
 keytool -keystore broker.keystore.jks -storepass KafkaTest -alias broker -certreq -file broker-cert
 
 # sign it with the CA
-openssl x509 -req -CA ca-cert -CAkey ca-key -in broker-cert -out broker-cert-signed -days 5000 -CAcreateserial -passin pass:KafkaTest
+openssl x509 -req -CA ca-cert -CAkey ca-key -in broker-cert -out broker-cert-signed -days 5000 -CAcreateserial -passin pass:KafkaTest -sha256
 
 # import CA and signed cert back into server keystore
 keytool -keystore broker.keystore.jks -storepass KafkaTest -alias CARoot -import -file ca-cert