From e4c48162b80214e0887f896e953f51fcd4e62e83 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Fri, 13 Jun 2025 10:48:59 +0200 Subject: [PATCH 1/2] PMM-14031 Add in missing subpaths to navtree --- pkg/services/navtree/navtreeimpl/admin.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/services/navtree/navtreeimpl/admin.go b/pkg/services/navtree/navtreeimpl/admin.go index 9bc0b5001303a..654ea199708cb 100644 --- a/pkg/services/navtree/navtreeimpl/admin.go +++ b/pkg/services/navtree/navtreeimpl/admin.go @@ -74,7 +74,7 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink Text: "General", SubTitle: "Manage default preferences and settings across Grafana", Id: navtree.NavIDCfgGeneral, - Url: "/admin/general", + Url: s.cfg.AppSubURL + "/admin/general", Icon: "shield", Children: generalNodeLinks, } @@ -119,7 +119,7 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink Text: "Plugins and data", SubTitle: "Install plugins and define the relationships between data", Id: navtree.NavIDCfgPlugins, - Url: "/admin/plugins", + Url: s.cfg.AppSubURL + "/admin/plugins", Icon: "shield", Children: pluginsNodeLinks, } @@ -185,7 +185,7 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink Text: "Users and access", SubTitle: "Configure access for individual users, teams, and service accounts", Id: navtree.NavIDCfgAccess, - Url: "/admin/access", + Url: s.cfg.AppSubURL + "/admin/access", Icon: "shield", Children: accessNodeLinks, } @@ -212,7 +212,7 @@ func (s *ServiceImpl) getAdminNode(c *contextmodel.ReqContext) (*navtree.NavLink Icon: "cog", SortWeight: navtree.WeightConfig, Children: configNodes, - Url: "/admin", + Url: s.cfg.AppSubURL + "/admin", } return configNode, nil From 43ba05b3efe552ebf62a22b7ef73054f4733d771 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Tue, 16 Sep 2025 21:52:46 +0200 Subject: [PATCH 2/2] PMM-14031 Add missing subpath to support bundles --- pkg/services/navtree/navtreeimpl/navtree.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/navtree/navtreeimpl/navtree.go b/pkg/services/navtree/navtreeimpl/navtree.go index 5dd09222aa0bc..2c6ded273cd51 100644 --- a/pkg/services/navtree/navtreeimpl/navtree.go +++ b/pkg/services/navtree/navtreeimpl/navtree.go @@ -262,7 +262,7 @@ func (s *ServiceImpl) addHelpLinks(treeRoot *navtree.NavTreeRoot, c *contextmode supportBundleNode := &navtree.NavLink{ Text: "Support bundles", Id: "support-bundles", - Url: "/support-bundles", + Url: s.cfg.AppSubURL + "/support-bundles", Icon: "wrench", SortWeight: navtree.WeightHelp, }