From e0499a1e53441154df9da5efabeb305f2dd897b7 Mon Sep 17 00:00:00 2001
From: enovotna <eliska.novotna@teskalabs.com>
Date: Fri, 2 Feb 2024 16:58:09 +0100
Subject: [PATCH 1/2] fix oauth

---
 Site/ASAB Maestro/Descriptors/grafana.yaml | 5 ++++-
 Site/ASAB Maestro/Versions/v24.04.yaml     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Site/ASAB Maestro/Descriptors/grafana.yaml b/Site/ASAB Maestro/Descriptors/grafana.yaml
index 7e21a3d..9227382 100644
--- a/Site/ASAB Maestro/Descriptors/grafana.yaml	
+++ b/Site/ASAB Maestro/Descriptors/grafana.yaml	
@@ -34,7 +34,10 @@ descriptor:
     GF_AUTH_GENERIC_OAUTH_API_URL: "{{SEACAT_AUTH_PUBLIC}}/openidconnect/userinfo"
     GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_STRICT: true
     GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH: contains(resources."*"[*], 'authz:superuser') && 'Admin' || contains(resources."*"[*], 'grafana:edit') && 'Editor' || contains(resources."*"[*], 'grafana:access') && 'Viewer'
-
+    GF_AUTH_GENERIC_OAUTH_LOGIN_ATTRIBUTE_PATH: preferred_username
+    GF_AUTH_GENERIC_OAUTH_NAME_ATTRIBUTE_PATH: preferred_username
+    GF_AUTH_GENERIC_OAUTH_EMAIL_ATTRIBUTE_PATH: email
+    GF_AUTH_SIGNOUT_REDIRECT_URL: "{{PUBLIC_URL}}"
 files:
   - "provisioning/"
 
diff --git a/Site/ASAB Maestro/Versions/v24.04.yaml b/Site/ASAB Maestro/Versions/v24.04.yaml
index d082f13..9820201 100644
--- a/Site/ASAB Maestro/Versions/v24.04.yaml	
+++ b/Site/ASAB Maestro/Versions/v24.04.yaml	
@@ -12,6 +12,7 @@ versions:
   asab-remote-control: latest
   bs-query: v24.03-alpha2 # with service discovery
   elasticsearch: '7.17.12'
+  grafana: '10.3.1'
   influxdb: '2.7.1'
   jupyter: lab-4.0.9
   kafdrop: '4.0.0'

From 962d75911f242a4c495dd64713d4a6a6c9f2cdee Mon Sep 17 00:00:00 2001
From: eliska-n <82450969+eliska-n@users.noreply.github.com>
Date: Tue, 6 Feb 2024 09:13:36 +0100
Subject: [PATCH 2/2] Update grafana.yaml

---
 Site/ASAB Maestro/Descriptors/grafana.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Site/ASAB Maestro/Descriptors/grafana.yaml b/Site/ASAB Maestro/Descriptors/grafana.yaml
index 9227382..7f684d8 100644
--- a/Site/ASAB Maestro/Descriptors/grafana.yaml	
+++ b/Site/ASAB Maestro/Descriptors/grafana.yaml	
@@ -36,7 +36,6 @@ descriptor:
     GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH: contains(resources."*"[*], 'authz:superuser') && 'Admin' || contains(resources."*"[*], 'grafana:edit') && 'Editor' || contains(resources."*"[*], 'grafana:access') && 'Viewer'
     GF_AUTH_GENERIC_OAUTH_LOGIN_ATTRIBUTE_PATH: preferred_username
     GF_AUTH_GENERIC_OAUTH_NAME_ATTRIBUTE_PATH: preferred_username
-    GF_AUTH_GENERIC_OAUTH_EMAIL_ATTRIBUTE_PATH: email
     GF_AUTH_SIGNOUT_REDIRECT_URL: "{{PUBLIC_URL}}"
 files:
   - "provisioning/"