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: don't change original series name in histogram mode, #8886 (#9782)

Browse Source
This commit is contained in:
Alexander Zobnin 2017-11-04 10:09:41 +03:00 committed by Torkel Ödegaard
parent b8f9edaea3
commit f5c5c4b88b
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/plugins/panel/graph/data_processor.ts
View File

@ -25,12 +25,20 @@ export class DataProcessor {
switch (this.panel.xaxis.mode) { switch (this.panel.xaxis.mode) {
case 'series': case 'series':
case 'histogram':
case 'time': { case 'time': {
return options.dataList.map((item, index) => { return options.dataList.map((item, index) => {
return this.timeSeriesHandler(item, index, options); return this.timeSeriesHandler(item, index, options);
}); });
} }
case 'histogram': {
let histogramDataList = [{
target: 'count',
datapoints: _.concat([], _.flatten(_.map(options.dataList, 'datapoints')))
}];
return histogramDataList.map((item, index) => {
return this.timeSeriesHandler(item, index, options);
});
}
case 'field': { case 'field': {
return this.customHandler(firstItem); return this.customHandler(firstItem);
} }

4
public/app/plugins/panel/graph/graph.ts
View File

@ -313,11 +313,7 @@ function graphDirective($rootScope, timeSrv, popoverSrv, contextSrv) {
let ticks = panel.xaxis.buckets || panelWidth / 50; let ticks = panel.xaxis.buckets || panelWidth / 50;
bucketSize = tickStep(histMin, histMax, ticks); bucketSize = tickStep(histMin, histMax, ticks);
let histogram = convertValuesToHistogram(values, bucketSize); let histogram = convertValuesToHistogram(values, bucketSize);
data[0].data = histogram; data[0].data = histogram;
data[0].alias = data[0].label = data[0].id = "count";
data = [data[0]];
options.series.bars.barWidth = bucketSize * 0.8; options.series.bars.barWidth = bucketSize * 0.8;
} else { } else {
bucketSize = 0; bucketSize = 0;

15
public/app/plugins/panel/graph/histogram.ts
View File

@ -1,18 +1,21 @@
import _ from 'lodash'; import _ from 'lodash';
import TimeSeries from 'app/core/time_series2';
/** /**
* Convert series into array of series values. * Convert series into array of series values.
* @param data Array of series * @param data Array of series
*/ */
export function getSeriesValues(data: any): number[] { export function getSeriesValues(dataList: TimeSeries[]): number[] {
const VALUE_INDEX = 0;
let values = []; let values = [];
// Count histogam stats // Count histogam stats
for (let i = 0; i < data.length; i++) { for (let i = 0; i < dataList.length; i++) {
let series = data[i]; let series = dataList[i];
for (let j = 0; j < series.data.length; j++) { let datapoints = series.datapoints;
if (series.data[j][1] !== null) { for (let j = 0; j < datapoints.length; j++) {
values.push(series.data[j][1]); if (datapoints[j][VALUE_INDEX] !== null) {
values.push(datapoints[j][VALUE_INDEX]);
} }
} }
} }

6
public/app/plugins/panel/graph/specs/histogram.jest.ts
View File

@ -37,7 +37,9 @@ describe('Graph Histogam Converter', function () {
beforeEach(() => { beforeEach(() => {
data = [ data = [
{ {
data: [[0, 1], [0, 2], [0, 10], [0, 11], [0, 17], [0, 20], [0, 29]] datapoints: [
[1, 0], [2, 0], [10, 0], [11, 0], [17, 0], [20, 0], [29, 0]
]
} }
]; ];
}); });
@ -50,7 +52,7 @@ describe('Graph Histogam Converter', function () {
}); });
it('Should skip null values', () => { it('Should skip null values', () => {
data[0].data.push([0, null]); data[0].datapoints.push([null, 0]);
let expected = [1, 2, 10, 11, 17, 20, 29]; let expected = [1, 2, 10, 11, 17, 20, 29];