diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml index ed5435d737..bfc3a231e8 100644 --- a/stable/datadog/Chart.yaml +++ b/stable/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 1.38.14 +version: 1.38.15 appVersion: "6" description: DataDog Agent keywords: diff --git a/stable/datadog/README.md b/stable/datadog/README.md index 3db35ec030..0c87fca4df 100644 --- a/stable/datadog/README.md +++ b/stable/datadog/README.md @@ -271,6 +271,7 @@ helm install --name \ | `datadog.nonLocalTraffic` | Enable statsd reporting and APM 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.dogStatsDPort` | Used to override the default agent DogStatsD Port | `8125` | | `datadog.useDogStatsDSocketVolume` | Enable dogstatsd over Unix Domain Socket | `False` | | `datadog.dogStatsDSocketPath` | Custom path to the socket, has to be located in the `/var/run/datadog` folder path | `/var/run/datadog/dsd.socket` | | `datadog.volumes` | Additional volumes for the daemonset or deployment | `nil` | diff --git a/stable/datadog/templates/container-agent.yaml b/stable/datadog/templates/container-agent.yaml index 2c85b3f6f9..69ff10ce36 100644 --- a/stable/datadog/templates/container-agent.yaml +++ b/stable/datadog/templates/container-agent.yaml @@ -6,9 +6,9 @@ resources: {{ toYaml .Values.daemonset.containers.agent.resources | indent 4 }} ports: - - containerPort: 8125 + - containerPort: {{ default 8125 .Values.datadog.dogStatsDPort }} {{- if .Values.daemonset.useHostPort }} - hostPort: 8125 + hostPort: {{ default 8125 .Values.datadog.dogStatsDPort }} {{- end }} name: dogstatsdport protocol: UDP @@ -33,6 +33,10 @@ - name: DD_LOG_LEVEL value: {{ .Values.daemonset.containers.agent.logLevel | default .Values.datadog.logLevel | quote }} {{- end }} + {{- if .Values.datadog.dogStatsDPort }} + - name: DD_DOGSTATD_PORT + value: {{ .Values.datadog.dogStatsDPort | quote }} + {{- end }} {{- if .Values.datadog.nonLocalTraffic }} - name: DD_DOGSTATSD_NON_LOCAL_TRAFFIC value: {{ .Values.datadog.nonLocalTraffic | quote }} diff --git a/stable/datadog/templates/container-agents.yaml b/stable/datadog/templates/container-agents.yaml index fa00d4411a..5dd20f2013 100644 --- a/stable/datadog/templates/container-agents.yaml +++ b/stable/datadog/templates/container-agents.yaml @@ -5,9 +5,9 @@ resources: {{ toYaml .Values.datadog.resources | indent 4 }} ports: - - containerPort: 8125 + - containerPort: {{ default 8125 .Values.datadog.dogStatsDPort }} {{- if .Values.daemonset.useHostPort }} - hostPort: 8125 + hostPort: {{ default 8125 .Values.datadog.dogStatsDPort }} {{- end }} name: dogstatsdport protocol: UDP @@ -44,6 +44,10 @@ - name: DD_LOG_LEVEL value: {{ .Values.datadog.logLevel | quote }} {{- end }} + {{- if .Values.datadog.dogStatsDPort }} + - name: DD_DOGSTATD_PORT + value: {{ .Values.datadog.dogStatsDPort | quote }} + {{- end }} {{- if .Values.datadog.nonLocalTraffic }} - name: DD_DOGSTATSD_NON_LOCAL_TRAFFIC value: {{ .Values.datadog.nonLocalTraffic | quote }} diff --git a/stable/datadog/templates/deployment.yaml b/stable/datadog/templates/deployment.yaml index 453a9e8ad2..e9cb24ea26 100644 --- a/stable/datadog/templates/deployment.yaml +++ b/stable/datadog/templates/deployment.yaml @@ -55,7 +55,7 @@ spec: resources: {{ toYaml .Values.datadog.resources | indent 10 }} ports: - - containerPort: 8125 + - containerPort: {{ default 8125 .Values.datadog.dogStatsDPort }} name: dogstatsdport protocol: UDP {{- if .Values.datadog.apmEnabled }} diff --git a/stable/datadog/templates/service.yaml b/stable/datadog/templates/service.yaml index ce399cca96..216c2e7583 100644 --- a/stable/datadog/templates/service.yaml +++ b/stable/datadog/templates/service.yaml @@ -23,7 +23,7 @@ spec: app: {{ template "datadog.fullname" . }} type: deployment ports: - - port: 8125 + - port: {{ default 8125 .Values.datadog.dogStatsDPort }} name: dogstatsdport protocol: UDP {{- if .Values.deployment.dogstatsdNodePort }} diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml index 7501290a23..3db315e1c0 100644 --- a/stable/datadog/values.yaml +++ b/stable/datadog/values.yaml @@ -154,6 +154,12 @@ datadog: # # useDogStatsDSocketVolume: true + # # dogStatsDPort - integer - optional - default: 8125 + # # Override the Agent DogStatsD port. + # # Note: Make sure your client is sending to the same UDP port. + # + # dogStatsDPort: + ## @param nonLocalTraffic - boolean - optional - default: false ## Enable this to make each node accept non-local statsd traffic. ## ref: https://github.com/DataDog/docker-dd-agent#environment-variables