Merge remote-tracking branch 'upstream/main' into feature/gotestsum-skip

* upstream/main:
  Guard against `nil` pointer dereference (elastic#8107)
  Generate NOTICE.txt with only modules used by binaries (elastic#8053)
  Retry enrollment requests when an error is returned, add enrollment timeout (elastic#8056)
  Changelog for 8.17.6 version (elastic#8062) (elastic#8106)
  [main][Automation] Update versions (elastic#8098)
  Allow using beats receivers for self-monitoring (elastic#8031)
  Adding new configuration setting: `agent.upgrade.rollback.window` (elastic#8065)
  [Integration Testing] Allow tests to declare themselves as needing a FIPS environment (elastic#8083)
  fix(agentless): overcome SIGPIPE in agentless promotion pipeline (elastic#8094)
  ksm autosharing integration configuration update (elastic#8086)

Author: v1v

.buildkite/scripts/steps/run-agentless-tests.sh

@@ -36,7 +36,7 @@ extract_sha() {
     local env=$1
 
     # Extract first matching SHA for the environment pattern
-    yq eval ".services.agentless-controller.versions | to_entries | .[] | select(.key | test(\"^${env}.*\")) | .value" serverless-gitops/services/agentless-controller/versions.yaml | head -1
+    yq eval ".services.agentless-controller.versions | with_entries(select(.key | test(\"^${env}.*\"))) | to_entries | .[0].value // \"\"" serverless-gitops/services/agentless-controller/versions.yaml
 }
 
 

NOTICE.txt

@@ -119,6 +119,12 @@ inputs:
 #   # duration will increase for subsequent retry attempts in a randomized exponential backoff manner.
 #   retry_sleep_init_duration: 30s
 
+# agent.upgrade
+#   # rollback settings
+#   rollback:
+#       # duration in which an upgraded Agent may be manually rolled back.
+#       window: 168h
+
 # agent.process:
 #   # timeout for creating new processes. when process is not successfully created by this timeout
 #   # start operation is considered a failure

_meta/config/common.reference.p2.yml.tmpl

@@ -0,0 +1,25 @@
+// begin 8.17.6 relnotes
+
+[[release-notes-8.17.6]]
+==  8.17.6
+
+Review important information about the  8.17.6 release.
+
+[discrete]
+[[new-features-8.17.6]]
+=== New features
+
+The 8.17.6 release adds the following new and notable features.
+
+
+elastic-agent::
+
+* Use `fullnameOverride` to set the fully qualified application names in the EDOT Kube-Stack Helm chart. {elastic-agent-pull}https://github.com/elastic/elastic-agent/pull/7754[#https://github.com/elastic/elastic-agent/pull/7754] {elastic-agent-issue}https://github.com/elastic/elastic-agent/issues/7381[#https://github.com/elastic/elastic-agent/issues/7381]
+
+
+
+
+
+
+
+// end 8.17.6 relnotes

changelog/8.17.6.asciidoc

@@ -0,0 +1,14 @@
+version: 8.17.6
+entries:
+    - kind: feature
+      summary: Set collectors fullnameOverride for edot kube-stack values.
+      description: ""
+      component: elastic-agent
+      pr:
+        - https://github.com/elastic/elastic-agent/pull/7754
+      issue:
+        - https://github.com/elastic/elastic-agent/issues/7381
+      timestamp: 1744384247
+      file:
+        name: 1744384247-set-collector's-fullnameOverride-for-edot-kube-stack-values.yaml
+        checksum: d7ccd1a2a660e7e0cc8bed5fc91570465b9ff639

changelog/8.17.6.yaml

@@ -8,15 +8,19 @@
 # - 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
+kind: enhancement
 
 # Change summary; a 80ish characters long description of the change.
-summary: set collectors fullnameOverride for edot kube-stack values
+summary: Retry enrollment requests on any error
 
 # 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:
+description: |
+  If any error is encountered during an attempted enrollment, the elastic-agent
+  will backoff and retry. Add a new --enroll-timeout flag and
+  FLEET_ENROLL_TIMEOUT env var to set how long it tries for, default 10m. A
+  negative value disables the timeout.
 
 # Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
 component: elastic-agent
@@ -25,8 +29,8 @@ 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/elastic/elastic-agent/pull/7754
+pr: https://github.com/elastic/elastic-agent/pull/8056
 
 # 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/7381
+#issue: https://github.com/owner/repo/1234

changelog/fragments/1744384247-set-collector's-fullnameOverride-for-edot-kube-stack-values.yaml renamed to changelog/fragments/1746113477-Retry-enrollment-for-all-errors.yaml

@@ -0,0 +1,36 @@
+# 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: Adds a new configuration setting, `agent.upgrade.rollback.window`
+
+# 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: |
+  The value of the `agent.upgrade.rollback.window` setting determines the period after upgrading
+  Elastic Agent when a rollback to the previous version can be triggered. This is an optional
+  setting, with a default value of `168h` (7 days). The value can be any string that is parseable
+  by https://pkg.go.dev/time#ParseDuration.
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: elastic-agent
+
+# 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/8065
+
+# 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/6881

changelog/fragments/1746197293-config-rollback-window.yaml

@@ -0,0 +1,35 @@
+# 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: other
+
+# Change summary; a 80ish characters long description of the change.
+summary: NOTICE.txt now contains only those modules that are used by the Elastic Agent binaries.
+
+# 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: |
+  Only those modules that the Elastic Agent binaries for various platforms directly
+  or indirectly depend on are now included in the NOTICE.txt file . Modules used for development
+  tooling are now excluded from NOTICE.txt.
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: elastic-agent
+
+# 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/8053
+
+# 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/owner/repo/1234

changelog/fragments/1746636264-fix-notice.yaml

@@ -22,7 +22,7 @@ In this example we will perform two Helm chart installations, one installing ela
       --set kubernetes.state.agentAsSidecar.enabled=true \
       -n kube-system
     ```
-3. In the associated policy from the previous steps install the Kubernetes integration and **enable only** the "Collect Kubernetes metrics from kube-state-metrics".
+3. In the associated policy from the previous steps install the Kubernetes integration and **enable only** the "Collect Kubernetes metrics from kube-state-metrics" input. For all associated data streams, update the **Host** destination to `localhost:8080` (instead of the default `kube-state-metrics:8080`), and disable the **Leader Election** option.
 4. Follow again [this guide](https://www.elastic.co/guide/en/fleet/current/install-fleet-managed-elastic-agent.html#elastic-agent-installation-steps) to set up a different agent policy and enroll an agent to it. Extract again the Fleet URL (`--url=$NEW_FLEET_URL`) and Enrollment token (`--enrollment-token=$NEW_FLEET_TOKEN`).
 5. Install elastic-agent as a Daemonset without kube-state-metrics.
     ```console

deploy/helm/elastic-agent/examples/fleet-managed-ksm-sharding/README.md

@@ -9,8 +9,10 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"maps"
 	"os"
 	"os/exec"
+	"slices"
 	"strings"
 
 	"github.com/magefile/mage/sh"
@@ -36,17 +38,25 @@ func Notice() (err error) {
 		return err
 	}
 
+	modules, err := getDependentModules()
+	if err != nil {
+		return fmt.Errorf("unable to fetch list of dependent modules: %w", err)
+	}
+	slices.Sort(modules)
+
 	// piping output of the first command to the second
 	// similar to former Makefile implementation
 	//
-	// go list -m -json all | go run go.elastic.co/go-licence-detector \
+	// go list -m -json {modules} | go run go.elastic.co/go-licence-detector \
 	// -includeIndirect \
 	// -rules dev-tools/notice/rules.json \
 	// -overrides dev-tools/notice/overrides.json \
 	// -noticeTemplate dev-tools/notice/NOTICE.txt.tmpl \
 	// -noticeOut NOTICE.txt \
 	// -depsOut ""
-	listCmd := exec.Command("go", "list", "-m", "-json", "all")
+	listCmdArgs := []string{"list", "-m", "-json"}
+	listCmdArgs = append(listCmdArgs, modules...)
+	listCmd := exec.Command("go", listCmdArgs...)
 	licDetectCmd := exec.Command("go", "run", "go.elastic.co/go-licence-detector",
 		"-includeIndirect",
 		"-rules", "dev-tools/notice/rules.json",
@@ -133,3 +143,47 @@ func Notice() (err error) {
 
 	return nil
 }
+
+// getDependentModules returns the unique list paths of modules that the
+// github.com/elastic/elastic-agent module recursively depends on. If
+// additionalTags are specified, only files that would be compiled with
+// those build tags + "linux,darwin,windows" are examined.
+// Equivalent to running the following on the command line:
+// go list -deps -f "{{with .Module}}{{if not .Main}}{{.Path}}{{end}}{{end}}" -tags "linux,darwin,windows,{additionalTags...}"
+func getDependentModules(additionalTags ...string) ([]string, error) {
+	tags := append([]string{"linux", "darwin", "windows"}, additionalTags...)
+
+	cmdArgs := []string{
+		"list",
+		"-deps",
+		"-f",
+		"{{with .Module}}{{if not .Main}}{{.Path}}{{end}}{{end}}",
+		"-tags",
+		strings.Join(tags, ","),
+	}
+
+	cmd := exec.Command("go", cmdArgs...)
+	fmt.Printf(">> %s\n", strings.Join(cmd.Args, " "))
+
+	output, err := cmd.Output()
+	if err != nil {
+		var exitErr *exec.ExitError
+		if errors.As(err, &exitErr) { // double pointer is necessary because Error() is defined on *exec.ExitError receiver
+			fmt.Println(string(exitErr.Stderr))
+		}
+		return nil, err
+	}
+
+	// Parse out list of modules from command output, while also
+	// de-duplicating the list.
+	modulesMap := map[string]struct{}{}
+	for _, line := range bytes.Split(output, []byte("\n")) {
+		if len(line) > 0 {
+			modulesMap[string(line)] = struct{}{}
+		}
+	}
+
+	// Convert to list and return
+	modules := slices.Collect(maps.Keys(modulesMap))
+	return modules, nil
+}