Add infra agent config option

pkg/config/config_template.yaml

@@ -1636,6 +1636,14 @@ api_key:
   #
   # disable_realtime_checks: false
 
+  ## @param infra_agent - object - optional
+  ## Enables Infrastructure Monitoring
+  ##
+  #infra_agent:
+  ## @env DD_INFRA_AGENT_ENABLE - boolean - optional - default: true
+  ## Enables or disables Infrastructure Monitoring
+  # enabled: true
+
 {{- if .InternalProfiling -}}
   ## @param profiling - custom object - optional
   ## Enter specific configurations for internal profiling.

pkg/config/setup/config.go

@@ -238,6 +238,7 @@ var serverlessConfigComponents = []func(pkgconfigmodel.Setup){
 	debugging,
 	vector,
 	podman,
+	infraAgent, // run after serializer as some flags are overridden
 }
 
 func init() {
@@ -1648,6 +1649,17 @@ func podman(config pkgconfigmodel.Setup) {
 	config.BindEnvAndSetDefault("podman_db_path", "")
 }
 
+func infraAgent(config pkgconfigmodel.Setup) {
+	// Disables metric data submission (including Custom Metrics) so that hosts stop showing up in Datadog.
+	// Used namely for Error Tracking Standalone where Infrastructure Monitoring is not needed.
+	if enabled := os.Getenv("DD_INFRA_AGENT_ENABLE"); enabled == "false" {
+		config.BindEnvAndSetDefault("enable_payloads.events", false)
+		config.BindEnvAndSetDefault("enable_payloads.series", false)
+		config.BindEnvAndSetDefault("enable_payloads.service_checks", false)
+		config.BindEnvAndSetDefault("enable_payloads.sketches", false)
+	}
+}
+
 // LoadProxyFromEnv overrides the proxy settings with environment variables
 func LoadProxyFromEnv(config pkgconfigmodel.Config) {
 	// Viper doesn't handle mixing nested variables from files and set

pkg/config/setup/config_test.go

@@ -1389,7 +1389,7 @@ use_proxy_for_cloud_metadata: true
 func TestServerlessConfigNumComponents(t *testing.T) {
 	// Enforce the number of config "components" reachable by the serverless agent
 	// to avoid accidentally adding entire components if it's not needed
-	require.Len(t, serverlessConfigComponents, 22)
+	require.Len(t, serverlessConfigComponents, 23)
 }
 
 func TestServerlessConfigInit(t *testing.T) {
@@ -1405,6 +1405,22 @@ func TestServerlessConfigInit(t *testing.T) {
 	// ensure some non-serverless configs are not declared
 	assert.False(t, conf.IsKnown("sbom.enabled"))
 	assert.False(t, conf.IsKnown("inventories_enabled"))
+
+	// ensure infra events payloads are enabled
+	assert.True(t, conf.GetBool("enable_payloads.events"))
+}
+
+func TestServerlessConfigInitInfraDisabled(t *testing.T) {
+	conf := pkgconfigmodel.NewConfig("datadog", "DD", strings.NewReplacer(".", "_")) // nolint: forbidigo // legit use case
+	t.Setenv("DD_INFRA_AGENT_ENABLE", "false")
+
+	initCommonWithServerless(conf)
+
+	// ensure infra payloads are disabled
+	assert.False(t, conf.GetBool("enable_payloads.events"))
+	assert.False(t, conf.GetBool("enable_payloads.series"))
+	assert.False(t, conf.GetBool("enable_payloads.service_check"))
+	assert.False(t, conf.GetBool("enable_payloads.sketches"))
 }
 
 func TestAgentConfigInit(t *testing.T) {

releasenotes/notes/add-infra-agent-config-option-a066d0571014d2bc.yaml

@@ -0,0 +1,11 @@
+# Each section from every release note are combined when the
+# CHANGELOG.rst is rendered. So the text needs to be worded so that
+# it does not depend on any information only available in another
+# section. This may mean repeating some details, but each section
+# must be readable independently of the other.
+#
+# Each section note must be formatted as reStructuredText.
+---
+enhancements:
+  - |
+    Infrastructure Monitoring can now be disabled through a single flag in the config.