Promote 'log' to top of record in k8s examples (open-telemetry#2873)

Addresses open-telemetry#2851
pmatyjasek-sumo · Apr 28, 2021 · 9455d0a · 9455d0a
1 parent ea925a8
commit 9455d0a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/examples/kubernetes/otel-collector-config.yml b/examples/kubernetes/otel-collector-config.yml
@@ -61,13 +61,9 @@ receivers:
       - type: restructure
         id: clean-up-log-record
         ops:
-          - remove: logtag
-          - remove: stream
-          - remove: container_name
-          - remove: namespace
-          - remove: pod_name
-          - remove: run_id
-          - remove: uid
+          - move:
+              from: log
+              to: $
 exporters:
   logging:
     loglevel: debug

diff --git a/examples/kubernetes/otel-collector.yaml b/examples/kubernetes/otel-collector.yaml
@@ -68,13 +68,9 @@ data:
           - type: restructure
             id: clean-up-log-record
             ops:
-              - remove: logtag
-              - remove: stream
-              - remove: container_name
-              - remove: namespace
-              - remove: pod_name
-              - remove: run_id
-              - remove: uid
+              - move:
+                  from: log
+                  to: $
     exporters:
       logging:
         loglevel: debug

diff --git a/testbed/datasenders/k8s.go b/testbed/datasenders/k8s.go
@@ -215,13 +215,9 @@ func NewKubernetesContainerWriter() *FileLogK8sWriter {
       - type: restructure
         id: clean-up-log-record
         ops:
-          - remove: logtag
-          - remove: stream
-          - remove: container_name
-          - remove: namespace
-          - remove: pod_name
-          - remove: run_id
-          - remove: uid
+          - move:
+              from: log
+              to: $
   `)
 }
 
@@ -261,13 +257,9 @@ func NewKubernetesCRIContainerdWriter() *FileLogK8sWriter {
       - type: restructure
         id: clean-up-log-record
         ops:
-          - remove: logtag
-          - remove: stream
-          - remove: container_name
-          - remove: namespace
-          - remove: pod_name
-          - remove: run_id
-          - remove: uid
+          - move:
+              from: log
+              to: $
   `)
 }