From 2f7eccc970a69293c272bc593be2c20837b91a6c Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 3 Dec 2023 15:53:33 +0100 Subject: [PATCH] fix: grafana root_url needs https://, role mapping --- hosts/flora-6/apps/grafana.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/flora-6/apps/grafana.nix b/hosts/flora-6/apps/grafana.nix index 2727b8e..ee0fb49 100644 --- a/hosts/flora-6/apps/grafana.nix +++ b/hosts/flora-6/apps/grafana.nix @@ -31,6 +31,7 @@ http_port = 3000; # Grafana needs to know on which domain and URL it's running domain = "grafana.pub.solar"; + root_url = "https://grafana.pub.solar"; enable_gzip = true; }; smtp = { @@ -59,7 +60,7 @@ auth_url = "https://auth.pub.solar/realms/pub.solar/protocol/openid-connect/auth"; token_url = "https://auth.pub.solar/realms/pub.solar/protocol/openid-connect/token"; api_url = "https://auth.pub.solar/realms/pub.solar/protocol/openid-connect/userinfo"; - role_attribute_path = "contains(info.roles[*], 'admin') && 'GrafanaAdmin' || contains(info.roles[*], 'editor') && 'Editor' || 'Viewer'"; + role_attribute_path = "contains(roles[*], 'admin') && 'GrafanaAdmin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'"; allow_assign_grafana_admin = true; }; };