From a8385c432e5d56a712be5a79f46dab650f2f8215 Mon Sep 17 00:00:00 2001 From: Guillaume Pagnoux Date: Wed, 5 Mar 2025 17:45:48 +0100 Subject: [PATCH 1/5] [DSCVR-75] Add config option for Service Discovery network stats collection --- charts/datadog/CHANGELOG.md | 4 ++++ charts/datadog/README.md | 1 + charts/datadog/templates/_helpers.tpl | 2 +- charts/datadog/templates/system-probe-configmap.yaml | 2 ++ charts/datadog/values.yaml | 4 ++++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md index 33f2d6b12..fce546a43 100644 --- 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/README.md b/charts/datadog/README.md index 927f60479..a148274bc 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -736,6 +736,7 @@ helm install \ | 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 | `nil` | 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 index db31eb837..7681ac338 100644 --- 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 .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 index 88471d801..3b3f4eb45 100644 --- 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 index bd9ffc550..d5a0f3d05 100644 --- 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 From 70dbc99443c8edc79279bb45e5289a20331f9a6d Mon Sep 17 00:00:00 2001 From: Guillaume Pagnoux Date: Wed, 5 Mar 2025 17:58:59 +0100 Subject: [PATCH 2/5] add default value for networkStats option --- charts/datadog/README.md | 2 +- charts/datadog/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/datadog/README.md b/charts/datadog/README.md index a148274bc..caa37dd62 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -736,7 +736,7 @@ helm install \ | 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 | `nil` | Enable Service Discovery Network Stats | +| 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/values.yaml b/charts/datadog/values.yaml index d5a0f3d05..34cdd6aed 100644 --- a/charts/datadog/values.yaml +++ b/charts/datadog/values.yaml @@ -861,7 +861,7 @@ datadog: # datadog.discovery.networkStats.enabled -- (bool) Enable Service Discovery Network Stats networkStats: - enabled: # true + enabled: true gpuMonitoring: # datadog.gpuMonitoring.enabled -- Enable GPU monitoring From 24748d7718b84b9e2c89247c95ee9f380a8570c4 Mon Sep 17 00:00:00 2001 From: Guillaume Pagnoux Date: Wed, 5 Mar 2025 18:25:51 +0100 Subject: [PATCH 3/5] only add mounts if SD is enabled --- charts/datadog/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/datadog/templates/_helpers.tpl b/charts/datadog/templates/_helpers.tpl index 7681ac338..fb9c1bf1f 100644 --- 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 .Values.datadog.discovery.networkStats.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 From 5214186632d94963882088d8ef36a611b666e2a7 Mon Sep 17 00:00:00 2001 From: Guillaume Pagnoux Date: Thu, 6 Mar 2025 14:14:52 +0100 Subject: [PATCH 4/5] update chart version --- charts/datadog/Chart.yaml | 2 +- charts/datadog/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml index e1974cebe..aef151caa 100644 --- 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 index caa37dd62..59ee0e428 100644 --- 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/). From f60bf86b1c8a59b4677e318efc403835a8bafc2a Mon Sep 17 00:00:00 2001 From: Guillaume Pagnoux Date: Thu, 6 Mar 2025 14:46:58 +0100 Subject: [PATCH 5/5] fix baseline test --- test/datadog/baseline/manifests/otel_enabled.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/datadog/baseline/manifests/otel_enabled.yaml b/test/datadog/baseline/manifests/otel_enabled.yaml index 8027a6cf4..285d3ad92 100644 --- 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