Skip to content

Commit 35485f2

Browse files
chore(deps): Migrate routing processor to routing connector for metrics collection
0.136.* version of otel collector does not support routing processor, the routing processor is being moved to routing connector. This PR changes the routing config for metrics. Signed-off-by: Dhruv Shah <[email protected]>
1 parent bf22c2d commit 35485f2

File tree

9 files changed

+392
-224
lines changed

9 files changed

+392
-224
lines changed

deploy/helm/sumologic/conf/metrics/otelcol/config.yaml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
{{- if eq .Values.sumologic.metrics.sourceType "http" }}
2+
connectors:
3+
{{ tpl (.Files.Get "conf/metrics/otelcol/connectors.yaml") . | indent 2 }}
4+
{{- end}}
5+
16
exporters:
27
{{ tpl (.Files.Get "conf/metrics/otelcol/exporters.yaml") . | indent 2 }}
38

@@ -53,6 +58,67 @@ service:
5358
pipelines:
5459
metrics:
5560
{{ tpl (.Files.Get "conf/metrics/otelcol/pipeline.yaml") . | indent 6 }}
61+
{{- if eq .Values.sumologic.metrics.sourceType "http" }}
62+
metrics/sumologic/default:
63+
receivers:
64+
- routing/default
65+
exporters:
66+
- sumologic/default
67+
{{- if eq .Values.debug.metrics.metadata.print true }}
68+
metrics/debug:
69+
receivers:
70+
- routing/default
71+
exporters:
72+
- debug
73+
{{- end }}
74+
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
75+
metrics/sumologic/sumologic-mock-default:
76+
receivers:
77+
- routing/default
78+
exporters:
79+
- sumologic/sumologic-mock-default
80+
metrics/sumologic/sumologic-mock-http:
81+
receivers:
82+
- routing/default
83+
exporters:
84+
- sumologic/sumologic-mock-http
85+
{{- end }}
86+
metrics/apiserver:
87+
receivers:
88+
- routing/default
89+
exporters:
90+
- sumologic/apiserver
91+
metrics/control_plane:
92+
receivers:
93+
- routing/default
94+
exporters:
95+
- sumologic/control_plane
96+
metrics/controller:
97+
receivers:
98+
- routing/default
99+
exporters:
100+
- sumologic/controller
101+
metrics/kubelet:
102+
receivers:
103+
- routing/default
104+
exporters:
105+
- sumologic/kubelet
106+
metrics/node:
107+
receivers:
108+
- routing/default
109+
exporters:
110+
- sumologic/node
111+
metrics/scheduler:
112+
receivers:
113+
- routing/default
114+
exporters:
115+
- sumologic/scheduler
116+
metrics/state:
117+
receivers:
118+
- routing/default
119+
exporters:
120+
- sumologic/state
121+
{{- end }}
56122
telemetry:
57123
logs:
58124
level: {{ .Values.metadata.metrics.logLevel }}
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
routing/default:
2+
default_pipelines:
3+
- metrics/sumologic/default
4+
{{- if eq .Values.debug.metrics.metadata.print true }}
5+
- metrics/debug
6+
{{- end }}
7+
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
8+
- metrics/sumologic/sumologic-mock-default
9+
{{- end }}
10+
table:
11+
- statement: route() where resource.attributes["job"] == "apiserver"
12+
pipelines:
13+
- metrics/apiserver
14+
{{- if eq .Values.debug.metrics.metadata.print true }}
15+
- metrics/debug
16+
{{- end }}
17+
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
18+
- metrics/sumologic/sumologic-mock-http
19+
{{- end }}
20+
- statement: route() where resource.attributes["job"] == "coredns"
21+
pipelines:
22+
- metrics/control_plane
23+
{{- if eq .Values.debug.metrics.metadata.print true }}
24+
- metrics/debug
25+
{{- end }}
26+
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
27+
- metrics/sumologic/sumologic-mock-http
28+
{{- end }}
29+
- statement: route() where resource.attributes["job"] == "kube-etcd"
30+
pipelines:
31+
- metrics/control_plane
32+
{{- if eq .Values.debug.metrics.metadata.print true }}
33+
- metrics/debug
34+
{{- end }}
35+
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
36+
- metrics/sumologic/sumologic-mock-http
37+
{{- end }}
38+
- statement: route() where resource.attributes["job"] == "kube-controller-manager"
39+
pipelines:
40+
- metrics/controller
41+
{{- if eq .Values.debug.metrics.metadata.print true }}
42+
- metrics/debug
43+
{{- end }}
44+
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
45+
- metrics/sumologic/sumologic-mock-http
46+
{{- end }}
47+
- statement: route() where resource.attributes["job"] == "kubelet"
48+
pipelines:
49+
- metrics/kubelet
50+
{{- if eq .Values.debug.metrics.metadata.print true }}
51+
- metrics/debug
52+
{{- end }}
53+
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
54+
- metrics/sumologic/sumologic-mock-http
55+
{{- end }}
56+
- statement: route() where resource.attributes["job"] == "node-exporter"
57+
pipelines:
58+
- metrics/node
59+
{{- if eq .Values.debug.metrics.metadata.print true }}
60+
- metrics/debug
61+
{{- end }}
62+
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
63+
- metrics/sumologic/sumologic-mock-http
64+
{{- end }}
65+
- statement: route() where resource.attributes["job"] == "kube-scheduler"
66+
pipelines:
67+
- metrics/scheduler
68+
{{- if eq .Values.debug.metrics.metadata.print true }}
69+
- metrics/debug
70+
{{- end }}
71+
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
72+
- metrics/sumologic/sumologic-mock-http
73+
{{- end }}
74+
- statement: route() where resource.attributes["job"] == "kube-state-metrics"
75+
pipelines:
76+
- metrics/state
77+
{{- if eq .Values.debug.metrics.metadata.print true }}
78+
- metrics/debug
79+
{{- end }}
80+
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
81+
- metrics/sumologic/sumologic-mock-http
82+
{{- end }}

