From 91a5c3803c3824108ad768cea227cf8527eed684 Mon Sep 17 00:00:00 2001
From: Gabriel MABILLE <gamab@users.noreply.github.com>
Date: Thu, 23 Nov 2023 12:17:28 +0100
Subject: [PATCH] RBAC: GrafanaAdmin users are admins of the Global
 Organization (#78559)

---
 pkg/services/accesscontrol/accesscontrol.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/services/accesscontrol/accesscontrol.go b/pkg/services/accesscontrol/accesscontrol.go
index c4f2446034d..a07053c003d 100644
--- a/pkg/services/accesscontrol/accesscontrol.go
+++ b/pkg/services/accesscontrol/accesscontrol.go
@@ -365,6 +365,10 @@ func GetOrgRoles(user identity.Requester) []string {
 	roles := []string{string(user.GetOrgRole())}
 
 	if user.GetIsGrafanaAdmin() {
+		if user.GetOrgID() == GlobalOrgID {
+			// A server admin is the admin of the global organization
+			return []string{RoleGrafanaAdmin, string(org.RoleAdmin)}
+		}
 		roles = append(roles, RoleGrafanaAdmin)
 	}