From 0af5708837e0afb5ad0fc77c81b92b96b624fadd Mon Sep 17 00:00:00 2001
From: Alvaro del Castillo <acs@bitergia.com>
Date: Mon, 19 Oct 2015 19:45:53 +0200
Subject: [PATCH 01/10] Added labels for metrics aggregations in Kibana. Just
 activated for Metric vis. First version needing improvements in the params
 handling.

---
 .../kibana/public/visualize/editor/agg.html   | 28 +++++++++++-
 .../kibana/public/visualize/editor/agg.js     | 43 +++++++++++++++++++
 .../public/metric_vis_controller.js           |  7 ++-
 3 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/src/plugins/kibana/public/visualize/editor/agg.html b/src/plugins/kibana/public/visualize/editor/agg.html
index 56b3906d6fdde..0fb45899d99fc 100644
--- a/src/plugins/kibana/public/visualize/editor/agg.html
+++ b/src/plugins/kibana/public/visualize/editor/agg.html
@@ -42,7 +42,7 @@
 
     <!-- down button -->
     <button
-      aria-lebl="Decrease Priority"
+      aria-label="Decrease Priority"
       ng-if="stats.count > 1"
       ng-class="{ disabled: $last }"
       ng-click="moveDown(agg)"
@@ -53,6 +53,20 @@
       <i aria-hidden="true" class="fa fa-caret-down"></i>
     </button>
 
+    <!-- metric label button -->
+    <!-- Next line won't work with tooltip or ng-if -->
+    <!-- ng-click="showMetricLabel = !showMetricLabel" -->
+    <button
+      aria-label="Label"
+      ng-if="useAggLabels(agg)"
+      ng-click="showFormLabel(agg)"
+      tooltip="Label for the aggregation"
+      tooltip-append-to-body="true"
+      type="button"
+      class="btn btn-xs btn-default">
+      <i aria-hidden="true" class="fa fa-tag"></i>
+    </button>
+
     <!-- remove button -->
     <button
       ng-if="canRemove(agg)"
@@ -65,9 +79,21 @@
       class="btn btn-xs btn-danger">
       <i aria-hidden="true" class="fa fa-times"></i>
     </button>
+
   </div>
+
 </div>
 
+  <div class="form-group" ng-show="showMetricLabel">
+    <label>Metric {{$index + 1}} label</label>
+    <input
+      ng-model="metric_label"
+      placeholder="Label"
+      type="text"
+      class="form-control"
+      name="label{{$index}}">
+  </div>
+
 <vis-editor-agg-params
   agg="agg"
   group-name="groupName"
