Merge branch 'main' into mtls-flags

Author: michel-laterman

.buildkite/scripts/steps/integration_tests.sh

@@ -11,7 +11,7 @@ MAGE_SUBTARGET="${3:-""}"
 # Override the agent package version using a string with format <major>.<minor>.<patch>
 # NOTE: use only after version bump when the new version is not yet available, for example:
 # OVERRIDE_AGENT_PACKAGE_VERSION="8.10.3" otherwise OVERRIDE_AGENT_PACKAGE_VERSION="".
-OVERRIDE_AGENT_PACKAGE_VERSION="8.12.0"
+OVERRIDE_AGENT_PACKAGE_VERSION=""
 
 if [[ -n "$OVERRIDE_AGENT_PACKAGE_VERSION" ]]; then
   OVERRIDE_TEST_AGENT_VERSION=${OVERRIDE_AGENT_PACKAGE_VERSION}"-SNAPSHOT"

.go-version

@@ -1 +1 @@
-1.21.5
+1.21.6

.golangci.yml

@@ -116,7 +116,7 @@ linters-settings:
 
   gosimple:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.5"
+    go: "1.21.6"
 
   nakedret:
     # make an issue if func has more lines of code than this setting and it has naked returns; default is 30
@@ -136,17 +136,17 @@ linters-settings:
 
   staticcheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.5"
+    go: "1.21.6"
     checks: ["all"]
 
   stylecheck:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.5"
+    go: "1.21.6"
     checks: ["all"]
 
   unused:
     # Select the Go version to target. The default is '1.13'.
-    go: "1.21.5"
+    go: "1.21.6"
 
   gosec:
     excludes:

Dockerfile

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.21.5
+ARG GO_VERSION=1.21.6
 FROM circleci/golang:${GO_VERSION}
 
 

Dockerfile.skaffold

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.21.5
+ARG GO_VERSION=1.21.6
 ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild"
 ARG AGENT_VERSION=8.9.0-SNAPSHOT
 ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"

NOTICE.txt

@@ -0,0 +1,31 @@
+// begin 8.11.4 relnotes
+
+[[release-notes-8.11.4]]
+==  8.11.4
+
+Review important information about the  8.11.4 release.
+
+[discrete]
+[[security-updates-8.11.4]]
+=== Security updates
+
+
+elastic-agent::
+
+* Upgrade Go Version To 1.20.12. {elastic-agent-pull}https://github.com/elastic/elastic-agent/pull/3885[#https://github.com/elastic/elastic-agent/pull/3885] 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// end 8.11.4 relnotes

changelog/8.11.4.asciidoc

@@ -0,0 +1,13 @@
+version: 8.11.4
+entries:
+    - kind: security
+      summary: Upgrade Go version to 1.20.12.
+      description: ""
+      component: elastic-agent
+      pr:
+        - https://github.com/elastic/elastic-agent/pull/3885
+      issue: []
+      timestamp: 1702055473
+      file:
+        name: 1702055473-Upgrade-to-Go-1.20.12.yaml
+        checksum: d66f715a1ce95792a87a3f632825f5e6e50d8057

changelog/8.11.4.yaml

@@ -0,0 +1,32 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: feature
+
+# Change summary; a 80ish characters long description of the change.
+summary: Move control socket path to the installation directory
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+#description:
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component:
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+pr: https://github.com/elastic/elastic-agent/pull/3909
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+issue: https://github.com/elastic/elastic-agent/issues/3840

changelog/fragments/1702501610-Adjust-control-socket-path-into-the-installation-directory.yaml

@@ -11,7 +11,7 @@
 kind: security
 
 # Change summary; a 80ish characters long description of the change.
-summary: Upgrade to Go 1.21.5
+summary: Upgrade to Go 1.21.6
 
 # Long description; in case the summary is not enough to describe the change
 # this field accommodate a description without length limits.
@@ -25,7 +25,7 @@ component: "elastic-agent"
 # If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
 # NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
 # Please provide it if you are adding a fragment for a different PR.
-pr: https://github.com/owner/repo/1234
+pr: https://github.com/elastic/elastic-agent/pull/4073
 
 # Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
 # If not present is automatically filled by the tooling with the issue linked to the PR number.

changelog/fragments/1704304944-Upgrade-to-Go-1.21.5.yaml renamed to changelog/fragments/1704304944-Upgrade-to-Go-1.21.6.yaml

@@ -18,15 +18,14 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
 	"testing"
 
 	"github.com/blakesmith/ar"
-	rpm "github.com/cavaliercoder/go-rpm"
+	"github.com/cavaliercoder/go-rpm"
 )
 
 const (
@@ -85,7 +84,7 @@ func TestTar(t *testing.T) {
 }
 
 func TestZip(t *testing.T) {
-	zips := getFiles(t, regexp.MustCompile(`^\w+beat-\S+.zip$`))
+	zips := getFiles(t, regexp.MustCompile(`^\w+\S+.zip$`))
 	for _, zip := range zips {
 		checkZip(t, zip)
 	}
@@ -792,7 +791,7 @@ type dockerManifest struct {
 }
 
 func readDockerManifest(r io.Reader) (*dockerManifest, error) {
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		return nil, err
 	}
@@ -820,7 +819,7 @@ type dockerInfo struct {
 }
 
 func readDockerInfo(r io.Reader) (*dockerInfo, error) {
-	data, err := ioutil.ReadAll(r)
+	data, err := io.ReadAll(r)
 	if err != nil {
 		return nil, err
 	}