github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/datadog][v2.0.1] improve logs fields (#21086)

Browse Source 
Co-Authored-By: Vincent Boulineau <58430298+vboulineau@users.noreply.github.com>
Signed-off-by: cedric lamoriniere <cedric.lamoriniere@datadoghq.com>

Co-authored-by: Vincent Boulineau <58430298+vboulineau@users.noreply.github.com>
This commit is contained in:
Cedric Lamoriniere
2020-02-27 11:15:28 -08:00
committed by GitHub
co-authored by Vincent Boulineau
parent 357b28a896
commit 1388bd5663
9 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/datadog/CHANGELOG.md
+5
View File
@@ -2,6 +2,11 @@
## 2.0
## 2.0.1
* Add parameters `datadog.logs.enabled` and `datadog.logs.containerCollectAll` to replace `datadog.logsEnabled` and `datadog.logsConfigContainerCollectAll`.
* Update the migration document link in the `Readme.md`.
### 2.0.0
* Remove Datadog agent deployment configuration.
stable/datadog/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: datadog
version: 2.0.0
version: 2.0.1
appVersion: "7"
description: DataDog Agent
keywords:
stable/datadog/README.md
+4 -4
View File
@@ -61,10 +61,10 @@ You can specify the Datadog Cluster Agent token used to secure the communication
#### From 1.x to 2.x
⚠️ Migrating from 1.x to 2.x requires a manual action.
⚠️ Migrating from 1.x to 2.x requires a manual action.
The `datadog` chart has been refactored to regroup the `values.yaml` parameters in a more logical way.
Please follow the [migration guide](docs/Migration_1.x_to_2.x.md) to update you `values.yaml` file.
Please follow the [migration guide](https://github.com/helm/charts/blob/master/stable/datadog/docs/Migration_1.x_to_2.x.md) to update you `values.yaml` file.
#### From 1.19.0 onwards
@@ -265,8 +265,8 @@ helm install --name <RELEASE_NAME> \
| `datadog.dd_url` | Datadog intake server | `nil` |
| `datadog.env` | Additional Datadog environment variables | `nil` |
| `datadog.logLevel` | Agent log verbosity (possible values: trace, debug, info, warn, error, critical, and off) | `INFO` |
| `datadog.logsEnabled` | Enable log collection | `nil` |
| `datadog.logsConfigContainerCollectAll` | Collect logs from all containers | `nil` |
| `datadog.logs.enabled` | Enable log collection | `nil` |
| `datadog.logs.containerCollectAll` | Collect logs from all containers | `nil` |
| `datadog.logsPointerHostPath` | Host path to store the log tailing state in | `/var/lib/datadog-agent/logs` |
| `datadog.apm.enabled` | Enable tracing from the host | `false` |
| `datadog.apm.port` | Used to override the default agent APM Port | `8126` |
stable/datadog/docs/Migration_1.x_to_2.x.md
+2
View File
@@ -66,3 +66,5 @@ location in v1 and v2.
| `clusterchecksDeployment.tolerations` | `clusterChecksRunner.tolerations` | |
| `clusterchecksDeployment.livenessProbe` | `clusterChecksRunner.livenessProbe` | |
| `clusterchecksDeployment.env` | `clusterChecksRunner.env` | |
| `logsEnabled` | `logs.enabled` | |
| `logsConfigContainerCollectAll` | `logs.containerCollectAll` | |
stable/datadog/templates/cluster-agent-deployment.yaml
+2
View File
@@ -153,7 +153,9 @@ spec:
readinessProbe:
{{ toYaml .Values.clusterAgent.readinessProbe | indent 10 }}
volumeMounts:
{{- if .Values.clusterAgent.volumeMounts }}
{{ toYaml .Values.clusterAgent.volumeMounts | indent 10 }}
{{- end }}
{{- if .Values.clusterAgent.confd }}
- name: confd
mountPath: /conf.d
stable/datadog/templates/container-agent.yaml
+3 -7
View File
@@ -81,14 +81,10 @@
- name: DD_KUBERNETES_POD_ANNOTATIONS_AS_TAGS
value: '{{ toJson .Values.datadog.podAnnotationsAsTags }}'
{{- end }}
{{- if .Values.datadog.logsEnabled }}
- name: DD_LOGS_ENABLED
value: {{.Values.datadog.logsEnabled | quote}}
{{- end }}
{{- if .Values.datadog.logsConfigContainerCollectAll }}
value: {{ (default false (or .Values.datadog.logs.enabled .Values.datadog.logsEnabled)) | quote}}
- name: DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL
value: {{.Values.datadog.logsConfigContainerCollectAll | quote}}
{{- end }}
value: {{ (default false (or .Values.datadog.logs.containerCollectAll .Values.datadog.logsConfigContainerCollectAll)) | quote}}
{{- if .Values.datadog.criSocketPath }}
- name: DD_CRI_SOCKET_PATH
value: {{ print "/host/" .Values.datadog.criSocketPath | clean }}
@@ -131,7 +127,7 @@
- name: cgroups
mountPath: /host/sys/fs/cgroup
readOnly: true
{{- if .Values.datadog.logsEnabled }}
{{- if or .Values.datadog.logs.enabled .Values.datadog.logsEnabled }}
- name: pointerdir
mountPath: /opt/datadog-agent/run
- name: logpodpath
stable/datadog/templates/daemonset.yaml
+2 -2
View File
@@ -105,7 +105,7 @@ spec:
configMap:
name: {{ template "datadog.fullname" . }}-checksd
{{- end }}
{{- if .Values.datadog.logsEnabled }}
{{- if or .Values.datadog.logs.enabled .Values.datadog.logsEnabled }}
- hostPath:
path: "/var/lib/datadog-agent/logs"
name: pointerdir
@@ -127,7 +127,7 @@ spec:
- name: sysprobe-config
configMap:
name: {{ template "datadog.fullname" . }}-system-probe-config
{{- if eq .Values.systemProbe.seccomp "localhost/system-probe" }}
{{- if eq .Values.datadog.systemProbe.seccomp "localhost/system-probe" }}
- name: datadog-agent-security
configMap:
name: {{ template "datadog.fullname" . }}-security
stable/datadog/templates/system-probe-init.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
{{- define "system-probe-init" -}}
- name: seccomp-setup
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
image: "{{ .Values.agents.image.repository }}:{{ .Values.agents.image.tag }}"
command:
- cp
- /etc/config/system-probe-seccomp.json
stable/datadog/values.yaml
+16
View File
@@ -189,6 +189,22 @@ datadog:
#
# leaderLeaseDuration: 60
## @param logs - object - required
## Enable logs agent and provide custom configs
#
logs:
## @param enabled - boolean - optional - default: false
## Enables this to activate Datadog Agent log collection.
## ref: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup
#
enabled: false
## @param containerCollectAll - boolean - optional - default: false
## Enable this to allow log collection for all containers.
## ref: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup
#
# containerCollectAll: false
## @param logsEnabled - boolean - optional - default: false
## Enables this to activate Datadog Agent log collection.
## ref: https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/#log-collection-setup