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

Set cluster_name for host logs too if renameFieldsSck is enabled #837

Merged
merged 1 commit into from
Jun 29, 2023
Merged

Set cluster_name for host logs too if renameFieldsSck is enabled #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

## Unreleased

### Fixed

- Set cluster_name for host logs too if renameFieldsSck is enabled [#837](https://github.com/signalfx/splunk-otel-collector-chart/pull/837)

### Added

- Update PodDisruptionBudgets API version to allow both `policy/v1beta1` and `policy/v1` [#835](https://github.com/signalfx/splunk-otel-collector-chart/pull/835)
Expand Down
5 changes: 0 additions & 5 deletions helm-charts/splunk-otel-collector/templates/config/_common.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@ resource/logs:
- key: container_name
from_attribute: k8s.container.name
action: upsert
- key: cluster_name
from_attribute: k8s.cluster.name
action: upsert
- key: container_id
from_attribute: container.id
action: upsert
Expand All @@ -186,8 +183,6 @@ resource/logs:
{{- if not .Values.splunkPlatform.fieldNameConvention.keepOtelConvention }}
- key: k8s.container.name
action: delete
- key: k8s.cluster.name
action: delete
- key: container.id
action: delete
- key: k8s.pod.name
Expand Down
9 changes: 9 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 @@ -527,6 +527,15 @@ processors:
key: "{{ .name }}"
value: "{{ .value }}"
{{- end }}
{{- if .Values.splunkPlatform.fieldNameConvention.renameFieldsSck }}
- key: cluster_name
from_attribute: k8s.cluster.name
action: upsert
{{- if not .Values.splunkPlatform.fieldNameConvention.keepOtelConvention }}
- key: k8s.cluster.name
action: delete
{{- end }}
{{- end }}

# Resource attributes specific to the agent itself.
resource/add_agent_k8s:
Expand Down