Use container parser of stanza for logs collection (#1195)

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

charts/opentelemetry-collector/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-collector
-version: 0.95.0
+version: 0.96.0
 description: OpenTelemetry Collector Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 557a7b092ef1a9ffce5e218ba3f888b793eaffda6338c86168b2d18ef490edf0
+        checksum/config: 66f8ac12e857d9d92222f15b9effb486601863d6c0b9e0db67048c597f400252
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: bb4af2ad47c592ddef5d5446eaf4e8fbfc6d3e5a30aa5469118e45caaa3d0d44
+        checksum/config: 55435a78bb3a7c9a2fa7c28ba8e82ca19db4e9da0e68432ee91d631b28cc9361
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"
@@ -33,75 +33,9 @@ data:
         include_file_name: false
         include_file_path: true
         operators:
-        - id: get-format
-          routes:
-          - expr: body matches "^\\{"
-            output: parser-docker
-          - expr: body matches "^[^ Z]+ "
-            output: parser-crio
-          - expr: body matches "^[^ Z]+Z"
-            output: parser-containerd
-          type: router
-        - id: parser-crio
-          regex: ^(?P<time>[^ Z]+) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) ?(?P<log>.*)$
-          timestamp:
-            layout: 2006-01-02T15:04:05.999999999Z07:00
-            layout_type: gotime
-            parse_from: attributes.time
-          type: regex_parser
-        - combine_field: attributes.log
-          combine_with: ""
-          id: crio-recombine
-          is_last_entry: attributes.logtag == 'F'
+        - id: container-parser
           max_log_size: 102400
-          output: extract_metadata_from_filepath
-          source_identifier: attributes["log.file.path"]
-          type: recombine
-        - id: parser-containerd
-          regex: ^(?P<time>[^ ^Z]+Z) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) ?(?P<log>.*)$
-          timestamp:
-            layout: '%Y-%m-%dT%H:%M:%S.%LZ'
-            parse_from: attributes.time
-          type: regex_parser
-        - combine_field: attributes.log
-          combine_with: ""
-          id: containerd-recombine
-          is_last_entry: attributes.logtag == 'F'
-          max_log_size: 102400
-          output: extract_metadata_from_filepath
-          source_identifier: attributes["log.file.path"]
-          type: recombine
-        - id: parser-docker
-          output: extract_metadata_from_filepath
-          timestamp:
-            layout: '%Y-%m-%dT%H:%M:%S.%LZ'
-            parse_from: attributes.time
-          type: json_parser
-        - id: extract_metadata_from_filepath
-          parse_from: attributes["log.file.path"]
-          regex: ^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]+)\/(?P<container_name>[^\._]+)\/(?P<restart_count>\d+)\.log$
-          type: regex_parser
-        - from: attributes.stream
-          to: attributes["log.iostream"]
-          type: move
-        - from: attributes.container_name
-          to: resource["k8s.container.name"]
-          type: move
-        - from: attributes.namespace
-          to: resource["k8s.namespace.name"]
-          type: move
-        - from: attributes.pod_name
-          to: resource["k8s.pod.name"]
-          type: move
-        - from: attributes.restart_count
-          to: resource["k8s.container.restart_count"]
-          type: move
-        - from: attributes.uid
-          to: resource["k8s.pod.uid"]
-          type: move
-        - from: attributes.log
-          to: body
-          type: move
+          type: container
         retry_on_failure:
           enabled: true
         start_at: end

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 2c04ea5d0d81651dd8b818daa256184bf9f935db5965c5bb568ffb0fa9aa66bd
+        checksum/config: 6b752a930d8bbe3de38e069c6a7b646453db1c9422591d2cf4545c6608ee34f7
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: f052d3d1c724e70c2bd3e0f732a8ae5682f77ab6a9ace2e4c145c99b1a39f23b
+        checksum/config: 5616a32ce8e5182f1e0100b62635b7c284e6bfc407f81e7c35ed28ccce3df43a
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: ffda55b73d0eef95e71b5bf88c6f2a414e1c3a915cadc5bfaa029adebc40da16
+        checksum/config: 725c18a6898999b83babe60959b2b493b99e4da66258eea381685941bbc7d3ba
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector-agent
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"
@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: ffda55b73d0eef95e71b5bf88c6f2a414e1c3a915cadc5bfaa029adebc40da16
+        checksum/config: 725c18a6898999b83babe60959b2b493b99e4da66258eea381685941bbc7d3ba
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: bb4af2ad47c592ddef5d5446eaf4e8fbfc6d3e5a30aa5469118e45caaa3d0d44
+        checksum/config: 55435a78bb3a7c9a2fa7c28ba8e82ca19db4e9da0e68432ee91d631b28cc9361
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: 57b93052e5fcf63229c9903b2348d2efaa7b5967468a0bb3542e5ce3f8d65047
+        checksum/config: c49fad9b3be0e2a3eba508fb563247541aa710f38604a77acbb60c5cb4c3b1de
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml

@@ -6,7 +6,7 @@ metadata:
   name: example-opentelemetry-collector
   namespace: default
   labels:
-    helm.sh/chart: opentelemetry-collector-0.95.0
+    helm.sh/chart: opentelemetry-collector-0.96.0
     app.kubernetes.io/name: opentelemetry-collector
     app.kubernetes.io/instance: example
     app.kubernetes.io/version: "0.103.1"