Merge branch 'main' into fix-versions

.buildkite/bk.integration.pipeline.yml

@@ -44,6 +44,7 @@ steps:
           - fleet-privileged
           - standalone-upgrade
           - upgrade
+          - upgrade-flavor
           - install-uninstall
 
       - label: "Win2022:non-sudo:{{matrix}}"
@@ -95,6 +96,7 @@ steps:
         matrix:
           - default
           - upgrade
+          - upgrade-flavor
           - standalone-upgrade
           - fleet
           - fleet-endpoint-security
@@ -122,6 +124,7 @@ steps:
         matrix:
           - default
           - upgrade
+          - upgrade-flavor
           - standalone-upgrade
           - fleet
           - fleet-endpoint-security

.github/workflows/golangci-lint.yml

@@ -25,7 +25,7 @@ jobs:
           go-version-file: .go-version
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6.1.1
+        uses: golangci/golangci-lint-action@v6.2.0
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
           version: v1.61.0

_meta/config/common.p2.yml.tmpl

@@ -38,6 +38,20 @@ inputs:
       - metricsets:
         - filesystem
         data_stream.dataset: system.filesystem
+#     - metricsets:
+#       - process
+#       data_stream.dataset: system.process
+#       # While running in unprivileged mode, process/process_summary metricsets can emit
+#       # partial metrics. Some metrics that require privileged access can be missing.
+#       # On Windows, non-administrator users may not be able to access protected processes, leading 
+#       # to missing details like command line and arguments. On Unix, non-root users can't access 
+#       # procfs without the right permissions. 
+#       # Errors like ERROR_ACCESS_DENIED, EPERM, and EACCESS may result in partial metrics. 
+#       # Enabling the config below will mark the metricset as degraded when this occurs.
+#       # You may want to enable it to identify potential permission-related issues.
+#       # If you're unable to provide the necessary access, you can disable this config to keep
+#       # metricsets healthy.
+#       #degrade_on_partial: false
 
 #   # Collecting log files
 #   - type: filestream

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

@@ -36,6 +36,20 @@ inputs:
       - metricsets:
         - filesystem
         data_stream.dataset: system.filesystem
+#     - metricsets:
+#       - process
+#       data_stream.dataset: system.process
+#       # While running in unprivileged mode, process/process_summary metricsets can emit
+#       # partial metrics. Some metrics that require privileged access can be missing.
+#       # On Windows, non-administrator users may not be able to access protected processes, leading 
+#       # to missing details like command line and arguments. On Unix, non-root users can't access 
+#       # procfs without the right permissions. 
+#       # Errors like ERROR_ACCESS_DENIED, EPERM, and EACCESS may result in partial metrics. 
+#       # Enabling the config below will mark the metricset as degraded when this occurs.
+#       # You may want to enable it to identify potential permission-related issues.
+#       # If you're unable to provide the necessary access, you can disable this config to keep
+#       # metricsets healthy.
+#       #degrade_on_partial: false
 
 #   # Collecting log files
 #   - type: filestream

_meta/elastic-agent.yml

@@ -30,6 +30,20 @@ inputs:
       - metricsets: 
         - filesystem
         data_stream.dataset: system.filesystem
+#     - metricsets:
+#       - process
+#       data_stream.dataset: system.process
+#       # While running in unprivileged mode, process/process_summary metricsets can emit
+#       # partial metrics. Some metrics that require privileged access can be missing.
+#       # On Windows, non-administrator users may not be able to access protected processes, leading 
+#       # to missing details like command line and arguments. On Unix, non-root users can't access 
+#       # procfs without the right permissions. 
+#       # Errors like ERROR_ACCESS_DENIED, EPERM, and EACCESS may result in partial metrics. 
+#       # Enabling the config below will mark the metricset as degraded when this occurs.
+#       # You may want to enable it to identify potential permission-related issues.
+#       # If you're unable to provide the necessary access, you can disable this config to keep
+#       # metricsets healthy.
+#       #degrade_on_partial: false
 
 # management:
 #   # Mode of management, the Elastic Agent support two modes of operation:

