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

Graph-panel: Add initial histogram option, issue #5812.

Browse Source
This commit is contained in:
Alexander Zobnin 2016-08-16 18:45:57 +03:00
parent 7588ee974d
commit e39e5f9a9b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/plugins/panel/graph/graph.js
View File

@ -232,8 +232,10 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
if (histogramData.length && histogramData[0].ticks.length) { if (histogramData.length && histogramData[0].ticks.length) {
// options.series.bars.barWidth = histogramData[0].ticks.length / 1.5; // options.series.bars.barWidth = histogramData[0].ticks.length / 1.5;
options.series.bars.barWidth = 0.7; options.series.bars.barWidth = 0.7;
// options.series.bars.align = 'center'; options.series.bars.align = 'center';
} }
addXAxis(options);
} else { } else {
for (var i = 0; i < data.length; i++) { for (var i = 0; i < data.length; i++) {
var series = data[i]; var series = data[i];
@ -249,11 +251,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
if (data.length && data[0].stats.timeStep) { if (data.length && data[0].stats.timeStep) {
options.series.bars.barWidth = data[0].stats.timeStep / 1.5; options.series.bars.barWidth = data[0].stats.timeStep / 1.5;
} }
}
if (panel.xaxis.mode === 'histogram') {
addXAxis(options);
} else {
addTimeAxis(options); addTimeAxis(options);
} }
@ -298,11 +296,11 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
return point[0]; return point[0];
}), null); }), null);
var calculatedPoint = getValueCallback(values); var calculatedPoint = getValueCallback(values);
return [index, calculatedPoint]; return [index + 1, calculatedPoint];
}); });
histogram[0].ticks = _.map(data, function(series, index) { histogram[0].ticks = _.map(data, function(series, index) {
return [index, series.alias]; return [index + 1, series.alias];
}); });
return histogram; return histogram;
@ -346,7 +344,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
show: panel.xaxis.show, show: panel.xaxis.show,
mode: null, mode: null,
min: 0, min: 0,
max: ticks.length, max: ticks.length + 1,
label: "Datetime", label: "Datetime",
ticks: ticks ticks: ticks
}; };