fix: canary only worked when gateway enabled

Author: jacobcrawford

docs/sources/setup/install/helm/reference.md

@@ -6690,6 +6690,15 @@ null
 			<td><pre lang="json">
 "pod"
 </pre>
+</td>
+		</tr>
+		<tr>
+			<td>lokiCanary.lokiurl</td>
+			<td>string</td>
+			<td>If set overwrites the default value set by loki.host helper function. Use this if gateway not enabled.</td>
+			<td><pre lang="json">
+null
+</pre>
 </td>
 		</tr>
 		<tr>

production/helm/loki/CHANGELOG.md

@@ -13,6 +13,8 @@ Entries should include a reference to the pull request that introduced the chang
 
 [//]: # (<AUTOMATED_UPDATES_LOCATOR> : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
 
+- [BUGFIX] Loki endpoint for Canary assumed gateway was always enabled. Can now be overwritten through values.
+
 ## 6.28.0
 
 - [CHANGE] Add extraContainers parameter for the backend pod

production/helm/loki/templates/loki-canary/daemonset.yaml

@@ -41,7 +41,7 @@ spec:
           image: {{ include "loki-canary.image" $ }}
           imagePullPolicy: {{ $.Values.loki.image.pullPolicy }}
           args:
-            - -addr={{- include "loki.host" $ }}
+            - -addr={{- default (include "loki.host" $) .lokiurl }}
             - -labelname={{ .labelname }}
             - -labelvalue=$(POD_NAME)
             {{- if $.Values.enterprise.enabled }}

production/helm/loki/values.yaml

@@ -749,6 +749,8 @@ lokiCanary:
   # -- If true, the canary will send directly to Loki via the address configured for verification --
   # -- If false, it will write to stdout and an Agent will be needed to scrape and send the logs --
   push: true
+  # -- If set overwrites the default value set by loki.host helper function. Use this if gateway not enabled.
+  lokiurl: null
   # -- The name of the label to look for at loki when doing the checks.
   labelname: pod
   # -- Additional annotations for the `loki-canary` Daemonset