Merge branch 'master' into fix/Watcher-error-prevents-navigation-#20305

.backportrc.json

@@ -1,5 +1,5 @@
 {
   "upstream": "elastic/kibana",
-  "branches": [{ "name": "6.x", "checked": true }, "6.4", "6.3", "6.2", "6.1", "6.0", "5.6"],
+  "branches": [{ "name": "6.x", "checked": true }, "6.5", "6.4", "6.3", "5.6"],
   "labels": ["backport"]
 }

docs/development/core/development-basepath.asciidoc

@@ -55,8 +55,8 @@ Append `request.getBasePath()` to any absolute URL path.
 const basePath = server.config().get('server.basePath');
 server.route({
   path: '/redirect',
-  handler(request, reply) {
-    reply.redirect(`${request.getBasePath()}/otherLocation`);
+  handler(request, h) {
+    return h.redirect(`${request.getBasePath()}/otherLocation`);
   }
 });
 -----------
@@ -84,4 +84,4 @@ or `yarn start`.
 ["source","shell"]
 -----------
 yarn start --no-base-path
------------
+-----------

docs/monitoring/monitoring-metricbeat.asciidoc

@@ -84,11 +84,41 @@ You must specify the following settings in the `modules.d/kibana.yml` file:
 ----------------------------------
 <1> This setting identifies the host and port number that are used to access {kib}.  
 
-NOTE: If you configured {kib} to use <<configuring-tls,encrypted communications>>, 
-you must access it via HTTPS. For example, `https://localhost:5601`. 
+--
+
+. If {security} is enabled, you must also provide a user ID and password so that 
+{metricbeat} can collect metrics successfully. 
+
+.. Create or identify a user that you want to use to collect the metrics. 
++
+--
+TIP: There is a `remote_monitoring_user` built-in user that grants the privileges 
+necessary for {metricbeat} to monitor {stack} products. See 
+{stack-ov}/built-in-users.html[Built-in users].
 
+Alternatively, you can choose a different user and give them the 
+`remote_monitoring_collector` {stack-ov}/built-in-roles.html[built-in role]. 
 --
 
+.. Add the `username` and `password` settings to the {kib} module configuration 
+file.
++
+--
+For example, add the following settings in the `modules.d/kibana.yml` file:
+
+[source,yaml]
+----------------------------------
+- module: kibana
+  ...
+  username: remote_monitoring_user
+  password: YOUR_PASSWORD
+----------------------------------
+--
+
+. If you configured {kib} to use <<configuring-tls,encrypted communications>>, 
+you must access it via HTTPS. For example, use a `hosts` setting like 
+`https://localhost:5601` in the `modules.d/kibana.yml` file. 
+
 . Identify where to send the monitoring data. +
 +
 --
@@ -109,15 +139,43 @@ output.elasticsearch:
 <1> In this example, the data is stored on a monitoring cluster with nodes 
 `es-mon-1` and `es-mon-2`. 
 
-NOTE: If you configured the monitoring cluster to use 
-{ref}/configuring-tls.html[encrypted communications], you must access it via 
-HTTPS. For example, `https://es-mon-1:9200`. 
-
 For more information about these configuration options, see 
 {metricbeat-ref}/elasticsearch-output.html[Configure the {es} output].
 
 --
 
+. If {security} is enabled on the monitoring cluster, you must provide a valid 
+user ID and password so that {metricbeat} can send metrics successfully. 
+
+.. Create or identify a user that you want to use to send the metrics. 
++
+--
+TIP: There is a `remote_monitoring_user` built-in user that grants the privileges 
+necessary for {metricbeat} to monitor {stack} products. See 
+{stack-ov}/built-in-users.html[Built-in users].
+
+Alternatively, you can choose a different user and give them the 
+`remote_monitoring_agent` {stack-ov}/built-in-roles.html[built-in role]. 
+--
+
+.. Add the `username` and `password` settings to the {es} output information in 
+the {metricbeat} configuration file (`metricbeat.yml`):
++
+--
+[source,yaml]
+----------------------------------
+output.elasticsearch:
+  ...
+  username: remote_monitoring_user
+  password: YOUR_PASSWORD
+----------------------------------
+--
+
+. If you configured the monitoring cluster to use 
+{ref}/configuring-tls.html[encrypted communications], you must access it via 
+HTTPS. For example, use a `hosts` setting like `https://es-mon-1:9200` in the 
+`metricbeat.yml` file. 
+
 . <<start-stop,Start {kib}>>.
 
 . {metricbeat-ref}/metricbeat-starting.html[Start {metricbeat}]. 

package.json

@@ -68,6 +68,7 @@
   "dependencies": {
     "@elastic/eui": "4.5.1",
     "@elastic/filesaver": "1.1.2",
+    "@elastic/good": "8.1.1-kibana1",
     "@elastic/numeral": "2.3.2",
     "@elastic/ui-ace": "0.2.3",
     "@kbn/babel-preset": "link:packages/kbn-babel-preset",
@@ -92,7 +93,7 @@
     "babel-polyfill": "6.20.0",
     "babel-register": "6.18.0",
     "bluebird": "2.9.34",
-    "boom": "5.2.0",
+    "boom": "^7.2.0",
     "brace": "0.11.1",
     "cache-loader": "1.0.3",
     "chalk": "^2.4.1",
@@ -108,7 +109,6 @@
     "elasticsearch": "^15.1.1",
     "elasticsearch-browser": "^15.1.1",
     "encode-uri-query": "1.0.0",
-    "even-better": "7.0.2",
     "execa": "^0.10.0",
     "expiry-js": "0.1.7",
     "extract-text-webpack-plugin": "3.0.1",
@@ -118,16 +118,15 @@
     "glob": "^7.1.2",
     "glob-all": "^3.1.0",
     "good-squeeze": "2.1.0",
-    "h2o2": "5.1.1",
-    "h2o2-latest": "npm:h2o2@8.1.2",
+    "h2o2": "^8.1.2",
     "handlebars": "4.0.5",
-    "hapi": "14.2.0",
-    "hapi-latest": "npm:hapi@17.5.0",
+    "hapi": "^17.5.3",
     "hjson": "3.1.0",
+    "hoek": "^5.0.4",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.1",
-    "inert": "4.0.2",
-    "joi": "10.4.1",
+    "inert": "^5.1.0",
+    "joi": "^13.5.2",
     "jquery": "^3.3.1",
     "js-yaml": "3.4.1",
     "json-stringify-pretty-compact": "1.0.4",
@@ -151,6 +150,7 @@
     "ngreact": "0.5.1",
     "no-ui-slider": "1.2.0",
     "node-fetch": "1.3.2",
+    "oppsy": "^2.0.0",
     "pegjs": "0.9.0",
     "postcss-loader": "2.0.6",
     "prop-types": "15.5.8",
@@ -186,7 +186,7 @@
     "style-loader": "0.19.0",
     "tar": "2.2.0",
     "tinygradient": "0.3.0",
-    "tinymath": "0.2.1",
+    "tinymath": "1.1.0",
     "topojson-client": "3.0.0",
     "trunc-html": "1.0.2",
     "trunc-text": "1.0.2",
@@ -203,11 +203,11 @@
     "vega-lite": "^2.4.0",
     "vega-schema-url-parser": "1.0.0",
     "vega-tooltip": "^0.9.14",
-    "vision": "4.1.0",
+    "vision": "^5.3.3",
     "webpack": "3.6.0",
     "webpack-merge": "4.1.0",
     "whatwg-fetch": "^2.0.3",
-    "wreck": "12.4.0",
+    "wreck": "^14.0.2",
     "x-pack": "link:x-pack",
     "yauzl": "2.7.0"
   },
@@ -238,10 +238,11 @@
     "@types/fetch-mock": "^5.12.2",
     "@types/getopts": "^2.0.0",
     "@types/glob": "^5.0.35",
-    "@types/hapi-latest": "npm:@types/hapi@17.0.12",
+    "@types/hapi": "^17.0.18",
     "@types/has-ansi": "^3.0.0",
+    "@types/hoek": "^4.1.3",
     "@types/jest": "^23.3.1",
-    "@types/joi": "^10.4.4",
+    "@types/joi": "^13.4.2",
     "@types/jquery": "^3.3.6",
     "@types/js-yaml": "^3.11.1",
     "@types/listr": "^0.13.0",

packages/kbn-config-schema/src/internals/index.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import * as Joi from 'joi';
+import Joi from 'joi';
 import {
   AnySchema,
   JoiRoot,

packages/kbn-config-schema/src/types/type.ts

@@ -101,12 +101,7 @@ export abstract class Type<V> {
       return error;
     }
 
-    const { context = {}, type, path: rawPath, message } = error;
-
-    // Before v11.0.0 Joi reported paths as `.`-delimited strings, but more
-    // recent version use arrays instead. Once we upgrade Joi, we should just
-    // remove this split logic and use `path` provided by Joi directly.
-    const path = rawPath ? rawPath.split('.') : [];
+    const { context = {}, type, path, message } = error;
 
     const errorHandleResult = this.handleError(type, context, path);
     if (errorHandleResult instanceof SchemaTypeError) {

packages/kbn-plugin-generator/sao_template/template/server/routes/example.js

@@ -3,8 +3,8 @@ export default function (server) {
   server.route({
     path: '/api/<%= name %>/example',
     method: 'GET',
-    handler(req, reply) {
-      reply({ time: (new Date()).toISOString() });
+    handler() {
+      return { time: (new Date()).toISOString() };
     }
   });