Skip to content

Commit

Permalink
[NPM-3754] Add config to enable traceroute in sysprobe
Browse files Browse the repository at this point in the history
  • Loading branch information
pimlu committed Mar 6, 2025
1 parent 89f29bb commit 4f86f41
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 3 deletions.
4 changes: 4 additions & 0 deletions charts/datadog/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Datadog changelog

## 3.103.2

* Add `datadog.traceroute.enabled`, which turns on the `traceroute` system-probe module for Network Path.

## 3.103.1

* Update `fips.image.tag` to `1.1.8` fixing CVEs
Expand Down
3 changes: 2 additions & 1 deletion charts/datadog/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog

![Version: 3.103.1](https://img.shields.io/badge/Version-3.103.1-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
![Version: 3.103.2](https://img.shields.io/badge/Version-3.103.1-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/).

Expand Down Expand Up @@ -887,6 +887,7 @@ helm install <RELEASE_NAME> \
| datadog.systemProbe.seccomp | string | `"localhost/system-probe"` | Apply an ad-hoc seccomp profile to the system-probe agent to restrict its privileges |
| datadog.systemProbe.seccompRoot | string | `"/var/lib/kubelet/seccomp"` | Specify the seccomp profile root directory |
| datadog.tags | list | `[]` | List of static tags to attach to every metric, event and service check collected by this Agent. |
| datadog.traceroute.enabled | bool | `false` | Enable traceroutes in system-probe for Network Path |
| datadog.useHostPID | bool | `true` | Run the agent in the host's PID namespace, required for origin detection / unified service tagging |
| existingClusterAgent.clusterchecksEnabled | bool | `true` | set this to false if you don’t want the agents to run the cluster checks of the joined external cluster agent |
| existingClusterAgent.join | bool | `false` | set this to true if you want the agents deployed by this chart to connect to a Cluster Agent deployed independently |
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/templates/NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ On GKE Autopilot, only one "datadog" Helm chart release is allowed by Kubernetes
##############################################################################################
#### WARNING: System Probe on GKE Autopilot requires GKE v1.32.1-gke.1729000 or later ####
##############################################################################################
{{- fail "System Probe on GKE Autopilot environments requires GKE v1.32.1-gke.1729000 or later. The option 'datadog.securityAgent.runtime.enabled', 'datadog.securityAgent.runtime.fimEnabled', 'datadog.networkMonitoring.enabled', 'datadog.systemProbe.enableTCPQueueLength', 'datadog.systemProbe.enableOOMKill', 'datadog.serviceMonitoring.enabled' and 'datadog.discovery.enabled' must be set 'false'" }}
{{- fail "System Probe on GKE Autopilot environments requires GKE v1.32.1-gke.1729000 or later. The option 'datadog.securityAgent.runtime.enabled', 'datadog.securityAgent.runtime.fimEnabled', 'datadog.networkMonitoring.enabled', 'datadog.systemProbe.enableTCPQueueLength', 'datadog.systemProbe.enableOOMKill', 'datadog.serviceMonitoring.enabled', 'datadog.traceroute.enabled', and 'datadog.discovery.enabled' must be set 'false'" }}

{{- end }}

Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ Return a remote image path based on `.Values` (passed as root) and `.` (any `.im
Return true if a system-probe feature is enabled.
*/}}
{{- define "system-probe-feature" -}}
{{- if or .Values.datadog.securityAgent.runtime.enabled .Values.datadog.securityAgent.runtime.fimEnabled .Values.datadog.networkMonitoring.enabled .Values.datadog.systemProbe.enableTCPQueueLength .Values.datadog.systemProbe.enableOOMKill .Values.datadog.serviceMonitoring.enabled .Values.datadog.discovery.enabled .Values.datadog.gpuMonitoring.enabled -}}
{{- if or .Values.datadog.securityAgent.runtime.enabled .Values.datadog.securityAgent.runtime.fimEnabled .Values.datadog.networkMonitoring.enabled .Values.datadog.systemProbe.enableTCPQueueLength .Values.datadog.systemProbe.enableOOMKill .Values.datadog.serviceMonitoring.enabled .Values.datadog.traceroute.enabled .Values.datadog.discovery.enabled .Values.datadog.gpuMonitoring.enabled -}}
true
{{- else -}}
false
Expand Down
4 changes: 4 additions & 0 deletions charts/datadog/templates/system-probe-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ data:
native:
enabled: {{ $.Values.datadog.serviceMonitoring.tls.native.enabled }}
{{- end }}
{{- if not (eq .Values.datadog.traceroute.enabled nil) }}
traceroute:
enabled: {{ $.Values.datadog.traceroute.enabled }}
{{- end }}
{{- if not (eq .Values.datadog.discovery.enabled nil) }}
discovery:
enabled: {{ $.Values.datadog.discovery.enabled }}
Expand Down
4 changes: 4 additions & 0 deletions charts/datadog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,10 @@ datadog:
# datadog.serviceMonitoring.tls.native.enabled -- (bool) Enable TLS monitoring for native (openssl, libssl, gnutls) services (Requires Agent 7.51.0+). Empty values use the default setting in the datadog agent.
enabled:

traceroute:
# datadog.traceroute.enabled -- (bool) Enable traceroutes in system-probe for Network Path
enabled: false

discovery:
# datadog.discovery.enabled -- (bool) Enable Service Discovery
enabled: # false
Expand Down

0 comments on commit 4f86f41

Please sign in to comment.