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
31892ed7
Commit
31892ed7
authored
Sep 14, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
style(alertlist): remove unused code
parent
9dd8b3b4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
21 deletions
+2
-21
public/app/plugins/panel/alertlist/editor.html
+1
-2
public/app/plugins/panel/alertlist/module.ts
+1
-19
No files found.
public/app/plugins/panel/alertlist/editor.html
View file @
31892ed7
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
</div>
</div>
<div
class=
"gf-form"
>
<div
class=
"gf-form"
>
<span
class=
"gf-form-label width-8"
>
Max items
</span>
<span
class=
"gf-form-label width-8"
>
Max items
</span>
<input
type=
"text"
class=
"gf-form-input max-width-15"
ng-model=
"ctrl.panel.limit"
/>
<input
type=
"text"
class=
"gf-form-input max-width-15"
ng-model=
"ctrl.panel.limit"
ng-change=
"ctrl.onRender()"
/>
</div>
</div>
</div>
</div>
<div
class=
"section gf-form-group"
>
<div
class=
"section gf-form-group"
>
...
@@ -23,7 +23,6 @@
...
@@ -23,7 +23,6 @@
<div
class=
"section gf-form-group"
ng-if=
"ctrl.panel.show == 'changes'"
>
<div
class=
"section gf-form-group"
ng-if=
"ctrl.panel.show == 'changes'"
>
<!-- <h5 class="section-heading">Search options</h5> -->
<!-- <h5 class="section-heading">Search options</h5> -->
</div>
</div>
<div
class=
"section gf-form-group"
ng-if=
"ctrl.panel.show == 'current'"
>
<div
class=
"section gf-form-group"
ng-if=
"ctrl.panel.show == 'current'"
>
...
...
public/app/plugins/panel/alertlist/module.ts
View file @
31892ed7
...
@@ -14,7 +14,7 @@ class AlertListPanel extends PanelCtrl {
...
@@ -14,7 +14,7 @@ class AlertListPanel extends PanelCtrl {
showOptions
=
[
showOptions
=
[
{
text
:
'Current state'
,
value
:
'current'
},
{
text
:
'Current state'
,
value
:
'current'
},
{
text
:
'
Recent state
changes'
,
value
:
'changes'
}
{
text
:
'
State
changes'
,
value
:
'changes'
}
];
];
stateFilter
:
any
=
{};
stateFilter
:
any
=
{};
...
@@ -71,24 +71,6 @@ class AlertListPanel extends PanelCtrl {
...
@@ -71,24 +71,6 @@ class AlertListPanel extends PanelCtrl {
newState
:
this
.
panel
.
stateFilter
newState
:
this
.
panel
.
stateFilter
};
};
//date.unix();i
this
.
panel
.
since
=
'12h'
;
if
(
this
.
panel
.
since
)
{
var
range
=
this
.
timeSrv
.
timeRange
();
//var timeShiftInterpolated = this.panel.since;
var
timeShiftInterpolated
=
this
.
templateSrv
.
replace
(
this
.
panel
.
since
,
this
.
panel
.
scopedVars
);
var
timeShiftInfo
=
rangeUtil
.
describeTextRange
(
timeShiftInterpolated
);
var
timeShift
=
'-'
+
timeShiftInterpolated
;
//params.from = dateMath.parseDateMath(timeShift, range.from, false).unix() * 1000;
params
.
from
=
dateMath
.
parseDateMath
(
timeShift
,
moment
((
new
Date
()).
getTime
()),
true
).
unix
()
*
1000
;
//params.to = dateMath.parseDateMath(timeShift, range.to, true).unix() * 1000;
params
.
to
=
(
new
Date
()).
getTime
();
}
console
.
log
(
params
.
from
,
params
.
to
);
this
.
backendSrv
.
get
(
`/api/annotations`
,
params
)
this
.
backendSrv
.
get
(
`/api/annotations`
,
params
)
.
then
(
res
=>
{
.
then
(
res
=>
{
this
.
alertHistory
=
_
.
map
(
res
,
al
=>
{
this
.
alertHistory
=
_
.
map
(
res
,
al
=>
{
...
...
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