Merge branch 'master' into fix/elastic#1962

src/kibana/components/agg_response/hierarchical/_collect_branch.js

@@ -27,7 +27,7 @@ define(function (require) {
         depth: depth,
         field: field,
         bucket: bucket,
-        metric: item.value
+        metric: item.size
       });
 
       // If the item has a parent and it's also a child then continue walking

src/kibana/components/agg_response/hierarchical/_hierarchical_tooltip_formatter.js

@@ -25,7 +25,7 @@ define(function (require) {
         // Map those values to what the tooltipSource.rows format.
         $tooltipScope.rows = _.map(rows, function (row) {
           row.spacer = $sce.trustAsHtml(_.repeat(' ', row.depth));
-          row.metric = row.metric + ' (' + Math.round((row.metric / sum) * 100) + '%)';
+          row.metric = row.metric + ' (' + Math.round((Math.abs(row.metric) / sum) * 100) + '%)';
           return row;
         });
 

src/kibana/components/vislib/visualizations/pie_chart.js

@@ -61,7 +61,7 @@ define(function (require) {
       var partition = d3.layout.partition()
       .sort(null)
       .value(function (d) {
-        return d.size;
+        return Math.abs(d.size);
       });
       var x = d3.scale.linear()
       .range([0, 2 * Math.PI]);

src/kibana/styles/_notify.less

@@ -41,6 +41,7 @@
         margin: 10px 0;
         word-break: normal;
         word-wrap: normal;
+        white-space: pre-wrap;
       }
     }
 

src/server/lib/migrateConfig.js

@@ -33,7 +33,7 @@ module.exports = function () {
   return client.search(options)
   .then(upgrade)
   .catch(function (err) {
-    if (!/^IndexMissingException/.test(err.message)) throw err;
+    if (!/SearchParseException.+mapping.+\[buildNum\]|^IndexMissingException/.test(err.message)) throw err;
   });
 };
 

src/server/lib/upgradeConfig.js

@@ -16,7 +16,7 @@ module.exports = function (response) {
   // Look for upgradeable configs. If none of them are upgradeable
   // then resolve with null.
   var body = _.find(response.hits.hits, isUpgradeable);
-  if (body) return Promise.resolve();
+  if (!body) return Promise.resolve();
 
   return client.create({
     index: config.kibana.kibana_index,

src/server/routes/proxy.js

@@ -37,7 +37,7 @@ router.use(function (req, res, next) {
 
 function getPort(req) {
   var matches = req.headers.host.match(/:(\d+)/);
-  if (matches[1]) return matches[1];
+  if (matches) return matches[1];
   return req.connection.pair ? '443' : '80';
 }
 

test/unit/specs/components/agg_response/hierarchical/collect_branch.js

@@ -11,18 +11,18 @@ define(function (require) {
       results = collectBranch({
         name: 'bucket3',
         depth: 3,
-        value: 6,
+        size: 6,
         field: { format: { convert: convert } },
         aggConfig: { params: { field: { displayName: 'field3' } }, fieldFormatter: _.constant(String) },
         parent: {
           name: 'bucket2',
           depth: 2,
-          value: 12,
+          size: 12,
           aggConfig: { label: 'field2', fieldFormatter: _.constant(String) },
           parent: {
             name: 'bucket1',
             depth: 1,
-            value: 24,
+            size: 24,
             parent: {}
           }
         }