IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed plothover when 2 axis have different y format

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-01-12 11:41:22 +01:00
parent 799fd77766
commit 159bab1b13
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/panels/graphite/module.js
View File

@ -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) {
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) {
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' ?