diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go index 16ee498765..71ce06ec79 100644 --- a/pkg/services/navtree/navtreeimpl/navtree.go +++ b/pkg/services/navtree/navtreeimpl/navtree.go @@ -21,7 +21,6 @@ import ( "github.com/grafana/grafana/pkg/services/pluginsintegration/pluginstore" pref "github.com/grafana/grafana/pkg/services/preference" "github.com/grafana/grafana/pkg/services/star" - "github.com/grafana/grafana/pkg/services/supportbundles/supportbundlesimpl" "github.com/grafana/grafana/pkg/setting" ) @@ -203,44 +202,6 @@ func (s *ServiceImpl) getHomeNode(c *contextmodel.ReqContext, prefs *pref.Prefer return homeNode } -func isSupportBundlesEnabled(s *ServiceImpl) bool { - return s.cfg.SectionWithEnvOverrides("support_bundles").Key("enabled").MustBool(true) -} - -func (s *ServiceImpl) addHelpLinks(treeRoot *navtree.NavTreeRoot, c *contextmodel.ReqContext) { - if s.cfg.HelpEnabled { - // The version subtitle is set later by NavTree.ApplyHelpVersion - helpNode := &navtree.NavLink{ - Text: "Help", - Id: "help", - Url: "#", - Icon: "question-circle", - SortWeight: navtree.WeightHelp, - Children: []*navtree.NavLink{}, - } - - treeRoot.AddSection(helpNode) - - hasAccess := ac.HasAccess(s.accessControl, c) - supportBundleAccess := ac.EvalAny( - ac.EvalPermission(supportbundlesimpl.ActionRead), - ac.EvalPermission(supportbundlesimpl.ActionCreate), - ) - - if isSupportBundlesEnabled(s) && hasAccess(supportBundleAccess) { - supportBundleNode := &navtree.NavLink{ - Text: "Support bundles", - Id: "support-bundles", - Url: "/support-bundles", - Icon: "wrench", - SortWeight: navtree.WeightHelp, - } - - helpNode.Children = append(helpNode.Children, supportBundleNode) - } - } -} - func (s *ServiceImpl) getProfileNode(c *contextmodel.ReqContext) *navtree.NavLink { // Only set login if it's different from the name var login string