elastic-agent.reference.yml

@@ -42,6 +42,20 @@ inputs:
       - metricsets:
         - filesystem
         data_stream.dataset: system.filesystem
+#     - metricsets:
+#       - process
+#       data_stream.dataset: system.process
+#       # While running in unprivileged mode, process/process_summary metricsets can emit
+#       # partial metrics. Some metrics that require privileged access can be missing.
+#       # On Windows, non-administrator users may not be able to access protected processes, leading 
+#       # to missing details like command line and arguments. On Unix, non-root users can't access 
+#       # procfs without the right permissions. 
+#       # Errors like ERROR_ACCESS_DENIED, EPERM, and EACCESS may result in partial metrics. 
+#       # Enabling the config below will mark the metricset as degraded when this occurs.
+#       # You may want to enable it to identify potential permission-related issues.
+#       # If you're unable to provide the necessary access, you can disable this config to keep
+#       # metricsets healthy.
+#       #degrade_on_partial: false
 
 #   # Collecting log files
 #   - type: filestream

elastic-agent.yml

@@ -44,6 +44,20 @@ inputs:
       - metricsets:
         - filesystem
         data_stream.dataset: system.filesystem
+#     - metricsets:
+#       - process
+#       data_stream.dataset: system.process
+#       # While running in unprivileged mode, process/process_summary metricsets can emit
+#       # partial metrics. Some metrics that require privileged access can be missing.
+#       # On Windows, non-administrator users may not be able to access protected processes, leading 
+#       # to missing details like command line and arguments. On Unix, non-root users can't access 
+#       # procfs without the right permissions. 
+#       # Errors like ERROR_ACCESS_DENIED, EPERM, and EACCESS may result in partial metrics. 
+#       # Enabling the config below will mark the metricset as degraded when this occurs.
+#       # You may want to enable it to identify potential permission-related issues.
+#       # If you're unable to provide the necessary access, you can disable this config to keep
+#       # metricsets healthy.
+#       #degrade_on_partial: false
 
 #   # Collecting log files
 #   - type: filestream

magefile.go

@@ -651,7 +651,7 @@ func commitID() string {
 
 // Update is an alias for executing control protocol, configs, and specs.
 func Update() {
-	mg.SerialDeps(Config, BuildPGP, BuildFleetCfg, Otel.Readme)
+	mg.Deps(Config, BuildPGP, BuildFleetCfg, Otel.Readme)
 }
 
 func EnsureCrossBuildOutputDir() error {

testing/integration/groups_test.go

@@ -35,6 +35,9 @@ const (
 	// Upgrade group of tests. Used for testing upgrades.
 	Upgrade = "upgrade"
 
+	// UpgradeFlavor group of tests. Used for testing flavored upgrades.
+	UpgradeFlavor = "upgrade-flavor"
+
 	// StandaloneUpgrade group of tests. Used for TestStandaloneUpgrade.
 	StandaloneUpgrade = "standalone-upgrade"
 

testing/integration/upgrade_standalone_flavors_test.go

@@ -24,7 +24,7 @@ import (
 
 func TestStandaloneUpgrade_Flavor_Basic(t *testing.T) {
 	define.Require(t, define.Requirements{
-		Group: Upgrade,
+		Group: UpgradeFlavor,
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
 	})
@@ -82,7 +82,7 @@ func TestStandaloneUpgrade_Flavor_Basic(t *testing.T) {
 
 func TestStandaloneUpgrade_Flavor_Servers(t *testing.T) {
 	define.Require(t, define.Requirements{
-		Group: Upgrade,
+		Group: UpgradeFlavor,
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
 	})
@@ -139,7 +139,7 @@ func TestStandaloneUpgrade_Flavor_Servers(t *testing.T) {
 
 func TestStandaloneUpgrade_Flavor_UpgradeFromUnflavored(t *testing.T) {
 	define.Require(t, define.Requirements{
-		Group: Upgrade,
+		Group: UpgradeFlavor,
 		Local: false, // requires Agent installation
 		Sudo:  true,  // requires Agent installation
 	})