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
fa2a7db6
Commit
fa2a7db6
authored
Apr 14, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ux: create annotations
parent
03ef1fd7
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
public/app/features/annotations/event_manager.ts
+2
-2
public/app/plugins/panel/graph/graph.ts
+2
-2
public/app/plugins/panel/graph/specs/threshold_manager_specs.ts
+1
-1
public/app/plugins/panel/graph/threshold_manager.ts
+1
-1
No files found.
public/app/features/annotations/event_manager.ts
View file @
fa2a7db6
...
@@ -57,7 +57,7 @@ export class EventManager {
...
@@ -57,7 +57,7 @@ export class EventManager {
this
.
panelCtrl
.
render
();
this
.
panelCtrl
.
render
();
}
}
add
PlotEvents
(
annota
tions
)
{
add
FlotEvents
(
annotations
,
flotOp
tions
)
{
if
(
this
.
event
||
annotations
.
length
===
0
)
{
if
(
this
.
event
||
annotations
.
length
===
0
)
{
return
;
return
;
}
}
...
@@ -108,7 +108,7 @@ export class EventManager {
...
@@ -108,7 +108,7 @@ export class EventManager {
}
}
}
}
o
ptions
.
events
=
{
flotO
ptions
.
events
=
{
levels
:
_
.
keys
(
types
).
length
+
1
,
levels
:
_
.
keys
(
types
).
length
+
1
,
data
:
annotations
,
data
:
annotations
,
types
:
types
,
types
:
types
,
...
...
public/app/plugins/panel/graph/graph.ts
View file @
fa2a7db6
...
@@ -330,8 +330,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
...
@@ -330,8 +330,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv, popoverSrv) {
}
}
}
}
thresholdManager
.
add
P
lotOptions
(
options
,
panel
);
thresholdManager
.
add
F
lotOptions
(
options
,
panel
);
eventManager
.
add
P
lotEvents
(
annotations
,
options
);
eventManager
.
add
F
lotEvents
(
annotations
,
options
);
configureAxisOptions
(
data
,
options
);
configureAxisOptions
(
data
,
options
);
sortedSeries
=
_
.
sortBy
(
data
,
function
(
series
)
{
return
series
.
zindex
;
});
sortedSeries
=
_
.
sortBy
(
data
,
function
(
series
)
{
return
series
.
zindex
;
});
...
...
public/app/plugins/panel/graph/specs/threshold_manager_specs.ts
View file @
fa2a7db6
...
@@ -21,7 +21,7 @@ describe('ThresholdManager', function() {
...
@@ -21,7 +21,7 @@ describe('ThresholdManager', function() {
ctx
.
setup
=
function
(
thresholds
)
{
ctx
.
setup
=
function
(
thresholds
)
{
ctx
.
panel
.
thresholds
=
thresholds
;
ctx
.
panel
.
thresholds
=
thresholds
;
var
manager
=
new
ThresholdManager
(
ctx
.
panelCtrl
);
var
manager
=
new
ThresholdManager
(
ctx
.
panelCtrl
);
manager
.
add
P
lotOptions
(
ctx
.
options
,
ctx
.
panel
);
manager
.
add
F
lotOptions
(
ctx
.
options
,
ctx
.
panel
);
};
};
func
(
ctx
);
func
(
ctx
);
...
...
public/app/plugins/panel/graph/threshold_manager.ts
View file @
fa2a7db6
...
@@ -158,7 +158,7 @@ export class ThresholdManager {
...
@@ -158,7 +158,7 @@ export class ThresholdManager {
this
.
needsCleanup
=
true
;
this
.
needsCleanup
=
true
;
}
}
add
P
lotOptions
(
options
,
panel
)
{
add
F
lotOptions
(
options
,
panel
)
{
if
(
!
panel
.
thresholds
||
panel
.
thresholds
.
length
===
0
)
{
if
(
!
panel
.
thresholds
||
panel
.
thresholds
.
length
===
0
)
{
return
;
return
;
}
}
...
...
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