[stable/datadog] add logsEnabled value (#6013)

* [stable/datadog] add logsEnabled value

* [stable/datadog] a version bump
This commit is contained in:
Teppei Fukuda
2018-06-20 08:00:10 -07:00
committed by k8s-ci-robot
parent 1c258fd243
commit ebfd2957a9
4 changed files with 26 additions and 1 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
name: datadog
version: 0.16.0
version: 0.16.1
appVersion: 6.2.1
description: DataDog Agent
keywords:
+2
View File
@@ -46,6 +46,8 @@ The following table lists the configurable parameters of the Datadog chart and t
| `rbac.create` | If true, create & use RBAC resources | `true` |
| `rbac.serviceAccount` | existing ServiceAccount to use (ignored if rbac.create=true) | `default` |
| `datadog.env` | Additional Datadog environment variables | `nil` |
| `datadog.logsEnabled` | Enable log collection from containers | `nil` |
| `datadog.logsConfigContainerCollectAll` | Add a log configuration that enabled log collection for all containers | `nil` |
| `datadog.apmEnabled` | Enable tracing from the host | `nil` |
| `datadog.autoconf` | Additional Datadog service discovery configurations | `nil` |
| `datadog.checksd` | Additional Datadog service checks | `nil` |
+17
View File
@@ -95,6 +95,14 @@ spec:
fieldRef:
fieldPath: status.hostIP
{{- end }}
{{- if .Values.datadog.logsEnabled }}
- name: DD_LOGS_ENABLED
value: {{.Values.datadog.logsEnabled | quote}}
{{- end }}
{{- if .Values.datadog.logsConfigContainerCollectAll }}
- name: DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL
value: {{.Values.datadog.logsConfigContainerCollectAll | quote}}
{{- end }}
{{- if .Values.datadog.env }}
{{ toYaml .Values.datadog.env | indent 10 }}
@@ -128,6 +136,10 @@ spec:
{{- end }}
readOnly: true
{{- end }}
{{- if .Values.datadog.logsEnabled }}
- name: pointerdir
mountPath: /opt/datadog-agent/run
{{- end }}
{{- if .Values.datadog.volumeMounts }}
{{ toYaml .Values.datadog.volumeMounts | indent 10 }}
{{- end }}
@@ -162,6 +174,11 @@ spec:
configMap:
name: {{ template "datadog.autoconf.fullname" . }}
{{- end }}
{{- if .Values.datadog.logsEnabled }}
- hostPath:
path: /opt/datadog-agent/run
name: pointerdir
{{- end }}
{{- if .Values.datadog.volumes }}
{{ toYaml .Values.datadog.volumes | indent 8 }}
{{- end }}
+6
View File
@@ -104,6 +104,12 @@ datadog:
##
collectEvents: false
## Enables log collection
## ref: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup
##
# logsEnabled: false
# logsConfigContainerCollectAll: false
## Un-comment this to enable APM and tracing, on ports 7777 and 8126
## ref: https://github.com/DataDog/docker-dd-agent#tracing-from-the-host
##