Merge branch 'main' into frank.spano-kube-actions-par

Author: frank-spano

.github/CODEOWNERS

@@ -272,6 +272,7 @@
 /cmd/agent/dist/conf.d/oracle.d/    @DataDog/database-monitoring
 /cmd/agent/dist/conf.d/oracle-dbm.d/    @DataDog/database-monitoring
 /cmd/agent/dist/conf.d/network_path.d/  @DataDog/network-path
+/cmd/agent/dist/conf.d/network_config_management.d/  @DataDog/ndm-integrations
 /cmd/agent/dist/conf.d/orchestrator_ecs.d/  @DataDog/ecs-experiences
 /cmd/agent/dist/conf.d/sbom.d/          @DataDog/agent-security @DataDog/container-integrations
 /cmd/agent/dist/conf.d/snmp.d/          @DataDog/network-device-monitoring-core

pkg/fleet/installer/packages/datadog_agent_linux.go

@@ -219,7 +219,7 @@ func installFilesystem(ctx HookContext) (err error) {
 
 	// 7. Stop and remove legacy procmgr unit names so only datadog-agent-procmgr.service runs dd-procmgrd
 	if err = retireLegacyProcmgrUnits(ctx); err != nil {
-		return fmt.Errorf("failed to retire legacy procmgr units: %w", err)
+		log.Warnf("failed to retire legacy procmgr units: %v", err)
 	}
 	return nil
 }
@@ -228,29 +228,48 @@ func installFilesystem(ctx HookContext) (err error) {
 // A host that upgraded from datadog-agent-procmgrd.service could otherwise run two dd-procmgrd
 // instances (socket and processes.d conflicts).
 func retireLegacyProcmgrUnits(ctx HookContext) error {
-	switch service.GetServiceManagerType() {
+	serviceManager := service.GetServiceManagerType()
+	log.Debugf("retire legacy procmgr units: service manager %q", serviceManager)
+	switch serviceManager {
 	case service.SystemdType:
 	default:
+		log.Debugf("retire legacy procmgr units: skipping, systemd not in use")
 		return nil
 	}
 	running, err := systemd.IsRunning()
 	if err != nil {
-		return err
+		log.Debugf("retire legacy procmgr units: check systemd running failed: %v", err)
+		return fmt.Errorf("check systemd running: %w", err)
 	}
+	log.Debugf("retire legacy procmgr units: systemd running=%t", running)
 	if running {
+		log.Debugf("retire legacy procmgr units: stopping units %v", legacyProcmgrUnitNames)
 		if err := systemd.StopUnits(ctx, legacyProcmgrUnitNames...); err != nil {
-			return err
+			log.Debugf("retire legacy procmgr units: stop failed: %v", err)
+			return fmt.Errorf("stop legacy procmgr units: %w", err)
 		}
+		log.Debugf("retire legacy procmgr units: disabling units %v", legacyProcmgrUnitNames)
 		if err := systemd.DisableUnits(ctx, legacyProcmgrUnitNames...); err != nil {
-			return err
+			log.Debugf("retire legacy procmgr units: disable failed: %v", err)
+			return fmt.Errorf("disable legacy procmgr units: %w", err)
 		}
+	} else {
+		log.Debugf("retire legacy procmgr units: skipping stop/disable, systemd not running")
 	}
 	for _, unitsPath := range systemdUnitInstallPaths {
+		log.Debugf("retire legacy procmgr units: removing unit files from %q", unitsPath)
 		if err := legacyProcmgrUnitPaths.EnsureAbsent(ctx, unitsPath); err != nil {
-			return err
+			log.Debugf("retire legacy procmgr units: remove unit files from %q failed: %v", unitsPath, err)
+			return fmt.Errorf("remove legacy procmgr unit files from %s: %w", unitsPath, err)
 		}
 	}
-	return systemd.Reload(ctx)
+	log.Debugf("retire legacy procmgr units: reloading systemd")
+	if err := systemd.Reload(ctx); err != nil {
+		log.Debugf("retire legacy procmgr units: reload failed: %v", err)
+		return fmt.Errorf("reload systemd after retiring legacy procmgr units: %w", err)
+	}
+	log.Debugf("retire legacy procmgr units: done")
+	return nil
 }
 
 const parExecutorProcmgrConfigName = "datadog-agent-action-executor.yaml"

test/static/static_quality_gates.yml

@@ -1,5 +1,5 @@
 static_quality_gate_agent_deb_amd64:
-  max_on_disk_size: 759.01 MiB
+  max_on_disk_size: 759.22 MiB
   max_on_wire_size: 181.38 MiB
 static_quality_gate_agent_deb_amd64_fips:
   max_on_disk_size: 710.52 MiB
@@ -8,43 +8,43 @@ static_quality_gate_agent_heroku_amd64:
   max_on_disk_size: 315.23 MiB
   max_on_wire_size: 80.56 MiB
 static_quality_gate_agent_msi:
-  max_on_disk_size: 657.0 MiB
+  max_on_disk_size: 657.29 MiB
   max_on_wire_size: 157.89 MiB
 static_quality_gate_agent_rpm_amd64:
-  max_on_disk_size: 758.98 MiB
+  max_on_disk_size: 759.19 MiB
   max_on_wire_size: 184.16 MiB
 static_quality_gate_agent_rpm_amd64_fips:
   max_on_disk_size: 710.52 MiB
   max_on_wire_size: 175.6 MiB
 static_quality_gate_agent_rpm_arm64:
-  max_on_disk_size: 730.38 MiB
+  max_on_disk_size: 730.63 MiB
   max_on_wire_size: 165.03 MiB
 static_quality_gate_agent_rpm_arm64_fips:
   max_on_disk_size: 688.91 MiB
   max_on_wire_size: 158.68 MiB
 static_quality_gate_agent_suse_amd64:
-  max_on_disk_size: 758.98 MiB
+  max_on_disk_size: 759.19 MiB
   max_on_wire_size: 184.13 MiB
 static_quality_gate_agent_suse_amd64_fips:
   max_on_disk_size: 710.52 MiB
   max_on_wire_size: 175.74 MiB
 static_quality_gate_agent_suse_arm64:
-  max_on_disk_size: 730.38 MiB
+  max_on_disk_size: 730.63 MiB
   max_on_wire_size: 164.99 MiB
 static_quality_gate_agent_suse_arm64_fips:
   max_on_disk_size: 688.91 MiB
   max_on_wire_size: 158.67 MiB
 static_quality_gate_docker_agent_amd64:
-  max_on_disk_size: 814.6 MiB
+  max_on_disk_size: 814.81 MiB
   max_on_wire_size: 275.7 MiB
 static_quality_gate_docker_agent_arm64:
-  max_on_disk_size: 815.75 MiB
+  max_on_disk_size: 815.96 MiB
   max_on_wire_size: 263.67 MiB
 static_quality_gate_docker_agent_jmx_amd64:
-  max_on_disk_size: 1005.36 MiB
+  max_on_disk_size: 1005.57 MiB
   max_on_wire_size: 344.32 MiB
 static_quality_gate_docker_agent_jmx_arm64:
-  max_on_disk_size: 995.43 MiB
+  max_on_disk_size: 995.64 MiB
   max_on_wire_size: 328.27 MiB
 static_quality_gate_docker_cluster_agent_amd64:
   max_on_disk_size: 211.25 MiB