IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

AccessControl: Alerting role grants folder read on all folders to viewers (#47278)

Browse Source
This commit is contained in:
Gabriel MABILLE 2022-04-05 09:04:02 +02:00 committed by GitHub
parent 110d4661d7
commit e430f5021d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/services/ngalert/accesscontrol.go
View File

@ -16,16 +16,12 @@ var (
DisplayName: "Rules Reader", DisplayName: "Rules Reader",
Description: "Can read alert rules in all Grafana folders and external providers", Description: "Can read alert rules in all Grafana folders and external providers",
Group: AlertRolesGroup, Group: AlertRolesGroup,
Version: 1, Version: 2,
Permissions: []accesscontrol.Permission{ Permissions: []accesscontrol.Permission{
{ {
Action: accesscontrol.ActionAlertingRuleRead, Action: accesscontrol.ActionAlertingRuleRead,
Scope: dashboards.ScopeFoldersAll, Scope: dashboards.ScopeFoldersAll,
}, },
{
Action: dashboards.ActionFoldersRead,
Scope: dashboards.ScopeFoldersAll,
},
{ {
Action: accesscontrol.ActionAlertingRuleExternalRead, Action: accesscontrol.ActionAlertingRuleExternalRead,
Scope: datasources.ScopeAll, Scope: datasources.ScopeAll,
@ -40,7 +36,7 @@ var (
DisplayName: "Rules Editor", DisplayName: "Rules Editor",
Description: "Can add, update, and delete rules in any Grafana folder and external providers", Description: "Can add, update, and delete rules in any Grafana folder and external providers",
Group: AlertRolesGroup, Group: AlertRolesGroup,
Version: 1, Version: 2,
Permissions: accesscontrol.ConcatPermissions(rulesReaderRole.Role.Permissions, []accesscontrol.Permission{ Permissions: accesscontrol.ConcatPermissions(rulesReaderRole.Role.Permissions, []accesscontrol.Permission{
{ {
Action: accesscontrol.ActionAlertingRuleCreate, Action: accesscontrol.ActionAlertingRuleCreate,
@ -154,7 +150,7 @@ var (
DisplayName: "Full read-only access", DisplayName: "Full read-only access",
Description: "Can read alert rules, instances, silences, contact points, and notification policies in Grafana and all external providers", Description: "Can read alert rules, instances, silences, contact points, and notification policies in Grafana and all external providers",
Group: AlertRolesGroup, Group: AlertRolesGroup,
Version: 1, Version: 2,
Permissions: accesscontrol.ConcatPermissions(rulesReaderRole.Role.Permissions, instancesReaderRole.Role.Permissions, notificationsReaderRole.Role.Permissions), Permissions: accesscontrol.ConcatPermissions(rulesReaderRole.Role.Permissions, instancesReaderRole.Role.Permissions, notificationsReaderRole.Role.Permissions),
}, },
Grants: []string{string(models.ROLE_VIEWER)}, Grants: []string{string(models.ROLE_VIEWER)},
@ -166,7 +162,7 @@ var (
DisplayName: "Full access", DisplayName: "Full access",
Description: "Can add,update and delete alert rules, instances, silences, contact points, and notification policies in Grafana and all external providers", Description: "Can add,update and delete alert rules, instances, silences, contact points, and notification policies in Grafana and all external providers",
Group: AlertRolesGroup, Group: AlertRolesGroup,
Version: 1, Version: 2,
Permissions: accesscontrol.ConcatPermissions(rulesEditorRole.Role.Permissions, instancesEditorRole.Role.Permissions, notificationsEditorRole.Role.Permissions), Permissions: accesscontrol.ConcatPermissions(rulesEditorRole.Role.Permissions, instancesEditorRole.Role.Permissions, notificationsEditorRole.Role.Permissions),
}, },
Grants: []string{string(models.ROLE_EDITOR)}, Grants: []string{string(models.ROLE_EDITOR)},