From 692daad649d683292c9be5ca122222eefe23edcc Mon Sep 17 00:00:00 2001 From: LFA Date: Tue, 8 Jan 2019 16:44:09 +0100 Subject: [PATCH] add DD_HOSTNAME, DD_AC_INCLUDE, DD_AC_EXCLUDE to DaemonSet config (#10211) Signed-off-by: Laurent Fallet --- stable/datadog/Chart.yaml | 2 +- stable/datadog/README.md | 3 +++ stable/datadog/templates/daemonset.yaml | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 0dae90a54a..6a3cebc41d 100755 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,5 +1,5 @@ name: datadog -version: 1.15.1 +version: 1.16.0 appVersion: 6.6.0 description: DataDog Agent keywords: diff --git a/stable/datadog/README.md b/stable/datadog/README.md index 6dabb43329..c648d5c17e 100644 --- a/stable/datadog/README.md +++ b/stable/datadog/README.md @@ -93,6 +93,9 @@ The following table lists the configurable parameters of the Datadog chart and t | `datadog.resources.limits.memory` | Memory resource limits | `256Mi` | | `datadog.securityContext` | Allows you to overwrite the default securityContext applied to the container | `nil` | | `datadog.livenessProbe` | Overrides the default liveness probe | exec /probe.sh | +| `datadog.hostname` | Set the hostname (write it in datadog.conf) | `nil` | +| `datadog.acInclude` | Include containers based on image name | `nil` | +| `datadog.acExclude` | Exclude containers based on image name | `nil` | | `daemonset.podAnnotations` | Annotations to add to the DaemonSet's Pods | `nil` | | `daemonset.tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `nil` | | `daemonset.nodeSelector` | Node selectors | `nil` | diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml index 7a8f78bae7..33aa5d4d7f 100644 --- a/stable/datadog/templates/daemonset.yaml +++ b/stable/datadog/templates/daemonset.yaml @@ -96,6 +96,18 @@ spec: - name: DD_PROCESS_AGENT_ENABLED value: {{ .Values.datadog.processAgentEnabled | quote }} {{- end }} + {{- if .Values.datadog.hostname }} + - name: DD_HOSTNAME + value: {{ .Values.datadog.hostname | quote }} + {{- end }} + {{- if .Values.datadog.acInclude }} + - name: DD_AC_INCLUDE + value: {{ .Values.datadog.acInclude | quote }} + {{- end }} + {{- if .Values.datadog.acExclude }} + - name: DD_AC_EXCLUDE + value: {{ .Values.datadog.acExclude | quote }} + {{- end }} {{- if not .Values.clusterAgent.enabled }} {{- if .Values.datadog.leaderElection }} - name: DD_LEADER_ELECTION