Fix loki gateway url when deployed on non-dev namespace (nebari-dev#2327

)
MetroStar · Mar 18, 2024 · 13923e4 · 13923e4
2 parents 9f945c4 + 0a00024
commit 13923e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...nebari/stages/kubernetes_services/template/modules/kubernetes/services/monitoring/main.tf b/...nebari/stages/kubernetes_services/template/modules/kubernetes/services/monitoring/main.tf
@@ -181,6 +181,14 @@ resource "helm_release" "prometheus-grafana" {
           "${var.node-group.key}" = var.node-group.value
         }
 
+        additionalDataSources = [
+          {
+            name = "Loki"
+            type = "loki"
+            url  = "http://loki-gateway.${var.namespace}"
+          }
+        ]
+
         # Avoid using the default password, as that's a security risk
         adminPassword : random_password.grafana_admin_password.result
 

diff --git a/...ri/stages/kubernetes_services/template/modules/kubernetes/services/monitoring/values.yaml b/...ri/stages/kubernetes_services/template/modules/kubernetes/services/monitoring/values.yaml
@@ -1,7 +1 @@
 # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml
-
-grafana:
-  additionalDataSources:
-   - name: Loki
-     type: loki
-     url: http://loki-gateway.dev