From 9ea4dff6924c852e9ba0d82a3dd6ab628a569ae1 Mon Sep 17 00:00:00 2001
From: Pierre Gimalac <pierre.gimalac@datadoghq.com>
Date: Tue, 31 Dec 2024 15:13:09 +0100
Subject: [PATCH] fix: sysvinit service definition and windows start

---
 cmd/agent/subcommands/run/command_windows.go                | 4 ++--
 .../config/templates/init-scripts-agent/sysvinit_debian.erb | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmd/agent/subcommands/run/command_windows.go b/cmd/agent/subcommands/run/command_windows.go
index 8504227a81433..283f950af59a8 100644
--- a/cmd/agent/subcommands/run/command_windows.go
+++ b/cmd/agent/subcommands/run/command_windows.go
@@ -124,7 +124,7 @@ func StartAgentWithDefaults(ctxChan <-chan context.Context) (<-chan error, error
 			agentAPI internalAPI.Component,
 			_ packagesigning.Component,
 			statusComponent status.Component,
-			collector collector.Component,
+			// collector collector.Component,
 			cloudfoundrycontainer cloudfoundrycontainer.Component,
 			_ autoexit.Component,
 			_ expvarserver.Component,
@@ -155,7 +155,7 @@ func StartAgentWithDefaults(ctxChan <-chan context.Context) (<-chan error, error
 				invChecks,
 				logsReceiver,
 				statusComponent,
-				collector,
+				// collector,
 				config,
 				cloudfoundrycontainer,
 				jmxlogger,
diff --git a/omnibus/config/templates/init-scripts-agent/sysvinit_debian.erb b/omnibus/config/templates/init-scripts-agent/sysvinit_debian.erb
index c3c91bd5a7f7a..5046f5d6176c5 100644
--- a/omnibus/config/templates/init-scripts-agent/sysvinit_debian.erb
+++ b/omnibus/config/templates/init-scripts-agent/sysvinit_debian.erb
@@ -6,8 +6,8 @@
 # Description: Datadog Agent
 # Required-Start: $remote_fs
 # Required-Stop: $remote_fs
-# Should-Start: datadog-agent-process datadog-agent-trace datadog-agent-security
-# Should-Stop: datadog-agent-process datadog-agent-trace datadog-agent-security
+# Should-Start: datadog-agent-checks datadog-agent-process datadog-agent-trace datadog-agent-security
+# Should-Stop: datadog-agent-checks datadog-agent-process datadog-agent-trace datadog-agent-security
 # Default-Start: 2 3 4 5
 # Default-Stop: 0 1 6
 ### END INIT INFO
@@ -71,6 +71,7 @@ start_and_wait()
 				if [ "$?" -eq "1" ]; then
 					# We've started up successfully. Exit cleanly
 					log_end_msg 0
+					service datadog-agent-checks start
 					service datadog-agent-process start
 					service datadog-agent-trace start
 					service datadog-agent-security start
@@ -113,6 +114,7 @@ stop_and_wait()
 	case "$?" in
 		0|1)
 			log_end_msg 0
+			service datadog-agent-checks stop
 			service datadog-agent-process stop
 			service datadog-agent-trace stop
 			service datadog-agent-security stop