Merge pull request #65 from TeskaLabs/fix/grafana-oauth

Grafana: fix oauth
TeskaLabs · Feb 6, 2024 · 6f776ed · 6f776ed
2 parents 3cbfd34 + 962d759
commit 6f776ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Site/ASAB Maestro/Descriptors/grafana.yaml b/Site/ASAB Maestro/Descriptors/grafana.yaml
@@ -34,7 +34,9 @@ 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_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
@@ -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'