Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(agent): Add dogstatsd.enabled flag to disable it when using a standalone DogStatsD #1590

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions charts/datadog/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Datadog changelog

## 3.77.0

* Add dogstatsd.enabled flag to disable it when using a standalone DogStatsD.

## 3.76.2

* Fix warning message displayed when installing/upgrading the Agent with OTel collector.
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: datadog
version: 3.76.2
version: 3.77.0
appVersion: "7"
description: Datadog Agent
keywords:
Expand Down
3 changes: 2 additions & 1 deletion charts/datadog/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog

![Version: 3.76.2](https://img.shields.io/badge/Version-3.76.2-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
![Version: 3.77.0](https://img.shields.io/badge/Version-3.77.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)

[Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds the Datadog Agent to all nodes in your cluster via a DaemonSet. It also optionally depends on the [kube-state-metrics chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics). For more information about monitoring Kubernetes with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/).

Expand Down Expand Up @@ -709,6 +709,7 @@ helm install <RELEASE_NAME> \
| datadog.criSocketPath | string | `nil` | Path to the container runtime socket (if different from Docker) |
| datadog.dd_url | string | `nil` | The host of the Datadog intake server to send Agent data to, only set this option if you need the Agent to send data to a custom URL |
| datadog.dockerSocketPath | string | `nil` | Path to the docker socket |
| datadog.dogstatsd.enabled | bool | `true` | Enable DogStatsD on port 8125 UDP |
| datadog.dogstatsd.hostSocketPath | string | `"/var/run/datadog/"` | Host path to the DogStatsD socket |
| datadog.dogstatsd.nonLocalTraffic | bool | `true` | Enable this to make each node accept non-local statsd traffic (from outside of the pod) |
| datadog.dogstatsd.originDetection | bool | `false` | Enable origin detection for container tagging |
Expand Down
8 changes: 8 additions & 0 deletions charts/datadog/ci/dogstastd-disable-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Empty values file for testing default parameters.
datadog:
apiKey: "00000000000000000000000000000000"
appKey: "0000000000000000000000000000000000000000"
kubeStateMetricsEnabled: false

dogstatsd:
enabled: false
6 changes: 6 additions & 0 deletions charts/datadog/templates/_container-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
resources:
{{ toYaml .Values.agents.containers.agent.resources | indent 4 }}
ports:
{{- if .Values.datadog.dogstatsd.enabled }}
- containerPort: {{ .Values.datadog.dogstatsd.port }}
{{- if .Values.datadog.dogstatsd.useHostPort }}
hostPort: {{ .Values.datadog.dogstatsd.port }}
{{- end }}
name: dogstatsdport
protocol: UDP
{{- end }}
{{- if .Values.datadog.otlp }}
{{- if .Values.datadog.otlp.receiver }}
{{- if .Values.datadog.otlp.receiver.protocols }}
Expand Down Expand Up @@ -64,6 +66,10 @@
- name: DD_LOG_LEVEL
value: {{ .Values.agents.containers.agent.logLevel | default .Values.datadog.logLevel | quote }}
{{- end }}
{{- if .Values.datadog.dogstatsd.enabled }}
- name: DD_USE_DOGSTATSD
value: {{ .Values.datadog.dogstatsd.enabled | quote }}
{{- end }}
{{- if .Values.datadog.dogstatsd.port }}
- name: DD_DOGSTATSD_PORT
value: {{ .Values.datadog.dogstatsd.port | quote }}
Expand Down
4 changes: 4 additions & 0 deletions charts/datadog/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,10 @@ datadog:
## ref: https://docs.datadoghq.com/agent/kubernetes/dogstatsd/
## To emit custom metrics from your Kubernetes application, use DogStatsD.
dogstatsd:

# datadog.dogstatsd.enabled -- Enable DogStatsD on port 8125 UDP
enabled: true

# datadog.dogstatsd.port -- Override the Agent DogStatsD port

## Note: Make sure your client is sending to the same UDP port.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: datadog-clusterchecks
namespace: datadog-agent
labels:
helm.sh/chart: 'datadog-3.75.0'
helm.sh/chart: 'datadog-3.77.0'
app.kubernetes.io/name: "datadog"
app.kubernetes.io/instance: "datadog"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -36,8 +36,8 @@ spec:

name: datadog-clusterchecks
annotations:
checksum/clusteragent_token: e662bb8d6708ee7d2bd21ce95572b12e19152da58e6c1640fbd706d505af5199
checksum/install_info: 0f26ba698ed19cfca67b345f53ad633320db3f86502c811b4c44738df3ee25a4
checksum/clusteragent_token: dcdb9a9ea20343bd238e4faee0d4f8ecab6aa9b242482ffd57eb90a1eb93c19c
checksum/install_info: f403040e6025b96734be0a558887981234898c3cae7f36887aa7f3f4eefe5ea4
spec:
serviceAccountName: datadog-cluster-checks
automountServiceAccountToken: true
Expand Down
10 changes: 5 additions & 5 deletions test/datadog/baseline/cluster-agent-deployment_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: datadog-cluster-agent
namespace: datadog-agent
labels:
helm.sh/chart: 'datadog-3.75.0'
helm.sh/chart: 'datadog-3.77.0'
app.kubernetes.io/name: "datadog"
app.kubernetes.io/instance: "datadog"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -36,11 +36,11 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: 5d58162fbaf3dc86cb8e4ed4166bcc1442b62c8592072a72f4a041568bd5d921
checksum/clusteragent-configmap: 0c1966cffe42a8ccb4671c256aa7db39c81c3dae6879d43317408155ad03110b
checksum/api_key: a65b0e9878ce3895aac0a8a39067aaceac970036603a52f6b4d3b8841fe562b9
checksum/clusteragent_token: 71865d72d66a9c849d9564df6eed60528f14c98ce1aaa6f388057b6e347e9cd7
checksum/clusteragent-configmap: 6ea3bed44b8db683b800fdee6a9b1d42658d093d35acac83ebe3ba6ac4c11f33
checksum/api_key: a437d40538689de1f38c011341f314e7711aafb0316dba9710224f5db67f8857
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/install_info: 0f26ba698ed19cfca67b345f53ad633320db3f86502c811b4c44738df3ee25a4
checksum/install_info: f403040e6025b96734be0a558887981234898c3cae7f36887aa7f3f4eefe5ea4
spec:
serviceAccountName: datadog-cluster-agent
automountServiceAccountToken: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: datadog-cluster-agent
namespace: datadog-agent
labels:
helm.sh/chart: 'datadog-3.75.0'
helm.sh/chart: 'datadog-3.77.0'
app.kubernetes.io/name: "datadog"
app.kubernetes.io/instance: "datadog"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -36,11 +36,11 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: 4faaaae681309cfb4836e070a4b35e8a718a1b3c012ffb338d2ec7a3cf4036b1
checksum/clusteragent-configmap: 0c1966cffe42a8ccb4671c256aa7db39c81c3dae6879d43317408155ad03110b
checksum/api_key: a65b0e9878ce3895aac0a8a39067aaceac970036603a52f6b4d3b8841fe562b9
checksum/clusteragent_token: 85d8dd164baaad1c0c76a5266576179777e53bd5031102fc34d457c342beb9c6
checksum/clusteragent-configmap: 6ea3bed44b8db683b800fdee6a9b1d42658d093d35acac83ebe3ba6ac4c11f33
checksum/api_key: a437d40538689de1f38c011341f314e7711aafb0316dba9710224f5db67f8857
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/install_info: 0f26ba698ed19cfca67b345f53ad633320db3f86502c811b4c44738df3ee25a4
checksum/install_info: f403040e6025b96734be0a558887981234898c3cae7f36887aa7f3f4eefe5ea4
spec:
serviceAccountName: datadog-cluster-agent
automountServiceAccountToken: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: datadog-cluster-agent
namespace: datadog-agent
labels:
helm.sh/chart: 'datadog-3.75.0'
helm.sh/chart: 'datadog-3.77.0'
app.kubernetes.io/name: "datadog"
app.kubernetes.io/instance: "datadog"
app.kubernetes.io/managed-by: Helm
Expand Down Expand Up @@ -36,11 +36,11 @@ spec:

name: datadog-cluster-agent
annotations:
checksum/clusteragent_token: 7f6c7c85263dcfa577b2dd96600808784265f650c52ee13f4814274fdae02eb4
checksum/clusteragent-configmap: 0c1966cffe42a8ccb4671c256aa7db39c81c3dae6879d43317408155ad03110b
checksum/api_key: a65b0e9878ce3895aac0a8a39067aaceac970036603a52f6b4d3b8841fe562b9
checksum/clusteragent_token: 6c9d16627c64353bd0f6e6ac5420297ce88edebc7559497e782b29170daf930c
checksum/clusteragent-configmap: 6ea3bed44b8db683b800fdee6a9b1d42658d093d35acac83ebe3ba6ac4c11f33
checksum/api_key: a437d40538689de1f38c011341f314e7711aafb0316dba9710224f5db67f8857
checksum/application_key: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
checksum/install_info: 0f26ba698ed19cfca67b345f53ad633320db3f86502c811b4c44738df3ee25a4
checksum/install_info: f403040e6025b96734be0a558887981234898c3cae7f36887aa7f3f4eefe5ea4
spec:
serviceAccountName: datadog-cluster-agent
automountServiceAccountToken: true
Expand Down
8 changes: 5 additions & 3 deletions test/datadog/baseline/daemonset_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: datadog
namespace: datadog-agent
labels:
helm.sh/chart: 'datadog-3.75.0'
helm.sh/chart: 'datadog-3.77.0'
app.kubernetes.io/name: "datadog"
app.kubernetes.io/instance: "datadog"
app.kubernetes.io/managed-by: Helm
Expand All @@ -30,8 +30,8 @@ spec:

name: datadog
annotations:
checksum/clusteragent_token: 83b5b1602b5e1169578e69dded647f78c781486cc5e8203a93bcd477148b6938
checksum/install_info: 0f26ba698ed19cfca67b345f53ad633320db3f86502c811b4c44738df3ee25a4
checksum/clusteragent_token: 6b7aaf26c3c7a20b688eb3152d5fe27ced042a260cfb237e786805a8c601237f
checksum/install_info: f403040e6025b96734be0a558887981234898c3cae7f36887aa7f3f4eefe5ea4
checksum/autoconf-config: 74234e98afe7498fb5daf1f36ac2d78acc339464f950703b8c019892f982b90b
checksum/confd-config: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
checksum/checksd-config: 44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a
Expand Down Expand Up @@ -89,6 +89,8 @@ spec:
value: "false"
- name: DD_LOG_LEVEL
value: "INFO"
- name: DD_USE_DOGSTATSD
value: "true"
- name: DD_DOGSTATSD_PORT
value: "8125"
- name: DD_DOGSTATSD_NON_LOCAL_TRAFFIC
Expand Down
Loading