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

Change log "stream' attribute according to OTel semantic conventions #311

Merged
merged 2 commits into from
Nov 19, 2021
Merged

Change log "stream' attribute according to OTel semantic conventions #311

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f08badd
Change log "stream' attribute according to OTel semantic conventions
dmitryax Nov 19, 2021
cb5e231
Merge branch 'main' into update-log-media-attribute
dmitryax Nov 19, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ guidelines](https://github.com/signalfx/splunk-otel-collector-chart/blob/main/UP
- `otelAgent` -> `agent`
- `otelCollector` -> `gateway`
- `otelK8sClusterReceiver` -> `clusterReceiver`
- Rename `stream` log attribute to `log.iostream` (#311)

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -209,7 +209,7 @@ receivers:
k8s.pod.name: 'EXPR($$.pod_name)'
com.splunk.sourcetype: 'EXPR("kube:container:"+$$.container_name)'
attributes:
stream: 'EXPR($$.stream)'
log.iostream: 'EXPR($$.stream)'
{{- if .Values.logsCollection.containers.multilineConfigs }}
- type: router
routes:
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/otel-logs/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ data:
regex: ^\/var\/log\/pods\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[^\/]+)\/(?P<container_name>[^\._]+)\/(?P<restart_count>\d+)\.log$
type: regex_parser
- attributes:
stream: EXPR($$.stream)
log.iostream: EXPR($$.stream)
resource:
com.splunk.sourcetype: EXPR("kube:container:"+$$.container_name)
k8s.container.name: EXPR($$.container_name)
Expand Down
2 changes: 1 addition & 1 deletion rendered/manifests/otel-logs/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: e73b2f1f1048c7e2d13b567693eb1f3c7ea915c6b740f37fd74ae54a1c8a8420
checksum/config: 10a67e090122e6b58df427f82dfba0ffd078a3b1aef01fa51ab5602a89bfcbd0
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down