chore: fix keeping time attribute

Signed-off-by: Dominik Rosiek <[email protected]>
SumoLogic · Jul 5, 2024 · dca6989 · dca6989
1 parent a7b211d
commit dca6989
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 8 deletions.
diff --git a/deploy/helm/sumologic/conf/logs/collector/common/filelog_receiver.yaml b/deploy/helm/sumologic/conf/logs/collector/common/filelog_receiver.yaml
@@ -49,6 +49,9 @@ filelog/containers:
     - type: move
       from: resource["log.iostream"]
       to: resource["stream"]
+    - type: move
+      from: resource["time"]
+      to: attributes["time"]
     ## Keep only the following attributes:
     ## - stream
     ## - k8s.pod.name
@@ -63,9 +66,9 @@ filelog/containers:
         - resource["k8s.pod.name"]
         - resource["k8s.container.name"]
         - resource["k8s.namespace.name"]
-        - resource["log.file.path"]
+        - attributes["log.file.path"]
 {{ if .Values.sumologic.logs.container.keep_time_attribute }}
-        - resource["time"]
+        - attributes["time"]
 {{ end }}
 
     ## Strip trailing "\n" from the log body

diff --git a/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/basic.output.yaml
@@ -67,12 +67,15 @@ data:
         - from: resource["log.iostream"]
           to: resource["stream"]
           type: move
+        - from: resource["time"]
+          to: attributes["time"]
+          type: move
         - fields:
           - resource["stream"]
           - resource["k8s.pod.name"]
           - resource["k8s.container.name"]
           - resource["k8s.namespace.name"]
-          - resource["log.file.path"]
+          - attributes["log.file.path"]
           id: keep-fields
           type: retain
         - default: multiline

diff --git a/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml b/tests/helm/testdata/goldenfile/logs_otc/debug.output.yaml
@@ -77,12 +77,15 @@ data:
         - from: resource["log.iostream"]
           to: resource["stream"]
           type: move
+        - from: resource["time"]
+          to: attributes["time"]
+          type: move
         - fields:
           - resource["stream"]
           - resource["k8s.pod.name"]
           - resource["k8s.container.name"]
           - resource["k8s.namespace.name"]
-          - resource["log.file.path"]
+          - attributes["log.file.path"]
           id: keep-fields
           type: retain
         - default: multiline

diff --git a/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_daemonset/multiple_multiline.output.yaml
@@ -67,12 +67,15 @@ data:
         - from: resource["log.iostream"]
           to: resource["stream"]
           type: move
+        - from: resource["time"]
+          to: attributes["time"]
+          type: move
         - fields:
           - resource["stream"]
           - resource["k8s.pod.name"]
           - resource["k8s.container.name"]
           - resource["k8s.namespace.name"]
-          - resource["log.file.path"]
+          - attributes["log.file.path"]
           id: keep-fields
           type: retain
         - default: multiline

diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/basic.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/basic.output.yaml
@@ -46,12 +46,15 @@ data:
         - from: resource["log.iostream"]
           to: resource["stream"]
           type: move
+        - from: resource["time"]
+          to: attributes["time"]
+          type: move
         - fields:
           - resource["stream"]
           - resource["k8s.pod.name"]
           - resource["k8s.container.name"]
           - resource["k8s.namespace.name"]
-          - resource["log.file.path"]
+          - attributes["log.file.path"]
           id: keep-fields
           type: retain
         - default: multiline

diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/debug.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/configmap/debug.output.yaml
@@ -57,12 +57,15 @@ data:
         - from: resource["log.iostream"]
           to: resource["stream"]
           type: move
+        - from: resource["time"]
+          to: attributes["time"]
+          type: move
         - fields:
           - resource["stream"]
           - resource["k8s.pod.name"]
           - resource["k8s.container.name"]
           - resource["k8s.namespace.name"]
-          - resource["log.file.path"]
+          - attributes["log.file.path"]
           id: keep-fields
           type: retain
         - default: multiline

diff --git a/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/multiple_multiline.output.yaml b/tests/helm/testdata/goldenfile/logs_otc_windows/daemonset/multiple_multiline.output.yaml
@@ -46,12 +46,15 @@ data:
         - from: resource["log.iostream"]
           to: resource["stream"]
           type: move
+        - from: resource["time"]
+          to: attributes["time"]
+          type: move
         - fields:
           - resource["stream"]
           - resource["k8s.pod.name"]
           - resource["k8s.container.name"]
           - resource["k8s.namespace.name"]
-          - resource["log.file.path"]
+          - attributes["log.file.path"]
           id: keep-fields
           type: retain
         - default: multiline