deploy/helm/sumologic/conf/metrics/otelcol/pipeline.yaml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
exporters:
2+
{{- if ne .Values.sumologic.metrics.sourceType "http" }}
23
- sumologic/default
34
{{- if eq .Values.debug.metrics.metadata.print true }}
45
- debug
56
{{- end }}
67
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
78
- sumologic/sumologic-mock-default
89
{{- end }}
9-
{{- if eq .Values.sumologic.metrics.sourceType "http" }}
10-
- sumologic/apiserver
11-
- sumologic/control_plane
12-
- sumologic/controller
13-
- sumologic/kubelet
14-
- sumologic/node
15-
- sumologic/scheduler
16-
- sumologic/state
17-
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
18-
- sumologic/sumologic-mock-http
19-
{{- end }}
10+
{{- else }}
11+
- routing/default
2012
{{- end }}
2113
processors:
2214
- memory_limiter
@@ -45,9 +37,6 @@ processors:
4537
- filter/app_metrics
4638
{{- end }}
4739
- batch
48-
{{- if eq .Values.sumologic.metrics.sourceType "http" }}
49-
- routing
50-
{{- end }}
5140
receivers:
5241
- telegraf
5342
- otlp

deploy/helm/sumologic/conf/metrics/otelcol/processors.yaml

Lines changed: 1 addition & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -165,98 +165,7 @@ resource/remove_k8s_pod_pod_name:
165165
- action: delete
166166
key: k8s.pod.pod_name
167167

