diff --git a/pkg/api/index.go b/pkg/api/index.go index 2b5a32fdf60..44f9bdb667e 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -196,6 +196,9 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool) ([]*dto alertChildNavs := []*dtos.NavLink{ {Text: "Alert rules", Id: "alert-list", Url: hs.Cfg.AppSubURL + "/alerting/list", Icon: "list-ul"}, } + if hs.Cfg.IsNgAlertEnabled() { + alertChildNavs = append(alertChildNavs, &dtos.NavLink{Text: "Silences", Id: "silences", Url: hs.Cfg.AppSubURL + "/alerting/silences", Icon: "bell-slash"}) + } if c.OrgRole == models.ROLE_ADMIN && hs.Cfg.IsNgAlertEnabled() { alertChildNavs = append(alertChildNavs, &dtos.NavLink{Text: "Routes", Id: "am-routes", Url: hs.Cfg.AppSubURL + "/alerting/routes", Icon: "sitemap"}) } diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx index eecfbd90e25..f7ec6696c69 100644 --- a/public/app/core/components/Page/Page.tsx +++ b/public/app/core/components/Page/Page.tsx @@ -31,10 +31,13 @@ export const Page: PageType = ({ navModel, children, className, contentWidth, .. }, [navModel]); return ( -
{JSON.stringify(result, null, 2)}} +