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
159bab1b
Commit
159bab1b
authored
Jan 12, 2014
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed plothover when 2 axis have different y format
parent
799fd777
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
src/app/panels/graphite/module.js
+3
-5
No files found.
src/app/panels/graphite/module.js
View file @
159bab1b
...
@@ -338,9 +338,6 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
...
@@ -338,9 +338,6 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
$scope
.
legend
=
[];
$scope
.
legend
=
[];
var
data
=
[];
var
data
=
[];
if
(
results
.
length
===
0
)
{
return
[];
}
_
.
each
(
results
,
function
(
targetData
)
{
_
.
each
(
results
,
function
(
targetData
)
{
var
alias
=
targetData
.
target
;
var
alias
=
targetData
.
target
;
var
color
=
$scope
.
panel
.
aliasColors
[
alias
]
||
$scope
.
colors
[
data
.
length
];
var
color
=
$scope
.
panel
.
aliasColors
[
alias
]
||
$scope
.
colors
[
data
.
length
];
...
@@ -643,6 +640,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
...
@@ -643,6 +640,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
var
_d
=
data
[
i
].
time_series
.
getFlotPairs
(
required_times
,
scope
.
panel
.
nullPointMode
);
var
_d
=
data
[
i
].
time_series
.
getFlotPairs
(
required_times
,
scope
.
panel
.
nullPointMode
);
data
[
i
].
yaxis
=
data
[
i
].
info
.
yaxis
;
data
[
i
].
yaxis
=
data
[
i
].
info
.
yaxis
;
data
[
i
].
data
=
_d
;
data
[
i
].
data
=
_d
;
data
[
i
].
info
.
y_format
=
data
[
i
].
yaxis
===
1
?
scope
.
panel
.
y_format
:
scope
.
panel
.
y2_format
;
}
}
configureAxisOptions
(
data
,
options
);
configureAxisOptions
(
data
,
options
);
...
@@ -724,10 +722,10 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
...
@@ -724,10 +722,10 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
value
=
(
scope
.
panel
.
stack
&&
scope
.
panel
.
tooltip
.
value_type
===
'individual'
)
?
value
=
(
scope
.
panel
.
stack
&&
scope
.
panel
.
tooltip
.
value_type
===
'individual'
)
?
item
.
datapoint
[
1
]
-
item
.
datapoint
[
2
]
:
item
.
datapoint
[
1
]
-
item
.
datapoint
[
2
]
:
item
.
datapoint
[
1
];
item
.
datapoint
[
1
];
if
(
scope
.
panel
.
y_format
===
'bytes'
)
{
if
(
item
.
series
.
info
.
y_format
===
'bytes'
)
{
value
=
kbn
.
byteFormat
(
value
,
2
);
value
=
kbn
.
byteFormat
(
value
,
2
);
}
}
if
(
scope
.
panel
.
y_format
===
'short'
)
{
if
(
item
.
series
.
info
.
y_format
===
'short'
)
{
value
=
kbn
.
shortFormat
(
value
,
2
);
value
=
kbn
.
shortFormat
(
value
,
2
);
}
}
timestamp
=
scope
.
panel
.
timezone
===
'browser'
?
timestamp
=
scope
.
panel
.
timezone
===
'browser'
?
...
...
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