fix(test): followup for fluentfforward changes

Signed-off-by: Szilard Parrag <szilard.parrag@axoflow.com>
kube-logging · Apr 26, 2024 · fb06ac9 · fb06ac9
1 parent b678a11
commit fb06ac9
Showing 1 changed file with 9 additions and 19 deletions.
diff --git a/internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml b/internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml
@@ -64,7 +64,6 @@ exporters:
             insecure: true
     fluentforwardexporter/collector_fluentforward-test-output:
          endpoint:     fluentforward.example-tenant-ns.svc.cluster.local:8888
-         map_metadata: true
          tls:
            insecure: true
     otlp/collector_otlp-test-output:
@@ -107,23 +106,6 @@ processors:
             - action: insert
               key: loki.attribute.labels
               value: tenant
-    attributes/fluentforward_exporter_fluentforward-test-output:
-        actions:
-            - action: insert
-              from_attribute: k8s.pod.name
-              key:            kubernetes.pod_name
-            - action: insert
-              from_attribute: k8s.pod.uid
-              key:            kubernetes.pod_id
-            - action:         insert
-              from_attribute: k8s.pod.labels
-              key:            kubernetes.labels
-            - action:         insert
-              from_attribute: k8s.namespace.name
-              key:            kubernetes.namespace_name
-            - action:         insert
-              from_attribute: k8s.container.name
-              key:            kubernetes.container_name
     attributes/subscription_subscription-example-1:
         actions:
             - action: insert
@@ -170,6 +152,14 @@ processors:
         check_interval: "1s"
         limit_percentage: 75
         spike_limit_percentage: 25
+    transform/fluentforward_exporter_fluentforward-test-output:
+        log_statements:
+            - context: log
+              statements:
+                - set(attributes["kubernetes.pod"], resource.attributes["k8s.pod.name"])
+                - set(attributes["kubernetes.labels"], resource.attributes["k8s.pod.labels.app.kubernetes.io/name"])
+                - set(attributes["kubernetes.namespace_name"], resource.attributes["k8s.namespace.name"])
+                - set(attributes["kubernetes.container_name"], resource.attributes["k8s.container.name"])
 connectors:
     count/output_metrics:
         logs:
@@ -230,7 +220,7 @@ service:
             exporters: [otlp/collector_otlp-test-output-2, count/output_metrics]
         logs/output_example-tenant-ns_subscription-example-2_collector_fluentforward-test-output:
             receivers:  [routing/subscription_example-tenant-ns_subscription-example-2_outputs]
-            processors: [memory_limiter, attributes/exporter_name_fluentforward-test-output, attributes/fluentforward_exporter_fluentforward-test-output]
+            processors: [memory_limiter, attributes/exporter_name_fluentforward-test-output, transform/fluentforward_exporter_fluentforward-test-output]
             exporters:  [fluentforwardexporter/collector_fluentforward-test-output, count/output_metrics]
         logs/tenant_example-tenant:
             receivers: [routing/tenants]