feat: auto loki datasource creation in grafana when promtail enabled

butschi84 · Dec 3, 2023 · c91f547 · c91f547
1 parent c2f83f1
commit c91f547
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/helm/templates/grafana/grafana-datasources.yaml b/helm/templates/grafana/grafana-datasources.yaml
@@ -13,4 +13,10 @@ data:
         access: proxy
         url: http://prometheus-service.f2s:9090
         isDefault: true
+      {{- if .Values.promtail.enabled }}
+      - name: Loki
+        type: loki
+        access: proxy
+        url: {{.Values.promtail.loki_url}}
+      {{- end }}
 {{- end }}
diff --git a/helm/templates/prometheus/promtail.yaml b/helm/templates/prometheus/promtail.yaml
@@ -56,7 +56,7 @@ data:
       http_listen_port: 9080
       grpc_listen_port: 0
     clients:
-    - url: "{{.Values.promtail.loki_url}}"
+    - url: "{{.Values.promtail.loki_url}}/loki/api/v1/push"
       headers:
         X-Scope-OrgID: loki-internal
     positions:

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -6,7 +6,7 @@ testfunctions:
 # you need your own loki instance
 promtail:
   enabled: false
-  loki_url: http://loki-loki-distributed-gateway.loki:80/loki/api/v1/push
+  loki_url: http://loki-loki-distributed-gateway.loki:80
 
 # deploy grafana to have insight into metrics
 # - f2s scaling decision dashboard