Merge remote-tracking branch 'upstream/master'

docs/access.asciidoc

@@ -5,8 +5,16 @@ Kibana is a web application that you access through port 5601. All you need to d
 machine where Kibana is running and specify the port number. For example, `localhost:5601` or 
 `http://YOURDOMAIN.com:5601`.
 
-When you access Kibana, the Discover page loads by default with the default index pattern selected. The time filter is 
-set to the last 15 minutes and the search query is set to match-all (\*).
+When you access Kibana, the <<discover,Discover>> page loads by default with the default index pattern selected. The 
+time filter is set to the last 15 minutes and the search query is set to match-all (\*).
 
 If you don't see any documents, try setting the time filter to a wider time range.
 If you still don't see any results, it's possible that you don't *have* any documents.
+
+[[status]]
+=== Checking Kibana Status
+
+You can reach the Kibana server's status page by navigating to `localhost:5601/status`. The status page displays 
+information about the server's resource usage and lists the installed plugins.
+
+image::images/kibana-status-page.png[]

docs/datatable.asciidoc

@@ -31,7 +31,8 @@ remove a range.
 or bottom _n_ elements of a  given field to display, ordered by count or a custom metric.
 *Filters*:: You can specify a set of {ref}/search-aggregations-bucket-filters-aggregation.html[_filters_] for the data. 
 You can specify a filter as a query string or in JSON format, just as in the Discover search bar. Click *Add Filter* to 
-add another filter.
+add another filter. Click the image:images/labelbutton.png[] *label* button to open the label field, where you can type 
+in a name to display on the visualization.
 *Significant Terms*:: Displays the results of the experimental 
 {ref}/search-aggregations-bucket-significantterms-aggregation.html[_significant terms_] aggregation. The value of the 
 *Size* parameter defines the number of entries this aggregation returns.

docs/pie.asciidoc

@@ -42,7 +42,8 @@ remove a range.
 or bottom _n_ elements of a  given field to display, ordered by count or a custom metric.
 *Filters*:: You can specify a set of {ref}/search-aggregations-bucket-filters-aggregation.html[_filters_] for the data. 
 You can specify a filter as a query string or in JSON format, just as in the Discover search bar. Click *Add Filter* to 
-add another filter.
+add another filter. Click the image:images/labelbutton.png[] *label* button to open the label field, where you can type 
+in a name to display on the visualization.
 *Significant Terms*:: Displays the results of the experimental 
 {ref}/search-aggregations-bucket-significantterms-aggregation.html[_significant terms_] aggregation. The value of the 
 *Size* parameter defines the number of entries this aggregation returns.

docs/tilemap.asciidoc

@@ -62,7 +62,8 @@ remove a range.
 or bottom _n_ elements of a  given field to display, ordered by count or a custom metric.
 *Filters*:: You can specify a set of {ref}/search-aggregations-bucket-filters-aggregation.html[_filters_] for the data. 
 You can specify a filter as a query string or in JSON format, just as in the Discover search bar. Click *Add Filter* to 
-add another filter.
+add another filter. Click the image:images/labelbutton.png[] *label* button to open the label field, where you can type 
+in a name to display on the visualization.
 *Significant Terms*:: Displays the results of the experimental 
 {ref}/search-aggregations-bucket-significantterms-aggregation.html[_significant terms_] aggregation. The value of the 
 *Size* parameter defines the number of entries this aggregation returns.

docs/x-axis-aggs.asciidoc

@@ -28,7 +28,8 @@ remove a range.
 or bottom _n_ elements of a  given field to display, ordered by count or a custom metric.
 *Filters*:: You can specify a set of {ref}/search-aggregations-bucket-filters-aggregation.html[_filters_] for the data. 
 You can specify a filter as a query string or in JSON format, just as in the Discover search bar. Click *Add Filter* to 
-add another filter.
+add another filter. Click the images:labelbutton.png[] *label* button to open the label field, where you can type in a 
+name to display on the visualization.
 *Significant Terms*:: Displays the results of the experimental 
 {ref}/search-aggregations-bucket-significantterms-aggregation.html[_significant terms_] aggregation.
 

