From 274b2c19f1964a44e908a278ceebe6dd90718388 Mon Sep 17 00:00:00 2001 From: Maxime mouial Date: Thu, 16 Jul 2026 17:21:46 +0200 Subject: [PATCH] Remove useless comment to not pollute the schema --- .../schema/yaml/admission_controller.yaml | 3 - pkg/config/schema/yaml/agent_telemetry.yaml | 1 - pkg/config/schema/yaml/cluster_agent.yaml | 1 - pkg/config/schema/yaml/cluster_checks.yaml | 5 +- pkg/config/schema/yaml/compliance_config.yaml | 1 - pkg/config/schema/yaml/container_image.yaml | 1 - .../schema/yaml/container_lifecycle.yaml | 1 - pkg/config/schema/yaml/core_schema.yaml | 73 +--------------- pkg/config/schema/yaml/gpu.yaml | 1 - .../schema/yaml/internal_profiling.yaml | 1 - .../schema/yaml/orchestrator_explorer.yaml | 1 - pkg/config/schema/yaml/otelcollector.yaml | 1 - pkg/config/schema/yaml/process_config.yaml | 6 +- .../schema/yaml/remote_configuration.yaml | 1 - .../schema/yaml/runtime_security_config.yaml | 2 - pkg/config/schema/yaml/sbom.yaml | 5 -- pkg/config/setup/common_settings.go | 87 +------------------ pkg/config/setup/config.go | 8 -- pkg/config/setup/system_probe_settings.go | 75 ---------------- 19 files changed, 11 insertions(+), 263 deletions(-) diff --git a/pkg/config/schema/yaml/admission_controller.yaml b/pkg/config/schema/yaml/admission_controller.yaml index ae039da49544..c12b8874b797 100644 --- a/pkg/config/schema/yaml/admission_controller.yaml +++ b/pkg/config/schema/yaml/admission_controller.yaml @@ -22,7 +22,6 @@ properties: default: false visibility: public description: Set to true to enable the admission controller in the cluster-agent. - comment: Admission controller validation: node_type: section type: object @@ -551,7 +550,6 @@ properties: node_type: setting type: string default: datadog/ingress-nginx-injection - comment: ingress-nginx injection configuration init_run_as_group: node_type: setting type: integer @@ -585,7 +583,6 @@ properties: node_type: setting type: string default: ghcr.io/datadog/dd-trace-go/service-extensions-callout - comment: Processor mode and sidecar configuration image_tag: node_type: setting type: string diff --git a/pkg/config/schema/yaml/agent_telemetry.yaml b/pkg/config/schema/yaml/agent_telemetry.yaml index 4069dba73cce..ff03115ae004 100644 --- a/pkg/config/schema/yaml/agent_telemetry.yaml +++ b/pkg/config/schema/yaml/agent_telemetry.yaml @@ -56,7 +56,6 @@ properties: node_type: setting type: boolean default: true - comment: Agent Telemetry errortracking: node_type: section type: object diff --git a/pkg/config/schema/yaml/cluster_agent.yaml b/pkg/config/schema/yaml/cluster_agent.yaml index 954a248544fa..eb4b1c16007f 100644 --- a/pkg/config/schema/yaml/cluster_agent.yaml +++ b/pkg/config/schema/yaml/cluster_agent.yaml @@ -17,7 +17,6 @@ properties: default: false visibility: public description: Set to true to enable the Cluster Agent. - comment: Datadog cluster agent auth_token: node_type: setting type: string diff --git a/pkg/config/schema/yaml/cluster_checks.yaml b/pkg/config/schema/yaml/cluster_checks.yaml index 75a7586f3e13..ce7ad1b71467 100644 --- a/pkg/config/schema/yaml/cluster_checks.yaml +++ b/pkg/config/schema/yaml/cluster_checks.yaml @@ -147,9 +147,8 @@ properties: node_type: setting type: boolean default: false - comment: |- - Cluster check Autodiscovery - TODO(CINT)(Agent 7.53+) Remove this flag when hybrid ignore_ad_tags is fully deprecated + comment: TODO(CINT)(Agent 7.53+) Remove this flag when hybrid ignore_ad_tags is + fully deprecated unscheduled_check_threshold: node_type: setting type: integer diff --git a/pkg/config/schema/yaml/compliance_config.yaml b/pkg/config/schema/yaml/compliance_config.yaml index 89ef22bb2d45..8f8b32c6abfb 100644 --- a/pkg/config/schema/yaml/compliance_config.yaml +++ b/pkg/config/schema/yaml/compliance_config.yaml @@ -16,7 +16,6 @@ properties: description: Set to true to enable Cloud Security Posture Management (CSPM). tags: - full-agent-only:true - comment: Datadog security agent (compliance) dir: node_type: setting type: string diff --git a/pkg/config/schema/yaml/container_image.yaml b/pkg/config/schema/yaml/container_image.yaml index e38b09a12e08..d61c2cfeb4f2 100644 --- a/pkg/config/schema/yaml/container_image.yaml +++ b/pkg/config/schema/yaml/container_image.yaml @@ -53,7 +53,6 @@ properties: node_type: setting type: boolean default: true - comment: Container image configuration input_chan_size: node_type: setting type: integer diff --git a/pkg/config/schema/yaml/container_lifecycle.yaml b/pkg/config/schema/yaml/container_lifecycle.yaml index 16d709abd49a..71cf70ca063f 100644 --- a/pkg/config/schema/yaml/container_lifecycle.yaml +++ b/pkg/config/schema/yaml/container_lifecycle.yaml @@ -53,7 +53,6 @@ properties: node_type: setting type: boolean default: true - comment: Container lifecycle configuration input_chan_size: node_type: setting type: integer diff --git a/pkg/config/schema/yaml/core_schema.yaml b/pkg/config/schema/yaml/core_schema.yaml index 768b13ca1d96..1f4adfe56992 100644 --- a/pkg/config/schema/yaml/core_schema.yaml +++ b/pkg/config/schema/yaml/core_schema.yaml @@ -302,7 +302,6 @@ properties: tags: - template_section:Common - full-agent-only:true - comment: Installer configuration process_manager: node_type: section type: object @@ -616,7 +615,6 @@ properties: Increasing the buffer size can help if payload drops occur due to high prio buffer being full. tags: - template_section:Common - comment: Forwarder channels buffer size forwarder_low_prio_buffer_size: node_type: setting type: integer @@ -800,7 +798,6 @@ properties: tags: - template_section:Common - full-agent-only:true - comment: GCE exclude_gce_tags: node_type: setting type: array @@ -868,7 +865,6 @@ properties: tags: - template_section:Common - full-agent-only:true - comment: GPU gpu: $ref: gpu.yaml azure_metadata_timeout: @@ -897,7 +893,6 @@ properties: tags: - template_section:Common - full-agent-only:true - comment: Azure azure_metadata_api_version: node_type: setting type: string @@ -967,7 +962,6 @@ properties: tags: - template_section:Common - full-agent-only:true - comment: controls the agent configurations metadata_ip_resolution_from_hostname: node_type: setting type: boolean @@ -1026,7 +1020,6 @@ properties: description: |- Time (in seconds) delay during which the auto exit validates that the selected method continuously detects an exit condition, before exiting. The value is verified every 30s. By default, three consecutive checks need to return true to trigger an automatic exit. - comment: Auto exit configuration remote_configuration: $ref: remote_configuration.yaml fips: @@ -1113,7 +1106,6 @@ properties: visibility: public description: Enables forwarding of metrics to an Observability Pipelines Worker - comment: metrics options url: node_type: setting type: string @@ -1145,7 +1137,6 @@ properties: visibility: public description: Enables forwarding of logs to an Observability Pipelines Worker - comment: logs options url: node_type: setting type: string @@ -1451,7 +1442,6 @@ properties: tags: - template_section:Agent - full-agent-only:true - comment: secrets backend secret_backend_config: node_type: setting type: object @@ -1541,7 +1531,6 @@ properties: example: tags: - template_section:Agent - comment: secrets backend secret_backend_arguments: node_type: setting type: array @@ -1680,7 +1669,6 @@ properties: description: The full path to the file where Datadog Agent Manager System Tray logs are written. example: '"c:\\programdata\\datadog\\logs\\ddtray.log"' - comment: Datadog Agent Manager System Tray logs_enabled: node_type: setting title: Log collection Configuration @@ -1727,7 +1715,6 @@ properties: description: Enables Network Path Dynamic Test for monitoring network connections via Network Path. example: 'true' - comment: Network Path collector: node_type: section type: object @@ -2056,9 +2043,6 @@ properties: default: false visibility: public description: '[Preview] Enables Synthetics tests.' - comment: |- - Generic resources configuration - Synthetics configuration workers: node_type: setting type: integer @@ -2211,7 +2195,6 @@ properties: example: localhost tags: - template_section:Dogstatsd - comment: statsd dogstatsd_socket: node_type: setting type: string @@ -2530,7 +2513,6 @@ properties: tags: - template_section:CoreAgent - full-agent-only:true - comment: JMXFetch jmx_use_cgroup_memory_limit: node_type: setting type: boolean @@ -3063,7 +3045,6 @@ properties: - golang_type:int64 - template_section:CoreAgent - full-agent-only:true - comment: Docker ad_config_poll_interval: node_type: setting type: integer @@ -3134,7 +3115,6 @@ properties: visibility: public description: The network on which the garden API is listening. Possible values are `unix` or `tcp` - comment: Cloud Foundry Garden listen_address: node_type: setting type: string @@ -3313,9 +3293,7 @@ properties: tags: - template_section:ECS - full-agent-only:true - comment: |- - ECS - Will be autodetected + comment: Will be autodetected ecs_collect_resource_tags_ec2: node_type: setting type: boolean @@ -3588,7 +3566,6 @@ properties: tags: - template_section:KubeApiServer - full-agent-only:true - comment: Kube ApiServer kubernetes_apiserver_ca_path: node_type: setting type: string @@ -3889,7 +3866,6 @@ properties: default: https://bbs.service.cf.internal:8889 visibility: public description: URL of the BBS API. - comment: Cloud Foundry BBS poll_interval: node_type: setting type: integer @@ -3957,7 +3933,6 @@ properties: default: https://cloud-controller-ng.service.cf.internal:9024 visibility: public description: URL of the CC API. - comment: Cloud Foundry CC client_id: node_type: setting type: string @@ -4017,7 +3992,6 @@ properties: It should contain less than 100 characters and should not contain any of `<`, `>`, `\n`, `\t`, `\r` characters. This field is used by NDM features (SNMP check, SNMP Traps listener, etc). - comment: Network Devices Monitoring default_scan: node_type: section type: object @@ -4663,7 +4637,6 @@ properties: default: false visibility: public description: Set to true to enable collection of NetFlow traffic. - comment: NetFlow listeners: node_type: setting type: array @@ -4959,7 +4932,6 @@ properties: node_type: setting type: boolean default: false - comment: Network Config Management metadata: node_type: section type: object @@ -5077,9 +5049,6 @@ properties: visibility: public description: The number of concurrent workers used to perform reverse DNS lookups. - comment: |- - Data Observability - Reverse DNS Enrichment chan_size: node_type: setting type: integer @@ -5226,7 +5195,6 @@ properties: default: false visibility: public description: Set to true to enable High Availability Agent feature. - comment: HA Agent group: node_type: setting type: string @@ -6336,7 +6304,6 @@ properties: node_type: setting type: boolean default: false - comment: Cluster autoscaling product spot: node_type: section type: object @@ -6357,7 +6324,6 @@ properties: node_type: setting type: boolean default: false - comment: Spot scheduling fallback_duration: node_type: setting type: string @@ -6394,7 +6360,6 @@ properties: node_type: setting type: boolean default: false - comment: Workload autoscaling product external_recommender: node_type: section type: object @@ -6460,7 +6425,6 @@ properties: default: [] tags: - full-agent-only:true - comment: Agent Workload Filtering config cf_os_hostname_aliasing: node_type: setting type: boolean @@ -6560,7 +6524,6 @@ properties: default: false tags: - full-agent-only:true - comment: Cluster check runner clc_runner_host: node_type: setting type: string @@ -6643,7 +6606,6 @@ properties: node_type: setting type: string default: /bin/sh - comment: Cloud Foundry Container Tagger tags: - full-agent-only:true cluster_trust_chain: @@ -6682,7 +6644,6 @@ properties: default: false tags: - no-env - comment: command line options cmd_host: node_type: setting type: string @@ -6705,7 +6666,6 @@ properties: node_type: setting type: boolean default: false - comment: Config files discovery forwarder: node_type: section type: object @@ -6885,7 +6845,6 @@ properties: node_type: setting type: boolean default: false - comment: CSI driver tags: - full-agent-only:true data_observability: @@ -7655,7 +7614,6 @@ properties: node_type: setting type: boolean default: false - comment: Data Jobs Monitoring config tags: - full-agent-only:true dogstatsd_capture_depth: @@ -7892,7 +7850,6 @@ properties: default: false tags: - full-agent-only:true - comment: EC2 ecs_metadata_retry_initial_interval: node_type: setting type: string @@ -8232,7 +8189,6 @@ properties: tags: - golang_type:duration - full-agent-only:true - comment: flare configs flare_stripped_keys: node_type: setting type: array @@ -8252,7 +8208,7 @@ properties: node_type: setting type: string default: '' - comment: Fleet policies + comment: Directory to store fleet policies forwarder_apikey_validation_interval: node_type: setting type: integer @@ -8262,7 +8218,6 @@ properties: node_type: setting type: integer default: 2 - comment: Forwarder retry settings forwarder_connection_reset_interval: node_type: setting type: integer @@ -8304,7 +8259,6 @@ properties: node_type: setting type: string default: ${run_path}/transactions_to_retry - comment: Forwarder storage on disk genresources: node_type: section type: object @@ -8517,7 +8471,6 @@ properties: node_type: setting type: string default: '' - comment: Host Profiler config health_metrics: node_type: section type: object @@ -8573,7 +8526,6 @@ properties: tags: - full-agent-only:true comment: |- - IBM cloud We use a long timeout here since the metadata and token API can be very slow sometimes. value in seconds ignore_autoconf: @@ -8642,7 +8594,6 @@ properties: node_type: setting type: boolean default: false - comment: DatadogInstrumentation controller tags: - full-agent-only:true integration: @@ -8774,7 +8725,6 @@ properties: tags: - full-agent-only:true comment: |- - Integration security When enabled, integrations will ignore configuration parameters that refer to file paths Ignore file path params from untrusted providers (e.g. labels, annotations) when enabled. integration_profiling: @@ -8817,14 +8767,12 @@ properties: default: true tags: - full-agent-only:true - comment: controls the checks configurations inventories_collect_cloud_provider_account_id: node_type: setting type: boolean default: true tags: - full-agent-only:true - comment: collect collection of `cloud_provider_account_id` inventories_diagnostics_enabled: node_type: setting type: boolean @@ -8835,7 +8783,6 @@ properties: default: true tags: - full-agent-only:true - comment: inventories inventories_first_run_delay: node_type: setting type: integer @@ -8926,7 +8873,6 @@ properties: node_type: setting type: boolean default: false - comment: Kubernetes actions forwarder: node_type: section type: object @@ -9157,7 +9103,6 @@ properties: node_type: setting type: boolean default: false - comment: Language Detection reporting: node_type: section type: object @@ -9233,7 +9178,6 @@ properties: tags: - full-agent-only:true comment: |- - Metadata endpoints Defines the maximum size of hostame gathered from EC2, GCE, Azure, Alibaba, Oracle and Tencent cloud metadata endpoints (all cloudprovider except IBM). IBM cloud ignore this setting as their API return a huge JSON with all the metadata for the VM. @@ -9257,7 +9201,6 @@ properties: Delegated authentication (global) Cloud provider and region are auto-detected if not specified Enabled automatically when org_uuid is specified - Filterlist metric_filterlist_match_prefix: node_type: setting type: boolean @@ -9323,7 +9266,6 @@ properties: node_type: setting type: string default: '' - comment: Network network_check: node_type: section type: object @@ -9345,7 +9287,6 @@ properties: node_type: setting type: boolean default: false - comment: Notable Events (EUDM) ol_proxy_config: node_type: section type: object @@ -9447,9 +9388,8 @@ properties: env_parser: json items: type: object - comment: |- - Prometheus HTTP Service Discovery - List of HTTP SD endpoints to poll. Each entry must specify url and check_template. + comment: List of HTTP SD endpoints to poll. Each entry must specify url and + check_template. url: node_type: setting type: string @@ -9549,7 +9489,6 @@ properties: node_type: setting type: integer default: 3 - comment: Remote tagger tags: - full-agent-only:true run_path: @@ -9576,7 +9515,6 @@ properties: node_type: setting type: integer default: 5010 - comment: Datadog security agent (common) disable_thp: node_type: setting type: boolean @@ -9912,7 +9850,6 @@ properties: node_type: setting type: boolean default: false - comment: Shared library check library_folder_path: node_type: setting type: string @@ -9929,7 +9866,6 @@ properties: node_type: setting type: boolean default: false - comment: Software Inventory forwarder: node_type: section type: object @@ -10268,7 +10204,6 @@ properties: default: '' tags: - full-agent-only:true - comment: Vsock win_skip_com_init: node_type: setting type: boolean diff --git a/pkg/config/schema/yaml/gpu.yaml b/pkg/config/schema/yaml/gpu.yaml index e0c4eea3a715..e28a215dfa88 100644 --- a/pkg/config/schema/yaml/gpu.yaml +++ b/pkg/config/schema/yaml/gpu.yaml @@ -38,7 +38,6 @@ properties: default: false visibility: public description: Enable the NCCL collective performance check. - comment: NCCL host_socket_path: node_type: setting type: string diff --git a/pkg/config/schema/yaml/internal_profiling.yaml b/pkg/config/schema/yaml/internal_profiling.yaml index d6ec9e0f9995..2594863dee63 100644 --- a/pkg/config/schema/yaml/internal_profiling.yaml +++ b/pkg/config/schema/yaml/internal_profiling.yaml @@ -45,7 +45,6 @@ properties: node_type: setting type: boolean default: false - comment: internal profiling extra_tags: node_type: setting type: array diff --git a/pkg/config/schema/yaml/orchestrator_explorer.yaml b/pkg/config/schema/yaml/orchestrator_explorer.yaml index 2da1395f3b7a..40ba073b6742 100644 --- a/pkg/config/schema/yaml/orchestrator_explorer.yaml +++ b/pkg/config/schema/yaml/orchestrator_explorer.yaml @@ -66,7 +66,6 @@ properties: node_type: setting type: boolean default: true - comment: Orchestrator Explorer DCA and core agent extra_tags: node_type: setting type: array diff --git a/pkg/config/schema/yaml/otelcollector.yaml b/pkg/config/schema/yaml/otelcollector.yaml index bdd237263afe..efb8bfb6a1fe 100644 --- a/pkg/config/schema/yaml/otelcollector.yaml +++ b/pkg/config/schema/yaml/otelcollector.yaml @@ -29,7 +29,6 @@ properties: node_type: setting type: boolean default: false - comment: OTel Collector extension_timeout: node_type: setting type: integer diff --git a/pkg/config/schema/yaml/process_config.yaml b/pkg/config/schema/yaml/process_config.yaml index d67a143294c1..a3c0e7428d44 100644 --- a/pkg/config/schema/yaml/process_config.yaml +++ b/pkg/config/schema/yaml/process_config.yaml @@ -395,10 +395,8 @@ properties: env_vars: - DD_PROCESS_CONFIG_ORCHESTRATOR_DD_URL - DD_PROCESS_AGENT_ORCHESTRATOR_DD_URL - comment: |- - Service discovery configuration - Orchestrator Explorer - process agent - DEPRECATED in favor of `orchestrator_explorer.orchestrator_dd_url` setting. If both are set `orchestrator_explorer.orchestrator_dd_url` will take precedence. + comment: DEPRECATED in favor of `orchestrator_explorer.orchestrator_dd_url` setting. + If both are set `orchestrator_explorer.orchestrator_dd_url` will take precedence. process_dd_url: node_type: setting type: string diff --git a/pkg/config/schema/yaml/remote_configuration.yaml b/pkg/config/schema/yaml/remote_configuration.yaml index bf5e480d38b8..91da6d01a58b 100644 --- a/pkg/config/schema/yaml/remote_configuration.yaml +++ b/pkg/config/schema/yaml/remote_configuration.yaml @@ -70,7 +70,6 @@ properties: node_type: setting type: boolean default: true - comment: Remote config products apm_semantics: node_type: section type: object diff --git a/pkg/config/schema/yaml/runtime_security_config.yaml b/pkg/config/schema/yaml/runtime_security_config.yaml index 634609a4ee7a..27597cd11c81 100644 --- a/pkg/config/schema/yaml/runtime_security_config.yaml +++ b/pkg/config/schema/yaml/runtime_security_config.yaml @@ -123,7 +123,6 @@ properties: node_type: setting type: boolean default: false - comment: CWS - general config endpoints: node_type: section type: object @@ -235,7 +234,6 @@ properties: windows: localhost:3335 other: ${install_path}/run/runtime-security.sock comment: |- - CWS - general config the following entries are platform specific - runtime_security_config.policies.dir - runtime_security_config.socket diff --git a/pkg/config/schema/yaml/sbom.yaml b/pkg/config/schema/yaml/sbom.yaml index 311ac6a3f148..0def74a875d7 100644 --- a/pkg/config/schema/yaml/sbom.yaml +++ b/pkg/config/schema/yaml/sbom.yaml @@ -15,7 +15,6 @@ properties: default: false visibility: public description: set to true to enable Cloud Security Management Vulnerability Management - comment: SBOM configuration host: node_type: section type: object @@ -30,7 +29,6 @@ properties: default: false visibility: public description: set to true to enable Infrastructure Vulnerabiltilies - comment: Host SBOM configuration additional_directories: node_type: setting type: array @@ -59,7 +57,6 @@ properties: default: false visibility: public description: Set to true to enable container image vulnerability scanning. - comment: Container image SBOM configuration additional_directories: node_type: setting type: array @@ -198,7 +195,6 @@ properties: node_type: setting type: boolean default: false - comment: Container file system SBOM configuration dd_url: node_type: setting type: string @@ -221,7 +217,6 @@ properties: node_type: setting type: boolean default: false - comment: SBOM enrichment configuration input_chan_size: node_type: setting type: integer diff --git a/pkg/config/setup/common_settings.go b/pkg/config/setup/common_settings.go index 87a6906deb25..3e4ed6575428 100644 --- a/pkg/config/setup/common_settings.go +++ b/pkg/config/setup/common_settings.go @@ -107,7 +107,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("disable_cluster_name_tag_key", false) config.BindEnvAndSetDefault("enabled_rfc1123_compliant_cluster_name_tag", true) - // secrets backend config.BindEnvAndSetDefault("secret_backend_type", "") config.BindEnvAndSetDefault("secret_backend_config", map[string]interface{}{}) config.BindEnvAndSetDefault("multi_secret_backends", map[string]interface{}{}) @@ -132,7 +131,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // Defaults to safe YAML methods in base and custom checks. config.BindEnvAndSetDefault("disable_unsafe_yaml", true) - // flare configs config.BindEnvAndSetDefault("flare_provider_timeout", 10*time.Second) config.BindEnvAndSetDefault("flare.rc_profiling.profile_duration", 30*time.Second) config.BindEnvAndSetDefault("flare.profile_overhead_runtime", 10*time.Second) @@ -141,7 +139,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("flare.rc_streamlogs.duration", 60*time.Second) - // Docker config.BindEnvAndSetDefault("docker_query_timeout", int64(5)) config.BindEnvAndSetDefault("docker_labels_as_tags", map[string]string{}) config.BindEnvAndSetDefault("docker_env_as_tags", map[string]string{}) @@ -178,13 +175,11 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("prometheus_scrape.checks", "") // Defines any extra prometheus/openmetrics check configurations to be handled by the prometheus config provider config.BindEnvAndSetDefault("prometheus_scrape.version", 1) // Version of the openmetrics check to be scheduled by the Prometheus auto-discovery - // Prometheus HTTP Service Discovery config.BindEnvAndSetDefault("prometheus_http_sd.configs", []map[string]interface{}{}) // List of HTTP SD endpoints to poll. Each entry must specify url and check_template. config.ParseEnvJSON("prometheus_http_sd.configs", []map[string]interface{}{}) // DD_PROMETHEUS_HTTP_SD_CONFIGS is a JSON-encoded list-of-objects. config.BindEnvAndSetDefault("prometheus_http_sd.url", "") // [DEPRECATED] URL of the Prometheus HTTP SD endpoint. Use prometheus_http_sd.configs instead. config.BindEnvAndSetDefault("prometheus_http_sd.check_template", "") // [DEPRECATED] JSON check template applied to each discovered target. Use prometheus_http_sd.configs instead. - // Network Devices Monitoring bindEnvAndSetLogsConfigKeys(config, "network_devices.metadata.") config.BindEnvAndSetDefault("network_devices.namespace", "default") @@ -244,7 +239,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("network_devices.snmp_traps.users", []map[string]string{}) config.BindEnvAndSetDefault("network_devices.snmp_traps.tags", []string{}) - // NetFlow config.BindEnvAndSetDefault("network_devices.netflow.enabled", false) config.SetDefault("network_devices.netflow.listeners", []map[string]interface{}{}) config.BindEnvAndSetDefault("network_devices.netflow.stop_timeout", 5) @@ -258,7 +252,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { bindEnvAndSetLogsConfigKeys(config, "network_devices.netflow.forwarder.") config.BindEnvAndSetDefault("network_devices.netflow.reverse_dns_enrichment_enabled", false) - // Network Path config.BindEnvAndSetDefault("network_path.connections_monitoring.enabled", false) config.BindEnvAndSetDefault("network_path.netflow_monitoring.enabled", false) config.BindEnvAndSetDefault("network_path.remote_config.enabled", false) @@ -290,15 +283,12 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { bindEnvAndSetLogsConfigKeys(config, "network_path.forwarder.") - // Network Config Management bindEnvAndSetLogsConfigKeys(config, "network_devices.config_management.forwarder.") config.BindEnvAndSetDefault("network_devices.config_management.rollback.enabled", false) - // HA Agent config.BindEnvAndSetDefault("ha_agent.enabled", false) config.BindEnvAndSetDefault("ha_agent.group", "") - // Kube ApiServer config.BindEnvAndSetDefault("kubernetes_kubeconfig_path", "") config.BindEnvAndSetDefault("kubernetes_apiserver_ca_path", "") config.BindEnvAndSetDefault("kubernetes_apiserver_tls_verify", true) @@ -310,7 +300,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("kube_resources_namespace", "") config.BindEnvAndSetDefault("kube_cache_sync_timeout_seconds", 10) - // Datadog cluster agent config.BindEnvAndSetDefault("cluster_agent.enabled", false) config.BindEnvAndSetDefault("cluster_agent.cmd_port", 5005) config.BindEnvAndSetDefault("cluster_agent.allow_legacy_tls", false) @@ -365,7 +354,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("cluster_agent.tracing.env", "") config.BindEnvAndSetDefault("cluster_agent.tracing.sample_rate", float64(0.1)) - // Processor mode and sidecar configuration config.BindEnvAndSetDefault("admission_controller.appsec.sidecar.image", "ghcr.io/datadog/dd-trace-go/service-extensions-callout") config.BindEnvAndSetDefault("admission_controller.appsec.sidecar.image_tag", "latest") config.BindEnvAndSetDefault("admission_controller.appsec.sidecar.port", 8080) @@ -378,7 +366,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("admission_controller.appsec.sidecar.uds_path", "/var/run/datadog/extproc.sock") config.BindEnvAndSetDefault("admission_controller.appsec.sidecar.run_as_user", 65532) - // ingress-nginx injection configuration config.BindEnvAndSetDefault("admission_controller.appsec.nginx.init_image", "datadog/ingress-nginx-injection") config.BindEnvAndSetDefault("admission_controller.appsec.nginx.module_mount_path", "/modules_mount") // Non-root UID/GID for the injected init container. Defaults match the @@ -428,15 +415,12 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // the entity id, typically set by dca admisson controller config mutator, used for external origin detection config.SetDefault("entity_id", "") - // Metadata endpoints - // Defines the maximum size of hostame gathered from EC2, GCE, Azure, Alibaba, Oracle and Tencent cloud metadata // endpoints (all cloudprovider except IBM). IBM cloud ignore this setting as their API return a huge JSON with // all the metadata for the VM. // Used internally to protect against configurations where metadata endpoints return incorrect values with 200 status codes. config.BindEnvAndSetDefault("metadata_endpoints_max_hostname_size", 255) - // EC2 config.BindEnvAndSetDefault("ec2_use_windows_prefix_detection", false) config.BindEnvAndSetDefault("ec2_metadata_timeout", 300) // value in milliseconds config.BindEnvAndSetDefault("ec2_metadata_token_lifetime", 21600) // value in seconds @@ -449,7 +433,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("exclude_ec2_tags", []string{}) config.BindEnvAndSetDefault("ec2_imdsv2_transition_payload_enabled", true) - // ECS config.BindEnvAndSetDefault("ecs_agent_url", "") // Will be autodetected config.BindEnvAndSetDefault("ecs_agent_container_name", "ecs-agent") config.BindEnvAndSetDefault("ecs_collect_resource_tags_ec2", false) @@ -464,7 +447,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("ecs_task_collection_burst", 60) config.BindEnvAndSetDefault("ecs_deployment_mode", "auto") - // GCE config.BindEnvAndSetDefault("collect_gce_tags", true) config.BindEnvAndSetDefault("exclude_gce_tags", []string{ "bosh_settings", "cli-cert", "common-psm1", "configure-sh", "containerd-configure-sh", @@ -476,7 +458,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("gce_send_project_id_tag", false) config.BindEnvAndSetDefault("gce_metadata_timeout", 1000) // value in milliseconds - // GPU config.BindEnvAndSetDefault("collect_gpu_tags", true) config.BindEnvAndSetDefault("gpu.enabled", false) config.BindEnvAndSetDefault("gpu.nvml_lib_path", "") @@ -492,7 +473,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // Binds DD_GPU_COLLECTION_INTERVAL_OVERRIDE. config.BindEnvAndSetDefault("gpu.collection_interval_override", 0) - // NCCL config.BindEnvAndSetDefault("gpu.nccl.enabled", false) config.BindEnvAndSetDefault("gpu.nccl.socket_path", "/var/run/datadog/nccl.socket") // host_socket_path is read by the helm chart and operator to decide whether @@ -507,7 +487,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // directory mount never collides with the APM/DSD config webhook's mount. config.BindEnvAndSetDefault("admission_controller.nccl_profiler.socket_dir", "/var/run/datadog-nccl") - // Cloud Foundry BBS config.BindEnvAndSetDefault("cloud_foundry_bbs.url", "https://bbs.service.cf.internal:8889") config.BindEnvAndSetDefault("cloud_foundry_bbs.poll_interval", 15) config.BindEnvAndSetDefault("cloud_foundry_bbs.ca_file", "") @@ -516,7 +495,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("cloud_foundry_bbs.env_include", []string{}) config.BindEnvAndSetDefault("cloud_foundry_bbs.env_exclude", []string{}) - // Cloud Foundry CC config.BindEnvAndSetDefault("cloud_foundry_cc.url", "https://cloud-controller-ng.service.cf.internal:9024") config.BindEnvAndSetDefault("cloud_foundry_cc.client_id", "") config.BindEnvAndSetDefault("cloud_foundry_cc.client_secret", "") @@ -524,25 +502,20 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("cloud_foundry_cc.skip_ssl_validation", false) config.BindEnvAndSetDefault("cloud_foundry_cc.apps_batch_size", 5000) - // Cloud Foundry Garden config.BindEnvAndSetDefault("cloud_foundry_garden.listen_network", "unix") config.BindEnvAndSetDefault("cloud_foundry_garden.listen_address", "/var/vcap/data/garden/garden.sock") - // Cloud Foundry Container Tagger config.BindEnvAndSetDefault("cloud_foundry_container_tagger.shell_path", "/bin/sh") config.BindEnvAndSetDefault("cloud_foundry_container_tagger.retry_count", 10) config.BindEnvAndSetDefault("cloud_foundry_container_tagger.retry_interval", 10) - // Azure config.BindEnvAndSetDefault("azure_hostname_style", "os") config.BindEnvAndSetDefault("azure_metadata_timeout", 300) config.BindEnvAndSetDefault("azure_metadata_api_version", "2021-02-01") - // IBM cloud // We use a long timeout here since the metadata and token API can be very slow sometimes. config.BindEnvAndSetDefault("ibm_metadata_timeout", 5) // value in seconds - // JMXFetch config.BindEnvAndSetDefault("jmx_custom_jars", []string{}) config.BindEnvAndSetDefault("jmx_java_tool_options", "") config.BindEnvAndSetDefault("jmx_use_cgroup_memory_limit", false) @@ -569,7 +542,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // Go_expvar server port config.BindEnvAndSetDefault("expvar_port", 5000) - // internal profiling config.BindEnvAndSetDefault("internal_profiling.enabled", false) config.BindEnvAndSetDefault("internal_profiling.profile_dd_url", "") config.BindEnvAndSetDefault("internal_profiling.unix_socket", "") // file system path to a unix socket, e.g. `/var/run/datadog/apm.socket` @@ -623,9 +595,7 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("external_metrics_provider.split_batches_with_backoff", false) // Splits batches and runs queries with errors individually with an exponential backoff config.BindEnvAndSetDefault("external_metrics_provider.num_workers", 2) // Number of workers spawned by controller (only when CRD is used) config.BindEnvAndSetDefault("external_metrics_provider.max_parallel_queries", 10) // Maximum number of parallel queries sent to Datadog simultaneously - // DatadogInstrumentation controller config.BindEnvAndSetDefault("instrumentation_crd_controller.enabled", false) - // Cluster check Autodiscovery config.BindEnvAndSetDefault("cluster_checks.support_hybrid_ignore_ad_tags", false) // TODO(CINT)(Agent 7.53+) Remove this flag when hybrid ignore_ad_tags is fully deprecated config.BindEnvAndSetDefault("cluster_checks.enabled", false) config.BindEnvAndSetDefault("cluster_checks.node_expiration_timeout", 30) // value in seconds @@ -647,7 +617,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("cluster_checks.stickiness_upper_limit", float64(1)) // Maximum stickiness bias applied regardless of workersNeeded. config.BindEnvAndSetDefault("cluster_checks.stickiness_lower_limit", float64(0.05)) // Minimum stickiness bias applied when stickiness is enabled. - // Cluster check runner config.BindEnvAndSetDefault("clc_runner_enabled", false) config.BindEnvAndSetDefault("clc_runner_id", "") config.BindEnvAndSetDefault("clc_runner_host", "") // must be set using the Kubernetes downward API @@ -677,14 +646,11 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // emitting different resource metrics. config.BindEnvAndSetDefault("clc_runner_remote_tagger_enabled", true) - // Remote tagger config.BindEnvAndSetDefault("remote_tagger.max_concurrent_sync", 3) - // CSI driver config.BindEnvAndSetDefault("csi.enabled", false) config.BindEnvAndSetDefault("csi.driver", "k8s.csi.datadoghq.com") - // Admission controller config.BindEnvAndSetDefault("admission_controller.enabled", false) config.BindEnvAndSetDefault("admission_controller.validation.enabled", true) config.BindEnvAndSetDefault("admission_controller.mutation.enabled", true) @@ -796,7 +762,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("provider_kind", "") - // Orchestrator Explorer DCA and core agent config.BindEnvAndSetDefault("orchestrator_explorer.enabled", true) // enabling/disabling the environment variables & command scrubbing from the container specs // this option will potentially impact the CPU usage of the agent @@ -823,11 +788,9 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("orchestrator_explorer.kubelet_config_check.enabled", true, "DD_ORCHESTRATOR_EXPLORER_KUBELET_CONFIG_CHECK_ENABLED") config.BindEnvAndSetDefault("auto_team_tag_collection", true) - // Container lifecycle configuration config.BindEnvAndSetDefault("container_lifecycle.enabled", true) bindEnvAndSetLogsConfigKeys(config, "container_lifecycle.") - // Container image configuration config.BindEnvAndSetDefault("container_image.enabled", true) bindEnvAndSetLogsConfigKeys(config, "container_image.") @@ -835,14 +798,11 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // check is disabled. config.BindEnvAndSetDefault("workloadmeta.local_process_collector.collection_interval", 1*time.Minute) - // SBOM configuration config.BindEnvAndSetDefault("sbom.enabled", false) bindEnvAndSetLogsConfigKeys(config, "sbom.") - // Generic resources configuration bindEnvAndSetLogsConfigKeys(config, "genresources.") - // Synthetics configuration config.BindEnvAndSetDefault("synthetics.collector.enabled", false) config.BindEnvAndSetDefault("synthetics.collector.workers", 4) config.BindEnvAndSetDefault("synthetics.collector.flush_interval", "10s") @@ -857,7 +817,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("sbom.scan_queue.base_backoff", "5m") config.BindEnvAndSetDefault("sbom.scan_queue.max_backoff", "1h") - // Container image SBOM configuration config.BindEnvAndSetDefault("sbom.container_image.enabled", false) config.BindEnvAndSetDefault("sbom.container_image.use_mount", false) config.BindEnvAndSetDefault("sbom.container_image.scan_interval", 0) // Integer seconds @@ -874,35 +833,28 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("sbom.container_image.additional_directories", []string{}) config.BindEnvAndSetDefault("sbom.container_image.use_spread_refresher", false) - // Container file system SBOM configuration config.BindEnvAndSetDefault("sbom.container.enabled", false) - // Host SBOM configuration config.BindEnvAndSetDefault("sbom.host.enabled", false) config.BindEnvAndSetDefault("sbom.host.analyzers", []string{"os"}) config.BindEnvAndSetDefault("sbom.host.additional_directories", []string{}) - // SBOM enrichment configuration config.BindEnvAndSetDefault("sbom.enrichment.usage.enabled", false) - // Service discovery configuration bindEnvAndSetLogsConfigKeys(config, "service_discovery.forwarder.") - // Orchestrator Explorer - process agent // DEPRECATED in favor of `orchestrator_explorer.orchestrator_dd_url` setting. If both are set `orchestrator_explorer.orchestrator_dd_url` will take precedence. config.BindEnvAndSetDefault("process_config.orchestrator_dd_url", "", "DD_PROCESS_CONFIG_ORCHESTRATOR_DD_URL", "DD_PROCESS_AGENT_ORCHESTRATOR_DD_URL") // DEPRECATED in favor of `orchestrator_explorer.orchestrator_additional_endpoints` setting. If both are set `orchestrator_explorer.orchestrator_additional_endpoints` will take precedence. config.SetDefault("process_config.orchestrator_additional_endpoints", map[string][]string{}) config.BindEnvAndSetDefault("orchestrator_explorer.extra_tags", []string{}) - // Network config.BindEnvAndSetDefault("network.id", "") // Process manager (dd-procmgrd): on Windows the core agent starts dd-procmgr-service when enabled. // On Linux, dd-procmgrd is managed by systemd (datadog-agent-procmgr.service); this setting is ignored there. config.BindEnvAndSetDefault("process_manager.enabled", true) - // OTel Collector config.BindEnvAndSetDefault("otelcollector.enabled", false) config.BindEnvAndSetDefault("otelcollector.extension_url", "https://localhost:7777") config.BindEnvAndSetDefault("otelcollector.extension_timeout", 0) // in seconds, 0 for default value @@ -917,11 +869,10 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // or connected mode (expects core agent for secrets and tagger) config.BindEnvAndSetDefault("otel_standalone", false) - // inventories config.BindEnvAndSetDefault("inventories_enabled", true) - config.BindEnvAndSetDefault("inventories_configuration_enabled", true) // controls the agent configurations - config.BindEnvAndSetDefault("inventories_checks_configuration_enabled", true) // controls the checks configurations - config.BindEnvAndSetDefault("inventories_collect_cloud_provider_account_id", true) // collect collection of `cloud_provider_account_id` + config.BindEnvAndSetDefault("inventories_configuration_enabled", true) + config.BindEnvAndSetDefault("inventories_checks_configuration_enabled", true) + config.BindEnvAndSetDefault("inventories_collect_cloud_provider_account_id", true) // when updating the default here also update pkg/metadata/inventories/README.md config.BindEnvAndSetDefault("inventories_max_interval", 0) // 0 == default interval from inventories config.BindEnvAndSetDefault("inventories_min_interval", 0) // 0 == default interval from inventories @@ -929,7 +880,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("inventories_first_run_delay", 60) config.BindEnvAndSetDefault("metadata_ip_resolution_from_hostname", false) // resolve the hostname to get the IP address - // Datadog security agent (common) config.BindEnvAndSetDefault("security_agent.cmd_port", DefaultSecurityAgentCmdPort) config.BindEnvAndSetDefault("security_agent.expvar_port", 5011) config.BindEnvAndSetDefault("security_agent.log_file", "${log_path}/security-agent.log") @@ -954,7 +904,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("security_agent.internal_profiling.unix_socket", "") config.BindEnvAndSetDefault("security_agent.internal_profiling.extra_tags", []string{}) - // Datadog security agent (compliance) config.BindEnvAndSetDefault("compliance_config.enabled", false) config.BindEnvAndSetDefault("compliance_config.run_in_system_probe", false) config.BindEnvAndSetDefault("compliance_config.xccdf.enabled", false) // deprecated, use host_benchmarks instead @@ -971,7 +920,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("compliance_config.container_exclude", []string{}) config.BindEnvAndSetDefault("compliance_config.exclude_pause_container", true) - // Datadog security agent (runtime) config.BindEnvAndSetDefault("runtime_security_config.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.socket", GetPlatformDefault(map[string]interface{}{ "windows": "localhost:3335", @@ -984,7 +932,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("runtime_security_config.direct_send_from_system_probe", false) config.BindEnvAndSetDefault("runtime_security_config.event_grpc_server", "") - // command line options config.SetDefault("cmd.check.fullsketches", false) // Windows Performance Counter refresh interval in seconds (introduced in 7.40, narrowed down @@ -1013,10 +960,8 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // The default value of 20 means the Agent will retry counter intialization for roughly 5 minutes. config.BindEnvAndSetDefault("windows_counter_init_failure_limit", 20) - // Datadog Agent Manager System Tray config.BindEnvAndSetDefault("system_tray.log_file", "${log_path}/ddtray.log") - // Language Detection config.BindEnvAndSetDefault("language_detection.enabled", false) config.BindEnvAndSetDefault("language_detection.reporting.enabled", true) // buffer period represents how frequently newly detected languages buffer is flushed by reporting its content to the language detection handler in the cluster agent @@ -1031,7 +976,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("appsec.proxy.auto_detect", true) config.BindEnvAndSetDefault("appsec.proxy.proxies", []string{}) - // Installer configuration config.BindEnvAndSetDefault("remote_updates", true) config.BindEnvAndSetDefault("installer.mirror", "") config.BindEnvAndSetDefault("installer.registry.url", "") @@ -1044,13 +988,10 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // Legacy installer configuration config.SetDefault("remote_policies", false) - // Data Jobs Monitoring config config.BindEnvAndSetDefault("djm_config.enabled", false) - // Data Observability bindEnvAndSetLogsConfigKeys(config, "data_observability.forwarder.") - // Reverse DNS Enrichment config.BindEnvAndSetDefault("reverse_dns_enrichment.workers", 10) config.BindEnvAndSetDefault("reverse_dns_enrichment.chan_size", 5000) config.BindEnvAndSetDefault("reverse_dns_enrichment.rate_limiter.enabled", true) @@ -1102,14 +1043,11 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // more efficient than the Agent. Forwarded to ADP over the config stream. config.BindEnvAndSetDefault("data_plane.serializer_zstd_compressor_level", 3) - // Agent Workload Filtering config config.BindEnvAndSetDefault("cel_workload_exclude", []interface{}{}) - // Shared library check config.BindEnvAndSetDefault("shared_library_check.enabled", false) config.BindEnvAndSetDefault("shared_library_check.library_folder_path", "${conf_path}/checks.d") - // Vsock config.BindEnvAndSetDefault("vsock_addr", "") // Delegated authentication (global) @@ -1117,7 +1055,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // Enabled automatically when org_uuid is specified bindDelegatedAuthConfig(config, "") - // Filterlist config.BindEnvAndSetDefault("metric_filterlist", []string{}) config.BindEnvAndSetDefault("statsd_metric_blocklist", []string{}) config.BindEnvAndSetDefault("metric_filterlist_match_prefix", false) @@ -1127,8 +1064,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // Set to false to apply tag stripping regardless of whether ADP is running. config.BindEnvAndSetDefault("metric_tag_filterlist_adp_only", true) - // Integration security - // When enabled, integrations will ignore configuration parameters that refer to file paths // Ignore file path params from untrusted providers (e.g. labels, annotations) when enabled. config.BindEnvAndSetDefault("integration_ignore_untrusted_file_params", false) @@ -1142,7 +1077,6 @@ func initCoreAgentFull(config pkgconfigmodel.Setup) { // Integrations excluded from these restrictions. config.BindEnvAndSetDefault("integration_security_excluded_checks", []string{}) - // Host Profiler config config.BindEnvAndSetDefault("hostprofiler.debug.verbosity", "") config.BindEnvAndSetDefault("hostprofiler.additional_http_headers", map[string]string{}) config.BindEnvAndSetDefault("hostprofiler.ddprofiling.enabled", false) @@ -1337,20 +1271,16 @@ func agent(config pkgconfigmodel.Setup) { // Core agent (disabled for Error Tracking Standalone, Logs Collection Only) config.BindEnvAndSetDefault("core_agent.enabled", true) - // Config files discovery config.BindEnvAndSetDefault("config_files_discovery.enabled", false) bindEnvAndSetLogsConfigKeys(config, "config_files_discovery.forwarder.") - // Software Inventory config.BindEnvAndSetDefault("software_inventory.enabled", false) config.BindEnvAndSetDefault("software_inventory.jitter", 60) config.BindEnvAndSetDefault("software_inventory.interval", 10) bindEnvAndSetLogsConfigKeys(config, "software_inventory.forwarder.") - // Notable Events (EUDM) config.BindEnvAndSetDefault("notable_events.enabled", false) - // Logon Duration (EUDM) config.BindEnvAndSetDefault("logon_duration.enabled", false) // Event Management v2 API @@ -1366,7 +1296,6 @@ func fleet(config pkgconfigmodel.Setup) { } func autoscaling(config pkgconfigmodel.Setup) { - // Workload autoscaling product config.BindEnvAndSetDefault("autoscaling.workload.enabled", false) config.BindEnvAndSetDefault("autoscaling.failover.enabled", false) config.BindEnvAndSetDefault("autoscaling.workload.limit", 1000) @@ -1378,10 +1307,8 @@ func autoscaling(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("autoscaling.workload.in_place_vertical_scaling.disruption_tolerance_percent", 15) config.BindEnvAndSetDefault("autoscaling.failover.metrics", []string{"container.memory.usage", "container.cpu.usage"}) - // Cluster autoscaling product config.BindEnvAndSetDefault("autoscaling.cluster.enabled", false) - // Spot scheduling config.BindEnvAndSetDefault("autoscaling.cluster.spot.enabled", false) config.BindEnvAndSetDefault("autoscaling.cluster.spot.defaults.percentage", 100) config.BindEnvAndSetDefault("autoscaling.cluster.spot.defaults.min_on_demand_replicas", 0) @@ -1389,7 +1316,6 @@ func autoscaling(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("autoscaling.cluster.spot.fallback_duration", "2m") config.BindEnvAndSetDefault("autoscaling.cluster.spot.rebalance_stabilization_period", "1m") - // Kubernetes actions config.BindEnvAndSetDefault("kubeactions.enabled", false) // TODO(kubeactions): Update hostnameEndpointPrefix to "kubeops-intake." once provisioned bindEnvAndSetLogsConfigKeys(config, "kubeactions.forwarder.") @@ -1419,7 +1345,6 @@ func remoteconfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("remote_configuration.max_backoff_interval", 2*time.Minute) config.BindEnvAndSetDefault("remote_configuration.clients.ttl_seconds", 30*time.Second) config.BindEnvAndSetDefault("remote_configuration.clients.cache_bypass_limit", 5) - // Remote config products config.BindEnvAndSetDefault("remote_configuration.apm_sampling.enabled", true) // agent_config.enabled gates the trace-agent's AGENT_CONFIG subscription. // Defaults to true. The trace-agent additionally inherits @@ -1519,7 +1444,6 @@ func telemetry(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("telemetry.offlinereporter.enabled", false) config.BindEnvAndSetDefault("telemetry.offlinereporter.heartbeat_interval", "5s") - // Agent Telemetry config.BindEnvAndSetDefault("agent_telemetry.enabled", true) // default compression first setup inside the next bindEnvAndSetLogsConfigKeys() function ... bindEnvAndSetLogsConfigKeys(config, "agent_telemetry.") @@ -1629,14 +1553,12 @@ func forwarder(config pkgconfigmodel.Setup) { // them immediately (false). config.BindEnvAndSetDefault("forwarder_stop_wait_for_inflight", false) config.BindEnvAndSetDefault("forwarder_max_concurrent_requests", 10) - // Forwarder retry settings config.BindEnvAndSetDefault("forwarder_backoff_factor", 2) config.BindEnvAndSetDefault("forwarder_backoff_base", 2) config.BindEnvAndSetDefault("forwarder_backoff_max", 64) config.BindEnvAndSetDefault("forwarder_recovery_interval", DefaultForwarderRecoveryInterval) config.BindEnvAndSetDefault("forwarder_recovery_reset", false) - // Forwarder storage on disk config.BindEnvAndSetDefault("forwarder_storage_path", "${run_path}/transactions_to_retry") config.BindEnvAndSetDefault("forwarder_outdated_file_in_days", 10) config.BindEnvAndSetDefault("forwarder_flush_to_disk_mem_ratio", float64(0.5)) @@ -1644,7 +1566,6 @@ func forwarder(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("forwarder_storage_max_disk_ratio", float64(0.80)) // Do not store transactions on disk when the disk usage exceeds 80% of the disk capacity. Use 80% as some applications do not behave well when the disk space is very small. config.BindEnvAndSetDefault("forwarder_retry_queue_capacity_time_interval_sec", 900) // 15 mins - // Forwarder channels buffer size config.BindEnvAndSetDefault("forwarder_high_prio_buffer_size", 100) config.BindEnvAndSetDefault("forwarder_low_prio_buffer_size", 100) config.BindEnvAndSetDefault("forwarder_requeue_buffer_size", 100) @@ -2038,14 +1959,12 @@ func logsagent(config pkgconfigmodel.Setup) { // vector integration func vector(config pkgconfigmodel.Setup) { - // metrics options config.BindEnvAndSetDefault("observability_pipelines_worker.metrics.enabled", false) config.BindEnvAndSetDefault("observability_pipelines_worker.metrics.url", "") config.BindEnvAndSetDefault("vector.metrics.enabled", false) config.BindEnvAndSetDefault("vector.metrics.url", "") config.BindEnvAndSetDefault("observability_pipelines_worker.metrics.use_v3_api.series", false) config.BindEnvAndSetDefault("vector.metrics.use_v3_api.series", false) - // logs options config.BindEnvAndSetDefault("observability_pipelines_worker.logs.enabled", false) config.BindEnvAndSetDefault("observability_pipelines_worker.logs.url", "") config.BindEnvAndSetDefault("vector.logs.enabled", false) diff --git a/pkg/config/setup/config.go b/pkg/config/setup/config.go index 31e9cc8bea9c..ca05c4fd1c02 100644 --- a/pkg/config/setup/config.go +++ b/pkg/config/setup/config.go @@ -881,23 +881,18 @@ func setupFipsEndpoints(config pkgconfigmodel.Config) error { // The following overwrites should be kept in sync with the documentation for the fips.enabled config // setting in pkg/config/schema/yaml/. - // Metrics config.Set("dd_url", protocol+urlFor(metrics), pkgconfigmodel.SourceAgentRuntime) - // Logs setupFipsLogsConfig(config, "logs_config.", urlFor(logs)) config.Set("logs_config.use_http", true, pkgconfigmodel.SourceAgentRuntime) - // APM config.Set("apm_config.apm_dd_url", protocol+urlFor(traces), pkgconfigmodel.SourceAgentRuntime) // Adding "/api/v2/profile" because it's not added to the 'apm_config.profiling_dd_url' value by the Agent config.Set("apm_config.profiling_dd_url", protocol+urlFor(profiles)+"/api/v2/profile", pkgconfigmodel.SourceAgentRuntime) config.Set("apm_config.telemetry.dd_url", protocol+urlFor(instrumentationTelemetry), pkgconfigmodel.SourceAgentRuntime) - // Processes config.Set("process_config.process_dd_url", protocol+urlFor(processes), pkgconfigmodel.SourceAgentRuntime) - // Database monitoring // Historically we used a different port for samples because the intake hostname defined in epforwarder.go was different // (even though the underlying IPs were the same as the ones for DBM metrics intake hostname). We're keeping 2 ports for backward compatibility reason. setupFipsLogsConfig(config, "database_monitoring.metrics.", urlFor(databasesMonitoringMetrics)) @@ -908,13 +903,10 @@ func setupFipsEndpoints(config pkgconfigmodel.Config) error { setupFipsLogsConfig(config, "network_devices.snmp_traps.forwarder.", urlFor(networkDevicesSnmpTraps)) setupFipsLogsConfig(config, "network_devices.netflow.forwarder.", urlFor(networkDevicesNetflow)) - // Orchestrator Explorer config.Set("orchestrator_explorer.orchestrator_dd_url", protocol+urlFor(orchestratorExplorer), pkgconfigmodel.SourceAgentRuntime) - // CWS setupFipsLogsConfig(config, "runtime_security_config.endpoints.", urlFor(runtimeSecurity)) - // Compliance setupFipsLogsConfig(config, "compliance_config.endpoints.", urlFor(compliance)) return nil diff --git a/pkg/config/setup/system_probe_settings.go b/pkg/config/setup/system_probe_settings.go index 414d8b7fe977..b01561ccc924 100644 --- a/pkg/config/setup/system_probe_settings.go +++ b/pkg/config/setup/system_probe_settings.go @@ -17,16 +17,13 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("go_core_dump", false) config.BindEnvAndSetDefault("system_probe_config.disable_thp", true) - // Auto exit configuration config.BindEnvAndSetDefault("auto_exit.validation_period", 60) config.BindEnvAndSetDefault("auto_exit.noprocess.enabled", false) config.BindEnvAndSetDefault("auto_exit.noprocess.excluded_processes", []string{}) - // statsd config.BindEnvAndSetDefault("bind_host", "localhost") config.BindEnvAndSetDefault("dogstatsd_port", 8125) - // logging config.BindEnvAndSetDefault("system_probe_config.log_file", "") config.BindEnvAndSetDefault("system_probe_config.log_level", "") config.BindEnvAndSetDefault("log_file", "${log_path}/system-probe.log") @@ -41,7 +38,6 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("disable_file_logging", false) config.BindEnvAndSetDefault("log_format_rfc3339", false) - // secrets backend config.BindEnvAndSetDefault("secret_backend_command", "") config.BindEnvAndSetDefault("secret_backend_arguments", []string{}) config.BindEnvAndSetDefault("secret_backend_output_max_size", 1024*1024) @@ -49,7 +45,6 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("secret_backend_command_allow_group_exec_perm", false) config.BindEnvAndSetDefault("secret_backend_skip_checks", false) - // settings for system-probe in general config.BindEnvAndSetDefault("system_probe_config.enabled", false, "DD_SYSTEM_PROBE_ENABLED") config.BindEnvAndSetDefault("system_probe_config.external", false, "DD_SYSTEM_PROBE_EXTERNAL") config.SetDefault("system_probe_config.adjusted", false) @@ -89,7 +84,6 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("system_probe_config.memory_controller.pressure_levels", map[string]string{}) config.BindEnvAndSetDefault("system_probe_config.memory_controller.thresholds", map[string]string{}) - // ebpf general settings config.BindEnvAndSetDefault("system_probe_config.bpf_debug", false, "DD_SYSTEM_PROBE_CONFIG_BPF_DEBUG", "BPF_DEBUG") config.BindEnvAndSetDefault("system_probe_config.bpf_dir", "${install_path}/embedded/share/system-probe/ebpf", "DD_SYSTEM_PROBE_BPF_DIR") config.BindEnvAndSetDefault("system_probe_config.excluded_linux_versions", []string{}) @@ -112,7 +106,6 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("system_probe_config.zypper_repos_dir", suffixHostEtc(defaultZypperReposDirSuffix), "DD_ZYPPER_REPOS_DIR") config.BindEnvAndSetDefault("system_probe_config.attach_kprobes_with_kprobe_events_abi", false, "DD_ATTACH_KPROBES_WITH_KPROBE_EVENTS_ABI") - // Dynamic Instrumentation settings config.BindEnvAndSetDefault("dynamic_instrumentation.enabled", false, "DD_DYNAMIC_INSTRUMENTATION_ENABLED") config.BindEnvAndSetDefault("dynamic_instrumentation.offline_mode", false, "DD_DYNAMIC_INSTRUMENTATION_OFFLINE_MODE") config.BindEnvAndSetDefault("dynamic_instrumentation.probes_file_path", false, "DD_DYNAMIC_INSTRUMENTATION_PROBES_FILE_PATH") @@ -129,7 +122,6 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("dynamic_instrumentation.circuit_breaker.all_probes_cpu_limit", float64(0.5)) config.BindEnvAndSetDefault("dynamic_instrumentation.circuit_breaker.interrupt_overhead", 2*time.Microsecond) - // network_tracer settings config.BindEnvAndSetDefault("network_config.enabled", false, "DD_SYSTEM_PROBE_NETWORK_ENABLED") config.BindEnvAndSetDefault("system_probe_config.disable_tcp", false, "DD_DISABLE_TCP_TRACING") config.BindEnvAndSetDefault("system_probe_config.disable_udp", false, "DD_DISABLE_UDP_TRACING") @@ -216,25 +208,18 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("network_config.enable_fentry", false) config.BindEnvAndSetDefault("network_config.enable_sk_tracer", false) - // TLS cert collection config.BindEnvAndSetDefault("network_config.enable_cert_collection", false) config.BindEnvAndSetDefault("network_config.cert_collection_map_cleaner_interval", 30*time.Second) - // windows config config.BindEnvAndSetDefault("system_probe_config.windows.enable_monotonic_count", false) - // oom_kill module config.BindEnvAndSetDefault("system_probe_config.enable_oom_kill", false) - // tcp_queue_length module config.BindEnvAndSetDefault("system_probe_config.enable_tcp_queue_length", false) - // process module // nested within system_probe_config to not conflict with process-agent's process_config config.BindEnvAndSetDefault("system_probe_config.process_config.enabled", false, "DD_SYSTEM_PROBE_PROCESS_ENABLED") - // ebpf module config.BindEnvAndSetDefault("ebpf_check.enabled", false) config.BindEnvAndSetDefault("ebpf_check.kernel_bpf_stats", false) - // noisy neighbor module config.BindEnvAndSetDefault("noisy_neighbor.enabled", false) // Per-PMU-event toggles. Default false because each enabled event // adds non-trivial overhead. @@ -246,7 +231,6 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("noisy_neighbor.pmu_metrics.branch_misses", false) config.BindEnvAndSetDefault("noisy_neighbor.pmu_metrics.cpu_migrations", false) - // settings for the entry count of the ebpfcheck // control the size of the buffers used for the batch lookups of the ebpf maps config.BindEnvAndSetDefault("ebpf_check.entry_count.max_keys_buffer_size_bytes", 512*1024) config.BindEnvAndSetDefault("ebpf_check.entry_count.max_values_buffer_size_bytes", 1024*1024) @@ -257,7 +241,6 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { // single-item iteration config.BindEnvAndSetDefault("ebpf_check.entry_count.entries_for_iteration_restart_detection", 100) - // event monitoring config.BindEnvAndSetDefault("event_monitoring_config.network_process.enabled", true, "DD_SYSTEM_PROBE_EVENT_MONITORING_NETWORK_PROCESS_ENABLED") eventMonitorBindEnvAndSetDefault(config, "event_monitoring_config.enable_all_probes", false) eventMonitorBindEnvAndSetDefault(config, "event_monitoring_config.enable_kernel_filters", true) @@ -317,19 +300,14 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { // enable/disable use of root net namespace config.BindEnvAndSetDefault("network_config.enable_root_netns", true) - // Windows crash detection config.BindEnvAndSetDefault("windows_crash_detection.enabled", false) - // Ping config.BindEnvAndSetDefault("ping.enabled", false) - // Traceroute config.BindEnvAndSetDefault("traceroute.enabled", false) - // CCM config config.BindEnvAndSetDefault("ccm_network_config.enabled", false) - // Discovery config config.BindEnvAndSetDefault("discovery.enabled", GetPlatformDefault(map[string]interface{}{ "fargate": false, "linux": true, @@ -346,16 +324,13 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("discovery.service_collection_min_process_age", time.Minute) config.BindEnvAndSetDefault("discovery.service_map.enabled", false) - // Privileged Logs config config.BindEnvAndSetDefault("privileged_logs.enabled", false) // Logon Duration config (macOS) config.BindEnvAndSetDefault("logon_duration.enabled", false) - // Fleet policies config.BindEnvAndSetDefault("fleet_policies_dir", "") - // GPU monitoring config.BindEnvAndSetDefault("gpu_monitoring.enabled", false) config.BindEnvAndSetDefault("gpu_monitoring.enable_ebpf_probes", true) config.BindEnvAndSetDefault("gpu_monitoring.nvml_lib_path", "") @@ -376,7 +351,6 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { // Windows Injector telemetry, enabled by default config.BindEnvAndSetDefault("injector.enable_telemetry", true) - // gpu - stream config config.BindEnvAndSetDefault("gpu_monitoring.streams.max_kernel_launches", 1000) config.BindEnvAndSetDefault("gpu_monitoring.streams.max_mem_alloc_events", 1000) config.BindEnvAndSetDefault("gpu_monitoring.streams.max_pending_kernel_spans", 1000) @@ -388,7 +362,6 @@ func initMainSystemProbeConfig(config pkgconfigmodel.Setup) { } func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { - // CWS - general config // the following entries are platform specific // - runtime_security_config.policies.dir // - runtime_security_config.socket @@ -401,7 +374,6 @@ func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { "windows": "${conf_path}/runtime-security.d", })) - // CWS - general config config.BindEnvAndSetDefault("runtime_security_config.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.fim_enabled", false) config.BindEnvAndSetDefault("runtime_security_config.policies.monitor.enabled", false) @@ -441,7 +413,6 @@ func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { config.SetDefault("runtime_security_config.windows_write_event_rate_limiter_max_allowed", 4096) config.SetDefault("runtime_security_config.windows_write_event_rate_limiter_period", "1s") - // CWS - activity dump config.BindEnvAndSetDefault("runtime_security_config.activity_dump.enabled", true) config.BindEnvAndSetDefault("runtime_security_config.activity_dump.trace_systemd_cgroups", false) config.BindEnvAndSetDefault("runtime_security_config.activity_dump.cleanup_period", "30s") @@ -468,7 +439,6 @@ func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("runtime_security_config.activity_dump.workload_deny_list", []string{}) config.BindEnvAndSetDefault("runtime_security_config.activity_dump.auto_suppression.enabled", true) - // CWS - SBOM config.BindEnvAndSetDefault("runtime_security_config.sbom.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.sbom.workloads_cache_size", 10) config.BindEnvAndSetDefault("runtime_security_config.sbom.enrichment_interval", "1m") @@ -477,7 +447,6 @@ func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("runtime_security_config.sbom.host.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.sbom.generate_policies", false) - // CWS - Event sampling (per-type) config.BindEnvAndSetDefault("runtime_security_config.event_sampling.open.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.event_sampling.open.rate", 500) config.BindEnvAndSetDefault("runtime_security_config.event_sampling.connect.enabled", false) @@ -487,7 +456,6 @@ func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("runtime_security_config.event_sampling.dns.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.event_sampling.dns.rate", 500) - // CWS - Security Profiles config.BindEnvAndSetDefault("runtime_security_config.security_profile.enabled", true) config.BindEnvAndSetDefault("runtime_security_config.security_profile.v2.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.security_profile.max_image_tags", 20) @@ -499,17 +467,14 @@ func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("runtime_security_config.security_profile.node_eviction_timeout", "0s") // Disabled for now - waiting for another PR to be merged config.BindEnvAndSetDefault("runtime_security_config.security_profile.profile_cleanup_delay", "60m") - // CWS - Security Profile V2 config.BindEnvAndSetDefault("runtime_security_config.security_profile.v2.event_types", []string{"exec", "dns", "bind", "connect", "open"}) config.BindEnvAndSetDefault("runtime_security_config.security_profile.v2.sample_refresh_period", "30s") config.BindEnvAndSetDefault("runtime_security_config.security_profile.v2.excluded_images", []string{}) config.BindEnvAndSetDefault("runtime_security_config.security_profile.v2.max_dump_size", 5120) - // CWS - Auto suppression config.BindEnvAndSetDefault("runtime_security_config.security_profile.auto_suppression.enabled", true) config.BindEnvAndSetDefault("runtime_security_config.security_profile.auto_suppression.event_types", []string{"exec", "dns"}) - // CWS - Anomaly detection config.BindEnvAndSetDefault("runtime_security_config.security_profile.anomaly_detection.event_types", []string{"exec"}) config.BindEnvAndSetDefault("runtime_security_config.security_profile.anomaly_detection.default_minimum_stable_period", "900s") config.BindEnvAndSetDefault("runtime_security_config.security_profile.anomaly_detection.minimum_stable_period.exec", "900s") @@ -524,7 +489,6 @@ func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("runtime_security_config.security_profile.anomaly_detection.silent_rule_events.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.security_profile.anomaly_detection.enabled", true) - // CWS - Hash algorithms config.BindEnvAndSetDefault("runtime_security_config.hash_resolver.enabled", true) config.BindEnvAndSetDefault("runtime_security_config.hash_resolver.event_types", []string{"exec", "open"}) config.BindEnvAndSetDefault("runtime_security_config.hash_resolver.max_file_size", (1<<20)*5) // 5 MB @@ -533,7 +497,6 @@ func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("runtime_security_config.hash_resolver.cache_size", 500) config.BindEnvAndSetDefault("runtime_security_config.hash_resolver.replace", map[string]string{}) - // CWS - SysCtl config.BindEnvAndSetDefault("runtime_security_config.sysctl.enabled", true) config.BindEnvAndSetDefault("runtime_security_config.sysctl.ebpf.enabled", true) config.BindEnvAndSetDefault("runtime_security_config.sysctl.snapshot.enabled", true) @@ -541,23 +504,18 @@ func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("runtime_security_config.sysctl.snapshot.ignored_base_names", []string{"netdev_rss_key", "stable_secret"}) config.BindEnvAndSetDefault("runtime_security_config.sysctl.snapshot.kernel_compilation_flags", []string{}) - // CWS - UserSessions config.BindEnvAndSetDefault("runtime_security_config.user_sessions.ssh.enabled", true) config.BindEnvAndSetDefault("runtime_security_config.user_sessions.cache_size", 1024) - // CWS - Capture all syscall errors // When enabled, the eBPF IS_UNHANDLED_ERROR filter treats every negative syscall // return as handled (constant patched at probe load). Defaults to false. config.BindEnvAndSetDefault("runtime_security_config.syscalls.capture_all_errors.enabled", false) - // CWS -eBPF Less config.BindEnvAndSetDefault("runtime_security_config.ebpfless.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.ebpfless.socket", constants.DefaultEBPFLessProbeAddr) - // CWS - IMDS config.BindEnvAndSetDefault("runtime_security_config.imds_ipv4", "169.254.169.254") - // CWS enforcement capabilities config.BindEnvAndSetDefault("runtime_security_config.enforcement.enabled", true) config.BindEnvAndSetDefault("runtime_security_config.enforcement.raw_syscall.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.enforcement.exclude_binaries", []string{}) @@ -569,16 +527,12 @@ func initCWSSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("runtime_security_config.enforcement.disarmer.executable.max_allowed", 5) config.BindEnvAndSetDefault("runtime_security_config.enforcement.disarmer.executable.period", "1m") - // CWS - File metadata config.BindEnvAndSetDefault("runtime_security_config.file_metadata_resolver.enabled", false) config.BindEnvAndSetDefault("runtime_security_config.network_monitoring.enabled", false) } func initUSMSystemProbeConfig(config pkgconfigmodel.Setup) { - // ======================================== - // General USM Configuration - // ======================================== config.BindEnvAndSetDefault("service_monitoring_config.enabled", false, "DD_SYSTEM_PROBE_SERVICE_MONITORING_ENABLED") // max_concurrent_requests default of 0 is intentional: adjustUSM applies a // dynamic default (max_tracked_connections) via applyDefault when this key @@ -600,9 +554,6 @@ func initUSMSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("service_monitoring_config.direct_consumer.channel_size", 1000) config.BindEnvAndSetDefault("service_monitoring_config.direct_consumer.kernel_buffer_size_per_cpu", 65536) // 64KB per CPU base size - // ======================================== - // HTTP Protocol Configuration - // ======================================== // New tree structure with backward compatibility config.BindEnvAndSetDefault("service_monitoring_config.http.enabled", true) // Deprecated flat keys for backward compatibility @@ -641,7 +592,6 @@ func initUSMSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("service_monitoring_config.http.use_direct_consumer", true) - // HTTP replace rules configuration config.BindEnvAndSetDefault("service_monitoring_config.http.replace_rules", []map[string]string{}) // Deprecated flat keys for backward compatibility config.BindEnvAndSetDefault("service_monitoring_config.http_replace_rules", []map[string]string{}) @@ -651,10 +601,6 @@ func initUSMSystemProbeConfig(config pkgconfigmodel.Setup) { config.ParseEnvJSON("service_monitoring_config.http_replace_rules", []map[string]string{}) config.ParseEnvJSON("network_config.http_replace_rules", []map[string]string{}) - // ======================================== - // HTTP/2 Protocol Configuration - // ======================================== - // Tree structure config.BindEnvAndSetDefault("service_monitoring_config.http2.enabled", false) config.BindEnvAndSetDefault("service_monitoring_config.http2.dynamic_table_map_cleaner_interval_seconds", 30) @@ -662,9 +608,6 @@ func initUSMSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("service_monitoring_config.enable_http2_monitoring", false) config.BindEnvAndSetDefault("service_monitoring_config.http2_dynamic_table_map_cleaner_interval_seconds", 30) - // ======================================== - // Kafka Protocol Configuration - // ======================================== config.BindEnvAndSetDefault("service_monitoring_config.kafka.enabled", false) // For backward compatibility config.BindEnvAndSetDefault("service_monitoring_config.enable_kafka_monitoring", false) @@ -673,23 +616,14 @@ func initUSMSystemProbeConfig(config pkgconfigmodel.Setup) { // For backward compatibility config.BindEnvAndSetDefault("service_monitoring_config.max_kafka_stats_buffered", 100000) - // ======================================== - // PostgreSQL Protocol Configuration - // ======================================== config.BindEnvAndSetDefault("service_monitoring_config.postgres.enabled", false) config.BindEnvAndSetDefault("service_monitoring_config.postgres.max_stats_buffered", 100000) config.BindEnvAndSetDefault("service_monitoring_config.postgres.max_telemetry_buffer", 160) - // ======================================== - // Redis Protocol Configuration - // ======================================== config.BindEnvAndSetDefault("service_monitoring_config.redis.enabled", false) config.BindEnvAndSetDefault("service_monitoring_config.redis.track_resources", false) config.BindEnvAndSetDefault("service_monitoring_config.redis.max_stats_buffered", 100000) - // ======================================== - // Native TLS Configuration - // ======================================== config.BindEnvAndSetDefault("service_monitoring_config.tls.native.enabled", true) // For backward compatibility. Default is false because the canonical key // (service_monitoring_config.tls.native.enabled, defaulted to true above) @@ -697,9 +631,6 @@ func initUSMSystemProbeConfig(config pkgconfigmodel.Setup) { // alias when it is explicitly configured. config.BindEnvAndSetDefault("network_config.enable_https_monitoring", false, "DD_SYSTEM_PROBE_NETWORK_ENABLE_HTTPS_MONITORING") - // ======================================== - // Go TLS Configuration - // ======================================== config.BindEnvAndSetDefault("service_monitoring_config.tls.go.enabled", true) // For backward compatibility. Default is false because the canonical key // (service_monitoring_config.tls.go.enabled, defaulted to true above) is @@ -708,14 +639,8 @@ func initUSMSystemProbeConfig(config pkgconfigmodel.Setup) { config.BindEnvAndSetDefault("service_monitoring_config.enable_go_tls_support", false) config.BindEnvAndSetDefault("service_monitoring_config.tls.go.exclude_self", true) - // ======================================== - // Istio TLS Configuration - // ======================================== config.BindEnvAndSetDefault("service_monitoring_config.tls.istio.enabled", true) config.BindEnvAndSetDefault("service_monitoring_config.tls.istio.envoy_path", defaultEnvoyPath) - // ======================================== - // Node.js TLS Configuration - // ======================================== config.BindEnvAndSetDefault("service_monitoring_config.tls.nodejs.enabled", false) }