service discovery: Add check yaml by default (#29033)

DataDog · Sep 4, 2024 · af2cae3 · af2cae3
1 parent b5758df
commit af2cae3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/cmd/agent/dist/conf.d/service_discovery.d/conf.yaml.default b/cmd/agent/dist/conf.d/service_discovery.d/conf.yaml.default
@@ -0,0 +1,2 @@
+instances:
+  - {}
diff --git a/omnibus/config/software/datadog-agent-finalize.rb b/omnibus/config/software/datadog-agent-finalize.rb
@@ -52,6 +52,9 @@
             # load isn't supported by windows
             delete "#{conf_dir}/load.d"
 
+            # service_discovery isn't supported by windows
+            delete "#{conf_dir}/service_discovery.d"
+
             # Remove .pyc files from embedded Python
             command "del /q /s #{windows_safe_path(install_dir)}\\*.pyc"
         end

diff --git a/tasks/agent.py b/tasks/agent.py
@@ -76,6 +76,7 @@
     "orchestrator_ecs",
     "cisco_sdwan",
     "network_path",
+    "service_discovery",
 ]
 
 WINDOWS_CORECHECKS = [

diff --git a/test/new-e2e/tests/agent-subcommands/configcheck/configcheck_nix_test.go b/test/new-e2e/tests/agent-subcommands/configcheck/configcheck_nix_test.go
@@ -25,7 +25,7 @@ func TestLinuxConfigCheckSuite(t *testing.T) {
 	e2e.Run(t, &linuxConfigCheckSuite{}, e2e.WithProvisioner(awshost.ProvisionerNoFakeIntake()))
 }
 
-// cpu, disk, file_handle, io, load, memory, network, ntp, uptime
+// cpu, disk, file_handle, io, load, memory, network, ntp, uptime, service_discovery
 func (v *linuxConfigCheckSuite) TestDefaultInstalledChecks() {
 	testChecks := []CheckConfigOutput{
 		{
@@ -82,6 +82,12 @@ func (v *linuxConfigCheckSuite) TestDefaultInstalledChecks() {
 			InstanceID: "uptime:",
 			Settings:   "{}",
 		},
+		{
+			CheckName:  "service_discovery",
+			Filepath:   "file:/etc/datadog-agent/conf.d/service_discovery.d/conf.yaml.default",
+			InstanceID: "service_discovery:",
+			Settings:   "{}",
+		},
 	}
 
 	output := v.Env().Agent.Client.ConfigCheck()