From c608e62082e7ba22a2a654c4cb159b6ef51520e4 Mon Sep 17 00:00:00 2001
From: jgrusewski <jgrusewski@localhost>
Date: Mon, 2 Mar 2026 12:33:42 +0100
Subject: [PATCH] fix(grafana): restore full values file with sidecar,
 datasources, tolerations

The Grafana PVC was lost during cleanup (orphaned PV deletion).
Dashboards survived (ConfigMap-based), but user accounts and
datasources were lost.

This commit captures all Helm values previously set via --set:
- Sidecar config with foldersFromFilesStructure for folder organization
- Loki + Tempo datasources alongside Prometheus
- Platform node toleration for gitlab taint

Also fixed CI/CD folder annotation (slash caused nested directory).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 infra/k8s/gitlab/grafana-values.yaml | 46 ++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/infra/k8s/gitlab/grafana-values.yaml b/infra/k8s/gitlab/grafana-values.yaml
index fc1f2ca12..49a0e7401 100644
--- a/infra/k8s/gitlab/grafana-values.yaml
+++ b/infra/k8s/gitlab/grafana-values.yaml
@@ -6,6 +6,12 @@ replicas: 1
 nodeSelector:
   k8s.scaleway.com/pool-name: platform
 
+tolerations:
+  - key: gitlab
+    operator: Equal
+    value: "true"
+    effect: NoSchedule
+
 resources:
   requests:
     cpu: 50m
@@ -34,6 +40,46 @@ datasources:
         url: http://gitlab-prometheus-server.foxhunt.svc.cluster.local:80
         access: proxy
         isDefault: true
+      - name: Loki
+        type: loki
+        access: proxy
+        url: http://loki.foxhunt.svc.cluster.local:3100
+        isDefault: false
+        jsonData:
+          derivedFields:
+            - datasourceUid: tempo
+              matcherRegex: '"trace_id":"(\w+)"'
+              name: TraceID
+              url: "$${__value.raw}"
+      - name: Tempo
+        type: tempo
+        uid: tempo
+        access: proxy
+        url: http://tempo.foxhunt.svc.cluster.local:3200
+        isDefault: false
+        jsonData:
+          tracesToLogsV2:
+            datasourceUid: loki
+            filterByTraceID: true
+          nodeGraph:
+            enabled: true
+          serviceMap:
+            datasourceUid: prometheus
+
+sidecar:
+  dashboards:
+    enabled: true
+    folder: /tmp/dashboards
+    folderAnnotation: grafana_folder
+    label: grafana_dashboard
+    labelValue: "1"
+    searchNamespace: foxhunt
+    provider:
+      foldersFromFilesStructure: true
+  datasources:
+    enabled: false
+    label: grafana_datasource
+    labelValue: ""
 
 dashboardProviders:
   dashboardproviders.yaml: