From 41faeb5bf44b45c13c421608c1af9c1aaf129deb Mon Sep 17 00:00:00 2001
From: jvoravong <joshvoravong@gmail.com>
Date: Wed, 21 Jun 2023 10:01:56 -0600
Subject: [PATCH] Fix cri-o log format time layout

---
 CHANGELOG.md                                                  | 4 ++++
 .../only-logs-otel/rendered_manifests/configmap-agent.yaml    | 2 +-
 examples/only-logs-otel/rendered_manifests/daemonset.yaml     | 2 +-
 .../rendered_manifests/configmap-agent.yaml                   | 2 +-
 .../rendered_manifests/daemonset.yaml                         | 2 +-
 .../splunk-otel-collector/templates/config/_otel-agent.tpl    | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46bd6b9ab..fac078d25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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).
diff --git a/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml b/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml
index 9f37a9ad6..a9bfe0f90 100644
--- a/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml
+++ b/examples/only-logs-otel/rendered_manifests/configmap-agent.yaml
@@ -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
diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml
index 8ae242b9c..6a9409e4f 100644
--- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml
+++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml
@@ -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
diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml
index 72c4a717e..04eb5f041 100644
--- a/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml
+++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/configmap-agent.yaml
@@ -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
diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml
index 62125ec83..3b9e85060 100644
--- a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml
+++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml
@@ -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
diff --git a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
index a634c860b..07958d2cd 100644
--- a/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
+++ b/helm-charts/splunk-otel-collector/templates/config/_otel-agent.tpl
@@ -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