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
7d0c3ae6
Commit
7d0c3ae6
authored
Feb 20, 2018
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: alert history list now shows on graphs with manually added annotation events, fixes #10968
parent
f0d6ea17
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
public/app/features/alerting/alert_tab_ctrl.ts
+1
-1
No files found.
public/app/features/alerting/alert_tab_ctrl.ts
View file @
7d0c3ae6
...
...
@@ -75,7 +75,7 @@ export class AlertTabCtrl {
getAlertHistory
()
{
this
.
backendSrv
.
get
(
`/api/annotations?dashboardId=
${
this
.
panelCtrl
.
dashboard
.
id
}
&panelId=
${
this
.
panel
.
id
}
&limit=50`
)
.
get
(
`/api/annotations?dashboardId=
${
this
.
panelCtrl
.
dashboard
.
id
}
&panelId=
${
this
.
panel
.
id
}
&limit=50
&type=alert
`
)
.
then
(
res
=>
{
this
.
alertHistory
=
_
.
map
(
res
,
ah
=>
{
ah
.
time
=
this
.
dashboardSrv
.
getCurrent
().
formatDate
(
ah
.
time
,
'MMM D, YYYY HH:mm:ss'
);
...
...
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