IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 12:14:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

changes dashboard url in alertlist

Browse Source
This commit is contained in:
bergquist 2018-02-01 13:16:56 +01:00
parent 992fd37010
commit 74ca6f6dbf
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/alerting.go
View File

@ -105,7 +105,8 @@ func transformToDTOs(alerts []*models.Alert, c *middleware.Context) ([]*dtos.Ale
for _, alert := range alertDTOs { for _, alert := range alertDTOs {
for _, dash := range dashboardsQuery.Result { for _, dash := range dashboardsQuery.Result {
if alert.DashboardId == dash.Id { if alert.DashboardId == dash.Id {
alert.DashbboardUri = "db/" + dash.Slug alert.DashbboardUri = models.GetDashboardUrl(dash.Uid, dash.Slug)
break
} }
} }
} }

2
public/app/containers/AlertRuleList/AlertRuleList.jest.tsx
View File

@ -23,7 +23,7 @@ describe('AlertRuleList', () => {
.format(), .format(),
evalData: {}, evalData: {},
executionError: '', executionError: '',
dashboardUri: 'db/mygool', dashboardUri: 'd/ufkcofof/my-goal',
canEdit: true, canEdit: true,
}, },
]) ])

2
public/app/containers/AlertRuleList/AlertRuleList.tsx
View File

@ -137,7 +137,7 @@ export class AlertRuleItem extends React.Component<AlertRuleItemProps, any> {
'fa-pause': !rule.isPaused, 'fa-pause': !rule.isPaused,
}); });
let ruleUrl = `dashboard/${rule.dashboardUri}?panelId=${rule.panelId}&fullscreen&edit&tab=alert`; let ruleUrl = `${rule.dashboardUri}?panelId=${rule.panelId}&fullscreen=true&edit=true&tab=alert`;
return ( return (
<li className="alert-rule-item"> <li className="alert-rule-item">

4
public/app/containers/AlertRuleList/__snapshots__/AlertRuleList.jest.tsx.snap
View File

@ -21,7 +21,7 @@ exports[`AlertRuleList should render 1 rule 1`] = `
className="alert-rule-item__name" className="alert-rule-item__name"
> >
<a <a
href="dashboard/db/mygool?panelId=3&fullscreen&edit&tab=alert" href="d/ufkcofof/my-goal?panelId=3&fullscreen=true&edit=true&tab=alert"
> >
<Highlighter <Highlighter
highlightClassName="highlight-search-match" highlightClassName="highlight-search-match"
@ -92,7 +92,7 @@ exports[`AlertRuleList should render 1 rule 1`] = `
</button> </button>
<a <a
className="btn btn-small btn-inverse alert-list__btn width-2" className="btn btn-small btn-inverse alert-list__btn width-2"
href="dashboard/db/mygool?panelId=3&fullscreen&edit&tab=alert" href="d/ufkcofof/my-goal?panelId=3&fullscreen=true&edit=true&tab=alert"
title="Edit alert rule" title="Edit alert rule"
> >
<i <i