IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Navigation: Correctly create Alerts and incidents section when using legacy alerting (#64924)

Browse Source 
check for legacy alerting node as well
This commit is contained in:
Ashley Harrison 2023-03-16 17:55:23 +00:00 committed by GitHub
parent 27e2b037ae
commit 54dd8943ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/services/navtree/models.go
View File

@ -43,6 +43,7 @@ const (
NavIDAdmin = "admin"
NavIDAlertsAndIncidents = "alerts-and-incidents"
NavIDAlerting = "alerting"
NavIDAlertingLegacy = "alerting-legacy"
NavIDMonitoring = "monitoring"
NavIDReporting = "reports"
NavIDApps = "apps"

4
pkg/services/navtree/navtreeimpl/applinks.go
View File

@ -179,6 +179,10 @@ func (s *ServiceImpl) processAppPlugin(plugin plugins.PluginDTO, c *contextmodel
func (s *ServiceImpl) addPluginToSection(c *contextmodel.ReqContext, treeRoot *navtree.NavTreeRoot, plugin plugins.PluginDTO, appLink *navtree.NavLink) {
// Handle moving apps into specific navtree sections
alertingNode := treeRoot.FindById(navtree.NavIDAlerting)
if alertingNode == nil {
// Search for legacy alerting node just in case
alertingNode = treeRoot.FindById(navtree.NavIDAlertingLegacy)
}
sectionID := navtree.NavIDApps
if navConfig, hasOverride := s.navigationAppConfig[plugin.ID]; hasOverride {

2
public/app/features/alerting/routes.tsx
View File

@ -18,7 +18,7 @@ const legacyRoutes: RouteDescriptor[] = [
{
path: '/alerting',
component: () =>
config.featureToggles.topnav ? <NavLandingPage navId="alerting" /> : <Redirect to="/alerting/list" />,
config.featureToggles.topnav ? <NavLandingPage navId="alerting-legacy" /> : <Redirect to="/alerting/list" />,
},
{
path: '/alerting/list',