Skip to content

PMM-14031 Add in missing subpaths to navtree #827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
matejkubinec wants to merge 3 commits into
base: v3
Choose a base branch
from
Draft

PMM-14031 Add in missing subpaths to navtree #827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4c4816
PMM-14031 Add in missing subpaths to navtree
matejkubinec Jun 13, 2025
43ba05b
PMM-14031 Add missing subpath to support bundles
matejkubinec Sep 16, 2025
032ab8a
Merge branch 'v3' into PMM-14031-navigation-missing-subpaths
matejkubinec Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkg/services/navtree/navtreeimpl/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down Expand Up @@ -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,
}
Expand Down Expand Up @@ -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,
}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/services/navtree/navtreeimpl/navtree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
Loading