From 512ccd9feafbed6410b452bb1c4ed7797befa84a Mon Sep 17 00:00:00 2001 From: Tomasz Nowak Date: Mon, 18 Feb 2019 11:52:37 +0100 Subject: [PATCH] [datadog] Enable dogstatsd over unix domain socket (#11474) Signed-off-by: Tomasz Nowak --- stable/datadog/Chart.yaml | 2 +- stable/datadog/README.md | 2 ++ stable/datadog/templates/daemonset.yaml | 17 +++++++++++++++++ stable/datadog/templates/deployment.yaml | 17 +++++++++++++++++ stable/datadog/values.yaml | 10 ++++++++++ 5 files changed, 47 insertions(+), 1 deletion(-) diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index cab2ae11ce..26319f3632 100755 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,5 +1,5 @@ name: datadog -version: 1.20.0 +version: 1.21.0 appVersion: 6.9.0 description: DataDog Agent keywords: diff --git a/stable/datadog/README.md b/stable/datadog/README.md index d4553dd0c1..1ef50d3f79 100644 --- a/stable/datadog/README.md +++ b/stable/datadog/README.md @@ -83,6 +83,8 @@ The following table lists the configurable parameters of the Datadog chart and t | `datadog.tags` | Set host tags | `nil` | | `datadog.nonLocalTraffic` | Enable statsd reporting from any external ip | `False` | | `datadog.useCriSocketVolume` | Enable mounting the container runtime socket in Agent containers | `True` | +| `datadog.dogstatsdOriginDetection` | Enable origin detection for container tagging | `False` | +| `datadog.useDogStatsDSocketVolume` | Enable dogstatsd over Unix Domain Socket | `False` | | `datadog.volumes` | Additional volumes for the daemonset or deployment | `nil` | | `datadog.volumeMounts` | Additional volumeMounts for the daemonset or deployment | `nil` | | `datadog.podAnnotationsAsTags` | Kubernetes Annotations to Datadog Tags mapping | `nil` | diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml index 8681376f3c..45452b4eec 100644 --- a/stable/datadog/templates/daemonset.yaml +++ b/stable/datadog/templates/daemonset.yaml @@ -84,6 +84,10 @@ spec: - name: DD_DOGSTATSD_NON_LOCAL_TRAFFIC value: {{ .Values.datadog.nonLocalTraffic | quote }} {{- end }} + {{- if .Values.datadog.dogstatsdOriginDetection }} + - name: DD_DOGSTATSD_ORIGIN_DETECTION + value: {{ .Values.datadog.dogstatsdOriginDetection | quote }} + {{- end }} {{- if .Values.datadog.tags }} - name: DD_TAGS value: {{ .Values.datadog.tags | quote }} @@ -164,6 +168,10 @@ spec: - name: DD_HEALTH_PORT value: "5555" {{- end }} + {{- if .Values.datadog.useDogStatsDSocketVolume }} + - name: DD_DOGSTATSD_SOCKET + value: "/var/run/datadog/dsd.socket" + {{- end }} {{- if .Values.datadog.env }} {{ toYaml .Values.datadog.env | indent 10 }} {{- end }} @@ -173,6 +181,10 @@ spec: mountPath: {{ default "/var/run/docker.sock" .Values.datadog.criSocketPath | quote }} readOnly: true {{- end }} + {{- if .Values.datadog.useDogStatsDSocketVolume }} + - name: dsdsocket + mountPath: "/var/run/datadog" + {{- end }} - name: procdir mountPath: /host/proc readOnly: true @@ -223,6 +235,11 @@ spec: path: {{ default "/var/run/docker.sock" .Values.datadog.criSocketPath | quote }} name: runtimesocket {{- end }} + {{- if .Values.datadog.useDogStatsDSocketVolume }} + - hostPath: + path: "/var/run/datadog/" + name: dsdsocket + {{- end }} - hostPath: path: /proc name: procdir diff --git a/stable/datadog/templates/deployment.yaml b/stable/datadog/templates/deployment.yaml index 836b72811a..7ab7e44a6c 100644 --- a/stable/datadog/templates/deployment.yaml +++ b/stable/datadog/templates/deployment.yaml @@ -70,6 +70,10 @@ spec: - name: DD_DOGSTATSD_NON_LOCAL_TRAFFIC value: {{ .Values.datadog.nonLocalTraffic | quote }} {{- end }} + {{- if .Values.datadog.dogstatsdOriginDetection }} + - name: DD_DOGSTATSD_ORIGIN_DETECTION + value: {{ .Values.datadog.dogstatsdOriginDetection | quote }} + {{- end }} {{- if .Values.datadog.tags }} - name: DD_TAGS value: {{ .Values.datadog.tags | quote }} @@ -88,6 +92,10 @@ spec: - name: DD_CRI_SOCKET_PATH value: {{ .Values.datadog.criSocketPath | quote }} {{- end }} + {{- if .Values.datadog.useDogStatsDSocketVolume }} + - name: DD_DOGSTATSD_SOCKET + value: "/var/run/datadog/dsd.socket" + {{- end }} {{- if .Values.datadog.env }} {{ toYaml .Values.datadog.env | indent 10 }} {{- end }} @@ -97,6 +105,10 @@ spec: mountPath: {{ default "/var/run/docker.sock" .Values.datadog.criSocketPath | quote }} readOnly: true {{- end }} + {{- if .Values.datadog.useDogStatsDSocketVolume }} + - name: dsdsocket + mountPath: "/var/run/datadog" + {{- end }} - name: procdir mountPath: /host/proc readOnly: true @@ -134,6 +146,11 @@ spec: path: {{ default "/var/run/docker.sock" .Values.datadog.criSocketPath | quote }} name: runtimesocket {{- end }} + {{- if .Values.datadog.useDogStatsDSocketVolume }} + - hostPath: + path: "/var/run/datadog/" + name: dsdsocket + {{- end }} - hostPath: path: /proc name: procdir diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml index bf2ebfd480..f83fd385cd 100644 --- a/stable/datadog/values.yaml +++ b/stable/datadog/values.yaml @@ -171,9 +171,19 @@ datadog: ## # nonLocalTraffic: true + ## Enable origin detection for container tagging + ## https://docs.datadoghq.com/developers/dogstatsd/unix_socket/#using-origin-detection-for-container-tagging + ## + # dogstatsdOriginDetection: true + ## Enable container runtime socket volume mounting useCriSocketVolume: true + ## Enable dogstatsd over Unix Domain Socket + ## ref: https://docs.datadoghq.com/developers/dogstatsd/unix_socket/ + ## + # useDogStatsDSocketVolume: true + ## Set host tags. ## ref: https://github.com/DataDog/docker-dd-agent#environment-variables ##