Merge branch '9.2' into mergify/bp/9.2/pr-11605

cmacknz · web-flow · commit a90c78f76e82 · 2025-12-05T13:45:01.000-05:00
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -348,6 +348,19 @@ steps:
         - .buildkite/scripts/steps/beats_tests.sh
         - .buildkite/hooks/pre-command
 
+  # NOTE: This should help detecting issues earlier in the development cycle
+  # See https://github.com/elastic/elastic-agent/issues/11604
+  - label: "Trigger Elastic Agent Package"
+    if: build.pull_request.id != null
+    commands:
+      - .buildkite/scripts/steps/trigger-elastic-agent-package.sh
+      - .buildkite/scripts/steps/trigger-elastic-agent-package.sh | buildkite-agent pipeline upload
+    if_changed:
+      include:
+        - .buildkite/pipeline.elastic-agent-package.yml
+        - .buildkite/scripts/steps/package.sh
+        - .buildkite/scripts/steps/trigger-elastic-agent-package.sh
+
   # wait for CI to be done
   - wait: ~
 
diff --git a/.buildkite/scripts/steps/trigger-elastic-agent-package.sh b/.buildkite/scripts/steps/trigger-elastic-agent-package.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# Create a dynamic buildkite step for running the elastic-agent-package pipeline.
+#
+# Required environment variables:
+#  - BUILDKITE_PULL_REQUEST
+#  - BUILDKITE_COMMIT
+#  - BUILDKITE_BRANCH
+#  - BUILDKITE_PULL_REQUEST_BASE_BRANCH
+#
+
+if [ ! -f .package-version ]; then
+  echo ".package-version file not found!"
+  exit 1
+fi
+
+# No need for the snapshot but the three digits version is required
+BEAT_VERSION=$(jq -r .version .core_version)
+MANIFEST_URL=$(jq -r .manifest_url .package-version)
+
+cat << EOF
+  - label: ":pipeline: Run elastic-agent-package"
+    trigger: "elastic-agent-package"
+    build:
+      message: "#${BUILDKITE_PULL_REQUEST} - Verify elastic-agent-package works"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        DRA_VERSION: "${BEAT_VERSION}"
+        DRA_WORKFLOW: "snapshot"
+        DRA_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        DRA_DRY_RUN: "--dry-run"
+        MANIFEST_URL: "${MANIFEST_URL}"
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "false"
+EOF
diff --git a/.github/workflows/bump-agent-versions.yml b/.github/workflows/bump-agent-versions.yml
@@ -31,7 +31,7 @@ jobs:
       matrix: ${{ fromJson(needs.filter.outputs.matrix) }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: "${{ matrix.branch }}"
 
diff --git a/.github/workflows/bump-beats-version.yml b/.github/workflows/bump-beats-version.yml
@@ -37,7 +37,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.filter.outputs.matrix) }}
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         ref: ${{ matrix.branch }}
 
diff --git a/.github/workflows/bump-edot-images.yml b/.github/workflows/bump-edot-images.yml
@@ -19,7 +19,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:
diff --git a/.github/workflows/bump-golang.yml b/.github/workflows/bump-golang.yml
@@ -19,7 +19,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:
diff --git a/.github/workflows/bump-otel-version.yml b/.github/workflows/bump-otel-version.yml
@@ -22,7 +22,7 @@ jobs:
       matrix:
         branch: ["main", "8.19"]
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
 
     - name: Set up Go
       uses: actions/setup-go@v6
diff --git a/.github/workflows/bump-vm-images.yml b/.github/workflows/bump-vm-images.yml
@@ -40,7 +40,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.filter.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # NOTE: as long as the updatecli bump differs between branches, we need to
           # checkout the branch that we are going to bump that we are going to bump
diff --git a/.github/workflows/catalog-info.yml b/.github/workflows/catalog-info.yml
@@ -18,7 +18,7 @@ jobs:
       contents: read
       packages: read
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: elastic/oblt-actions/elastic/validate-catalog@v1
 
