Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
74ca6f6d
Commit
74ca6f6d
authored
Feb 01, 2018
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes dashboard url in alertlist
parent
992fd370
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
pkg/api/alerting.go
+2
-1
public/app/containers/AlertRuleList/AlertRuleList.jest.tsx
+1
-1
public/app/containers/AlertRuleList/AlertRuleList.tsx
+1
-1
public/app/containers/AlertRuleList/__snapshots__/AlertRuleList.jest.tsx.snap
+2
-2
No files found.
pkg/api/alerting.go
View file @
74ca6f6d
...
@@ -105,7 +105,8 @@ func transformToDTOs(alerts []*models.Alert, c *middleware.Context) ([]*dtos.Ale
...
@@ -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
}
}
}
}
}
}
...
...
public/app/containers/AlertRuleList/AlertRuleList.jest.tsx
View file @
74ca6f6d
...
@@ -23,7 +23,7 @@ describe('AlertRuleList', () => {
...
@@ -23,7 +23,7 @@ describe('AlertRuleList', () => {
.
format
(),
.
format
(),
evalData
:
{},
evalData
:
{},
executionError
:
''
,
executionError
:
''
,
dashboardUri
:
'd
b/mygoo
l'
,
dashboardUri
:
'd
/ufkcofof/my-goa
l'
,
canEdit
:
true
,
canEdit
:
true
,
},
},
])
])
...
...
public/app/containers/AlertRuleList/AlertRuleList.tsx
View file @
74ca6f6d
...
@@ -137,7 +137,7 @@ export class AlertRuleItem extends React.Component<AlertRuleItemProps, any> {
...
@@ -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"
>
...
...
public/app/containers/AlertRuleList/__snapshots__/AlertRuleList.jest.tsx.snap
View file @
74ca6f6d
...
@@ -21,7 +21,7 @@ exports[`AlertRuleList should render 1 rule 1`] = `
...
@@ -21,7 +21,7 @@ exports[`AlertRuleList should render 1 rule 1`] = `
className="alert-rule-item__name"
className="alert-rule-item__name"
>
>
<a
<a
href="d
ashboard/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`] = `
...
@@ -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="d
ashboard/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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment