wip

Author: kristofgyuracz

Diff for: internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml

@@ -121,11 +121,11 @@ connectors:
     routing/subscription_subscription-example-1_outputs:
         table:
             - statement: route()
-              pipelines: [logs/output_loki-test-output,logs/output_otlp-test-output]
+              pipelines: [logs/output_example-tenant-ns_subscription-example-1_collector_loki-test-output, logs/output_example-tenant-ns_subscription-example-1_collector_otlp-test-output]
     routing/subscription_subscription-example-2_outputs:
         table:
             - statement: route()
-              pipelines: [logs/output_otlp-test-output-2]
+              pipelines: [logs/output_example-tenant-ns_subscription-example-2_collector_otlp-test-output-2]
     routing/tenant_example-tenant_subscriptions:
         table:
             - statement: route()
@@ -142,14 +142,14 @@ service:
             receivers: [filelog/kubernetes]
             processors: [k8sattributes]
             exporters: [routing/tenants]
-        logs/output_loki-test-output:
+        logs/output_example-tenant-ns_subscription-example-1_collector_loki-test-output:
             receivers: [routing/subscription_subscription-example-1_outputs]
             processors: [attributes/loki_exporter_loki-test-output, resource/loki_exporter_loki-test-output]
             exporters: [loki/collector_loki-test-output]
-        logs/output_otlp-test-output:
+        logs/output_example-tenant-ns_subscription-example-1_collector_otlp-test-output:
             receivers: [routing/subscription_subscription-example-1_outputs]
             exporters: [otlp/otlp-test-output]
-        logs/output_otlp-test-output-2:
+        logs/output_example-tenant-ns_subscription-example-2_collector_otlp-test-output-2:
             receivers: [routing/subscription_subscription-example-2_outputs]
             exporters: [otlp/otlp-test-output-2]
         logs/tenant_example-tenant:

Diff for: internal/controller/telemetry/otel_conf_gen.go

@@ -400,7 +400,7 @@ func (cfgInput *OtelColConfigInput) generateNamedPipelines() map[string]Pipeline
 					}
 
 					if output.Spec.OTLP != nil {
-						namedPipelines[outputPipelineName] = generatePipeline([]string{fmt.Sprintf("routing/subscription_%s_outputs", subscription.Name)}, []string{}, []string{fmt.Sprintf("otlp/%s", output.Name)})
+						namedPipelines[outputPipelineName] = generatePipeline([]string{fmt.Sprintf("routing/subscription_%s_outputs", subscription.Name)}, []string{}, []string{fmt.Sprintf("otlp/%s_%s", output.Namespace, output.Name)})
 					}
 				}
 			}