Skip to content

N
nexpie-grafana-theme
Commit 84ef6b9d by Daniel Lee
Options

Merge branch 'bigbenhur-autologscale' 

Closes #5278 and closes #3090
parents 891df219 e19b4884
Showing with 94 additions and 34 deletions
public/app/core/time_series2.ts
...@@ -100,6 +100,7 @@ export default class TimeSeries { ...@@ -100,6 +100,7 @@ export default class TimeSeries {
this.stats.total = 0; this.stats.total = 0;
this.stats.max = -Number.MAX_VALUE; this.stats.max = -Number.MAX_VALUE;
this.stats.min = Number.MAX_VALUE; this.stats.min = Number.MAX_VALUE;
this.stats.logmin = Number.MAX_VALUE;
this.stats.avg = null; this.stats.avg = null;
this.stats.current = null; this.stats.current = null;
this.stats.first = null; this.stats.first = null;
...@@ -172,6 +173,11 @@ export default class TimeSeries { ...@@ -172,6 +173,11 @@ export default class TimeSeries {
} }
} }
previousValue = currentValue; previousValue = currentValue;
if (currentValue < this.stats.logmin && currentValue > 0) {
this.stats.logmin = currentValue;
}
} }
if (currentValue !== 0) { if (currentValue !== 0) {
......
public/app/plugins/panel/graph/graph.ts
...@@ -460,7 +460,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) { ...@@ -460,7 +460,8 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
show: panel.yaxes[0].show, show: panel.yaxes[0].show,
index: 1, index: 1,
logBase: panel.yaxes[0].logBase || 1, logBase: panel.yaxes[0].logBase || 1,
max: null min: panel.yaxes[0].min ? _.toNumber(panel.yaxes[0].min) : null,
max: panel.yaxes[0].max ? _.toNumber(panel.yaxes[0].max) : null,
}; };
options.yaxes.push(defaults); options.yaxes.push(defaults);
...@@ -471,12 +472,13 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) { ...@@ -471,12 +472,13 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
secondY.show = panel.yaxes[1].show; secondY.show = panel.yaxes[1].show;
secondY.logBase = panel.yaxes[1].logBase || 1; secondY.logBase = panel.yaxes[1].logBase || 1;
secondY.position = 'right'; secondY.position = 'right';
secondY.min = panel.yaxes[1].min ? _.toNumber(panel.yaxes[1].min) : null;
secondY.max = panel.yaxes[1].max ? _.toNumber(panel.yaxes[1].max) : null;
options.yaxes.push(secondY); options.yaxes.push(secondY);
applyLogScale(options.yaxes[1], data); applyLogScale(options.yaxes[1], data);
configureAxisMode(options.yaxes[1], panel.percentage && panel.stack ? "percent" : panel.yaxes[1].format); configureAxisMode(options.yaxes[1], panel.percentage && panel.stack ? "percent" : panel.yaxes[1].format);
} }
applyLogScale(options.yaxes[0], data); applyLogScale(options.yaxes[0], data);
configureAxisMode(options.yaxes[0], panel.percentage && panel.stack ? "percent" : panel.yaxes[0].format); configureAxisMode(options.yaxes[0], panel.percentage && panel.stack ? "percent" : panel.yaxes[0].format);
} }
...@@ -485,43 +487,67 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) { ...@@ -485,43 +487,67 @@ coreModule.directive('grafanaGraph', function($rootScope, timeSrv) {
if (axis.logBase === 1) { if (axis.logBase === 1) {
return; return;
} }
if (axis.min < Number.MIN_VALUE) {
axis.min = null;
}
if (axis.max < Number.MIN_VALUE) {
axis.max = null;
}
var series, i; var series, i;
var max = axis.max; var max = axis.max, min = axis.min;
if (max === null) { for (i = 0; i < data.length; i++) {
for (i = 0; i < data.length; i++) { series = data[i];
series = data[i]; if (series.yaxis === axis.index) {
if (series.yaxis === axis.index) { if (!max || max < series.stats.max) {
if (max < series.stats.max) { max = series.stats.max;
max = series.stats.max; }
} if (!min || min > series.stats.logmin) {
min = series.stats.logmin;
} }
}
if (max === void 0) {
max = Number.MAX_VALUE;
} }
} }
axis.min = axis.min !== null ? axis.min : 0; axis.transform = function(v) { return (v < Number.MIN_VALUE) ? null : Math.log(v) / Math.log(axis.logBase); };
axis.ticks = [0, 1]; axis.inverseTransform = function (v) { return Math.pow(axis.logBase,v); };
var nextTick = 1;
while (true) { if (!max && !min) {
nextTick = nextTick * axis.logBase; max = axis.inverseTransform(+2);
axis.ticks.push(nextTick); min = axis.inverseTransform(-2);
if (nextTick > max) { } else if (!max) {
break; max = min*axis.inverseTransform(+4);
} } else if (!min) {
min = max*axis.inverseTransform(-4);
} }
if (axis.logBase === 10) { if (axis.min) {
axis.transform = function(v) { return Math.log(v+0.1); }; min = axis.inverseTransform(Math.ceil(axis.transform(axis.min)));
axis.inverseTransform = function (v) { return Math.pow(10,v); }; } else {
min = axis.min = axis.inverseTransform(Math.floor(axis.transform(min)));
}
if (axis.max) {
max = axis.inverseTransform(Math.floor(axis.transform(axis.max)));
} else { } else {
axis.transform = function(v) { return Math.log(v+0.1) / Math.log(axis.logBase); }; max = axis.max = axis.inverseTransform(Math.ceil(axis.transform(max)));
axis.inverseTransform = function (v) { return Math.pow(axis.logBase,v); }; }
if (!min || min < Number.MIN_VALUE || !max || max < Number.MIN_VALUE) {
return;
}
axis.ticks = [];
var nextTick;
for (nextTick = min; nextTick <= max; nextTick *= axis.logBase) {
axis.ticks.push(nextTick);
} }
axis.tickDecimals = decimalPlaces(min);
}
function decimalPlaces(num) {
if (!num) { return 0; }
return (num.toString().split('.')[1] || []).length;
} }
function configureAxisMode(axis, format) { function configureAxisMode(axis, format) {
......
public/app/plugins/panel/graph/specs/graph_specs.ts
...@@ -113,15 +113,43 @@ describe('grafanaGraph', function() { ...@@ -113,15 +113,43 @@ describe('grafanaGraph', function() {
}); });
graphScenario('when logBase is log 10', function(ctx) { graphScenario('when logBase is log 10', function(ctx) {
ctx.setup(function(ctrl) { ctx.setup(function(ctrl, data) {
ctrl.panel.yaxes[0].logBase = 10; ctrl.panel.yaxes[0].logBase = 10;
data[0] = new TimeSeries({
datapoints: [[2000,1],[0.002,2],[0,3],[-1,4]],
alias: 'seriesAutoscale',
});
data[0].yaxis = 1;
ctrl.panel.yaxes[1].logBase = 10;
ctrl.panel.yaxes[1].min = '0.05';
ctrl.panel.yaxes[1].max = '1500';
data[1] = new TimeSeries({
datapoints: [[2000,1],[0.002,2],[0,3],[-1,4]],
alias: 'seriesFixedscale',
});
data[1].yaxis = 2;
}); });
it('should apply axis transform and ticks', function() { it('should apply axis transform, autoscaling (if necessary) and ticks', function() {
var axis = ctx.plotOptions.yaxes[0]; var axisAutoscale = ctx.plotOptions.yaxes[0];
expect(axis.transform(100)).to.be(Math.log(100+0.1)); expect(axisAutoscale.transform(100)).to.be(2);
expect(axis.ticks[0]).to.be(0); expect(axisAutoscale.inverseTransform(-3)).to.be(0.001);
expect(axis.ticks[1]).to.be(1); expect(axisAutoscale.min).to.be(0.001);
expect(axisAutoscale.max).to.be(10000);
expect(axisAutoscale.ticks.length).to.be(8);
expect(axisAutoscale.ticks[0]).to.be(0.001);
expect(axisAutoscale.ticks[7]).to.be(10000);
expect(axisAutoscale.tickDecimals).to.be(3);
var axisFixedscale = ctx.plotOptions.yaxes[1];
expect(axisFixedscale.min).to.be(0.05);
expect(axisFixedscale.max).to.be(1500);
expect(axisFixedscale.ticks.length).to.be(5);
expect(axisFixedscale.ticks[0]).to.be(0.1);
expect(axisFixedscale.ticks[4]).to.be(1000);
expect(axisFixedscale.tickDecimals).to.be(1);
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment