From 49b26d27842a5a92874969ff6ba010a5f3a30a2c Mon Sep 17 00:00:00 2001
From: Socheat Sok <socheatsok78@gmail.com>
Date: Thu, 8 May 2025 14:31:01 +0700
Subject: [PATCH 1/2] Upgrade Grafana to v12.0.0

---
 .dockerenv               | 2 +-
 docker-stack.yml         | 2 +-
 grafana/docker-stack.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.dockerenv b/.dockerenv
index a877a36..6c314a4 100644
--- a/.dockerenv
+++ b/.dockerenv
@@ -8,7 +8,7 @@ PROMSTACK_CADVISOR_VERSION=gcr.io/cadvisor/cadvisor:v0.52.1
 
 # grafana
 # https://github.com/grafana/grafana
-PROMSTACK_GRAFANA_VERSION=docker.io/grafana/grafana:11.6.1
+PROMSTACK_GRAFANA_VERSION=docker.io/grafana/grafana:12.0.0
 PROMSTACK_GRAFANA_CONFIG_PROVIDER_VERSION=docker.io/swarmlibs/prometheus-config-provider:0.1.0-rc.11
 PROMSTACK_GRAFANA_CONFIG_RELOADER_VERSION=docker.io/swarmlibs/grafana-provisioning-config-reloader:0.1.0-rc.3
 
diff --git a/docker-stack.yml b/docker-stack.yml
index 06f21be..552b070 100644
--- a/docker-stack.yml
+++ b/docker-stack.yml
@@ -433,7 +433,7 @@ services:
       interval: 30s
       retries: 3
       start_period: 30s
-    image: docker.io/grafana/grafana:11.6.1
+    image: docker.io/grafana/grafana:12.0.0
     logging:
       driver: json-file
       options:
diff --git a/grafana/docker-stack.yml b/grafana/docker-stack.yml
index 607dbe5..36db31a 100644
--- a/grafana/docker-stack.yml
+++ b/grafana/docker-stack.yml
@@ -315,7 +315,7 @@ services:
       interval: 30s
       retries: 3
       start_period: 30s
-    image: docker.io/grafana/grafana:11.6.1
+    image: docker.io/grafana/grafana:12.0.0
     logging:
       driver: json-file
       options:

From 19e337347a8a83acbdad93dfb4bbf4553b8cec4b Mon Sep 17 00:00:00 2001
From: Socheat Sok <socheatsok78@gmail.com>
Date: Thu, 8 May 2025 14:55:56 +0700
Subject: [PATCH 2/2] Enable Git Sync feature for Grafana

---
 docker-stack.yml              | 5 +++++
 grafana/docker-stack.tmpl.yml | 5 +++++
 grafana/docker-stack.yml      | 5 +++++
 grafana/grafana/custom.ini    | 9 +++++++++
 4 files changed, 24 insertions(+)
 create mode 100644 grafana/grafana/custom.ini

diff --git a/docker-stack.yml b/docker-stack.yml
index 552b070..4f548dd 100644
--- a/docker-stack.yml
+++ b/docker-stack.yml
@@ -372,6 +372,8 @@ services:
       - source: gf-server-entrypoint
         target: /docker-entrypoint-shim.sh
         mode: 365
+      - source: gf-custom-ini
+        target: /etc/grafana/grafana.ini
       - source: gf-provisioning-dashboards
         target: /etc/grafana/provisioning/dashboards/gf-provisioning-dashboards.yml
     deploy:
@@ -1035,6 +1037,9 @@ volumes:
   prometheus-configs: {}
   prometheus-node-agent-data: {}
 configs:
+  gf-custom-ini:
+    name: gf-custom-ini-v1
+    file: ./grafana/grafana/custom.ini
   gf-dashboard-promstack-cadvisor:
     name: gf-dashboard-promstack-cadvisor-v1
     file: ./grafana/grafana/dashboards/promstack-cadvisor.json
diff --git a/grafana/docker-stack.tmpl.yml b/grafana/docker-stack.tmpl.yml
index 3ee03c3..1752ee4 100644
--- a/grafana/docker-stack.tmpl.yml
+++ b/grafana/docker-stack.tmpl.yml
@@ -113,6 +113,8 @@ services:
       - source: gf-server-entrypoint
         target: /docker-entrypoint-shim.sh
         mode: 0555
+      - source: gf-custom-ini
+        target: /etc/grafana/grafana.ini
       - source: gf-provisioning-dashboards
         target: /etc/grafana/provisioning/dashboards/gf-provisioning-dashboards.yml
     volumes:
@@ -331,6 +333,9 @@ configs:
   gf-server-entrypoint:
     name: gf-server-entrypoint-v1
     file: ./grafana/docker-entrypoint-shim.sh
+  gf-custom-ini:
+    name: gf-custom-ini-v1
+    file: ./grafana/custom.ini
 
   # Grafana dashboards provisioning config
   gf-provisioning-dashboards:
diff --git a/grafana/docker-stack.yml b/grafana/docker-stack.yml
index 36db31a..bac38f8 100644
--- a/grafana/docker-stack.yml
+++ b/grafana/docker-stack.yml
@@ -254,6 +254,8 @@ services:
       - source: gf-server-entrypoint
         target: /docker-entrypoint-shim.sh
         mode: 365
+      - source: gf-custom-ini
+        target: /etc/grafana/grafana.ini
       - source: gf-provisioning-dashboards
         target: /etc/grafana/provisioning/dashboards/gf-provisioning-dashboards.yml
     deploy:
@@ -374,6 +376,9 @@ volumes:
   grafana-provisioning-dashboards: {}
   grafana-provisioning-datasources: {}
 configs:
+  gf-custom-ini:
+    name: gf-custom-ini-v1
+    file: ./grafana/custom.ini
   gf-dashboard-promstack-cadvisor:
     name: gf-dashboard-promstack-cadvisor-v1
     file: ./grafana/dashboards/promstack-cadvisor.json
diff --git a/grafana/grafana/custom.ini b/grafana/grafana/custom.ini
new file mode 100644
index 0000000..df33064
--- /dev/null
+++ b/grafana/grafana/custom.ini
@@ -0,0 +1,9 @@
+# In your custom.ini file
+
+[feature_toggles]
+provisioning = true
+kubernetesClientDashboardsFolders = true
+kubernetesDashboards = true ; use k8s from browser
+
+# If you want easy kubectl setup development mode
+grafanaAPIServerEnsureKubectlAccess = true