public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SupportBundles: Add config enablement (#61776)

Browse Source 
* wip

* implement role middleware drop

* remove not implement feature

* change grants based on config

* Update pkg/services/supportbundles/supportbundlesimpl/models.go

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>

Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
This commit is contained in:
Jo
2023-01-20 08:59:15 +00:00
committed by GitHub
co-authored by Ieva
parent 9faab75668
commit caae4fd034
3 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/supportbundles/supportbundlesimpl/models.go
+8 -3
View File
@@ -35,14 +35,19 @@ var (
}
)
func declareFixedRoles(ac accesscontrol.Service) error {
func (s *Service) declareFixedRoles(ac accesscontrol.Service) error {
grants := []string{string(org.RoleAdmin), accesscontrol.RoleGrafanaAdmin}
if s.serverAdminOnly {
grants = []string{accesscontrol.RoleGrafanaAdmin}
}
bundleReader := accesscontrol.RoleRegistration{
Role: bundleReaderRole,
Grants: []string{string(org.RoleAdmin)},
Grants: grants,
}
bundleWriter := accesscontrol.RoleRegistration{
Role: bundleWriterRole,
Grants: []string{string(org.RoleAdmin)},
Grants: grants,
}
return ac.DeclareFixedRoles(bundleWriter, bundleReader)