fixup! add persistent queues

Signed-off-by: Szilard Parrag <[email protected]>
kube-logging · Feb 2, 2024 · 0064d22 · 0064d22
1 parent c3a9184
commit 0064d22
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/docs/examples/simple-demo/one_tenant_two_subscriptions.yaml b/docs/examples/simple-demo/one_tenant_two_subscriptions.yaml
@@ -16,7 +16,7 @@ metadata:
   name: example-collector
 spec:
   controlNamespace: collector
-  atomicPersist: false
+  fsync: false
   tenantSelector:
     matchLabels:
       collectorLabel: example-collector

diff --git a/internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml b/internal/controller/telemetry/otel_col_conf_test_fixtures/complex.yaml
@@ -67,12 +67,14 @@ exporters:
         verbosity: detailed
     otlp/collector_otlp-test-output:
         endpoint: receiver-collector.example-tenant-ns.svc.cluster.local:4317
-        sending_queue: "file_storage/exporters"
+        sending_queue: 
+          storage: "file_storage/exporters"
         tls:
             insecure: true
     otlp/collector_otlp-test-output-2:
         endpoint: receiver-collector.example-tenant-ns.svc.cluster.local:4317
-        sending_queue: "file_storage/exporters"
+        sending_queue: 
+          storage: "file_storage/exporters"
         tls:
             insecure: true
 processors:

diff --git a/internal/controller/telemetry/otel_conf_gen.go b/internal/controller/telemetry/otel_conf_gen.go
@@ -107,7 +107,9 @@ func (cfgInput *OtelColConfigInput) generateOTLPExporters() map[string]any {
 			"tls": map[string]any{
 				"insecure": output.Spec.OTLP.TLSSetting.Insecure,
 			},
-			"sending_queue": ExportersFileStorageName,
+			"sending_queue": map[string]any{
+				"storage": ExportersFileStorageName,
+			},
 		}
 	}