diff --git a/src/plugins/kibana/public/visualize/editor/agg.js b/src/plugins/kibana/public/visualize/editor/agg.js
index 3f551f81647c9..1535c3926de80 100644
--- a/src/plugins/kibana/public/visualize/editor/agg.js
+++ b/src/plugins/kibana/public/visualize/editor/agg.js
@@ -71,6 +71,49 @@ define(function (require) {
           return metricCount > aggregation.schema.min;
         };
 
+        // TODO: include metric labels in params in Agg
+        function setMetricsLabels() {
+          if ($scope.vis.params.metricsLabels === undefined) {
+            $scope.vis.params.metricsLabels = {};
+            return;
+          }
+
+          var metricsLabels = $scope.vis.params.metricsLabels;
+          var firstSibling = $scope;
+
+          // Find the first sibling (scope)
+          while (firstSibling.$$prevSibling !== null) {
+            firstSibling = firstSibling.$$prevSibling;
+          }
+
+          var sibling = firstSibling;
+          // Travel all siblings setting metric label
+          while (sibling !== null) {
+            sibling.metric_label = metricsLabels[sibling.$index];
+            sibling = sibling.$$nextSibling;
+          }
+        }
+
+        setMetricsLabels(); // Fill with saved labels the metrics labels forms
+
+        $scope.showFormLabel = function () {
+          $scope.vis.params.metricsLabels[$scope.$index] = $scope.metric_label;
+
+          $scope.showMetricLabel = !$scope.showMetricLabel;
+          // TODO: Hack, labels should be params so viz.dirty is auto changed
+          $scope.vis.dirty = true;
+        };
+
+        $scope.useAggLabels = function (aggregation) {
+          var supported = false;
+
+          // Only supported in Metric vis yet
+          if (aggregation.vis.type.name === 'metric') {
+            supported = true;
+          }
+          return supported;
+        };
+
         function calcAggIsTooLow() {
           if (!$scope.agg.schema.mustBeFirst) {
             return false;
diff --git a/src/plugins/metric_vis/public/metric_vis_controller.js b/src/plugins/metric_vis/public/metric_vis_controller.js
index 3ac2ef17c7d22..98efcaf202e82 100644
--- a/src/plugins/metric_vis/public/metric_vis_controller.js
+++ b/src/plugins/metric_vis/public/metric_vis_controller.js
@@ -12,8 +12,13 @@ define(function (require) {
       tableGroups.tables.forEach(function (table) {
         table.columns.forEach(function (column, i) {
           var fieldFormatter = table.aggConfig(column).fieldFormatter();
+          var title;
+          if ($scope.vis.params.metricsLabels) {
+            title = $scope.vis.params.metricsLabels[i];
+          }
           metrics.push({
-            label: column.title,
+            // label: column.title,
+            label: title  || column.title,
             value: fieldFormatter(table.rows[0][i])
           });
         });

From 271baaa8c7d05b36fecdff12eb9f0c6f4b64aca0 Mon Sep 17 00:00:00 2001
From: Alvaro del Castillo <acs@bitergia.com>
Date: Mon, 19 Oct 2015 21:12:00 +0200
Subject: [PATCH 02/10] Check that $scope.vis is defined for testing env.

---
 src/plugins/kibana/public/visualize/editor/agg.js      | 6 +++++-
 src/plugins/metric_vis/public/metric_vis_controller.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/kibana/public/visualize/editor/agg.js b/src/plugins/kibana/public/visualize/editor/agg.js
index 1535c3926de80..219ca8679a2bb 100644
--- a/src/plugins/kibana/public/visualize/editor/agg.js
+++ b/src/plugins/kibana/public/visualize/editor/agg.js
@@ -73,6 +73,10 @@ define(function (require) {
 
         // TODO: include metric labels in params in Agg
         function setMetricsLabels() {
+          if (!$scope.vis) { // For testing
+            return;
+          }
+
           if ($scope.vis.params.metricsLabels === undefined) {
             $scope.vis.params.metricsLabels = {};
             return;
@@ -108,7 +112,7 @@ define(function (require) {
           var supported = false;
 
           // Only supported in Metric vis yet
-          if (aggregation.vis.type.name === 'metric') {
+          if (aggregation.vis && aggregation.vis.type.name === 'metric') {
             supported = true;
           }
           return supported;
diff --git a/src/plugins/metric_vis/public/metric_vis_controller.js b/src/plugins/metric_vis/public/metric_vis_controller.js
index 98efcaf202e82..01b8abee14030 100644
--- a/src/plugins/metric_vis/public/metric_vis_controller.js
+++ b/src/plugins/metric_vis/public/metric_vis_controller.js
@@ -13,7 +13,7 @@ define(function (require) {
         table.columns.forEach(function (column, i) {
           var fieldFormatter = table.aggConfig(column).fieldFormatter();
           var title;
-          if ($scope.vis.params.metricsLabels) {
+          if ($scope.vis && $scope.vis.params.metricsLabels) {
             title = $scope.vis.params.metricsLabels[i];
           }
           metrics.push({

From e5be6a8c909589b2eaf8a55f3ed8fa5fded1e166 Mon Sep 17 00:00:00 2001
From: Alvaro del Castillo <acs@bitergia.com>
Date: Fri, 27 Nov 2015 21:03:41 +0100
Subject: [PATCH 03/10] Labels now working in all visualizations. Some issues
 pending in Pie chart.

---
 .../kibana/public/visualize/editor/agg.html   | 11 +++----
 .../kibana/public/visualize/editor/agg.js     | 32 +++++++------------
 .../public/metric_vis_controller.js           |  7 ++--
 src/ui/public/Vis/AggConfig.js                |  4 +++
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/plugins/kibana/public/visualize/editor/agg.html b/src/plugins/kibana/public/visualize/editor/agg.html
index 0fb45899d99fc..c916757a2f858 100644
--- a/src/plugins/kibana/public/visualize/editor/agg.html
+++ b/src/plugins/kibana/public/visualize/editor/agg.html
@@ -53,12 +53,11 @@
       <i aria-hidden="true" class="fa fa-caret-down"></i>
     </button>
 
-    <!-- metric label button -->
+    <!-- label button -->
     <!-- Next line won't work with tooltip or ng-if -->
-    <!-- ng-click="showMetricLabel = !showMetricLabel" -->
+    <!-- ng-click="showAggLabel = !showAggLabel" -->
     <button
       aria-label="Label"
-      ng-if="useAggLabels(agg)"
       ng-click="showFormLabel(agg)"
       tooltip="Label for the aggregation"
       tooltip-append-to-body="true"
@@ -84,10 +83,10 @@
 
 </div>
 
-  <div class="form-group" ng-show="showMetricLabel">
-    <label>Metric {{$index + 1}} label</label>
+  <div class="form-group" ng-show="showAggLabel">
+    <label>Label {{agg.id}}</label>
     <input
-      ng-model="metric_label"
+      ng-model="agg_label"
       placeholder="Label"
       type="text"
       class="form-control"
diff --git a/src/plugins/kibana/public/visualize/editor/agg.js b/src/plugins/kibana/public/visualize/editor/agg.js
index 219ca8679a2bb..3247bb4382749 100644
--- a/src/plugins/kibana/public/visualize/editor/agg.js
+++ b/src/plugins/kibana/public/visualize/editor/agg.js
@@ -71,18 +71,18 @@ define(function (require) {
           return metricCount > aggregation.schema.min;
         };
 
-        // TODO: include metric labels in params in Agg
-        function setMetricsLabels() {
+        // TODO: include agg labels in params in Agg
+        function setAggLabels() {
           if (!$scope.vis) { // For testing
             return;
           }
 
-          if ($scope.vis.params.metricsLabels === undefined) {
-            $scope.vis.params.metricsLabels = {};
+          if ($scope.vis.params.aggLabels === undefined) {
+            $scope.vis.params.aggLabels = {};
             return;
           }
 
-          var metricsLabels = $scope.vis.params.metricsLabels;
+          var aggLabels = $scope.vis.params.aggLabels;
           var firstSibling = $scope;
 
           // Find the first sibling (scope)
@@ -91,33 +91,25 @@ define(function (require) {
           }
 
           var sibling = firstSibling;
-          // Travel all siblings setting metric label
+          // Travel all siblings setting agg label
           while (sibling !== null) {
-            sibling.metric_label = metricsLabels[sibling.$index];
+            if (sibling.agg) { // Pie is not defined
+              sibling.agg_label = aggLabels[sibling.agg.id - 1];
+            }
             sibling = sibling.$$nextSibling;
           }
         }
 
-        setMetricsLabels(); // Fill with saved labels the metrics labels forms
+        setAggLabels(); // Fill with saved labels the metrics labels forms
 
         $scope.showFormLabel = function () {
-          $scope.vis.params.metricsLabels[$scope.$index] = $scope.metric_label;
+          $scope.vis.params.aggLabels[$scope.agg.id - 1] = $scope.agg_label;
 
-          $scope.showMetricLabel = !$scope.showMetricLabel;
+          $scope.showAggLabel = !$scope.showAggLabel;
           // TODO: Hack, labels should be params so viz.dirty is auto changed
           $scope.vis.dirty = true;
         };
 
-        $scope.useAggLabels = function (aggregation) {
-          var supported = false;
-
-          // Only supported in Metric vis yet
-          if (aggregation.vis && aggregation.vis.type.name === 'metric') {
-            supported = true;
-          }
-          return supported;
-        };
-
         function calcAggIsTooLow() {
           if (!$scope.agg.schema.mustBeFirst) {
             return false;
diff --git a/src/plugins/metric_vis/public/metric_vis_controller.js b/src/plugins/metric_vis/public/metric_vis_controller.js
index 01b8abee14030..ae37cb2d130fc 100644
--- a/src/plugins/metric_vis/public/metric_vis_controller.js
+++ b/src/plugins/metric_vis/public/metric_vis_controller.js
@@ -13,12 +13,11 @@ define(function (require) {
         table.columns.forEach(function (column, i) {
           var fieldFormatter = table.aggConfig(column).fieldFormatter();
           var title;
-          if ($scope.vis && $scope.vis.params.metricsLabels) {
-            title = $scope.vis.params.metricsLabels[i];
+          if ($scope.vis && $scope.vis.params.aggLabels) {
+            title = $scope.vis.params.aggLabels[i];
           }
           metrics.push({
-            // label: column.title,
-            label: title  || column.title,
+            label: column.title,
             value: fieldFormatter(table.rows[0][i])
           });
         });
diff --git a/src/ui/public/Vis/AggConfig.js b/src/ui/public/Vis/AggConfig.js
index 46ed915a813a8..8f2c1549d984b 100644
--- a/src/ui/public/Vis/AggConfig.js
+++ b/src/ui/public/Vis/AggConfig.js
@@ -260,6 +260,10 @@ define(function (require) {
 
     AggConfig.prototype.makeLabel = function () {
       if (!this.type) return '';
+      if (this.vis && this.vis.params.aggLabels) {
+        var label = this.vis.params.aggLabels[this.id - 1];
+        if (label) {return label;}
+      }
       var pre = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
       return pre += this.type.makeLabel(this);
     };

From febff9005563d31604119bda9f982cf61ff793b1 Mon Sep 17 00:00:00 2001
From: Alvaro del Castillo <acs@bitergia.com>
Date: Wed, 2 Dec 2015 18:21:05 +0100
Subject: [PATCH 04/10] Use the same approach than "JSON input" to add a
 "Custom label" param to all aggs.

---
 .../kibana/public/visualize/editor/agg.html   | 23 -----------
 .../kibana/public/visualize/editor/agg.js     | 39 -------------------
 src/ui/public/Vis/AggConfig.js                | 13 ++++---
 src/ui/public/agg_types/AggType.js            |  6 +++
 4 files changed, 13 insertions(+), 68 deletions(-)

diff --git a/src/plugins/kibana/public/visualize/editor/agg.html b/src/plugins/kibana/public/visualize/editor/agg.html
index c916757a2f858..5cdbf20e72f0c 100644
--- a/src/plugins/kibana/public/visualize/editor/agg.html
+++ b/src/plugins/kibana/public/visualize/editor/agg.html
@@ -53,19 +53,6 @@
       <i aria-hidden="true" class="fa fa-caret-down"></i>
     </button>
 
-    <!-- label button -->
-    <!-- Next line won't work with tooltip or ng-if -->
-    <!-- ng-click="showAggLabel = !showAggLabel" -->
-    <button
-      aria-label="Label"
-      ng-click="showFormLabel(agg)"
-      tooltip="Label for the aggregation"
-      tooltip-append-to-body="true"
-      type="button"
-      class="btn btn-xs btn-default">
-      <i aria-hidden="true" class="fa fa-tag"></i>
-    </button>
-
     <!-- remove button -->
     <button
       ng-if="canRemove(agg)"
@@ -83,16 +70,6 @@
 
 </div>
 
-  <div class="form-group" ng-show="showAggLabel">
-    <label>Label {{agg.id}}</label>
-    <input
-      ng-model="agg_label"
-      placeholder="Label"
-      type="text"
-      class="form-control"
-      name="label{{$index}}">
-  </div>
-
 <vis-editor-agg-params
   agg="agg"
   group-name="groupName"
diff --git a/src/plugins/kibana/public/visualize/editor/agg.js b/src/plugins/kibana/public/visualize/editor/agg.js
index 3247bb4382749..3f551f81647c9 100644
--- a/src/plugins/kibana/public/visualize/editor/agg.js
+++ b/src/plugins/kibana/public/visualize/editor/agg.js
@@ -71,45 +71,6 @@ define(function (require) {
           return metricCount > aggregation.schema.min;
         };
 
-        // TODO: include agg labels in params in Agg
-        function setAggLabels() {
-          if (!$scope.vis) { // For testing
-            return;
-          }
-
-          if ($scope.vis.params.aggLabels === undefined) {
-            $scope.vis.params.aggLabels = {};
-            return;
-          }
-
-          var aggLabels = $scope.vis.params.aggLabels;
-          var firstSibling = $scope;
-
-          // Find the first sibling (scope)
-          while (firstSibling.$$prevSibling !== null) {
-            firstSibling = firstSibling.$$prevSibling;
-          }
-
-          var sibling = firstSibling;
-          // Travel all siblings setting agg label
-          while (sibling !== null) {
-            if (sibling.agg) { // Pie is not defined
-              sibling.agg_label = aggLabels[sibling.agg.id - 1];
-            }
-            sibling = sibling.$$nextSibling;
-          }
-        }
-
-        setAggLabels(); // Fill with saved labels the metrics labels forms
-
-        $scope.showFormLabel = function () {
-          $scope.vis.params.aggLabels[$scope.agg.id - 1] = $scope.agg_label;
-
-          $scope.showAggLabel = !$scope.showAggLabel;
-          // TODO: Hack, labels should be params so viz.dirty is auto changed
-          $scope.vis.dirty = true;
-        };
-
         function calcAggIsTooLow() {
           if (!$scope.agg.schema.mustBeFirst) {
             return false;
diff --git a/src/ui/public/Vis/AggConfig.js b/src/ui/public/Vis/AggConfig.js
index 8f2c1549d984b..6f50e2a3a51b1 100644
--- a/src/ui/public/Vis/AggConfig.js
+++ b/src/ui/public/Vis/AggConfig.js
@@ -259,13 +259,14 @@ define(function (require) {
     };
 
     AggConfig.prototype.makeLabel = function () {
-      if (!this.type) return '';
-      if (this.vis && this.vis.params.aggLabels) {
-        var label = this.vis.params.aggLabels[this.id - 1];
-        if (label) {return label;}
+      var label = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
+      label += this.type.makeLabel(this);
+
+      if (this.params.customLabel !== '') {
+        label = this.params.customLabel;
       }
-      var pre = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
-      return pre += this.type.makeLabel(this);
+
+      return label;
     };
 
     AggConfig.prototype.field = function () {
diff --git a/src/ui/public/agg_types/AggType.js b/src/ui/public/agg_types/AggType.js
index 85231ddb3a85a..522f4c1d373d1 100644
--- a/src/ui/public/agg_types/AggType.js
+++ b/src/ui/public/agg_types/AggType.js
@@ -96,6 +96,12 @@ define(function (require) {
           type: 'json',
           advanced: true
         });
+        // always append custom label
+        this.params.push({
+          name: 'customLabel',
+          type: 'string',
+          write: _.noop
+        });
 
         this.params = new AggParams(this.params);
       }

From b9a4582bec26a5ab847752fb104c73b7e183b3b1 Mon Sep 17 00:00:00 2001
From: Alvaro del Castillo <acs@bitergia.com>
Date: Wed, 20 Jan 2016 10:16:35 +0100
Subject: [PATCH 05/10] Don't use customLabel if it is not defined.

---
 src/ui/public/Vis/AggConfig.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/public/Vis/AggConfig.js b/src/ui/public/Vis/AggConfig.js
index 6f50e2a3a51b1..ef034c42b3b22 100644
--- a/src/ui/public/Vis/AggConfig.js
+++ b/src/ui/public/Vis/AggConfig.js
@@ -262,7 +262,7 @@ define(function (require) {
       var label = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
       label += this.type.makeLabel(this);
 
-      if (this.params.customLabel !== '') {
+      if (this.params.customLabel && this.params.customLabel !== '') {
         label = this.params.customLabel;
       }
 

From eeb35810142a98b78be987d434b315f74e10eade Mon Sep 17 00:00:00 2001
From: Alvaro del Castillo <acs@bitergia.com>
Date: Thu, 21 Jan 2016 22:30:11 +0100
Subject: [PATCH 06/10] [Aggregations labels] Address epixa comments about
 redundant check and more isolated changes.

---
 src/ui/public/Vis/AggConfig.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/ui/public/Vis/AggConfig.js b/src/ui/public/Vis/AggConfig.js
index ef034c42b3b22..b877d310662f8 100644
--- a/src/ui/public/Vis/AggConfig.js
+++ b/src/ui/public/Vis/AggConfig.js
@@ -259,14 +259,13 @@ define(function (require) {
     };
 
     AggConfig.prototype.makeLabel = function () {
-      var label = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
-      label += this.type.makeLabel(this);
-
-      if (this.params.customLabel && this.params.customLabel !== '') {
-        label = this.params.customLabel;
+      if (this.params.customLabel) {
+        return this.params.customLabel;
       }
 
-      return label;
+      if (!this.type) return '';
+      var pre = (_.get(this.vis, 'params.mode') === 'percentage') ? 'Percentage of ' : '';
+      return pre += this.type.makeLabel(this);
     };
 
     AggConfig.prototype.field = function () {

From b2068a45b633cfc2e26814edb193de99d94fb22d Mon Sep 17 00:00:00 2001
From: Alvaro del Castillo <acs@bitergia.com>
Date: Tue, 2 Feb 2016 07:55:20 +0100
Subject: [PATCH 07/10] [AgType tests] Update tests so the new customLabel
 param is supported.

---
 src/ui/public/agg_types/__tests__/AggType.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/public/agg_types/__tests__/AggType.js b/src/ui/public/agg_types/__tests__/AggType.js
index 2f3e37f317977..a01380f570752 100644
--- a/src/ui/public/agg_types/__tests__/AggType.js
+++ b/src/ui/public/agg_types/__tests__/AggType.js
@@ -128,7 +128,7 @@ describe('AggType Class', function () {
           });
 
           expect(aggType.params).to.be.an(AggParams);
-          expect(aggType.params.length).to.be(1);
+          expect(aggType.params.length).to.be(2);
           expect(aggType.params[0].name).to.be('json');
         });
 
@@ -137,7 +137,7 @@ describe('AggType Class', function () {
             {name: 'one'},
             {name: 'two'}
           ];
-          var paramLength = params.length + 1; // json is always appended
+          var paramLength = params.length + 2; // json and custom label are always appended
 
           var aggType = new AggType({
             name: 'bucketeer',

From ce80eb845a03027229a25a5ba6d8a4d9af60fbe0 Mon Sep 17 00:00:00 2001
From: Alvaro del Castillo <acs@bitergia.com>
Date: Tue, 2 Feb 2016 08:06:31 +0100
Subject: [PATCH 08/10] [AggType tests] Check the param name for customLabel.

---
 src/ui/public/agg_types/__tests__/AggType.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ui/public/agg_types/__tests__/AggType.js b/src/ui/public/agg_types/__tests__/AggType.js
index a01380f570752..6fa42678c1535 100644
--- a/src/ui/public/agg_types/__tests__/AggType.js
+++ b/src/ui/public/agg_types/__tests__/AggType.js
@@ -130,6 +130,7 @@ describe('AggType Class', function () {
           expect(aggType.params).to.be.an(AggParams);
           expect(aggType.params.length).to.be(2);
           expect(aggType.params[0].name).to.be('json');
+          expect(aggType.params[1].name).to.be('customLabel');
         });
 
         it('passes the params arg directly to the AggParams constructor', function () {

From 54d7e5119d0644da1c413894127a4eb12c498360 Mon Sep 17 00:00:00 2001
From: Alvaro del Castillo <acs@bitergia.com>
Date: Wed, 3 Feb 2016 00:01:34 +0100
Subject: [PATCH 09/10] [Tests AggConfig#makeLabel] Add tests for
 AggConfig.prototype.makeLabel.

---
 src/ui/public/Vis/__tests__/_AggConfig.js | 30 +++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/ui/public/Vis/__tests__/_AggConfig.js b/src/ui/public/Vis/__tests__/_AggConfig.js
index 579c120fc7e13..5dc2213735ba1 100644
--- a/src/ui/public/Vis/__tests__/_AggConfig.js
+++ b/src/ui/public/Vis/__tests__/_AggConfig.js
@@ -210,6 +210,36 @@ describe('AggConfig', function () {
     });
   });
 
+  describe('#makeLabel', function () {
+    it('uses the custom label if it is defined', function () {
+      var vis = new Vis(indexPattern, {});
+      var aggConfig = vis.aggs[0];
+      aggConfig.params.customLabel = 'Custom label';
+      var label = aggConfig.makeLabel();
+      expect(label).to.be(aggConfig.params.customLabel);
+    });
+    it('default label should be "Count"', function () {
+      var vis = new Vis(indexPattern, {});
+      var aggConfig = vis.aggs[0];
+      var label = aggConfig.makeLabel();
+      expect(label).to.be('Count');
+    });
+    it('default label should be "Percentage of Count" when Vis is in percentage mode', function () {
+      var vis = new Vis(indexPattern, {});
+      var aggConfig = vis.aggs[0];
+      aggConfig.vis.params.mode = 'percentage';
+      var label = aggConfig.makeLabel();
+      expect(label).to.be('Percentage of Count');
+    });
+    it('empty label if the Vis type is not defined', function () {
+      var vis = new Vis(indexPattern, {});
+      var aggConfig = vis.aggs[0];
+      aggConfig.type = undefined;
+      var label = aggConfig.makeLabel();
+      expect(label).to.be('');
+    });
+  });
+
   describe('#fieldFormatter', function () {
     it('returns the fields format unless the agg type has a custom getFormat handler', function () {
       var vis = new Vis(indexPattern, {

From 5556f1ad323092d892a011c45548f2086dc6eddf Mon Sep 17 00:00:00 2001
From: Rashid Khan <github.fliplap@spamgourmet.com>
Date: Wed, 3 Feb 2016 10:05:11 -0700
Subject: [PATCH 10/10] Allow customLabels to be disabled on a per-agg basis

---
 src/ui/public/agg_types/AggType.js           | 13 ++++++++-----
 src/ui/public/agg_types/__tests__/AggType.js | 10 ++++++++++
 src/ui/public/agg_types/buckets/filters.js   |  1 +
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/ui/public/agg_types/AggType.js b/src/ui/public/agg_types/AggType.js
index 522f4c1d373d1..49e87f6253d6a 100644
--- a/src/ui/public/agg_types/AggType.js
+++ b/src/ui/public/agg_types/AggType.js
@@ -97,11 +97,14 @@ define(function (require) {
           advanced: true
         });
         // always append custom label
-        this.params.push({
-          name: 'customLabel',
-          type: 'string',
-          write: _.noop
-        });
+
+        if (config.customLabels !== false) {
+          this.params.push({
+            name: 'customLabel',
+            type: 'string',
+            write: _.noop
+          });
+        }
 
         this.params = new AggParams(this.params);
       }
diff --git a/src/ui/public/agg_types/__tests__/AggType.js b/src/ui/public/agg_types/__tests__/AggType.js
index 6fa42678c1535..8e2e0c13da1d7 100644
--- a/src/ui/public/agg_types/__tests__/AggType.js
+++ b/src/ui/public/agg_types/__tests__/AggType.js
@@ -133,6 +133,16 @@ describe('AggType Class', function () {
           expect(aggType.params[1].name).to.be('customLabel');
         });
 
+        it('can disable customLabel', function () {
+          var aggType = new AggType({
+            name: 'smart agg',
+            customLabels: false
+          });
+
+          expect(aggType.params.length).to.be(1);
+          expect(aggType.params[0].name).to.be('json');
+        });
+
         it('passes the params arg directly to the AggParams constructor', function () {
           var params = [
             {name: 'one'},
diff --git a/src/ui/public/agg_types/buckets/filters.js b/src/ui/public/agg_types/buckets/filters.js
index 4acee45b705f7..07d9fffe22687 100644
--- a/src/ui/public/agg_types/buckets/filters.js
+++ b/src/ui/public/agg_types/buckets/filters.js
@@ -11,6 +11,7 @@ define(function (require) {
       name: 'filters',
       title: 'Filters',
       createFilter: createFilter,
+      customLabels: false,
       params: [
         {
           name: 'filters',