Merge pull request #7021 from ycombinator/gh-6246

Honor custom label, if set, in percentile and median metric visualizations

src/ui/public/agg_types/__tests__/metrics/percentiles.js

@@ -0,0 +1,38 @@
+import expect from 'expect.js';
+import ngMock from 'ng_mock';
+import AggTypeMetricPercentilesProvider from 'ui/agg_types/metrics/percentiles';
+import VisProvider from 'ui/vis';
+import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
+
+describe('AggTypeMetricPercentilesProvider class', function () {
+
+  let Vis;
+  let indexPattern;
+  let aggTypeMetricPercentiles;
+
+  beforeEach(ngMock.module('kibana'));
+  beforeEach(ngMock.inject(function (Private) {
+    Vis = Private(VisProvider);
+    indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
+    aggTypeMetricPercentiles = Private(AggTypeMetricPercentilesProvider);
+  }));
+
+  it('uses the custom label if it is set', function () {
+    const vis = new Vis(indexPattern, {});
+
+    // Grab the aggConfig off the vis (we don't actually use the vis for
+    // anything else)
+    const aggConfig = vis.aggs[0];
+    aggConfig.params.customLabel = 'prince';
+    aggConfig.params.percents = [ 95 ];
+    aggConfig.params.field = {
+      displayName: 'bytes'
+    };
+
+    const responseAggs = aggTypeMetricPercentiles.getResponseAggs(aggConfig);
+    const ninetyFifthPercentileLabel = responseAggs[0].makeLabel();
+
+    expect(ninetyFifthPercentileLabel).to.be('95th percentile of prince');
+  });
+
+});

src/ui/public/agg_types/metrics/percentiles.js

@@ -16,7 +16,8 @@ export default function AggTypeMetricPercentilesProvider(Private) {
 
   let valueProps = {
     makeLabel: function () {
-      return ordinalSuffix(this.key) + ' percentile of ' + this.fieldDisplayName();
+      const label = this.params.customLabel || this.fieldDisplayName();
+      return ordinalSuffix(this.key) + ' percentile of ' + label;
     }
   };