diff --git a/stable/datadog/README.md b/stable/datadog/README.md index 0b1a2560af..492b0d6b54 100644 --- a/stable/datadog/README.md +++ b/stable/datadog/README.md @@ -48,6 +48,8 @@ The following tables lists the configurable parameters of the Datadog chart and | `datadog.autoconf` | Additional Datadog service discovery configurations | `nil` | | `datadog.checksd` | Additional Datadog service checks | `nil` | | `datadog.confd` | Additional Datadog service configurations | `nil` | +| `datadog.volumes` | Additional volumes for the daemonset or deployment | `nil` | +| `datadog.volumeMounts` | Additional volumeMounts for the daemonset or deployment | `nil` | | `resources.requests.cpu` | CPU resource requests | `100m` | | `resources.limits.cpu` | CPU resource limits | `256m` | | `resources.requests.memory` | Memory resource requests | `128Mi` | diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml index bcc0a31e15..57b73f97c5 100644 --- a/stable/datadog/templates/daemonset.yaml +++ b/stable/datadog/templates/daemonset.yaml @@ -75,6 +75,9 @@ spec: - name: checksd mountPath: /checks.d readOnly: true +{{- if .Values.datadog.volumeMounts }} +{{ toYaml .Values.datadog.volumeMounts | indent 10 }} +{{- end }} volumes: - hostPath: path: /var/run/docker.sock @@ -94,6 +97,9 @@ spec: - name: autoconf configMap: name: {{ template "autoconf.fullname" . }} +{{- if .Values.datadog.volumes }} +{{ toYaml .Values.datadog.volumes | indent 8 }} +{{- end }} {{- if .Values.daemonset.tolerations }} tolerations: {{ toYaml .Values.daemonset.tolerations | indent 8 }} diff --git a/stable/datadog/templates/deployment.yaml b/stable/datadog/templates/deployment.yaml index 6f67e1b718..eb4e7df18e 100644 --- a/stable/datadog/templates/deployment.yaml +++ b/stable/datadog/templates/deployment.yaml @@ -72,6 +72,9 @@ spec: - name: checksd mountPath: /checks.d readOnly: true +{{- if .Values.datadog.volumeMounts }} +{{ toYaml .Values.datadog.volumeMounts | indent 10 }} +{{- end }} volumes: - hostPath: path: /var/run/docker.sock @@ -91,5 +94,8 @@ spec: - name: autoconf configMap: name: {{ template "autoconf.fullname" . }} +{{- if .Values.datadog.volumes }} +{{ toYaml .Values.datadog.volumes | indent 8 }} +{{- end }} {{ end }} {{ end }} diff --git a/stable/datadog/values.yaml b/stable/datadog/values.yaml index 8b5f6a4241..ca2da78ff4 100644 --- a/stable/datadog/values.yaml +++ b/stable/datadog/values.yaml @@ -79,6 +79,20 @@ datadog: # - name: # value: + ## The dd-agent supports detailed process and container monitoring and + ## requires control over the volume and volumeMounts for the daemonset + ## or deployment. + ## ref: https://docs.datadoghq.com/guides/process/ + ## + # volume: + # - hostPath: + # path: /etc/passwd + # name: passwd + # volumeMount: + # - name: passwd + # mountPath: /etc/passwd + # readOnly: true + ## Provide additonal service definitions ## Each key will become a file in /conf.d/auto_conf ## ref: https://github.com/DataDog/docker-dd-agent#configuration-files