Merge branch 'main' into dependabot/go_modules/github.com/elastic/elastic-agent-system-metrics-0.9.3

Author: cmacknz

.agent-versions.json

@@ -1,10 +1,10 @@
 {
   "testVersions": [
     "8.14.0-SNAPSHOT",
-    "8.13.3",
-    "8.13.3-SNAPSHOT",
+    "8.13.5-SNAPSHOT",
+    "8.13.4",
     "8.12.2",
-    "7.17.21",
-    "7.17.21-SNAPSHOT"
+    "7.17.22-SNAPSHOT",
+    "7.17.21"
   ]
 }

Makefile

@@ -48,7 +48,7 @@ check:
 ## check-go: download and run the go linter.
 .PHONY: check-go
 check-go: ## - Run golangci-lint
-	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.44.2
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2
 	@./bin/golangci-lint run -v
 
 ## check-no-changes : Check there is no local changes.

changelog/fragments/1715259944-Add-agent-info.yaml-to-diagnostics-bundle.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: enhancement
+
+# Change summary; a 80ish characters long description of the change.
+summary: Add agent-info.yaml to diagnostics bundle
+
+# 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/4725
+
+# 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/4439

internal/pkg/agent/application/coordinator/coordinator.go

@@ -714,6 +714,34 @@ func (c *Coordinator) Run(ctx context.Context) error {
 // Called by external goroutines.
 func (c *Coordinator) DiagnosticHooks() diagnostics.Hooks {
 	return diagnostics.Hooks{
+		{
+			Name:        "agent-info",
+			Filename:    "agent-info.yaml",
+			Description: "current state of the agent information of the running Elastic Agent",
+			ContentType: "application/yaml",
+			Hook: func(_ context.Context) []byte {
+				output := struct {
+					AgentID      string            `yaml:"agent_id"`
+					Headers      map[string]string `yaml:"headers"`
+					LogLevel     string            `yaml:"log_level"`
+					Snapshot     bool              `yaml:"snapshot"`
+					Version      string            `yaml:"version"`
+					Unprivileged bool              `yaml:"unprivileged"`
+				}{
+					AgentID:      c.agentInfo.AgentID(),
+					Headers:      c.agentInfo.Headers(),
+					LogLevel:     c.agentInfo.LogLevel(),
+					Snapshot:     c.agentInfo.Snapshot(),
+					Version:      c.agentInfo.Version(),
+					Unprivileged: c.agentInfo.Unprivileged(),
+				}
+				o, err := yaml.Marshal(output)
+				if err != nil {
+					return []byte(fmt.Sprintf("error: %q", err))
+				}
+				return o
+			},
+		},
 		{
 			Name:        "local-config",
 			Filename:    "local-config.yaml",

internal/pkg/agent/application/coordinator/diagnostics_test.go

@@ -33,6 +33,7 @@ import (
 func TestCoordinatorExpectedDiagnosticHooks(t *testing.T) {
 
 	expected := []string{
+		"agent-info",
 		"local-config",
 		"pre-config",
 		"variables",
@@ -128,6 +129,39 @@ fleet:
 	assert.YAMLEq(t, expectedCfg, string(result), "local-config diagnostic returned unexpected value")
 }
 
+func TestDiagnosticAgentInfo(t *testing.T) {
+	// Create a coordinator with an info.Agent and ensure its included in diagnostics.
+
+	coord := &Coordinator{agentInfo: fakeAgentInfo{
+		agentID: "agent-id",
+		headers: map[string]string{
+			"header1": "value1",
+			"header2": "value2",
+		},
+		logLevel:     "trace",
+		snapshot:     true,
+		version:      "8.14.0",
+		unprivileged: true,
+	}}
+
+	expected := `
+agent_id: agent-id
+headers:
+  header1: value1
+  header2: value2
+log_level: trace
+snapshot: true
+version: 8.14.0
+unprivileged: true
+`
+
+	hook, ok := diagnosticHooksMap(coord)["agent-info"]
+	require.True(t, ok, "diagnostic hooks should have an entry for agent-info")
+
+	result := hook.Hook(context.Background())
+	assert.YAMLEq(t, expected, string(result), "agent-info diagnostic returned unexpected value")
+}
+
 func TestDiagnosticPreConfig(t *testing.T) {
 	// Create a coordinator with a test AST and make sure it's returned
 	// by the pre-config diagnostic.
@@ -589,3 +623,39 @@ func mapFromRawYAML(t *testing.T, str string) map[string]interface{} {
 	require.NoError(t, err, "Parsing of YAML test string must succeed")
 	return result
 }
+
+type fakeAgentInfo struct {
+	agentID      string
+	headers      map[string]string
+	logLevel     string
+	snapshot     bool
+	version      string
+	unprivileged bool
+}
+
+func (a fakeAgentInfo) AgentID() string {
+	return a.agentID
+}
+
+func (a fakeAgentInfo) Headers() map[string]string {
+	return a.headers
+}
+
+func (a fakeAgentInfo) LogLevel() string {
+	return a.logLevel
+}
+
+func (a fakeAgentInfo) Snapshot() bool {
+	return a.snapshot
+}
+
+func (a fakeAgentInfo) Version() string {
+	return a.version
+}
+
+func (a fakeAgentInfo) Unprivileged() bool {
+	return a.unprivileged
+}
+
+func (a fakeAgentInfo) ReloadID(ctx context.Context) error                  { panic("implement me") }
+func (a fakeAgentInfo) SetLogLevel(ctx context.Context, level string) error { panic("implement me") }

testing/integration/diagnostics_test.go

@@ -31,6 +31,7 @@ const diagnosticsArchiveGlobPattern = "elastic-agent-diagnostics-*.zip"
 
 var diagnosticsFiles = []string{
 	"package.version",
+	"agent-info.yaml",
 	"allocs.pprof.gz",
 	"block.pprof.gz",
 	"components-actual.yaml",