From a7716d7cab76e40bedcb576a2e26423c1a89e406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vincent=20Qu=C3=A9m=C3=A9ner?= <vincent.quemener@c-s.fr>
Date: Tue, 15 Dec 2015 12:48:54 +0100
Subject: [PATCH 01/17] Make default columns configurable

---
 src/plugins/kibana/public/discover/controllers/discover.js | 2 +-
 src/ui/public/config/defaults.js                           | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js
index a7b17b5afd22..c89b823fc8f8 100644
--- a/src/plugins/kibana/public/discover/controllers/discover.js
+++ b/src/plugins/kibana/public/discover/controllers/discover.js
@@ -126,7 +126,7 @@ app.controller('discover', function ($scope, config, courier, $route, $window, N
     return {
       query: $scope.searchSource.get('query') || '',
       sort: getSort.array(savedSearch.sort, $scope.indexPattern),
-      columns: savedSearch.columns || ['_source'],
+      columns: savedSearch.columns.length > 0 ? savedSearch.columns : config.get('defaultColumns'),
       index: $scope.indexPattern.id,
       interval: 'auto',
       filters: _.cloneDeep($scope.searchSource.getOwn('filter'))
diff --git a/src/ui/public/config/defaults.js b/src/ui/public/config/defaults.js
index c167e814bf3e..ef56c170dad7 100644
--- a/src/ui/public/config/defaults.js
+++ b/src/ui/public/config/defaults.js
@@ -50,6 +50,10 @@ export default function configDefaultsProvider() {
       value: null,
       description: 'The index to access if no index is set',
     },
+    'defaultColumns': {
+      value: ['_source'],
+      description: 'Columns displayed by default in the Discovery tab',
+    },
     'metaFields': {
       value: ['_source', '_id', '_type', '_index', '_score'],
       description: 'Fields that exist outside of _source to merge into our document when displaying it',

From 1ccd13a94b68d30a80f1beae6bd6d42c12951289 Mon Sep 17 00:00:00 2001
From: David Vega Fontelos <david@zonamail.com>
Date: Sat, 27 Feb 2016 11:56:09 +0100
Subject: [PATCH 02/17] Fixes opacity on mouseover/mouseout in the chart

---
 src/ui/public/vislib/lib/dispatch.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
index 93766383b58e..71100f28c9b4 100644
--- a/src/ui/public/vislib/lib/dispatch.js
+++ b/src/ui/public/vislib/lib/dispatch.js
@@ -106,6 +106,7 @@ export default function DispatchClass(Private) {
     var isClickable = this.listenerCount('click') > 0;
     var addEvent = this.addEvent;
     var $el = this.handler.el;
+    var defaultOpacity = this.handler._attr.defaultOpacity || 1;
 
     function hover(d, i) {
       // Add pointer if item is clickable
@@ -113,7 +114,7 @@ export default function DispatchClass(Private) {
         self.addMousePointer.call(this, arguments);
       }
 
-      self.highlightLegend.call(this, $el);
+      self.highlightLegend.call(this, $el, defaultOpacity);
       self.emit('hover', self.eventResponse(d, i));
     }
 
@@ -129,9 +130,10 @@ export default function DispatchClass(Private) {
     var self = this;
     var addEvent = this.addEvent;
     var $el = this.handler.el;
+    var defaultOpacity = this.handler._attr.defaultOpacity || 1;
 
     function mouseout() {
-      self.unHighlightLegend.call(this, $el);
+      self.unHighlightLegend.call(this, $el, defaultOpacity);
     }
 
     return addEvent('mouseout', mouseout);
@@ -227,10 +229,14 @@ export default function DispatchClass(Private) {
    * @param element {D3.Selection}
    * @method highlightLegend
    */
-  Dispatch.prototype.highlightLegend = function (element) {
+  Dispatch.prototype.highlightLegend = function (element, defaultOpacity) {
     var label = this.getAttribute('data-label');
+    var highlightOpacity = (defaultOpacity < 1) ? 0.8 : 1;
     if (!label) return;
-    $('[data-label]', element.parentNode).not('[data-label="' + label + '"]').css('opacity', 0.5);
+
+    var highlightElements = $('[data-label="' + label + '"]', element.parentNode);
+    $('[data-label]', element.parentNode).not(highlightElements).css('opacity', defaultOpacity / 2);
+    highlightElements.css('opacity', highlightOpacity);
   };
 
   /**
@@ -239,8 +245,8 @@ export default function DispatchClass(Private) {
    * @param element {D3.Selection}
    * @method unHighlightLegend
    */
-  Dispatch.prototype.unHighlightLegend = function (element) {
-    $('[data-label]', element.parentNode).css('opacity', 1);
+  Dispatch.prototype.unHighlightLegend = function (element, defaultOpacity) {
+    $('[data-label]', element.parentNode).css('opacity', defaultOpacity);
   };
 
   /**

From 6f49e46ccd60a33097643359df861d6418ffbe0e Mon Sep 17 00:00:00 2001
From: David Vega Fontelos <david@zonamail.com>
Date: Sat, 27 Feb 2016 23:22:58 +0100
Subject: [PATCH 03/17] Fixes opacity when hovering the Legend. Also refactors
 the previous commit to be able to use the same function for both the chart
 and legend with area charts overlapped

---
 src/ui/public/vislib/lib/dispatch.js          | 24 ++++++++-----------
 .../vislib/visualizations/area_chart.js       | 15 +++++++++++-
 src/ui/public/visualize/visualize_legend.html |  6 ++---
 src/ui/public/visualize/visualize_legend.js   | 22 +++++++++++++----
 4 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
index 71100f28c9b4..6c1f41b9f2e8 100644
--- a/src/ui/public/vislib/lib/dispatch.js
+++ b/src/ui/public/vislib/lib/dispatch.js
@@ -106,7 +106,7 @@ export default function DispatchClass(Private) {
     var isClickable = this.listenerCount('click') > 0;
     var addEvent = this.addEvent;
     var $el = this.handler.el;
-    var defaultOpacity = this.handler._attr.defaultOpacity || 1;
+    var highlight = this.handler.highlight || self.highlight;
 
     function hover(d, i) {
       // Add pointer if item is clickable
@@ -114,7 +114,7 @@ export default function DispatchClass(Private) {
         self.addMousePointer.call(this, arguments);
       }
 
-      self.highlightLegend.call(this, $el, defaultOpacity);
+      highlight.call(this, $el);
       self.emit('hover', self.eventResponse(d, i));
     }
 
@@ -130,10 +130,10 @@ export default function DispatchClass(Private) {
     var self = this;
     var addEvent = this.addEvent;
     var $el = this.handler.el;
-    var defaultOpacity = this.handler._attr.defaultOpacity || 1;
+    var unHighlight = this.handler.unHighlight || self.unHighlight;
 
     function mouseout() {
-      self.unHighlightLegend.call(this, $el, defaultOpacity);
+      unHighlight.call(this, $el);
     }
 
     return addEvent('mouseout', mouseout);
@@ -227,26 +227,22 @@ export default function DispatchClass(Private) {
    * Mouseover Behavior
    *
    * @param element {D3.Selection}
-   * @method highlightLegend
+   * @method highlight
    */
-  Dispatch.prototype.highlightLegend = function (element, defaultOpacity) {
+  Dispatch.prototype.highlight = function (element) {
     var label = this.getAttribute('data-label');
-    var highlightOpacity = (defaultOpacity < 1) ? 0.8 : 1;
     if (!label) return;
-
-    var highlightElements = $('[data-label="' + label + '"]', element.parentNode);
-    $('[data-label]', element.parentNode).not(highlightElements).css('opacity', defaultOpacity / 2);
-    highlightElements.css('opacity', highlightOpacity);
+    $('[data-label]', element.parentNode).not('[data-label="' + label + '"]').css('opacity', 0.5);
   };
 
   /**
    * Mouseout Behavior
    *
    * @param element {D3.Selection}
-   * @method unHighlightLegend
+   * @method unHighlight
    */
-  Dispatch.prototype.unHighlightLegend = function (element, defaultOpacity) {
-    $('[data-label]', element.parentNode).css('opacity', defaultOpacity);
+  Dispatch.prototype.unHighlight = function (element) {
+    $('[data-label]', element.parentNode).css('opacity', 1);
   };
 
   /**
diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js
index a132b52ad6b8..7872cdf1d751 100644
--- a/src/ui/public/vislib/visualizations/area_chart.js
+++ b/src/ui/public/vislib/visualizations/area_chart.js
@@ -33,7 +33,20 @@ export default function AreaChartFactory(Private) {
     if (this.isOverlapping) {
 
       // Default opacity should return to 0.6 on mouseout
-      handler._attr.defaultOpacity = 0.6;
+      var defaultOpacity = 0.6;
+      handler._attr.defaultOpacity = defaultOpacity;
+      handler.highlight = function (element) {
+        var label = this.getAttribute('data-label');
+        if (!label) return;
+
+        var highlightOpacity = 0.8;
+        var highlightElements = $('[data-label="' + label + '"]', element.parentNode);
+        $('[data-label]', element.parentNode).not(highlightElements).css('opacity', defaultOpacity / 2); // half of the default opacity
+        highlightElements.css('opacity', highlightOpacity);
+      };
+      handler.unHighlight = function (element) {
+        $('[data-label]', element.parentNode).css('opacity', defaultOpacity);
+      };
     }
 
     this.checkIfEnoughData();
diff --git a/src/ui/public/visualize/visualize_legend.html b/src/ui/public/visualize/visualize_legend.html
index 568541d530af..45856c58d182 100644
--- a/src/ui/public/visualize/visualize_legend.html
+++ b/src/ui/public/visualize/visualize_legend.html
@@ -6,8 +6,8 @@
 
     <li
       ng-repeat="legendData in labels track by legendData.label"
-      ng-mouseenter="highlightSeries(legendData.label)"
-      ng-mouseleave="unhighlightSeries()"
+      ng-mouseenter="highlightSeries($event)"
+      ng-mouseleave="unhighlightSeries($event)"
       data-label="{{legendData.label}}"
       class="legend-value color">
 
@@ -38,4 +38,4 @@
 
     </li>
   </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js
index 9d3edea59b79..5821d7501183 100644
--- a/src/ui/public/visualize/visualize_legend.js
+++ b/src/ui/public/visualize/visualize_legend.js
@@ -29,12 +29,26 @@ uiModules.get('kibana')
         refresh();
       });
 
-      $scope.highlightSeries = function (label) {
-        $('[data-label]', $elem.siblings()).not('[data-label="' + label + '"]').css('opacity', 0.5);
+      $scope.highlightSeries = function (event) {
+        var el = event.currentTarget;
+        var handler = $scope.renderbot.vislibVis.handler;
+        if(handler.highlight) {
+          handler.highlight.call(el, handler.el);
+        }else{
+          var label = el.getAttribute('data-label');
+          if (!label) return;
+          $('[data-label]', el.siblings()).not('[data-label="' + label + '"]').css('opacity', 0.5);
+        }
       };
 
-      $scope.unhighlightSeries = function () {
-        $('[data-label]', $elem.siblings()).css('opacity', 1);
+      $scope.unhighlightSeries = function (event) {
+        var el = event.currentTarget;
+        var handler = $scope.renderbot.vislibVis.handler;
+        if(handler.unHighlight) {
+          handler.unHighlight.call(el, handler.el);
+        }else{
+          $('[data-label]', el.siblings()).css('opacity', 1);
+        }
       };
 
       $scope.setColor = function (label, color) {

From 3602964435af031bd738a16ae8a9bdfda454353d Mon Sep 17 00:00:00 2001
From: David Vega Fontelos <david@zonamail.com>
Date: Sun, 28 Feb 2016 01:21:18 +0100
Subject: [PATCH 04/17] Fixes an issue when hovering the legend in area charts.
 Also, other charts now have the same behavior

---
 src/ui/public/vislib/visualizations/area_chart.js |  5 ++++-
 src/ui/public/visualize/visualize_legend.html     |  4 ++--
 src/ui/public/visualize/visualize_legend.js       | 10 ++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js
index 7872cdf1d751..cd18fd947e50 100644
--- a/src/ui/public/vislib/visualizations/area_chart.js
+++ b/src/ui/public/vislib/visualizations/area_chart.js
@@ -45,7 +45,10 @@ export default function AreaChartFactory(Private) {
         highlightElements.css('opacity', highlightOpacity);
       };
       handler.unHighlight = function (element) {
-        $('[data-label]', element.parentNode).css('opacity', defaultOpacity);
+        $('[data-label]', element).css('opacity', defaultOpacity);
+
+        //The legend should keep max opacity
+        $('[data-label]', $(element).siblings()).css('opacity', 1);
       };
     }
 
diff --git a/src/ui/public/visualize/visualize_legend.html b/src/ui/public/visualize/visualize_legend.html
index 45856c58d182..3f8e2b4a09b3 100644
--- a/src/ui/public/visualize/visualize_legend.html
+++ b/src/ui/public/visualize/visualize_legend.html
@@ -6,8 +6,8 @@
 
     <li
       ng-repeat="legendData in labels track by legendData.label"
-      ng-mouseenter="highlightSeries($event)"
-      ng-mouseleave="unhighlightSeries($event)"
+      ng-mouseenter="highlight($event)"
+      ng-mouseleave="unhighlight($event)"
       data-label="{{legendData.label}}"
       class="legend-value color">
 
diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js
index 5821d7501183..2cf9651650d1 100644
--- a/src/ui/public/visualize/visualize_legend.js
+++ b/src/ui/public/visualize/visualize_legend.js
@@ -29,7 +29,7 @@ uiModules.get('kibana')
         refresh();
       });
 
-      $scope.highlightSeries = function (event) {
+      $scope.highlight = function (event) {
         var el = event.currentTarget;
         var handler = $scope.renderbot.vislibVis.handler;
         if(handler.highlight) {
@@ -37,17 +37,19 @@ uiModules.get('kibana')
         }else{
           var label = el.getAttribute('data-label');
           if (!label) return;
-          $('[data-label]', el.siblings()).not('[data-label="' + label + '"]').css('opacity', 0.5);
+          var highlightElements = $('[data-label="' + label + '"]', handler.el.parentNode);
+          $('[data-label]', handler.el.parentNode).not(highlightElements).css('opacity', 0.5);
+          $(highlightElements).css('opacity', 1);
         }
       };
 
-      $scope.unhighlightSeries = function (event) {
+      $scope.unhighlight = function (event) {
         var el = event.currentTarget;
         var handler = $scope.renderbot.vislibVis.handler;
         if(handler.unHighlight) {
           handler.unHighlight.call(el, handler.el);
         }else{
-          $('[data-label]', el.siblings()).css('opacity', 1);
+          $('[data-label]', handler.el.parentNode).css('opacity', 1);
         }
       };
 

From 9c969346b1f757a8d45b4a2bde13a0846a04878e Mon Sep 17 00:00:00 2001
From: David Vega Fontelos <david@zonamail.com>
Date: Sun, 28 Feb 2016 01:50:59 +0100
Subject: [PATCH 05/17] Harmonizes the hover behavior

---
 src/ui/public/vislib/lib/dispatch.js        | 12 ++++++++----
 src/ui/public/visualize/visualize_legend.js | 18 ++++--------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
index 6c1f41b9f2e8..924fb91be413 100644
--- a/src/ui/public/vislib/lib/dispatch.js
+++ b/src/ui/public/vislib/lib/dispatch.js
@@ -106,7 +106,9 @@ export default function DispatchClass(Private) {
     var isClickable = this.listenerCount('click') > 0;
     var addEvent = this.addEvent;
     var $el = this.handler.el;
-    var highlight = this.handler.highlight || self.highlight;
+    if(!this.handler.highlight) {
+      this.handler.highlight = self.highlight;
+    }
 
     function hover(d, i) {
       // Add pointer if item is clickable
@@ -114,7 +116,7 @@ export default function DispatchClass(Private) {
         self.addMousePointer.call(this, arguments);
       }
 
-      highlight.call(this, $el);
+      self.handler.highlight.call(this, $el);
       self.emit('hover', self.eventResponse(d, i));
     }
 
@@ -130,10 +132,12 @@ export default function DispatchClass(Private) {
     var self = this;
     var addEvent = this.addEvent;
     var $el = this.handler.el;
-    var unHighlight = this.handler.unHighlight || self.unHighlight;
+    if(!this.handler.unHighlight) {
+      this.handler.unHighlight = self.unHighlight;
+    }
 
     function mouseout() {
-      unHighlight.call(this, $el);
+      self.handler.unHighlight.call(this, $el);
     }
 
     return addEvent('mouseout', mouseout);
diff --git a/src/ui/public/visualize/visualize_legend.js b/src/ui/public/visualize/visualize_legend.js
index 2cf9651650d1..1924e4e97cc0 100644
--- a/src/ui/public/visualize/visualize_legend.js
+++ b/src/ui/public/visualize/visualize_legend.js
@@ -32,25 +32,15 @@ uiModules.get('kibana')
       $scope.highlight = function (event) {
         var el = event.currentTarget;
         var handler = $scope.renderbot.vislibVis.handler;
-        if(handler.highlight) {
-          handler.highlight.call(el, handler.el);
-        }else{
-          var label = el.getAttribute('data-label');
-          if (!label) return;
-          var highlightElements = $('[data-label="' + label + '"]', handler.el.parentNode);
-          $('[data-label]', handler.el.parentNode).not(highlightElements).css('opacity', 0.5);
-          $(highlightElements).css('opacity', 1);
-        }
+        if(!handler) return;
+        handler.highlight.call(el, handler.el);
       };
 
       $scope.unhighlight = function (event) {
         var el = event.currentTarget;
         var handler = $scope.renderbot.vislibVis.handler;
-        if(handler.unHighlight) {
-          handler.unHighlight.call(el, handler.el);
-        }else{
-          $('[data-label]', handler.el.parentNode).css('opacity', 1);
-        }
+        if(!handler) return;
+        handler.unHighlight.call(el, handler.el);
       };
 
       $scope.setColor = function (label, color) {

From 4899e4b177c789159573d6d435e1a8c4a098c562 Mon Sep 17 00:00:00 2001
From: David Vega Fontelos <david@zonamail.com>
Date: Thu, 3 Mar 2016 00:35:36 +0100
Subject: [PATCH 06/17] Removes the duplicated folder to be watch.

Watching the same folder twice hangs the watcher chokidar. All the plugins
folders are watched and this folder is included by default as plugin folder
and also directly in the watcher configuration.
---
 src/cli/cluster/cluster_manager.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js
index a80423be3104..bf5d7283498b 100644
--- a/src/cli/cluster/cluster_manager.js
+++ b/src/cli/cluster/cluster_manager.js
@@ -86,7 +86,6 @@ module.exports = class ClusterManager {
     const fromRoot = require('../../utils/fromRoot');
 
     this.watcher = chokidar.watch([
-      'src/plugins',
       'src/server',
       'src/ui',
       'src/utils',

From 414ba105c4991b15a383ffe9bd958571da89a50b Mon Sep 17 00:00:00 2001
From: David Vega Fontelos <david@zonamail.com>
Date: Thu, 3 Mar 2016 22:11:20 +0100
Subject: [PATCH 07/17] Update chokidar to version 1.4.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 222446e3b872..5bafa0d690d5 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "angular-mocks": "1.4.7",
     "auto-release-sinon": "1.0.3",
     "babel-eslint": "4.1.8",
-    "chokidar": "1.0.5",
+    "chokidar": "1.4.3",
     "eslint": "1.10.3",
     "eslint-plugin-mocha": "1.1.0",
     "expect.js": "0.3.1",

From 32f6667e3d78677c41be9243cbe549401fff24f4 Mon Sep 17 00:00:00 2001
From: David Vega Fontelos <david@zonamail.com>
Date: Thu, 3 Mar 2016 22:21:04 +0100
Subject: [PATCH 08/17] Watch function now receives a uniq array of absolute
 paths.

---
 src/cli/cluster/cluster_manager.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js
index bf5d7283498b..ccb591f41033 100644
--- a/src/cli/cluster/cluster_manager.js
+++ b/src/cli/cluster/cluster_manager.js
@@ -1,8 +1,8 @@
 import cluster from 'cluster';
-const { join } = require('path');
+const { join, resolve } = require('path');
 const { format: formatUrl } = require('url');
 import Hapi from 'hapi';
-const { debounce, compact, get, invoke, bindAll, once, sample } = require('lodash');
+const { debounce, compact, get, invoke, bindAll, once, sample, uniq } = require('lodash');
 
 import Log from '../Log';
 import Worker from './worker';
@@ -85,13 +85,16 @@ module.exports = class ClusterManager {
     const chokidar = require('chokidar');
     const fromRoot = require('../../utils/fromRoot');
 
-    this.watcher = chokidar.watch([
+    const watchPaths = uniq([
+      'src/plugins',
       'src/server',
       'src/ui',
       'src/utils',
       'config',
       ...extraPaths
-    ], {
+    ].map(path => resolve(path)));
+
+    this.watcher = chokidar.watch(watchPaths, {
       cwd: fromRoot('.'),
       ignored: /[\\\/](\..*|node_modules|bower_components|public|__tests__)[\\\/]/
     });

From e1eafc5567df1b2a284b7b1454511e01ddb07607 Mon Sep 17 00:00:00 2001
From: Court Ewing <court@epixa.com>
Date: Fri, 4 Mar 2016 11:08:15 -0500
Subject: [PATCH 09/17] Bump node to 4.3.2

---
 .node-version | 2 +-
 package.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.node-version b/.node-version
index f77856a6f1af..cc2fbe89b6c7 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-4.3.1
+4.3.2
diff --git a/package.json b/package.json
index 222446e3b872..8777f8ae32f6 100644
--- a/package.json
+++ b/package.json
@@ -189,7 +189,7 @@
     "supertest-as-promised": "2.0.2"
   },
   "engines": {
-    "node": "4.3.1",
+    "node": "4.3.2",
     "npm": "2.14.21"
   }
 }

From 9d825ef57babafb40659c31c56bf86ac83e80f7e Mon Sep 17 00:00:00 2001
From: Court Ewing <court@epixa.com>
Date: Fri, 4 Mar 2016 11:08:32 -0500
Subject: [PATCH 10/17] Bump npm to 2.14.22

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8777f8ae32f6..bc713698ef02 100644
--- a/package.json
+++ b/package.json
@@ -190,6 +190,6 @@
   },
   "engines": {
     "node": "4.3.2",
-    "npm": "2.14.21"
+    "npm": "2.14.22"
   }
 }

From 2faa3ee2f58f6e3e2ee839022184c3b52b94b407 Mon Sep 17 00:00:00 2001
From: Matthew Bargar <mbargar@gmail.com>
Date: Fri, 4 Mar 2016 15:48:14 -0500
Subject: [PATCH 11/17] Remove outdated mapping options that were copied over
 from logstash template

---
 .../kibana/server/lib/create_mappings_from_pattern_fields.js    | 2 --
 src/plugins/kibana/server/routes/api/ingest/register_post.js    | 2 --
 .../scenarios/logstashFunctional/makelogsIndexDefinition.js     | 1 -
 test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js     | 1 -
 4 files changed, 6 deletions(-)

diff --git a/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js b/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js
index db8891fb98ec..d05e65099161 100644
--- a/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js
+++ b/src/plugins/kibana/server/lib/create_mappings_from_pattern_fields.js
@@ -15,8 +15,6 @@ module.exports = function createMappingsFromPatternFields(fields) {
       mapping = {
         type: 'string',
         index: 'analyzed',
-        omit_norms: true,
-        fielddata: {format: 'disabled'},
         fields: {
           raw: {type: 'string', index: 'not_analyzed', doc_values: true, ignore_above: 256}
         }
diff --git a/src/plugins/kibana/server/routes/api/ingest/register_post.js b/src/plugins/kibana/server/routes/api/ingest/register_post.js
index 82972768c648..b36b778232fd 100644
--- a/src/plugins/kibana/server/routes/api/ingest/register_post.js
+++ b/src/plugins/kibana/server/routes/api/ingest/register_post.js
@@ -59,8 +59,6 @@ module.exports = function registerPost(server) {
                       mapping: {
                         type: 'string',
                         index: 'analyzed',
-                        omit_norms: true,
-                        fielddata: {format: 'disabled'},
                         fields: {
                           raw: {type: 'string', index: 'not_analyzed', doc_values: true, ignore_above: 256}
                         }
diff --git a/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js b/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js
index 67ecf94ca301..95b416ea852f 100644
--- a/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js
+++ b/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js
@@ -21,7 +21,6 @@ module.exports = {
           'mapping': {
             'type': 'string',
             'index': 'analyzed',
-            'omit_norms': true,
             'fields': {
               'raw': {
                 'index': 'not_analyzed',
diff --git a/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js b/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js
index 67ecf94ca301..95b416ea852f 100644
--- a/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js
+++ b/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js
@@ -21,7 +21,6 @@ module.exports = {
           'mapping': {
             'type': 'string',
             'index': 'analyzed',
-            'omit_norms': true,
             'fields': {
               'raw': {
                 'index': 'not_analyzed',

From f4d3e03ed319d819f1103e9c1ef228a47ac67067 Mon Sep 17 00:00:00 2001
From: David Vega Fontelos <david@zonamail.com>
Date: Sat, 5 Mar 2016 06:00:47 +0100
Subject: [PATCH 12/17] Now hightlights the hovered element

---
 src/ui/public/vislib/lib/dispatch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
index c375583d3af3..3d7569708528 100644
--- a/src/ui/public/vislib/lib/dispatch.js
+++ b/src/ui/public/vislib/lib/dispatch.js
@@ -236,7 +236,7 @@ export default function DispatchClass(Private) {
   Dispatch.prototype.highlight = function (element) {
     var label = this.getAttribute('data-label');
     if (!label) return;
-    $('[data-label]', element.parentNode).not(function (els, el) { return $(el).data('label') !== label;}).css('opacity', 0.5);
+    $('[data-label]', element.parentNode).not(function (els, el) { return $(el).data('label') === label; }).css('opacity', 0.5);
   };
 
   /**

From ca2264d12c04b3a0c30f5bf103fbf7a9edaf4238 Mon Sep 17 00:00:00 2001
From: David Vega Fontelos <david@zonamail.com>
Date: Sat, 5 Mar 2016 06:19:32 +0100
Subject: [PATCH 13/17] Prevent css application to the hovered element

---
 src/ui/public/vislib/lib/dispatch.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
index 3d7569708528..dfc476054103 100644
--- a/src/ui/public/vislib/lib/dispatch.js
+++ b/src/ui/public/vislib/lib/dispatch.js
@@ -236,7 +236,10 @@ export default function DispatchClass(Private) {
   Dispatch.prototype.highlight = function (element) {
     var label = this.getAttribute('data-label');
     if (!label) return;
-    $('[data-label]', element.parentNode).not(function (els, el) { return $(el).data('label') === label; }).css('opacity', 0.5);
+    //Opacity 1 is needed to avoid the css application
+    $('[data-label]', element.parentNode).css('opacity', 1).not(
+      function (els, el) { return `${$(el).data('label')}` === label;}
+    ).css('opacity', 0.5);
   };
 
   /**

From 2d04b3a09ce9b8446e93269b3b24521c19175125 Mon Sep 17 00:00:00 2001
From: David Vega Fontelos <david@zonamail.com>
Date: Sat, 5 Mar 2016 06:21:04 +0100
Subject: [PATCH 14/17] Change to a filter function instead of string
 concatenation

---
 src/ui/public/vislib/visualizations/area_chart.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js
index cd18fd947e50..63afcdd28226 100644
--- a/src/ui/public/vislib/visualizations/area_chart.js
+++ b/src/ui/public/vislib/visualizations/area_chart.js
@@ -40,7 +40,9 @@ export default function AreaChartFactory(Private) {
         if (!label) return;
 
         var highlightOpacity = 0.8;
-        var highlightElements = $('[data-label="' + label + '"]', element.parentNode);
+        var highlightElements = $('[data-label]', element.parentNode).filter(
+          function (els, el) { return `${$(el).data('label')}` === label;
+        });
         $('[data-label]', element.parentNode).not(highlightElements).css('opacity', defaultOpacity / 2); // half of the default opacity
         highlightElements.css('opacity', highlightOpacity);
       };

From 0cacfe6ddf9cfc23275f8bd8f58ccf1e8dbc8b38 Mon Sep 17 00:00:00 2001
From: Shivam Dixit <shivamd001@gmail.com>
Date: Mon, 7 Mar 2016 21:26:41 +0530
Subject: [PATCH 15/17] Fix typo in caution message

Signed-off-by: Shivam Dixit <shivamd001@gmail.com>
---
 src/plugins/kibana/public/settings/sections/advanced/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/kibana/public/settings/sections/advanced/index.html b/src/plugins/kibana/public/settings/sections/advanced/index.html
index a2894631dc86..13f85f7c8819 100644
--- a/src/plugins/kibana/public/settings/sections/advanced/index.html
+++ b/src/plugins/kibana/public/settings/sections/advanced/index.html
@@ -3,7 +3,7 @@
     <div class="bs-callout bs-callout-warning">
       <h4>Caution: You can break stuff here</h4>
       Be careful in here, these settings are for very advanced users only.
-      Tweaks you make here can break large portionsof Kibana. Some of these
+      Tweaks you make here can break large portions of Kibana. Some of these
       settings may be undocumented, unsupported or experimental. If a field has
       a default value, blanking the field will reset it to its default which
       may be unacceptable given other configuration directives. Deleting a

From 5d1796bed2c44c52bd1db471b30c5dd007b223fa Mon Sep 17 00:00:00 2001
From: Spencer <spalger@users.noreply.github.com>
Date: Mon, 7 Mar 2016 13:39:34 -0700
Subject: [PATCH 16/17] [test] extend timeout to avoid false negatives

---
 src/plugins/elasticsearch/lib/__tests__/routes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/elasticsearch/lib/__tests__/routes.js b/src/plugins/elasticsearch/lib/__tests__/routes.js
index b5f94d8f3e82..c4bacca30d55 100644
--- a/src/plugins/elasticsearch/lib/__tests__/routes.js
+++ b/src/plugins/elasticsearch/lib/__tests__/routes.js
@@ -11,7 +11,7 @@ describe('plugins/elasticsearch', function () {
     let kbnServer;
 
     before(function () {
-      this.timeout(15000); // sometimes waiting for server takes longer than 10
+      this.timeout(60000); // sometimes waiting for server takes longer than 10
 
       kbnServer = kbnTestServer.createServer();
       return kbnServer.ready()

From befe5f30d8070488735a0e9fd6080f27f1824391 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Mon, 7 Mar 2016 13:48:45 -0700
Subject: [PATCH 17/17] [cli/clustering] resolve our paths relative to root,
 not CWD

---
 src/cli/cluster/cluster_manager.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js
index ccb591f41033..ca9227912404 100644
--- a/src/cli/cluster/cluster_manager.js
+++ b/src/cli/cluster/cluster_manager.js
@@ -85,14 +85,17 @@ module.exports = class ClusterManager {
     const chokidar = require('chokidar');
     const fromRoot = require('../../utils/fromRoot');
 
-    const watchPaths = uniq([
-      'src/plugins',
-      'src/server',
-      'src/ui',
-      'src/utils',
-      'config',
-      ...extraPaths
-    ].map(path => resolve(path)));
+    const watchPaths = uniq(
+      [
+        fromRoot('src/plugins'),
+        fromRoot('src/server'),
+        fromRoot('src/ui'),
+        fromRoot('src/utils'),
+        fromRoot('config'),
+        ...extraPaths
+      ]
+      .map(path => resolve(path))
+    );
 
     this.watcher = chokidar.watch(watchPaths, {
       cwd: fromRoot('.'),