Skip to content

Commit 2f4ca14

Browse files
technimad-splunkjvoravong
technimad-splunk
and
jvoravong
authored
Added new dimension to internal metrics to identify mode (#1634)
* Add mode to gateway config * Add mode to agent config * add mode for cluster receiver * updated examples with new collector mode * fix extra line Co-authored-by: jvoravong <[email protected]> * add changelog item * Update .chloggen/add_collector_mode.yaml --------- Co-authored-by: jvoravong <[email protected]>
1 parent 8fc7872 commit 2f4ca14

File tree

144 files changed

+525
-70
lines changed

Some content is hidden

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

144 files changed

+525
-70
lines changed

‎.chloggen/add_collector_mode.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
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, clusterReceiver, gateway
5+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
6+
note: Add new dimension `otelcol.service.mode` to internal metrics to identify collector mode
7+
# One or more tracking issues related to the change
8+
issues: [1634]
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:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,11 @@ data:
176176
- action: insert
177177
key: k8s.namespace.name
178178
value: ${K8S_NAMESPACE}
179+
resource/add_mode:
180+
attributes:
181+
- action: insert
182+
key: otelcol.service.mode
183+
value: agent
179184
resource/logs:
180185
attributes:
181186
- action: upsert
@@ -474,6 +479,7 @@ data:
474479
- resource/add_agent_k8s
475480
- resourcedetection
476481
- resource
482+
- resource/add_mode
477483
receivers:
478484
- prometheus/agent
479485
traces:

‎examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ data:
5555
- action: insert
5656
key: k8s.namespace.name
5757
value: ${K8S_NAMESPACE}
58+
resource/add_mode:
59+
attributes:
60+
- action: insert
61+
key: otelcol.service.mode
62+
value: clusterReceiver
5863
resource/k8s_cluster:
5964
attributes:
6065
- action: insert
@@ -115,6 +120,7 @@ data:
115120
- resource/add_collector_k8s
116121
- resourcedetection
117122
- resource
123+
- resource/add_mode
118124
receivers:
119125
- prometheus/k8s_cluster_receiver
120126
telemetry:

‎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: c231dafe36c0682673dddd6c85709ccee470181c3126470b2e645cd7ba56507c
35+
checksum/config: fcb21155261f59bb9d209e0d4f5c0748d04cff784753bff6a92183f22b14d58a
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

‎examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 255712b444c57ed04dd3499a8655f166a80985e294e08e7237b6b500ef76b0b3
34+
checksum/config: 5080b8509ea7b5474b08c17da8a05009a8fdf466709c300f7fd4826f0111037e
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ data:
125125
- action: insert
126126
key: k8s.namespace.name
127127
value: ${K8S_NAMESPACE}
128+
resource/add_mode:
129+
attributes:
130+
- action: insert
131+
key: otelcol.service.mode
132+
value: agent
128133
resource/logs:
129134
attributes:
130135
- action: upsert
@@ -424,6 +429,7 @@ data:
424429
- resource/add_agent_k8s
425430
- resourcedetection
426431
- resource
432+
- resource/add_mode
427433
receivers:
428434
- prometheus/agent
429435
traces:

‎examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ data:
5555
- action: insert
5656
key: k8s.namespace.name
5757
value: ${K8S_NAMESPACE}
58+
resource/add_mode:
59+
attributes:
60+
- action: insert
61+
key: otelcol.service.mode
62+
value: clusterReceiver
5863
resource/k8s_cluster:
5964
attributes:
6065
- action: insert
@@ -115,6 +120,7 @@ data:
115120
- resource/add_collector_k8s
116121
- resourcedetection
117122
- resource
123+
- resource/add_mode
118124
receivers:
119125
- prometheus/k8s_cluster_receiver
120126
telemetry:

‎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: 44f909abad1637b2e78068afc4ab38b2fd530cce14f57ee66f13f5e565ab30ee
35+
checksum/config: ad95b3c2831a47c954119c1715845cc9ed49dc506bddc27026fd350360bdd969
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

‎examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 255712b444c57ed04dd3499a8655f166a80985e294e08e7237b6b500ef76b0b3
34+
checksum/config: 5080b8509ea7b5474b08c17da8a05009a8fdf466709c300f7fd4826f0111037e
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ data:
117117
- action: insert
118118
key: k8s.namespace.name
119119
value: ${K8S_NAMESPACE}
120+
resource/add_mode:
121+
attributes:
122+
- action: insert
123+
key: otelcol.service.mode
124+
value: agent
120125
resource/logs:
121126
attributes:
122127
- action: upsert
@@ -302,6 +307,7 @@ data:
302307
- resource/add_agent_k8s
303308
- resourcedetection
304309
- resource
310+
- resource/add_mode
305311
receivers:
306312
- prometheus/agent
307313
traces:

‎examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ data:
5555
- action: insert
5656
key: k8s.namespace.name
5757
value: ${K8S_NAMESPACE}
58+
resource/add_mode:
59+
attributes:
60+
- action: insert
61+
key: otelcol.service.mode
62+
value: clusterReceiver
5863
resource/k8s_cluster:
5964
attributes:
6065
- action: insert
@@ -115,6 +120,7 @@ data:
115120
- resource/add_collector_k8s
116121
- resourcedetection
117122
- resource
123+
- resource/add_mode
118124
receivers:
119125
- prometheus/k8s_cluster_receiver
120126
telemetry:

‎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: 836fcc21881bde4060a0d9edff09d7809cee53e63e6a1168001c531a47680516
35+
checksum/config: 07098b77606a130fe8b3c0619fc513eb0e700265d1abf11c5571479d7274c0ef
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

‎examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 255712b444c57ed04dd3499a8655f166a80985e294e08e7237b6b500ef76b0b3
34+
checksum/config: 5080b8509ea7b5474b08c17da8a05009a8fdf466709c300f7fd4826f0111037e
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,11 @@ data:
120120
- action: insert
121121
key: k8s.namespace.name
122122
value: ${K8S_NAMESPACE}
123+
resource/add_mode:
124+
attributes:
125+
- action: insert
126+
key: otelcol.service.mode
127+
value: agent
123128
resource/logs:
124129
attributes:
125130
- action: upsert
@@ -290,6 +295,7 @@ data:
290295
- resource/add_agent_k8s
291296
- resourcedetection
292297
- resource
298+
- resource/add_mode
293299
receivers:
294300
- prometheus/agent
295301
traces:

‎examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ data:
5555
- action: insert
5656
key: k8s.namespace.name
5757
value: ${K8S_NAMESPACE}
58+
resource/add_mode:
59+
attributes:
60+
- action: insert
61+
key: otelcol.service.mode
62+
value: clusterReceiver
5863
resource/k8s_cluster:
5964
attributes:
6065
- action: insert
@@ -115,6 +120,7 @@ data:
115120
- resource/add_collector_k8s
116121
- resourcedetection
117122
- resource
123+
- resource/add_mode
118124
receivers:
119125
- prometheus/k8s_cluster_receiver
120126
telemetry:

‎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: 087b234e31830ae8352ceafdb062671206dac92eb3490ff008cd6a734536c1d9
35+
checksum/config: 0d926858899a7d27ca9c752f9db3f257c8e93ba953d32c0303bd382d2f78f30c
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

‎examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 255712b444c57ed04dd3499a8655f166a80985e294e08e7237b6b500ef76b0b3
34+
checksum/config: 5080b8509ea7b5474b08c17da8a05009a8fdf466709c300f7fd4826f0111037e
3535
spec:
3636
serviceAccountName: default-splunk-otel-collector
3737
nodeSelector:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,11 @@ data:
143143
- action: insert
144144
key: k8s.namespace.name
145145
value: ${K8S_NAMESPACE}
146+
resource/add_mode:
147+
attributes:
148+
- action: insert
149+
key: otelcol.service.mode
150+
value: agent
146151
resource/logs:
147152
attributes:
148153
- action: upsert
@@ -466,6 +471,7 @@ data:
466471
- resource/add_agent_k8s
467472
- resourcedetection
468473
- resource
474+
- resource/add_mode
469475
receivers:
470476
- prometheus/agent
471477
traces:

‎examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ data:
5555
- action: insert
5656
key: k8s.namespace.name
5757
value: ${K8S_NAMESPACE}
58+
resource/add_mode:
59+
attributes:
60+
- action: insert
61+
key: otelcol.service.mode
62+
value: clusterReceiver
5863
resource/k8s_cluster:
5964
attributes:
6065
- action: insert
@@ -115,6 +120,7 @@ data:
115120
- resource/add_collector_k8s
116121
- resourcedetection
117122
- resource
123+
- resource/add_mode
118124
receivers:
119125
- prometheus/k8s_cluster_receiver
120126
telemetry:

‎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: c83c91c483abdf4d4f0f76b0c2dfcc2c900966e258fde53ab368e7e427eb05d4
35+
checksum/config: 25545be88b6636d4e92888850b2dfcdc95bc2201cf8e45c80f22ad6edcde385f
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
sidecar.istio.io/inject: "false"
3838
spec:

‎examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
component: otel-k8s-cluster-receiver
3232
release: default
3333
annotations:
34-
checksum/config: 255712b444c57ed04dd3499a8655f166a80985e294e08e7237b6b500ef76b0b3
34+
checksum/config: 5080b8509ea7b5474b08c17da8a05009a8fdf466709c300f7fd4826f0111037e
3535
sidecar.istio.io/inject: "false"
3636
spec:
3737
serviceAccountName: default-splunk-otel-collector

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ data:
117117
- action: insert
118118
key: k8s.namespace.name
119119
value: ${K8S_NAMESPACE}
120+
resource/add_mode:
121+
attributes:
122+
- action: insert
123+
key: otelcol.service.mode
124+
value: agent
120125
resource/logs:
121126
attributes:
122127
- action: upsert
@@ -287,6 +292,7 @@ data:
287292
- resource/add_agent_k8s
288293
- resourcedetection
289294
- resource
295+
- resource/add_mode
290296
receivers:
291297
- prometheus/agent
292298
traces:

‎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: 447bfd0ac5cea8708f6ca3c5904fb629da253463ed465d5badaf167ce00c793c
35+
checksum/config: 99ecbdd7c6f9b7bb4a206b6c1d9c4c6b8a1f9ee74ff85d1089ac0630c29c6c98
3636
kubectl.kubernetes.io/default-container: otel-collector
3737
spec:
3838
hostNetwork: true

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ data:
110110
- action: insert
111111
key: k8s.namespace.name
112112
value: ${K8S_NAMESPACE}
113+
resource/add_mode:
114+
attributes:
115+
- action: insert
116+
key: otelcol.service.mode
117+
value: agent
113118
resourcedetection:
114119
detectors:
115120
- env
@@ -271,6 +276,7 @@ data:
271276
- resource/add_agent_k8s
272277
- resourcedetection
273278
- resource
279+
- resource/add_mode
274280
receivers:
275281
- prometheus/agent
276282
traces:

‎examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ data:
5555
- action: insert
5656
key: k8s.namespace.name
5757
value: ${K8S_NAMESPACE}
58+
resource/add_mode:
59+
attributes:
60+
- action: insert
61+
key: otelcol.service.mode
62+
value: clusterReceiver
5863
resource/k8s_cluster:
5964
attributes:
6065
- action: insert
@@ -115,6 +120,7 @@ data:
115120
- resource/add_collector_k8s
116121
- resourcedetection
117122
- resource
123+
- resource/add_mode
118124
receivers:
119125
- prometheus/k8s_cluster_receiver
120126
telemetry:

‎examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@ data:
113113
- action: insert
114114
key: k8s.namespace.name
115115
value: ${K8S_NAMESPACE}
116+
resource/add_mode:
117+
attributes:
118+
- action: insert
119+
key: otelcol.service.mode
120+
value: gateway
116121
resource/logs:
117122
attributes:
118123
- action: upsert
@@ -199,6 +204,7 @@ data:
199204
- batch
200205
- resource/add_collector_k8s
201206
- resourcedetection
207+
- resource/add_mode
202208
- resource/add_cluster_name
203209
receivers:
204210
- prometheus/collector

0 commit comments

Comments
 (0)