Drilldown: Require `datasources:explore` RBAC action (#101366)

Drilldown: Require `datasources:explore` acton

pkg/api/accesscontrol.go

@@ -66,9 +66,6 @@ func (hs *HTTPServer) declareFixedRoles() error {
 				{
 					Action: ac.ActionDatasourcesExplore,
 				},
-				{
-					Action: ac.ActionDatasourcesDrilldown,
-				},
 			},
 		},
 		Grants: []string{string(org.RoleEditor)},

pkg/api/api.go

@@ -183,7 +183,7 @@ func (hs *HTTPServer) registerRoutes() {
 	}
 
 	r.Get("/explore", authorize(ac.EvalPermission(ac.ActionDatasourcesExplore)), hs.Index)
-	r.Get("/drilldown", authorize(ac.EvalPermission(ac.ActionDatasourcesDrilldown)), hs.Index)
+	r.Get("/drilldown", authorize(ac.EvalPermission(ac.ActionDatasourcesExplore)), hs.Index)
 
 	r.Get("/playlists/", reqSignedIn, hs.Index)
 	r.Get("/playlists/*", reqSignedIn, hs.Index)

pkg/services/accesscontrol/models.go

@@ -387,7 +387,6 @@ const (
 
 	// Datasources actions
 	ActionDatasourcesExplore = "datasources:explore"
-	ActionDatasourcesDrilldown = "datasources:drilldown"
 
 	// Global Scopes
 	ScopeGlobalUsersAll = "global.users:*"

pkg/services/navtree/navtreeimpl/navtree.go

@@ -130,7 +130,7 @@ func (s *ServiceImpl) GetNavTree(c *contextmodel.ReqContext, prefs *pref.Prefere
 		})
 	}
 
-	if hasAccess(ac.EvalPermission(ac.ActionDatasourcesDrilldown)) {
+	if hasAccess(ac.EvalPermission(ac.ActionDatasourcesExplore)) {
 		drilldownChildNavLinks := s.buildDrilldownNavLinks(c)
 		treeRoot.AddSection(&navtree.NavLink{
 			Text:       "Drilldown",