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

public/app/plugins/panel/heatmap/heatmap_data_converter.ts

@@ -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,
     };
     };
   }
   }
 }
 }