From d33d4cfacf55b604503542377ed53cb66a11c4de Mon Sep 17 00:00:00 2001 From: Ivan Ilichev Date: Wed, 18 Mar 2020 17:26:44 -0400 Subject: [PATCH] [stable/datadog] Correct handling of processAgent.processCollection setting (#21525) * Correct handling of processAgent.processCollection setting This addresses the issue when process agent would terminate if `processAgent.processCollection` was set to `false`. Setting `DD_PROCESS_AGENT_ENABLED` to `false` results in termination of process agent. To disable process collection we need to leave this env var as not set on this container. Signed-off-by: Ivan Ilichev * Bump chart version Signed-off-by: Ivan Ilichev --- stable/datadog/Chart.yaml | 2 +- stable/datadog/templates/container-process-agent.yaml | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index 2f77f81594..31e2e03186 100644 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 2.0.11 +version: 2.0.12 appVersion: "7" description: Datadog Agent keywords: diff --git a/stable/datadog/templates/container-process-agent.yaml b/stable/datadog/templates/container-process-agent.yaml index b0be06d14c..fcdb21b4f0 100644 --- a/stable/datadog/templates/container-process-agent.yaml +++ b/stable/datadog/templates/container-process-agent.yaml @@ -7,11 +7,9 @@ {{ toYaml .Values.agents.containers.processAgent.resources | indent 4 }} env: {{- include "containers-common-env" . | nindent 4 }} + {{- if .Values.datadog.processAgent.processCollection }} - name: DD_PROCESS_AGENT_ENABLED - {{- if .Values.datadog.processAgent.enabled }} - value: {{ .Values.datadog.processAgent.processCollection | quote }} - {{- else }} - value: "disabled" + value: "true" {{- end }} - name: DD_LOG_LEVEL value: {{ .Values.agents.containers.processAgent.logLevel | default .Values.datadog.logLevel | quote }}