Receiver TLS blocks are blocks, not attributes (#738)

Signed-off-by: Pete Wall <pete.wall@grafana.com>
grafana · Sep 18, 2024 · 0e490bd · 0e490bd
1 parent 2ad3313
commit 0e490bd
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/charts/k8s-monitoring/templates/alloy_config/_receivers_jaeger.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_receivers_jaeger.alloy.txt
@@ -33,7 +33,7 @@ otelcol.receiver.jaeger "receiver" {
 {{- end }}
   }
 {{- if .Values.receivers.jaeger.tls }}
-  tls = {
+  tls {
   {{- range $k, $v := .Values.receivers.jaeger.tls }}
     {{ $k }} = {{ $v | toJson }}
   {{- end }}

diff --git a/charts/k8s-monitoring/templates/alloy_config/_receivers_otlp.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_receivers_otlp.alloy.txt
@@ -8,7 +8,7 @@ otelcol.receiver.otlp "receiver" {
   grpc {
     endpoint = "0.0.0.0:{{ $data.port | int }}"
   {{- if .Values.receivers.grpc.tls }}
-    tls = {
+    tls {
     {{- range $k, $v := .Values.receivers.grpc.tls }}
       {{ $k }} = {{ $v | toJson }}
     {{- end }}
@@ -22,9 +22,9 @@ otelcol.receiver.otlp "receiver" {
   http {
     endpoint = "0.0.0.0:{{ $data.port | int }}"
   {{- if .Values.receivers.http.tls }}
-    tls = {
+    tls {
     {{- range $k, $v := .Values.receivers.http.tls }}
-      {{ $k }} = {{ $v | toJson }}
+      {{ $k }} = {{ $v | quote }}
     {{- end }}
     }
   {{- end }}

diff --git a/charts/k8s-monitoring/templates/alloy_config/_receivers_zipkin.alloy.txt b/charts/k8s-monitoring/templates/alloy_config/_receivers_zipkin.alloy.txt
@@ -6,9 +6,9 @@ otelcol.receiver.zipkin "receiver" {
 {{- include "checkforAlloyPort" $data }}
   endpoint = "0.0.0.0:{{ $data.port | int }}"
 {{- if .Values.receivers.zipkin.tls }}
-  tls = {
+  tls {
   {{- range $k, $v := .Values.receivers.zipkin.tls }}
-    {{ $k }} = {{ $v | toJson }},
+    {{ $k }} = {{ $v | quote }}
   {{- end }}
   }
 {{- end }}

diff --git a/examples/traces-enabled/metrics.alloy b/examples/traces-enabled/metrics.alloy
diff --git a/examples/traces-enabled/output.yaml b/examples/traces-enabled/output.yaml