Check for type=otlp before checking for protocol, which doesn't exist…

… in other destination types (#1262) Signed-off-by: Pete Wall <[email protected]>
grafana · Feb 20, 2025 · 8969b97 · 8969b97
1 parent 62951df
commit 8969b97
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/charts/k8s-monitoring/templates/destinations/_destination_validations.tpl b/charts/k8s-monitoring/templates/destinations/_destination_validations.tpl
@@ -36,24 +36,26 @@
       {{- fail (join "\n" $msg) }}
     {{- end }}
 
-    {{/* Check if OTLP destination using Grafana Cloud OTLP gateway has protocol set */}}
-    {{- if and (eq $destination.type "otlp") (ne $destination.protocol "http") (regexMatch "otlp-gateway-.+grafana\\.net" $destination.url) }}
-      {{ fail (printf "\nDestination #%d (%s) is using Grafana Cloud OTLP gateway but has incorrect protocol '%s'. The gateway requires 'http'.\nPlease set:\ndestinations:\n  - name: %s\n    type: otlp\n    url: %s\n    protocol: http" $i $destination.name ($destination.protocol | default "grpc (default)") $destination.name $destination.url) }}
-    {{- end }}
-
-    {{/* Check if OTLP destination using Grafana Cloud Tempo checks */}}
-    {{- if and (eq $destination.type "otlp") (regexMatch "tempo-.+grafana\\.net" $destination.url) }}
-      {{- if ne $destination.protocol "grpc" }}
-        {{ fail (printf "\nDestination #%d (%s) is using Grafana Cloud Traces but has incorrect protocol '%s'. Grafana Cloud Traces requires 'grpc'.\nPlease set:\ndestinations:\n  - name: %s\n    type: otlp\n    url: %s\n    protocol: grpc" $i $destination.name ($destination.protocol | default "grpc (default)") $destination.name $destination.url) }}
-      {{- end }}
-      {{- if eq (dig "metrics" "enabled" true $destination) true }}
-        {{ fail (printf "\nDestination #%d (%s) is using Grafana Cloud Traces but has metrics enabled. Tempo only supports traces.\nPlease set:\ndestinations:\n  - name: %s\n    type: otlp\n    url: %s\n    metrics:\n      enabled: false" $i $destination.name $destination.name $destination.url) }}
+    {{- if (eq $destination.type "otlp") }}
+      {{/* Check if OTLP destination using Grafana Cloud OTLP gateway has protocol set */}}
+      {{- if and (ne $destination.protocol "http") (regexMatch "otlp-gateway-.+grafana\\.net" $destination.url) }}
+        {{ fail (printf "\nDestination #%d (%s) is using Grafana Cloud OTLP gateway but has incorrect protocol '%s'. The gateway requires 'http'.\nPlease set:\ndestinations:\n  - name: %s\n    type: otlp\n    url: %s\n    protocol: http" $i $destination.name ($destination.protocol | default "grpc (default)") $destination.name $destination.url) }}
       {{- end }}
-      {{- if eq (dig "logs" "enabled" true $destination) true }}
-        {{ fail (printf "\nDestination #%d (%s) is using Grafana Cloud Traces but has logs enabled. Tempo only supports traces.\nPlease set:\ndestinations:\n  - name: %s\n    type: otlp\n    url: %s\n    logs:\n      enabled: false" $i $destination.name $destination.name $destination.url) }}
-      {{- end }}
-      {{- if eq (dig "traces" "enabled" true $destination) false }}
-        {{ fail (printf "\nDestination #%d (%s) is using Grafana Cloud Traces but has traces disabled.\nPlease set:\ndestinations:\n  - name: %s\n    type: otlp\n    url: %s\n    traces:\n      enabled: true" $i $destination.name $destination.name $destination.url) }}
+
+      {{/* Check if OTLP destination using Grafana Cloud Tempo checks */}}
+      {{- if and (regexMatch "tempo-.+grafana\\.net" $destination.url) }}
+        {{- if ne $destination.protocol "grpc" }}
+          {{ fail (printf "\nDestination #%d (%s) is using Grafana Cloud Traces but has incorrect protocol '%s'. Grafana Cloud Traces requires 'grpc'.\nPlease set:\ndestinations:\n  - name: %s\n    type: otlp\n    url: %s\n    protocol: grpc" $i $destination.name ($destination.protocol | default "grpc (default)") $destination.name $destination.url) }}
+        {{- end }}
+        {{- if eq (dig "metrics" "enabled" true $destination) true }}
+          {{ fail (printf "\nDestination #%d (%s) is using Grafana Cloud Traces but has metrics enabled. Tempo only supports traces.\nPlease set:\ndestinations:\n  - name: %s\n    type: otlp\n    url: %s\n    metrics:\n      enabled: false" $i $destination.name $destination.name $destination.url) }}
+        {{- end }}
+        {{- if eq (dig "logs" "enabled" true $destination) true }}
+          {{ fail (printf "\nDestination #%d (%s) is using Grafana Cloud Traces but has logs enabled. Tempo only supports traces.\nPlease set:\ndestinations:\n  - name: %s\n    type: otlp\n    url: %s\n    logs:\n      enabled: false" $i $destination.name $destination.name $destination.url) }}
+        {{- end }}
+        {{- if eq (dig "traces" "enabled" true $destination) false }}
+          {{ fail (printf "\nDestination #%d (%s) is using Grafana Cloud Traces but has traces disabled.\nPlease set:\ndestinations:\n  - name: %s\n    type: otlp\n    url: %s\n    traces:\n      enabled: true" $i $destination.name $destination.name $destination.url) }}
+        {{- end }}
       {{- end }}
     {{- end }}