Merge branch 'main' into fix/error-types

Author: hayotbisonai

.buildkite/pipeline.elastic-agent-binary-dra.yml

@@ -138,7 +138,7 @@ steps:
         PLATFORMS: "linux/amd64"
         FIPS: "true"
 
-    - label: ":package: linux/arm64 darwin/arm64 Elastic-Agent Core staging"
+    - label: ":package: linux/arm64 darwin/arm64 windows/arm64 Elastic-Agent Core staging"
       commands: |
         source .buildkite/scripts/version_qualifier.sh
         .buildkite/scripts/steps/build-agent-core.sh
@@ -151,7 +151,7 @@ steps:
         imagePrefix: "core-ubuntu-2204-aarch64"
       env:
         DRA_WORKFLOW: "dra-core-staging"
-        PLATFORMS: "linux/arm64 darwin/arm64"
+        PLATFORMS: "linux/arm64 darwin/arm64 windows/arm64"
 
     - label: ":package: linux/arm64 FIPS Elastic-Agent Core staging"
       commands: |

changelog/fragments/1759994876-fix-10417-inspect-slash.yaml

@@ -0,0 +1,45 @@
+# REQUIRED
+# 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: bug-fix
+
+# REQUIRED for all kinds
+# Change summary; a 80ish characters long description of the change.
+summary: "inspect: Handle components with slashes in their name"
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# description:
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# impact:
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# action:
+
+# REQUIRED for all kinds
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: elastic-agent
+
+# AUTOMATED
+# OPTIONAL to manually add other PR URLs
+# PR URL: A link the PR 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/owner/repo/1234
+
+# AUTOMATED
+# OPTIONAL to manually add other issue URLs
+# 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

internal/pkg/agent/cmd/inspect.go

@@ -318,24 +318,30 @@ func inspectComponents(ctx context.Context, cfgPath string, opts inspectComponen
 
 	// ID provided.
 	if opts.id != "" {
-		splitID := strings.SplitN(opts.id, "/", 2)
-		compID := splitID[0]
-		unitID := ""
-		if len(splitID) > 1 {
-			unitID = splitID[1]
-		}
+		// Interpret the ID as either a component or component/unit.
+		// First try to find a component with the full ID.
+		compID := opts.id
 		comp, ok := findComponent(comps, compID)
 		if ok {
-			if unitID != "" {
-				unit, ok := findUnit(comp, unitID)
-				if ok {
-					return printUnit(unit, streams)
-				}
-				return fmt.Errorf("unable to find unit with ID: %s/%s", compID, unitID)
-			}
 			return printComponent(comp, streams)
 		}
-		return fmt.Errorf("unable to find component with ID: %s", compID)
+
+		// Next try to split the ID and find a unit inside a component.
+		splitID := strings.SplitN(opts.id, "/", 2)
+		if len(splitID) > 1 {
+			compID = splitID[0]
+			comp, ok = findComponent(comps, compID)
+		}
+		if !ok {
+			return fmt.Errorf("unable to find component with ID: %s", compID)
+		}
+
+		unitID := splitID[1]
+		unit, ok := findUnit(comp, unitID)
+		if !ok {
+			return fmt.Errorf("unable to find unit with ID: %s/%s", compID, unitID)
+		}
+		return printUnit(unit, streams)
 	}
 
 	// Separate any components that are blocked by capabilities config

testing/integration/ess/inspect_test.go

@@ -100,4 +100,13 @@ func TestInspect(t *testing.T) {
 	assert.Equalf(t, "<REDACTED>", yObj.Inputs[0].CustomAttr, "inspect output: %s", p)
 	assert.Equalf(t, "<REDACTED>", yObj.Agent.Protection.SigningKey, "`signing_key` is not redacted but it should be, because it contains `key`. inspect output: %s", p)
 	assert.Equalf(t, "<REDACTED>", yObj.Agent.Protection.UninstallTokenHash, "`uninstall_token_hash` is not redacted but it should be, because it contains `token`. inspect output: %s", p)
+
+	p, err = fixture.Exec(ctx, []string{"inspect", "components", "beat/metrics-monitoring"})
+	require.NoErrorf(t, err, "Error when running inspect components, output: %s", p)
+	var yamlComponent struct {
+		InputType string `yaml:"input_type"`
+	}
+	err = yaml.Unmarshal(p, &yamlComponent)
+	require.NoError(t, err)
+	assert.Equal(t, "beat/metrics", yamlComponent.InputType)
 }

testing/integration/serverless/logs_ingestion_test.go

@@ -20,6 +20,5 @@ func TestLogIngestionFleetManaged(t *testing.T) {
 		Local: false,
 		Sudo:  true,
 	})
-	t.Skip("Skip serverless tests until we can enroll an agent with 9.3.0-SNAPSHOT.")
 	integration.LogIngestionFleetManaged(t, info)
 }