Skip to content

Commit d295beb

Browse files
agagnieredd-octo-sts[bot]
agagniere
and
dd-octo-sts[bot]
authored
Use DD exporter's sending queue instead of the batch processor (#2263)
Use DD exporter's sending queue instead of the batch processor Remove unused debug exporter Set sending queue batch timeout to 10s Remove empty processor lists chore: update charts - bump version for datadog to 3.158.1 (patch-version) - update changelog for datadog with version 3.158.1 - update readme for datadog Co-authored-by: dd-octo-sts[bot] <200755185+dd-octo-sts[bot]@users.noreply.github.com> Co-authored-by: antoine.gagniere <[email protected]>
1 parent 7bd3f1e commit d295beb

File tree

10 files changed

+52
-59
lines changed

10 files changed

+52
-59
lines changed

‎charts/datadog/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Datadog changelog
22

3+
## 3.158.1
4+
5+
* Use DD exporter's sending queue instead of the batch processor ([#2263](https://github.com/DataDog/helm-charts/pull/2263)).
6+
37
## 3.158.0
48

59
* deprecate `datadog.processAgent.runInCoreAgent` ([#2265](https://github.com/DataDog/helm-charts/pull/2265)).

‎charts/datadog/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
apiVersion: v1
33
name: datadog
4-
version: 3.158.0
4+
version: 3.158.1
55
appVersion: "7"
66
description: Datadog Agent
77
keywords:

‎charts/datadog/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Datadog
22

3-
![Version: 3.158.0](https://img.shields.io/badge/Version-3.158.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
3+
![Version: 3.158.1](https://img.shields.io/badge/Version-3.158.1-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
44

55
[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/).
66

‎charts/datadog/templates/_otel_agent_config.yaml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@ otel-config.yaml: {{- if .Values.datadog.otelCollector.config }} {{ toYaml .Valu
99
http:
1010
endpoint: 0.0.0.0:{{ include "get-port-number-from-name" (dict "ports" .Values.datadog.otelCollector.ports "portName" "otel-http") }}
1111
exporters:
12-
debug:
13-
verbosity: detailed
1412
otlphttp:
1513
endpoint: http://{{ template "datadog.fullname" . }}-otel-agent-gateway:4318
1614
tls:
1715
insecure: true
16+
sending_queue:
17+
batch:
18+
flush_timeout: 10s
1819
processors:
1920
infraattributes:
2021
cardinality: 2
21-
batch:
22-
timeout: 10s
2322
connectors:
2423
datadog/connector:
2524
traces:
@@ -30,15 +29,15 @@ otel-config.yaml: {{- if .Values.datadog.otelCollector.config }} {{ toYaml .Valu
3029
pipelines:
3130
traces:
3231
receivers: [otlp]
33-
processors: [infraattributes, batch]
32+
processors: [infraattributes,]
3433
exporters: [otlphttp, datadog/connector]
3534
metrics:
3635
receivers: [otlp, datadog/connector]
37-
processors: [infraattributes, batch]
36+
processors: [infraattributes]
3837
exporters: [otlphttp]
3938
logs:
4039
receivers: [otlp]
41-
processors: [infraattributes, batch]
40+
processors: [infraattributes]
4241
exporters: [otlphttp]
4342
{{- else }} |
4443
receivers:
@@ -56,17 +55,16 @@ otel-config.yaml: {{- if .Values.datadog.otelCollector.config }} {{ toYaml .Valu
5655
http:
5756
endpoint: 0.0.0.0:{{ include "get-port-number-from-name" (dict "ports" .Values.datadog.otelCollector.ports "portName" "otel-http") }}
5857
exporters:
59-
debug:
60-
verbosity: detailed
6158
datadog:
6259
api:
6360
key: ${env:DD_API_KEY}
6461
site: {{ .Values.datadog.site | default "" | quote }}
62+
sending_queue:
63+
batch:
64+
flush_timeout: 10s
6565
processors:
6666
infraattributes:
6767
cardinality: 2
68-
batch:
69-
timeout: 10s
7068
connectors:
7169
datadog/connector:
7270
traces:
@@ -77,16 +75,15 @@ otel-config.yaml: {{- if .Values.datadog.otelCollector.config }} {{ toYaml .Valu
7775
pipelines:
7876
traces:
7977
receivers: [otlp]
80-
processors: [infraattributes, batch]
78+
processors: [infraattributes]
8179
exporters: [datadog, datadog/connector]
8280
metrics:
8381
receivers: [otlp, datadog/connector, prometheus]
84-
processors: [infraattributes, batch]
82+
processors: [infraattributes]
8583
exporters: [datadog]
8684
logs:
8785
receivers: [otlp]
88-
processors: [infraattributes, batch]
86+
processors: [infraattributes]
8987
exporters: [datadog]
9088
{{- end -}}
9189
{{- end -}}
92-

‎charts/datadog/templates/_otel_agent_gateway_config.yaml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ otel-gateway-config.yaml: {{- if .Values.otelAgentGateway.config }} {{ toYaml .V
99
http:
1010
endpoint: 0.0.0.0:{{ include "get-port-number-from-name" (dict "ports" .Values.otelAgentGateway.ports "portName" "otel-http") }}
1111
exporters:
12-
debug:
13-
verbosity: detailed
1412
datadog:
1513
api:
1614
key: ${env:DD_API_KEY}
1715
site: {{ .Values.datadog.site | default "datadoghq.com" | quote }}
16+
sending_queue:
17+
batch:
18+
flush_timeout: 10s
1819
processors:
19-
batch:
20-
timeout: 10s
2120
extension:
2221
datadog:
2322
api:
@@ -28,16 +27,12 @@ otel-gateway-config.yaml: {{- if .Values.otelAgentGateway.config }} {{ toYaml .V
2827
pipelines:
2928
traces:
3029
receivers: [otlp]
31-
processors: [batch]
3230
exporters: [datadog]
3331
metrics:
3432
receivers: [otlp]
35-
processors: [batch]
3633
exporters: [datadog]
3734
logs:
3835
receivers: [otlp]
39-
processors: [batch]
4036
exporters: [datadog]
4137
{{- end -}}
4238
{{- end -}}
43-

‎examples/datadog/otel_collector_config.yaml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@ exporters:
1818
datadog:
1919
api:
2020
key: ${env:DD_API_KEY}
21+
sending_queue:
22+
batch:
23+
flush_timeout: 10s
2124
processors:
2225
infraattributes:
2326
cardinality: 2
2427
probabilistic_sampler:
2528
hash_seed: 22
2629
sampling_percentage: 15.3
27-
batch:
28-
timeout: 10s
2930
connectors:
3031
datadog/connector:
3132
traces:
@@ -42,17 +43,17 @@ service:
4243
pipelines:
4344
traces:
4445
receivers: [otlp]
45-
processors: [batch]
46+
processors: []
4647
exporters: [datadog/connector]
4748
traces/sampled:
4849
receivers: [otlp]
49-
processors: [probabilistic_sampler, infraattributes, batch]
50+
processors: [probabilistic_sampler, infraattributes]
5051
exporters: [datadog]
5152
metrics:
5253
receivers: [otlp, datadog/connector, prometheus]
53-
processors: [infraattributes, batch]
54+
processors: [infraattributes]
5455
exporters: [datadog]
5556
logs:
5657
receivers: [otlp]
57-
processors: [infraattributes, batch]
58+
processors: [infraattributes]
5859
exporters: [datadog]

‎test/datadog/baseline/manifests/otel-agent_config_ports.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,16 @@ data:
158158
http:
159159
endpoint: 0.0.0.0:4318
160160
exporters:
161-
debug:
162-
verbosity: detailed
163161
datadog:
164162
api:
165163
key: ${env:DD_API_KEY}
166164
site: ""
165+
sending_queue:
166+
batch:
167+
flush_timeout: 10s
167168
processors:
168169
infraattributes:
169170
cardinality: 2
170-
batch:
171-
timeout: 10s
172171
connectors:
173172
datadog/connector:
174173
traces:
@@ -179,15 +178,15 @@ data:
179178
pipelines:
180179
traces:
181180
receivers: [otlp]
182-
processors: [infraattributes, batch]
181+
processors: [infraattributes]
183182
exporters: [datadog, datadog/connector]
184183
metrics:
185184
receivers: [otlp, datadog/connector, prometheus]
186-
processors: [infraattributes, batch]
185+
processors: [infraattributes]
187186
exporters: [datadog]
188187
logs:
189188
receivers: [otlp]
190-
processors: [infraattributes, batch]
189+
processors: [infraattributes]
191190
exporters: [datadog]
192191
kind: ConfigMap
193192
metadata:

‎test/datadog/baseline/manifests/otel-agent_container_ports.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,16 @@ data:
158158
http:
159159
endpoint: 0.0.0.0:4318
160160
exporters:
161-
debug:
162-
verbosity: detailed
163161
datadog:
164162
api:
165163
key: ${env:DD_API_KEY}
166164
site: ""
165+
sending_queue:
166+
batch:
167+
flush_timeout: 10s
167168
processors:
168169
infraattributes:
169170
cardinality: 2
170-
batch:
171-
timeout: 10s
172171
connectors:
173172
datadog/connector:
174173
traces:
@@ -179,15 +178,15 @@ data:
179178
pipelines:
180179
traces:
181180
receivers: [otlp]
182-
processors: [infraattributes, batch]
181+
processors: [infraattributes]
183182
exporters: [datadog, datadog/connector]
184183
metrics:
185184
receivers: [otlp, datadog/connector, prometheus]
186-
processors: [infraattributes, batch]
185+
processors: [infraattributes]
187186
exporters: [datadog]
188187
logs:
189188
receivers: [otlp]
190-
processors: [infraattributes, batch]
189+
processors: [infraattributes]
191190
exporters: [datadog]
192191
kind: ConfigMap
193192
metadata:

‎test/datadog/baseline/manifests/otel-agent_volume_mounts.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,16 @@ data:
158158
http:
159159
endpoint: 0.0.0.0:4318
160160
exporters:
161-
debug:
162-
verbosity: detailed
163161
datadog:
164162
api:
165163
key: ${env:DD_API_KEY}
166164
site: ""
165+
sending_queue:
166+
batch:
167+
flush_timeout: 10s
167168
processors:
168169
infraattributes:
169170
cardinality: 2
170-
batch:
171-
timeout: 10s
172171
connectors:
173172
datadog/connector:
174173
traces:
@@ -179,15 +178,15 @@ data:
179178
pipelines:
180179
traces:
181180
receivers: [otlp]
182-
processors: [infraattributes, batch]
181+
processors: [infraattributes]
183182
exporters: [datadog, datadog/connector]
184183
metrics:
185184
receivers: [otlp, datadog/connector, prometheus]
186-
processors: [infraattributes, batch]
185+
processors: [infraattributes]
187186
exporters: [datadog]
188187
logs:
189188
receivers: [otlp]
190-
processors: [infraattributes, batch]
189+
processors: [infraattributes]
191190
exporters: [datadog]
192191
kind: ConfigMap
193192
metadata:

‎test/datadog/baseline/manifests/otel_enabled.yaml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,17 +158,16 @@ data:
158158
http:
159159
endpoint: 0.0.0.0:4318
160160
exporters:
161-
debug:
162-
verbosity: detailed
163161
datadog:
164162
api:
165163
key: ${env:DD_API_KEY}
166164
site: ""
165+
sending_queue:
166+
batch:
167+
flush_timeout: 10s
167168
processors:
168169
infraattributes:
169170
cardinality: 2
170-
batch:
171-
timeout: 10s
172171
connectors:
173172
datadog/connector:
174173
traces:
@@ -179,15 +178,15 @@ data:
179178
pipelines:
180179
traces:
181180
receivers: [otlp]
182-
processors: [infraattributes, batch]
181+
processors: [infraattributes]
183182
exporters: [datadog, datadog/connector]
184183
metrics:
185184
receivers: [otlp, datadog/connector, prometheus]
186-
processors: [infraattributes, batch]
185+
processors: [infraattributes]
187186
exporters: [datadog]
188187
logs:
189188
receivers: [otlp]
190-
processors: [infraattributes, batch]
189+
processors: [infraattributes]
191190
exporters: [datadog]
192191
kind: ConfigMap
193192
metadata:

0 commit comments

Comments
 (0)