From d681acf22b1697500c67ce62ea7ef4b5b6268291 Mon Sep 17 00:00:00 2001 From: Alexey Antonov Date: Fri, 22 Feb 2019 15:59:06 +0300 Subject: [PATCH] TSVB doesn't work for percentile aggregation in Gauge, metric and Top N (#31680) (#31794) --- .../response_processors/series/__tests__/percentile.js | 8 ++++---- .../lib/vis_data/response_processors/series/percentile.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/legacy/core_plugins/metrics/server/lib/vis_data/response_processors/series/__tests__/percentile.js b/src/legacy/core_plugins/metrics/server/lib/vis_data/response_processors/series/__tests__/percentile.js index 7468dd9ee04bc3..e7f5598f65618d 100644 --- a/src/legacy/core_plugins/metrics/server/lib/vis_data/response_processors/series/__tests__/percentile.js +++ b/src/legacy/core_plugins/metrics/server/lib/vis_data/response_processors/series/__tests__/percentile.js @@ -91,9 +91,9 @@ describe('percentile(resp, panel, series)', () => { const results = percentile(resp, panel, series)(next)([]); expect(results).to.have.length(3); - expect(results[0]).to.have.property('id', '10-90:test'); + expect(results[0]).to.have.property('id', 'test:10-90'); expect(results[0]).to.have.property('color', 'rgb(255, 0, 0)'); - expect(results[0]).to.have.property('fillBetween', '10-90:test:90'); + expect(results[0]).to.have.property('fillBetween', 'test:10-90:90'); expect(results[0]).to.have.property('label', 'Percentile of cpu (10)'); expect(results[0]).to.have.property('legend', false); expect(results[0]).to.have.property('lines'); @@ -109,7 +109,7 @@ describe('percentile(resp, panel, series)', () => { [2, 1.2] ]); - expect(results[1]).to.have.property('id', '10-90:test:90'); + expect(results[1]).to.have.property('id', 'test:10-90:90'); expect(results[1]).to.have.property('color', 'rgb(255, 0, 0)'); expect(results[1]).to.have.property('label', 'Percentile of cpu (10)'); expect(results[1]).to.have.property('legend', false); @@ -126,7 +126,7 @@ describe('percentile(resp, panel, series)', () => { [2, 5.3] ]); - expect(results[2]).to.have.property('id', '50:test'); + expect(results[2]).to.have.property('id', 'test:50'); expect(results[2]).to.have.property('color', 'rgb(255, 0, 0)'); expect(results[2]).to.have.property('label', 'Percentile of cpu (50)'); expect(results[2]).to.have.property('stack', false); diff --git a/src/legacy/core_plugins/metrics/server/lib/vis_data/response_processors/series/percentile.js b/src/legacy/core_plugins/metrics/server/lib/vis_data/response_processors/series/percentile.js index c04b880dd03ac8..79534452665a9e 100644 --- a/src/legacy/core_plugins/metrics/server/lib/vis_data/response_processors/series/percentile.js +++ b/src/legacy/core_plugins/metrics/server/lib/vis_data/response_processors/series/percentile.js @@ -40,17 +40,17 @@ export default function percentile(resp, panel, series) { return [bucket.key, getAggValue(bucket, m)]; }); results.push({ - id: `${percentile.id}:${split.id}`, + id: `${split.id}:${percentile.id}`, color: split.color, label, data, lines: { show: true, fill: percentile.shade, lineWidth: 0 }, points: { show: false }, legend: false, - fillBetween: `${percentile.id}:${split.id}:${percentile.percentile}` + fillBetween: `${split.id}:${percentile.id}:${percentile.percentile}` }); results.push({ - id: `${percentile.id}:${split.id}:${percentile.percentile}`, + id: `${split.id}:${percentile.id}:${percentile.percentile}`, color: split.color, label, data: fillData, @@ -61,7 +61,7 @@ export default function percentile(resp, panel, series) { } else { const decoration = getDefaultDecoration(series); results.push({ - id: `${percentile.id}:${split.id}`, + id: `${split.id}:${percentile.id}`, color: split.color, label, data,