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] Allow custom agent configuration (#15861)

Browse Source 
* datadog agent: allow custom configuration

Signed-off-by: Martin Gaida <mgaida@flipboard.com>
Signed-off-by: Martin Gaida <martin.m.gaida@gmail.com>

* datadog agent: configuration documentation

Signed-off-by: Martin Gaida <mgaida@flipboard.com>
Signed-off-by: Martin Gaida <martin.m.gaida@gmail.com>

* stable/datadog: bump version again

Signed-off-by: Martin Gaida <martin.m.gaida@gmail.com>

* stable/datadog: bump version

Signed-off-by: Martin Gaida <martin.m.gaida@gmail.com>
This commit is contained in:
Martin Gaida
2019-10-08 13:19:49 -07:00
committed by Kubernetes Prow Robot
parent 4e9b398336
commit 685f43751e
5 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/datadog/Chart.yaml
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: datadog
version: 1.38.0
version: 1.38.1
appVersion: 6.14.0
description: DataDog Agent
keywords:
stable/datadog/README.md
+2
View File
@@ -320,6 +320,8 @@ helm install --name <RELEASE_NAME> \
| `daemonset.containers.systemProbe.resources.limits.memory` | Memory resource limits for the system-probe container | `200Mi` |
| `daemonset.containers.systemProbe.resources.requests.memory` | Memory resource requests for the system-probe container | `200Mi` |
| `daemonset.priorityClassName` | Which Priority Class to associate with the daemonset | `nil` |
| `daemonset.useConfigMap` | Configures a configmap to provide the agent configuration | `false` |
| `daemonset.customAgentConfig` | Specify custom contents for the datadog agent config (datadog.yaml). | `{}` |
| `daemonset.updateStrategy` | Which update strategy to deploy the daemonset | RollingUpdate with 10% maxUnavailable |
| `datadog.leaderElection` | Enable the leader Election feature | `false` |
| `datadog.leaderLeaseDuration` | The duration for which a leader stays elected. | 60 sec, 15 if Cluster Checks enabled |
stable/datadog/templates/daemonset.yaml
+3
View File
@@ -39,6 +39,9 @@ spec:
checksum/autoconf-config: {{ tpl (toYaml .Values.datadog.autoconf) . | sha256sum }}
checksum/confd-config: {{ tpl (toYaml .Values.datadog.confd) . | sha256sum }}
checksum/checksd-config: {{ tpl (toYaml .Values.datadog.checksd) . | sha256sum }}
{{- if .Values.daemonset.customAgentConfig }}
checksum/agent-config: {{ tpl (toYaml .Values.daemonset.customAgentConfig) . | sha256sum }}
{{- end }}
{{- if and .Values.systemProbe.enabled .Values.daemonset.useDedicatedContainers }}
container.apparmor.security.beta.kubernetes.io/system-probe: {{ .Values.systemProbe.apparmor }}
container.seccomp.security.alpha.kubernetes.io/system-probe: localhost/system-probe
stable/datadog/templates/datadog-yaml-configmap.yaml
+7
View File
@@ -14,8 +14,14 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
app.kubernetes.io/version: {{ .Chart.AppVersion }}
annotations:
{{- if .Values.daemonset.customAgentConfig }}
checksum/agent-config: {{ tpl (toYaml .Values.daemonset.customAgentConfig) . | sha256sum }}
{{- end }}
data:
datadog.yaml: |
{{- if .Values.daemonset.customAgentConfig }}
{{ tpl (toYaml .Values.daemonset.customAgentConfig) . | indent 4 }}
{{- else }}
## Provides autodetected defaults, for kubernetes environments,
## please see datadog.yaml.example for all supported options
@@ -33,4 +39,5 @@ data:
# Use java cgroup memory awareness
jmx_use_cgroup_memory_limit: true
{{- end }}
{{- end }}
stable/datadog/values.yaml
+24
View File
@@ -664,6 +664,30 @@ daemonset:
#
# useConfigMap: false
## @param customAgentConfig - object - optional
## Specify custom contents for the datadog agent config (datadog.yaml).
## ref: https://docs.datadoghq.com/agent/guide/agent-configuration-files/?tab=agentv6
## ref: https://github.com/DataDog/datadog-agent/blob/master/pkg/config/config_template.yaml
#
# customAgentConfig:
# # Autodiscovery for Kubernetes
# listeners:
# - name: kubelet
# config_providers:
# - name: kubelet
# polling: true
# # needed to support legacy docker label config templates
# - name: docker
# polling: true
#
# # Enable APM by setting the DD_APM_ENABLED envvar to true, or override this configuration
# apm_config:
# enabled: false
# apm_non_local_traffic: true
#
# # Use java cgroup memory awareness
# jmx_use_cgroup_memory_limit: true
deployment:
## @param enabled - boolean - required
## Apart from DaemonSet, deploy Datadog agent pods and related service for