From c01d45c7a243eaeae14eb0f98af56dd6f0e2bff6 Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Mon, 8 Jan 2024 10:11:42 -0800
Subject: [PATCH] Upgrade grafana to version 10

---
 core/grafana.nomad       | 2 +-
 core/grafana/grafana.ini | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/grafana.nomad b/core/grafana.nomad
index abd604b..6846182 100644
--- a/core/grafana.nomad
+++ b/core/grafana.nomad
@@ -133,7 +133,7 @@ SELECT 'NOOP';
       driver = "docker"
 
       config {
-        image = "grafana/grafana:9.4.2"
+        image = "grafana/grafana:10.0.10"
         args = ["--config", "$${NOMAD_ALLOC_DIR}/config/grafana.ini"]
         ports = ["web"]
       }
diff --git a/core/grafana/grafana.ini b/core/grafana/grafana.ini
index 4bd3121..3745bda 100644
--- a/core/grafana/grafana.ini
+++ b/core/grafana/grafana.ini
@@ -270,6 +270,10 @@ api_url = https://authelia.{{ with nomadVar "nomad/jobs" }}{{ .base_hostname }}{
 login_attribute_path = preferred_username
 groups_attribute_path = groups
 name_attribute_path = name
+# Role attribute path is not working
+role_attribute_path = contains(groups[*], 'admin') && 'Admin' || contains(groups[*], 'grafana-admin') && 'Admin' || contains(groups[*], 'grafana-editor') && 'Editor' || contains(groups[*], 'developer') && 'Editor'
+allow_assign_grafana_admin = true
+skip_org_role_sync = true
 use_pkce = true
 
 ;team_ids =