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

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-06-16 10:47:53 -04:00
commit 25f88e9b3a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/plugins/panel/heatmap/heatmap_data_converter.ts
View File

@ -207,15 +207,20 @@ function pushToXBuckets(buckets, point, bucketNum, seriesName) {
} }
function pushToYBuckets(buckets, bucketNum, value, point, bounds) { function pushToYBuckets(buckets, bucketNum, value, point, bounds) {
var count = 1;
// Use the 3rd argument as scale/count
if (point.length > 2) {
count = parseInt(point[2]);
}
if (buckets[bucketNum]) { if (buckets[bucketNum]) {
buckets[bucketNum].values.push(value); buckets[bucketNum].values.push(value);
buckets[bucketNum].count += 1; buckets[bucketNum].count += count;
} else { } else {
buckets[bucketNum] = { buckets[bucketNum] = {
y: bucketNum, y: bucketNum,
bounds: bounds, bounds: bounds,
values: [value], values: [value],
count: 1, count: count,
}; };
} }
} }