Skip to content

Commit 4572409

Browse files
authored
Keep kubeletstats CPU usage metrics disabled by default (#1822)
They are turned to enabled in 0.125.0, but we don't need to use them yet.
1 parent 0c753e4 commit 4572409

File tree

54 files changed

+235
-26
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+235
-26
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2+
change_type: enhancement
3+
# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
4+
component: agent
5+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
6+
note: Keep the kubelet CPU usage metrics disabled by default for Splunk Observability users
7+
# One or more tracking issues related to the change
8+
issues: [1822]
9+
# (Optional) One or more lines of additional information to render under the primary note.
10+
# These lines will be padded with 2 spaces and then inserted directly into the document.
11+
# Use pipe (|) for multiline entries.
12+
subtext: |
13+
`k8s.node.cpu.usage`, `k8s.pod.cpu.usage` and `container.cpu.usage` metrics are enabled by default in the kubeletstats
14+
receiver upstream, but we disable them for Splunk Observability users because they are not included in the default
15+
metrics set. If enabled, they will be charged as custom metrics. For now, `container_cpu_utilization` should still be
16+
used. Later, it will be replaced with one of the CPU metrics from the kubelet receiver once they are fully stabilized
17+
(e.g., `container.cpu.usage` or `container.cpu.time`).

examples/add-filter-processor/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,13 @@ data:
339339
- container
340340
- pod
341341
- node
342+
metrics:
343+
container.cpu.usage:
344+
enabled: false
345+
k8s.node.cpu.usage:
346+
enabled: false
347+
k8s.pod.cpu.usage:
348+
enabled: false
342349
nop: null
343350
otlp:
344351
protocols:

examples/add-filter-processor/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 06450de50425c909d846c742e7544cf35d93c54a8af41dce186452da9041e90b
35+
checksum/config: d26b0d586f4d3211bdf8f2661cb9ed388eace611064b6031ad8b01564fccf6b7
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,13 @@ data:
295295
- container
296296
- pod
297297
- node
298+
metrics:
299+
container.cpu.usage:
300+
enabled: false
301+
k8s.node.cpu.usage:
302+
enabled: false
303+
k8s.pod.cpu.usage:
304+
enabled: false
298305
nop: null
299306
otlp:
300307
protocols:

examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 71c532ae7e57d02884df5b06da43db9d375fe3d532c5d7d8d79523858c7c6746
35+
checksum/config: 2fd632edb91bde6432e819b1c109de4c8a19391c9947f4fad15efa06f466156c
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,13 @@ data:
170170
- container
171171
- pod
172172
- node
173+
metrics:
174+
container.cpu.usage:
175+
enabled: false
176+
k8s.node.cpu.usage:
177+
enabled: false
178+
k8s.pod.cpu.usage:
179+
enabled: false
173180
nop: null
174181
otlp:
175182
protocols:

examples/add-receiver-creator/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 7c41e99b608fe8e5860a51894fa33f9b51bd226cb8a940190c3c06271fbd98c5
35+
checksum/config: ef0a3205e5092b5636829d97bc7a38bc95a423505ef02ae10d84670bcfbfb51c
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/add-sampler/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,13 @@ data:
173173
- container
174174
- pod
175175
- node
176+
metrics:
177+
container.cpu.usage:
178+
enabled: false
179+
k8s.node.cpu.usage:
180+
enabled: false
181+
k8s.pod.cpu.usage:
182+
enabled: false
176183
nop: null
177184
otlp:
178185
protocols:

examples/add-sampler/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: a220b82fd0a7d0e7189304aa83d356ff94cafa550b2990f9a172e9f3518985f3
35+
checksum/config: fcaec49973c2959f3f1b44874ca826f3a8c467519cb22380066720267812bf13
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/autodetect-istio/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,13 @@ data:
323323
- container
324324
- pod
325325
- node
326+
metrics:
327+
container.cpu.usage:
328+
enabled: false
329+
k8s.node.cpu.usage:
330+
enabled: false
331+
k8s.pod.cpu.usage:
332+
enabled: false
326333
nop: null
327334
otlp:
328335
protocols:

examples/autodetect-istio/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 6bc80121da57b5eeea99a0b9fa285c9bb977d81e751d3c72feb2663410a0bf09
35+
checksum/config: e13a1175e2f22ab967db545c6e0c70806fc7e0b6e78a67f97d9c28ba866652ee
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
sidecar.istio.io/inject: "false"
3838
spec:

examples/collector-agent-only/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,13 @@ data:
170170
- container
171171
- pod
172172
- node
173+
metrics:
174+
container.cpu.usage:
175+
enabled: false
176+
k8s.node.cpu.usage:
177+
enabled: false
178+
k8s.pod.cpu.usage:
179+
enabled: false
173180
nop: null
174181
otlp:
175182
protocols:

examples/collector-agent-only/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: cdb4b3f808634878c1a5d6f52c5789c863046e6eaff62199b3b1497297d1681b
35+
checksum/config: 10253913c3032ae9bb670379ac59850c3f46ad9d13f0eb0365c969357b838069
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/collector-all-modes/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,13 @@ data:
152152
- container
153153
- pod
154154
- node
155+
metrics:
156+
container.cpu.usage:
157+
enabled: false
158+
k8s.node.cpu.usage:
159+
enabled: false
160+
k8s.pod.cpu.usage:
161+
enabled: false
155162
nop: null
156163
otlp:
157164
protocols:

examples/collector-all-modes/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 14b1643facfac30f937fce4d7a168f22521a410b268b7f29fd5893ef0eef9555
35+
checksum/config: c36c2624dea028dc7762ece0395f99b2cbfc253b2b620f1c631658391f80bcdd
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,13 @@ data:
175175
- container
176176
- pod
177177
- node
178+
metrics:
179+
container.cpu.usage:
180+
enabled: false
181+
k8s.node.cpu.usage:
182+
enabled: false
183+
k8s.pod.cpu.usage:
184+
enabled: false
178185
nop: null
179186
otlp:
180187
protocols:

examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 20d0cdbfdf8d0c1038dcd95b884e3144976a8b2b870776c7cad2d601e89e6046
35+
checksum/config: b520400ef0137600e8e25e9b9aea2534b61b700c809f6e1e9589b01968a88bdb
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/crio-logging/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,13 @@ data:
170170
- container
171171
- pod
172172
- node
173+
metrics:
174+
container.cpu.usage:
175+
enabled: false
176+
k8s.node.cpu.usage:
177+
enabled: false
178+
k8s.pod.cpu.usage:
179+
enabled: false
173180
nop: null
174181
otlp:
175182
protocols:

examples/crio-logging/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: cdb4b3f808634878c1a5d6f52c5789c863046e6eaff62199b3b1497297d1681b
35+
checksum/config: 10253913c3032ae9bb670379ac59850c3f46ad9d13f0eb0365c969357b838069
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/default/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,13 @@ data:
170170
- container
171171
- pod
172172
- node
173+
metrics:
174+
container.cpu.usage:
175+
enabled: false
176+
k8s.node.cpu.usage:
177+
enabled: false
178+
k8s.pod.cpu.usage:
179+
enabled: false
173180
nop: null
174181
otlp:
175182
protocols:

examples/default/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: cdb4b3f808634878c1a5d6f52c5789c863046e6eaff62199b3b1497297d1681b
35+
checksum/config: 10253913c3032ae9bb670379ac59850c3f46ad9d13f0eb0365c969357b838069
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/discovery-mode/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,13 @@ data:
170170
- container
171171
- pod
172172
- node
173+
metrics:
174+
container.cpu.usage:
175+
enabled: false
176+
k8s.node.cpu.usage:
177+
enabled: false
178+
k8s.pod.cpu.usage:
179+
enabled: false
173180
nop: null
174181
otlp:
175182
protocols:

examples/discovery-mode/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 6552b5f5d20895b121196750edd9ffe6d9df58c2162469ff5b17bfe7f660fb9e
35+
checksum/config: 44c1cf6d8a131f6a48602305105f85ff4fdfcd78497756c16f85d7fac9ae9afa
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/distribution-aks/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,13 @@ data:
173173
- container
174174
- pod
175175
- node
176+
metrics:
177+
container.cpu.usage:
178+
enabled: false
179+
k8s.node.cpu.usage:
180+
enabled: false
181+
k8s.pod.cpu.usage:
182+
enabled: false
176183
nop: null
177184
otlp:
178185
protocols:

examples/distribution-aks/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: f00119ec35381b3bc87ee74eda5d6b4e148f5a066069181062fd3ed0c28cc4bd
35+
checksum/config: 48a922d4a2d062b8f87c6accb589cd09f0c804d29ada09c6ffd858056e4f4189
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/distribution-eks/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,13 @@ data:
172172
- container
173173
- pod
174174
- node
175+
metrics:
176+
container.cpu.usage:
177+
enabled: false
178+
k8s.node.cpu.usage:
179+
enabled: false
180+
k8s.pod.cpu.usage:
181+
enabled: false
175182
nop: null
176183
otlp:
177184
protocols:

examples/distribution-eks/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 42e8937348fd76361e5e2c7988d1301194bd7b1f473bfcac997b6e874be49365
35+
checksum/config: 206ef7cb1cbd9927238aa54e80a44d8fe82ee85c754b12d267a7792f83351dfe
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/distribution-gke-autopilot/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,13 @@ data:
171171
- container
172172
- pod
173173
- node
174+
metrics:
175+
container.cpu.usage:
176+
enabled: false
177+
k8s.node.cpu.usage:
178+
enabled: false
179+
k8s.pod.cpu.usage:
180+
enabled: false
174181
nop: null
175182
otlp:
176183
protocols:

examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 677837eea1b37e348118bb10338f7b2cc479f83c59c265edd42505f8f2fbb8e6
35+
checksum/config: a82ddc1a76b0769c6cb7dadc0013f68704acc4f4f70a3ecf4ca48adfc23e4052
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/distribution-gke/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,13 @@ data:
171171
- container
172172
- pod
173173
- node
174+
metrics:
175+
container.cpu.usage:
176+
enabled: false
177+
k8s.node.cpu.usage:
178+
enabled: false
179+
k8s.pod.cpu.usage:
180+
enabled: false
174181
nop: null
175182
otlp:
176183
protocols:

examples/distribution-gke/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 38c1adbd733796f1f4abf925dbc198ed8cc0afdbf88829163cc8f2ccd872a473
35+
checksum/config: f2588d9569587cf382b9236bb5d6e5d674b9e730e73c7e143b7b323b671b7cd7
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/distribution-openshift/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,13 @@ data:
170170
- container
171171
- pod
172172
- node
173+
metrics:
174+
container.cpu.usage:
175+
enabled: false
176+
k8s.node.cpu.usage:
177+
enabled: false
178+
k8s.pod.cpu.usage:
179+
enabled: false
173180
nop: null
174181
otlp:
175182
protocols:

examples/distribution-openshift/rendered_manifests/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
component: otel-collector-agent
3333
release: default
3434
annotations:
35-
checksum/config: 21e9b8fd9ec1c9e4cc44dd23d7b9615b2e119bb896bb79c90a4dd82c8905753a
35+
checksum/config: 8612137f053383188ea9074d8811d74bad9e7c029f63601d354f61e703ceaa83
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

examples/enable-operator-and-auto-instrumentation/rendered_manifests/configmap-agent.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,13 @@ data:
293293
- container
294294
- pod
295295
- node
296+
metrics:
297+
container.cpu.usage:
298+
enabled: false
299+
k8s.node.cpu.usage:
300+
enabled: false
301+
k8s.pod.cpu.usage:
302+
enabled: false
296303
nop: null
297304
otlp:
298305
protocols:

0 commit comments

Comments
 (0)