diff --git a/.github/workflows/fragment-in-pr.yml b/.github/workflows/fragment-in-pr.yml
@@ -8,7 +8,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'skip-changelog') && !contains(github.event.pull_request.labels.*.name, 'backport')"
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
     - uses: actions/setup-go@v6
       with:
         go-version-file: .go-version
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -18,7 +18,7 @@ jobs:
     name: lint
     runs-on: ${{  matrix.os }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-go@v6
         with:
diff --git a/.github/workflows/macos-unit-tests.yml b/.github/workflows/macos-unit-tests.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: macos-15
     timeout-minutes: 60
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           # pkg/testing/tools/git TestGetReleaseBranches test require full git history
           fetch-depth: 0
diff --git a/.github/workflows/post-dependabot.yml b/.github/workflows/post-dependabot.yml
@@ -16,7 +16,7 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: actions/setup-go@v6
         with:
diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml
@@ -16,7 +16,7 @@ jobs:
       issues: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0  # Fetch all history including tags
       
diff --git a/.github/workflows/updatecli-compose.yml b/.github/workflows/updatecli-compose.yml
@@ -17,7 +17,7 @@ jobs:
       packages: read
       pull-requests: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
diff --git a/changelog/fragments/1764873750-Merge-multiple-agent-keys-when-loading-config.yaml b/changelog/fragments/1764873750-Merge-multiple-agent-keys-when-loading-config.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: bug-fix
+
+# Change summary; a 80ish characters long description of the change.
+summary: Merge multiple agent keys when loading config
+
+# 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: 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/owner/repo/1234
+
+# 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/3717
diff --git a/internal/pkg/agent/cmd/run_test.go b/internal/pkg/agent/cmd/run_test.go
@@ -5,14 +5,29 @@
 package cmd
 
 import (
+	_ "embed"
 	"fmt"
+	"os"
+	"path/filepath"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 
+	"github.com/elastic/elastic-agent-libs/logp"
+	"github.com/elastic/elastic-agent/internal/pkg/agent/application/paths"
+	"github.com/elastic/elastic-agent/internal/pkg/agent/configuration"
 	monitoringCfg "github.com/elastic/elastic-agent/internal/pkg/core/monitoring/config"
 )
 
+var (
+	//go:embed testdata/run/singlelogging.yaml
+	singleLoggingConfig []byte
+
+	//go:embed testdata/run/splitlogging.yaml
+	splitLoggingConfig []byte
+)
+
 func Test_initTracer(t *testing.T) {
 	tenPercentSamplingRate := float32(0.1)
 
@@ -93,3 +108,49 @@ func Test_initTracer(t *testing.T) {
 		})
 	}
 }
+
+func TestRunLoadConfig(t *testing.T) {
+	tests := []struct {
+		name   string
+		file   []byte
+		expect func() *configuration.Configuration
+	}{{
+		name: "single logging entry",
+		file: singleLoggingConfig,
+		expect: func() *configuration.Configuration {
+			cfg := configuration.DefaultConfiguration()
+			cfg.Settings.LoggingConfig.Level = logp.DebugLevel
+			cfg.Settings.LoggingConfig.ToFiles = true
+			cfg.Settings.LoggingConfig.ToStderr = false
+
+			return cfg
+		},
+	}, {
+		name: "split logging entries",
+		file: splitLoggingConfig,
+		expect: func() *configuration.Configuration {
+			cfg := configuration.DefaultConfiguration()
+			cfg.Settings.LoggingConfig.Level = logp.DebugLevel
+			cfg.Settings.LoggingConfig.ToFiles = true
+			cfg.Settings.LoggingConfig.ToStderr = false
+
+			return cfg
+		},
+	}}
+
+	origCfgDir := paths.Config()
+	t.Cleanup(func() { paths.SetConfig(origCfgDir) })
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			dir := t.TempDir()
+			paths.SetConfig(dir)
+			err := os.WriteFile(filepath.Join(dir, paths.DefaultConfigName), tt.file, 0o644)
+			require.NoError(t, err)
+
+			cfg, err := loadConfig(t.Context(), nil)
+			require.NoError(t, err)
+			require.Equal(t, tt.expect(), cfg)
+		})
+	}
+}
diff --git a/internal/pkg/agent/cmd/testdata/run/singlelogging.yaml b/internal/pkg/agent/cmd/testdata/run/singlelogging.yaml
@@ -0,0 +1,5 @@
+agent:
+  logging:
+    level: debug
+    to_files: true
+    to_stderr: false
diff --git a/internal/pkg/agent/cmd/testdata/run/splitlogging.yaml b/internal/pkg/agent/cmd/testdata/run/splitlogging.yaml
@@ -0,0 +1,5 @@
+agent.logging.level: debug
+agent.logging.to_files: true
+agent:
+  logging:
+    to_stderr: false
diff --git a/internal/pkg/config/config.go b/internal/pkg/config/config.go
@@ -56,6 +56,7 @@ var DefaultOptions = []interface{}{
 	ucfg.IgnoreCommas,
 	ucfg.ResolveEnv,
 	ucfg.VarExp,
+	ucfg.FieldMergeValues("agent"),
 	VarSkipKeys("inputs", "outputs"),
 	OTelKeys("connectors", "receivers", "processors", "exporters", "extensions", "service"),
 }
