diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go index 6b1d0428ed9..a9db04da82c 100644 --- a/pkg/services/navtree/navtreeimpl/admin.go +++ b/pkg/services/navtree/navtreeimpl/admin.go @@ -1,6 +1,7 @@ package navtreeimpl import ( + "github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/login/social" ac "github.com/grafana/grafana/pkg/services/accesscontrol" "github.com/grafana/grafana/pkg/services/accesscontrol/ssoutils" @@ -60,15 +61,15 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink Url: s.cfg.AppSubURL + "/admin/migrate-to-cloud", }) } - if hasAccess(ac.EvalPermission(ac.ActionSettingsRead, ac.ScopeSettingsAll)) { - provisioningNode := &navtree.NavLink{ + if c.HasRole(identity.RoleAdmin) && + (s.cfg.StackID == "" || // show OnPrem even when provisioning is disabled + s.features.IsEnabledGlobally(featuremgmt.FlagProvisioning)) { + configNodes = append(configNodes, &navtree.NavLink{ Text: "Provisioning", Id: "provisioning", SubTitle: "View and manage your provisioning connections", Url: s.cfg.AppSubURL + "/admin/provisioning", - } - - configNodes = append(configNodes, provisioningNode) + }) } generalNode := &navtree.NavLink{ diff --git a/public/app/features/provisioning/GettingStarted/GettingStarted.tsx b/public/app/features/provisioning/GettingStarted/GettingStarted.tsx index 4c9a4563f8f..e239f511a7e 100644 --- a/public/app/features/provisioning/GettingStarted/GettingStarted.tsx +++ b/public/app/features/provisioning/GettingStarted/GettingStarted.tsx @@ -18,11 +18,8 @@ const featureIni = `# In your custom.ini file [feature_toggles] provisioning = true -kubernetesClientDashboardsFolders = true kubernetesDashboards = true ; use k8s from browser - -# If you want easy kubectl setup development mode -grafanaAPIServerEnsureKubectlAccess = true`; +`; const ngrokExample = `ngrok http 3000