Commit 5c73ed6e by Alexander Zobnin

heatmap: use series names as top or bottom bounds, depends of datasource

parent f21cebee
...@@ -204,11 +204,17 @@ export class HeatmapCtrl extends MetricsPanelCtrl { ...@@ -204,11 +204,17 @@ export class HeatmapCtrl extends MetricsPanelCtrl {
let xBucketSize, yBucketSize, bucketsData, tsBuckets; let xBucketSize, yBucketSize, bucketsData, tsBuckets;
// Convert histogram to heatmap. Each histogram bucket represented by the series which name is // Convert histogram to heatmap. Each histogram bucket represented by the series which name is
// a top bucket bound. Further, these values will be used as X axis labels. // a top (or bottom, depends of datasource) bucket bound. Further, these values will be used as X axis labels.
bucketsData = histogramToHeatmap(this.series); bucketsData = histogramToHeatmap(this.series);
tsBuckets = _.map(this.series, 'label'); tsBuckets = _.map(this.series, 'label');
// Add empty bottom bucket label
tsBuckets = [''].concat(tsBuckets); if (this.datasource && this.datasource.type === 'prometheus') {
// Prometheus labels are upper inclusive bounds, so add empty bottom bucket label.
tsBuckets = [''].concat(tsBuckets);
} else {
// Elasticsearch uses labels as bottom bucket bounds, so add empty top bucket label.
tsBuckets.push('');
}
// Calculate bucket size based on heatmap data // Calculate bucket size based on heatmap data
let xBucketBoundSet = _.map(_.keys(bucketsData), key => Number(key)); let xBucketBoundSet = _.map(_.keys(bucketsData), key => Number(key));
......
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