[mq] working branch - merge f60bf86 on top of main at ad18c5d

{"baseBranch":"main","baseCommit":"ad18c5d5234f77c04569ba840276f5a65832feff","createdAt":"2025-03-06T14:36:43.905532Z","headSha":"f60bf86b1c8a59b4677e318efc403835a8bafc2a","id":"21bdb500-45ff-48cb-a6a5-1334b3127a1a","priority":"200","pullRequestNumber":"1739","queuedAt":"2025-03-06T14:36:43.905051Z","status":"STATUS_QUEUED"}
DataDog · Mar 6, 2025 · 3d29401 · 3d29401
2 parents ba74633 + f60bf86
commit 3d29401
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 4 deletions.
diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Datadog changelog
 
+## 3.104.0
+
+* Add `datadog.discovery.networkStats.enabled` configuration to control Service Discovery network stats collection.
+
 ## 3.103.0
 
 * Upgrade default Agent version to `7.63.3`.

diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v1
 name: datadog
-version: 3.103.0
+version: 3.104.0
 appVersion: "7"
 description: Datadog Agent
 keywords:

diff --git a/charts/datadog/README.md b/charts/datadog/README.md
@@ -1,6 +1,6 @@
 # Datadog
 
-![Version: 3.103.0](https://img.shields.io/badge/Version-3.103.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
+![Version: 3.104.0](https://img.shields.io/badge/Version-3.104.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
 
 [Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds the Datadog Agent to all nodes in your cluster via a DaemonSet. It also optionally depends on the [kube-state-metrics chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics). For more information about monitoring Kubernetes with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/).
 
@@ -736,6 +736,7 @@ helm install <RELEASE_NAME> \
 | datadog.disableDefaultOsReleasePaths | bool | `false` | Set this to true to disable mounting datadog.osReleasePath in all containers |
 | datadog.disablePasswdMount | bool | `false` | Set this to true to disable mounting /etc/passwd in all containers |
 | datadog.discovery.enabled | bool | `nil` | Enable Service Discovery |
+| datadog.discovery.networkStats.enabled | bool | `true` | Enable Service Discovery Network Stats |
 | datadog.dockerSocketPath | string | `nil` | Path to the docker socket |
 | datadog.dogstatsd.hostSocketPath | string | `"/var/run/datadog/"` | Host path to the DogStatsD socket |
 | datadog.dogstatsd.nonLocalTraffic | bool | `true` | Enable this to make each node accept non-local statsd traffic (from outside of the pod) |

diff --git a/charts/datadog/templates/_helpers.tpl b/charts/datadog/templates/_helpers.tpl
@@ -780,7 +780,7 @@ Return the local service name
 Return true if runtime compilation is enabled in the system-probe
 */}}
 {{- define "runtime-compilation-enabled" -}}
-{{- if or .Values.datadog.systemProbe.enableTCPQueueLength .Values.datadog.systemProbe.enableOOMKill .Values.datadog.serviceMonitoring.enabled -}}
+{{- if or .Values.datadog.systemProbe.enableTCPQueueLength .Values.datadog.systemProbe.enableOOMKill .Values.datadog.serviceMonitoring.enabled (and .Values.datadog.discovery.enabled .Values.datadog.discovery.networkStats.enabled) -}}
 true
 {{- else -}}
 false

diff --git a/charts/datadog/templates/system-probe-configmap.yaml b/charts/datadog/templates/system-probe-configmap.yaml
@@ -69,6 +69,8 @@ data:
     {{- if not (eq .Values.datadog.discovery.enabled nil) }}
     discovery:
       enabled: {{ $.Values.datadog.discovery.enabled }}
+      network_stats:
+        enabled: {{ $.Values.datadog.discovery.networkStats.enabled }}
     {{- end }}
     gpu_monitoring:
       enabled: {{ $.Values.datadog.gpuMonitoring.enabled }}

diff --git a/charts/datadog/values.yaml b/charts/datadog/values.yaml
@@ -859,6 +859,10 @@ datadog:
     # datadog.discovery.enabled -- (bool) Enable Service Discovery
     enabled:  # false
 
+    # datadog.discovery.networkStats.enabled -- (bool) Enable Service Discovery Network Stats
+    networkStats:
+      enabled: true
+
   gpuMonitoring:
     # datadog.gpuMonitoring.enabled -- Enable GPU monitoring
     enabled: false

diff --git a/test/datadog/baseline/manifests/otel_enabled.yaml b/test/datadog/baseline/manifests/otel_enabled.yaml
@@ -166,7 +166,7 @@ data:
 kind: ConfigMap
 metadata:
   annotations:
-    checksum/otel-config: 0c5563c5e9a82132926709c072b925fd278450344419379d6d0738853d82e315
+    checksum/otel-config: 06a2c3eda9251384438ece9c7bde8a79e394b85bb9cfcd20c297839e0b5b29de
   labels:
     app.kubernetes.io/instance: datadog
     app.kubernetes.io/managed-by: Helm