package.json

@@ -76,8 +76,8 @@
     "commander": "^2.8.1",
     "css-loader": "^0.15.1",
     "d3": "^3.5.6",
-    "elasticsearch": "^5.0.0",
-    "elasticsearch-browser": "^5.0.0",
+    "elasticsearch": "^8.0.1",
+    "elasticsearch-browser": "^8.0.1",
     "expiry-js": "^0.1.7",
     "exports-loader": "^0.6.2",
     "expose-loader": "^0.7.0",

src/plugins/elasticsearch/index.js

@@ -23,7 +23,7 @@ module.exports = function (kibana) {
           cert: Joi.string(),
           key: Joi.string()
         }).default(),
-        apiVersion: Joi.string().default('master'),
+        apiVersion: Joi.string().default('2.0'),
         minimumVerison: Joi.string().default('2.0.0')
       }).default();
     },

src/plugins/kibana/index.js

@@ -39,7 +39,8 @@ module.exports = function (kibana) {
 
           return {
             kbnIndex: config.get('kibana.index'),
-            esShardTimeout: config.get('elasticsearch.shardTimeout')
+            esShardTimeout: config.get('elasticsearch.shardTimeout'),
+            esApiVersion: config.get('elasticsearch.apiVersion'),
           };
         }
       }

src/plugins/kibana/public/settings/sections/indices/_create.js

@@ -155,10 +155,13 @@ define(function (require) {
       var pattern = mockIndexPattern(index);
 
       return indexPatterns.mapper.getIndicesForIndexPattern(pattern)
-      .catch(notify.error)
+      .catch(function (err) {
+        if (err instanceof IndexPatternMissingIndices) return;
+        notify.error(err);
+      })
       .then(function (existing) {
-        var all = existing.all;
-        var matches = existing.matches;
+        var all = _.get(existing, 'all', []);
+        var matches = _.get(existing, 'matches', []);
         if (all.length) {
           index.existing = {
             class: 'success',

src/plugins/testsBundle/testsEntryTemplate.js

@@ -23,7 +23,8 @@ ${pluginSlug}
 window.__KBN__ = {
   vars: {
     kbnIndex: '.kibana',
-    esShardTimeout: 1500
+    esShardTimeout: 1500,
+    esApiVersion: '2.0',
   }
 };
 

src/ui/public/es.js

@@ -5,14 +5,14 @@ define(function (require) {
   var es; // share the client amoungst all apps
   require('ui/modules')
     .get('kibana', ['elasticsearch', 'kibana/config'])
-    .service('es', function (esFactory, esUrl, $q) {
+    .service('es', function (esFactory, esUrl, $q, esApiVersion) {
       if (es) return es;
 
       es = esFactory({
         host: esUrl,
         log: 'info',
         requestTimeout: 0,
-        apiVersion: '1.4',
+        apiVersion: esApiVersion,
         plugins: [function (Client, config) {
 
           // esFactory automatically injects the AngularConnector to the config

src/ui/public/index_patterns/_mapper.js

@@ -64,15 +64,7 @@ define(function (require) {
             includeDefaults: true
           });
         })
-        .catch(function (err) {
-          if (err.status >= 400) {
-            // transform specific error type
-            throw new IndexPatternMissingIndices();
-          } else {
-            // rethrow all others
-            throw err;
-          }
-        })
+        .catch(handleMissingIndexPattern)
         .then(transformMappingIntoFields)
         .then(function (fields) {
           fieldCache.set(id, fields);
@@ -108,7 +100,8 @@ define(function (require) {
             all: all,
             matches: matches
           };
-        });
+        })
+        .catch(handleMissingIndexPattern);
       };
 
       /**
@@ -123,6 +116,16 @@ define(function (require) {
       };
     }
 
+    function handleMissingIndexPattern(err) {
+      if (err.status >= 400) {
+        // transform specific error type
+        return Promise.reject(new IndexPatternMissingIndices());
+      } else {
+        // rethrow all others
+        throw err;
+      }
+    }
+
     return new Mapper();
   };
 });