From 6f88baeb9120f061dcc3f10b647b1cdd5da8d7b7 Mon Sep 17 00:00:00 2001
From: Erich Blume <blume.erich@gmail.com>
Date: Wed, 18 Mar 2026 12:40:44 -0700
Subject: [PATCH] Fix Grafana starred dashboards lost on pod restart

Add init container to pre-populate ConfigMap dashboards before Grafana
starts, eliminating the race between the sidecar and the provisioner
that caused dashboard DB records to be deleted and re-created with new
IDs. Also stamp stable UIDs on TeslaMate and UnPoller dashboards
fetched from upstream.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 argocd/manifests/grafana/deployment.yaml | 40 ++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/argocd/manifests/grafana/deployment.yaml b/argocd/manifests/grafana/deployment.yaml
index 86e7eb7..2f4c7b8 100644
--- a/argocd/manifests/grafana/deployment.yaml
+++ b/argocd/manifests/grafana/deployment.yaml
@@ -80,6 +80,11 @@ spec:
               ; do
                 wget -q -O "$DEST/$f" "$BASE_URL/$f"
               done
+              # Stamp stable UIDs so stars/bookmarks survive pod restarts
+              for f in "$DEST"/*.json; do
+                uid="teslamate-$(basename "$f" .json)"
+                sed -i "s/\"uid\": *\"[^\"]*\"/\"uid\": \"${uid}\"/" "$f"
+              done
               echo "Fetched $(ls "$DEST" | wc -l) TeslaMate dashboards"
           securityContext:
             allowPrivilegeEscalation: false
@@ -115,6 +120,12 @@ spec:
               # Fix datasource UIDs to match our Prometheus instance
               sed -i 's/"uid": *"bdkj55oguty4gd"/"uid": "prometheus"/g' "$DEST"/*.json
               sed -i 's/"uid": *"\${DS_PROMETHEUS}"/"uid": "prometheus"/g' "$DEST"/*.json
+              # Stamp stable UIDs so stars/bookmarks survive pod restarts
+              for f in "$DEST"/*.json; do
+                slug=$(basename "$f" .json | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/--*/-/g' | sed 's/^-//;s/-$//')
+                uid="unpoller-${slug}"
+                sed -i "s/\"uid\": *\"[^\"]*\"/\"uid\": \"${uid}\"/" "$f"
+              done
               echo "Fetched $(ls "$DEST" | wc -l) UnPoller dashboards"
           securityContext:
             allowPrivilegeEscalation: false
@@ -125,6 +136,35 @@ spec:
           volumeMounts:
             - name: sc-dashboard-volume
               mountPath: /tmp/dashboards
+        # Pre-populate ConfigMap dashboards so they exist before Grafana starts.
+        # Without this, the sidecar and Grafana race: if the provisioner scans
+        # before the sidecar writes files, it deletes existing DB records and
+        # re-creates them with new IDs, breaking starred dashboards.
+        - name: init-configmap-dashboards
+          image: registry.ops.eblu.me/blumeops/grafana-sidecar:kustomized
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: METHOD
+              value: LIST
+            - name: LABEL
+              value: grafana_dashboard
+            - name: LABEL_VALUE
+              value: "1"
+            - name: FOLDER
+              value: /tmp/dashboards
+            - name: RESOURCE
+              value: both
+            - name: FOLDER_ANNOTATION
+              value: grafana_folder
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            seccompProfile:
+              type: RuntimeDefault
+          volumeMounts:
+            - name: sc-dashboard-volume
+              mountPath: /tmp/dashboards
       containers:
         # Dashboard sidecar - watches ConfigMaps with grafana_dashboard=1
         - name: grafana-sc-dashboard