168-
{{- if eq .Values.sumologic.metrics.sourceType "http" }}
169-
routing:
170-
default_exporters:
171-
- sumologic/default
172-
{{- if eq .Values.debug.metrics.metadata.print true }}
173-
- debug
174-
{{- end }}
175-
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
176-
- sumologic/sumologic-mock-default
177-
{{- end }}
178-
error_mode: ignore
179-
table:
180-
## apiserver metrics
181-
- exporters:
182-
- sumologic/apiserver
183-
{{- if eq .Values.debug.metrics.metadata.print true }}
184-
- debug
185-
{{- end }}
186-
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
187-
- sumologic/sumologic-mock-http
188-
{{- end }}
189-
statement: route() where resource.attributes["job"] == "apiserver"
190-
## control-plane metrics
191-
- exporters:
192-
- sumologic/control_plane
193-
{{- if eq .Values.debug.metrics.metadata.print true }}
194-
- debug
195-
{{- end }}
196-
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
197-
- sumologic/sumologic-mock-http
198-
{{- end }}
199-
statement: route() where resource.attributes["job"] == "coredns"
200-
- exporters:
201-
- sumologic/control_plane
202-
{{- if eq .Values.debug.metrics.metadata.print true }}
203-
- debug
204-
{{- end }}
205-
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
206-
- sumologic/sumologic-mock-http
207-
{{- end }}
208-
statement: route() where resource.attributes["job"] == "kube-etcd"
209-
## controller metrics
210-
- exporters:
211-
- sumologic/controller
212-
{{- if eq .Values.debug.metrics.metadata.print true }}
213-
- debug
214-
{{- end }}
215-
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
216-
- sumologic/sumologic-mock-http
217-
{{- end }}
218-
statement: route() where resource.attributes["job"] == "kube-controller-manager"
219-
## kubelet metrics
220-
- exporters:
221-
- sumologic/kubelet
222-
{{- if eq .Values.debug.metrics.metadata.print true }}
223-
- debug
224-
{{- end }}
225-
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
226-
- sumologic/sumologic-mock-http
227-
{{- end }}
228-
statement: route() where resource.attributes["job"] == "kubelet"
229-
## node metrics
230-
- exporters:
231-
- sumologic/node
232-
{{- if eq .Values.debug.metrics.metadata.print true }}
233-
- debug
234-
{{- end }}
235-
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
236-
- sumologic/sumologic-mock-http
237-
{{- end }}
238-
statement: route() where resource.attributes["job"] == "node-exporter"
239-
## scheduler metrics
240-
- exporters:
241-
- sumologic/scheduler
242-
{{- if eq .Values.debug.metrics.metadata.print true }}
243-
- debug
244-
{{- end }}
245-
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
246-
- sumologic/sumologic-mock-http
247-
{{- end }}
248-
statement: route() where resource.attributes["job"] == "kube-scheduler"
249-
## state metrics
250-
- exporters:
251-
- sumologic/state
252-
{{- if eq .Values.debug.metrics.metadata.print true }}
253-
- debug
254-
{{- end }}
255-
{{- if eq (include "sumologic-mock.forward-metrics-metadata" .) "true" }}
256-
- sumologic/sumologic-mock-http
257-
{{- end }}
258-
statement: route() where resource.attributes["job"] == "kube-state-metrics"
259-
{{- end }}
168+
# routing removed to support routing connectors for the latest otel col version.
260169

261170
## Configuration for Source Processor
262171
## Source processor adds Sumo Logic related metadata

deploy/helm/sumologic/values.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -462,11 +462,14 @@ sumologic:
462462
fallbackExporters: []
463463
table: []
464464
## -
465-
## ## exporter is name of the exporter
466-
## exporter: sumologic/otlp
467-
## ## statement is an OTTL condition which defines what data should be send to the exporter
468-
## ## see routing processor documentation for more details:
469-
## ## https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/aee4b75100530bce7edbf736fbcf76ac4f6ced6d/processor/routingprocessor/README.md#tech-preview-opentelemetry-transformation-language-statements-as-routing-conditions
465+
## ## exporters is an array of the exporter
466+
## exporters:
467+
## - sumologic/otlp
468+
## ## statement is an OTTL condition which defines what data should be sent to the exporters
469+
## ## see routing connector documentation for more details:
470+
## ## https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/aee4b75100530bce7edbf736fbcf76ac4f6ced6d/connector/routingconnector
471+
## routing connector expects you to define a pipeline, but here the user can just mention the exporter.
472+
## The helm deployment would convert exporters into correct pipelines and configure the connectors.
470473
## statement: ""
471474

472475
## Fields to be created at Sumo Logic to ensure logs are tagged with

0 commit comments

Comments
 (0)