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

Fix cri-o log format time layout #817

Merged
merged 1 commit into from
Jun 21, 2023
Merged

Fix cri-o log format time layout #817

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

- Fix cri-o log format time layout [#817](https://github.com/signalfx/splunk-otel-collector-chart/pull/817)

## [0.79.0] - 2023-16-07

This Splunk OpenTelemetry Collector for Kubernetes release adopts the [Splunk OpenTelemetry Collector v0.79.0](https://github.com/signalfx/splunk-otel-collector/releases/tag/v0.79.0).
Expand Down
2 changes: 1 addition & 1 deletion examples/only-logs-otel/rendered_manifests/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ data:
- id: parser-crio
regex: ^(?P<time>[^ Z]+) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) ?(?P<log>.*)$
timestamp:
layout: "2006-01-02T15:04:05.999999999-07:00"
layout: 2006-01-02T15:04:05.999999999Z07:00
jvoravong marked this conversation as resolved.
Show resolved Hide resolved
layout_type: gotime
parse_from: attributes.time
type: regex_parser
Expand Down
2 changes: 1 addition & 1 deletion examples/only-logs-otel/rendered_manifests/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 7b50a263d2916690b8e710aae9ab2b5415ce7f42e020b7f0724e180c33f320f0
checksum/config: 16ee76d72fcbdb9a005ca1e2da9c15e0c50a84075f7804dd0f2e1e326a556b18
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
Expand Down
2 changes: 1 addition & 1 deletion examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ data:
- id: parser-crio
regex: ^(?P<time>[^ Z]+) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) ?(?P<log>.*)$
timestamp:
layout: "2006-01-02T15:04:05.999999999-07:00"
layout: 2006-01-02T15:04:05.999999999Z07:00
layout_type: gotime
parse_from: attributes.time
type: regex_parser
Expand Down
2 changes: 1 addition & 1 deletion examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
app: splunk-otel-collector
release: default
annotations:
checksum/config: 693edcd9dc744f0f0fd7b385e02f02cf165a1829d80e84345ab56208cef85f31
checksum/config: ee9d8b641e0a025163ba311ffc26fdfa4606eb017257a38cc01002bf10d65d58
kubectl.kubernetes.io/default-container: otel-collector
spec:
hostNetwork: true
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 @@ -297,7 +297,7 @@ receivers:
timestamp:
parse_from: attributes.time
layout_type: gotime
layout: '2006-01-02T15:04:05.999999999-07:00'
layout: '2006-01-02T15:04:05.999999999Z07:00'
- type: recombine
id: crio-recombine
output: handle_empty_log
Expand Down