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.

Sign up for GitHub

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

Added new dimension to internal metrics to identify mode #1634

Merged
merged 9 commits into from
Jan 30, 2025
Merged

Added new dimension to internal metrics to identify mode #1634

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
33ea155
Add mode to gateway config
technimad-splunk Jan 27, 2025
cd41fa9
Add mode to agent config
technimad-splunk Jan 27, 2025
779f07b
Merge branch 'signalfx:main' into patch-2
technimad-splunk Jan 28, 2025
3d9d76c
add mode for cluster receiver
technimad-splunk Jan 30, 2025
8de7ced
Merge branch 'signalfx:main' into patch-2
technimad-splunk Jan 30, 2025
9252e7e
updated examples with new collector mode
technimad-splunk Jan 30, 2025
65553df
fix extra line
technimad-splunk Jan 30, 2025
5605eba
add changelog item
technimad-splunk Jan 30, 2025
5f15e52
Update .chloggen/add_collector_mode.yaml
jvoravong Jan 30, 2025
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
8 changes: 8 additions & 0 deletions helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,13 @@ processors:
value: "{{ .Values.environment }}"
{{- end }}

# The following processor is used to add "otelcol.service.mode" attribute to the internal metrics
resource/add_mode:
attributes:
- action: insert
value: "agent"
key: otelcol.service.mode

{{- if .Values.isWindows }}
metricstransform:
transforms:
Expand Down Expand Up @@ -1050,6 +1057,7 @@ service:
- resource/add_agent_k8s
- resourcedetection
- resource
- resource/add_mode
{{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }}
- k8sattributes/metrics
{{- end }}
Expand Down
8 changes: 8 additions & 0 deletions helm-charts/splunk-otel-collector/templates/config/_otel-collector.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ processors:
key: deployment.environment
{{- end }}

# The following processor is used to add "otelcol.service.mode" attribute to the internal metrics
resource/add_mode:
attributes:
- action: insert
value: "gateway"
key: otelcol.service.mode

exporters:
{{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }}
signalfx:
Expand Down Expand Up @@ -257,6 +264,7 @@ service:
- batch
- resource/add_collector_k8s
- resourcedetection
- resource/add_mode
{{- if .Values.clusterName }}
- resource/add_cluster_name
{{- end }}
Expand Down
9 changes: 9 additions & 0 deletions helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,14 @@ processors:
value: "{{ .Values.environment }}"
{{- end }}

# The following processor is used to add "otelcol.service.mode" attribute to the internal metrics
resource/add_mode:
attributes:
- action: insert
value: "clusterReceiver"
key: otelcol.service.mode


resource/k8s_cluster:
attributes:
# XXX: Added so that Smart Agent metrics and OTel metrics don't map to the same MTS identity
Expand Down Expand Up @@ -278,6 +286,7 @@ service:
- resource/add_collector_k8s
- resourcedetection
- resource
- resource/add_mode
{{- if (eq (include "splunk-otel-collector.platformMetricsEnabled" $) "true") }}
- k8sattributes/metrics
{{- end }}
Expand Down
Loading