Merge branch 'master' into issue-xxx-saml-v1-drop

.github/CODEOWNERS

@@ -56,6 +56,7 @@
 /x-pack/legacy/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /src/legacy/server/csp/ @elastic/kibana-security
 /x-pack/plugins/security/  @elastic/kibana-security
+/x-pack/test/api_integration/apis/security/ @elastic/kibana-security
 
 # Kibana Stack Services
 /packages/kbn-analytics/ @elastic/kibana-stack-services

.sass-lint.yml

@@ -7,6 +7,8 @@ files:
     - 'x-pack/legacy/plugins/rollup/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
+  ignore:
+    - 'x-pack/legacy/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/lens/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss'
 rules:

docs/development/core/public/kibana-plugin-public.httpfetcherror._constructor_.md

@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [HttpFetchError](./kibana-plugin-public.httpfetcherror.md) &gt; [(constructor)](./kibana-plugin-public.httpfetcherror._constructor_.md)
+
+## HttpFetchError.(constructor)
+
+Constructs a new instance of the `HttpFetchError` class
+
+<b>Signature:</b>
+
+```typescript
+constructor(message: string, request: Request, response?: Response | undefined, body?: any);
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  message | <code>string</code> |  |
+|  request | <code>Request</code> |  |
+|  response | <code>Response &#124; undefined</code> |  |
+|  body | <code>any</code> |  |
+

docs/development/core/public/kibana-plugin-public.httpfetcherror.body.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [HttpFetchError](./kibana-plugin-public.httpfetcherror.md) &gt; [body](./kibana-plugin-public.httpfetcherror.body.md)
+
+## HttpFetchError.body property
+
+<b>Signature:</b>
+
+```typescript
+readonly body?: any;
+```

docs/development/core/public/kibana-plugin-public.httpfetcherror.md

@@ -0,0 +1,27 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [HttpFetchError](./kibana-plugin-public.httpfetcherror.md)
+
+## HttpFetchError class
+
+
+<b>Signature:</b>
+
+```typescript
+export declare class HttpFetchError extends Error 
+```
+
+## Constructors
+
+|  Constructor | Modifiers | Description |
+|  --- | --- | --- |
+|  [(constructor)(message, request, response, body)](./kibana-plugin-public.httpfetcherror._constructor_.md) |  | Constructs a new instance of the <code>HttpFetchError</code> class |
+
+## Properties
+
+|  Property | Modifiers | Type | Description |
+|  --- | --- | --- | --- |
+|  [body](./kibana-plugin-public.httpfetcherror.body.md) |  | <code>any</code> |  |
+|  [request](./kibana-plugin-public.httpfetcherror.request.md) |  | <code>Request</code> |  |
+|  [response](./kibana-plugin-public.httpfetcherror.response.md) |  | <code>Response &#124; undefined</code> |  |
+

docs/development/core/public/kibana-plugin-public.httpfetcherror.request.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [HttpFetchError](./kibana-plugin-public.httpfetcherror.md) &gt; [request](./kibana-plugin-public.httpfetcherror.request.md)
+
+## HttpFetchError.request property
+
+<b>Signature:</b>
+
+```typescript
+readonly request: Request;
+```

docs/development/core/public/kibana-plugin-public.httpfetcherror.response.md

@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-public](./kibana-plugin-public.md) &gt; [HttpFetchError](./kibana-plugin-public.httpfetcherror.md) &gt; [response](./kibana-plugin-public.httpfetcherror.response.md)
+
+## HttpFetchError.response property
+
+<b>Signature:</b>
+
+```typescript
+readonly response?: Response | undefined;
+```

docs/development/core/public/kibana-plugin-public.md

@@ -14,6 +14,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 
 |  Class | Description |
 |  --- | --- |
+|  [HttpFetchError](./kibana-plugin-public.httpfetcherror.md) |  |
 |  [HttpInterceptController](./kibana-plugin-public.httpinterceptcontroller.md) |  |
 |  [SavedObjectsClient](./kibana-plugin-public.savedobjectsclient.md) | Saved Objects is Kibana's data persisentence mechanism allowing plugins to use Elasticsearch for storing plugin state. The client-side SavedObjectsClient is a thin convenience library around the SavedObjects HTTP API for interacting with Saved Objects. |
 |  [SimpleSavedObject](./kibana-plugin-public.simplesavedobject.md) | This class is a very simple wrapper for SavedObjects loaded from the server with the [SavedObjectsClient](./kibana-plugin-public.savedobjectsclient.md)<!-- -->.<!-- -->It provides basic functionality for creating/saving/deleting saved objects, but doesn't include any type-specific implementations. |

docs/infrastructure/getting-started.asciidoc

@@ -2,7 +2,7 @@
 [[xpack-metrics-getting-started]]
 == Getting started with infrastructure monitoring
 
-To get started with the Infrastructure app in Kibana, you need to start collecting metrics data for your infrastructure.
+To get started with the Metrics app in Kibana, you need to start collecting metrics data for your infrastructure.
 
 Kibana provides step-by-step instructions to help you add metrics data.
 The {infra-guide}[Infrastructure Monitoring Guide] is a good source for more detailed information and instructions.

docs/infrastructure/index.asciidoc

@@ -1,10 +1,10 @@
 [role="xpack"]
 [[xpack-infra]]
-= Infrastructure
+= Metrics
 
 [partintro]
 --
-The Infrastructure app enables you to monitor your infrastructure and identify problems in real time.
+The Metrics app enables you to monitor your infrastructure and identify problems in real time.
 You start with a visual summary of your infrastructure where you can view basic metrics for common servers, containers, and services.
 Then you can drill down to view more detailed metrics or other information for that component.
 
@@ -21,7 +21,7 @@ You can optionally save these views and add them to {kibana-ref}/dashboard.html[
 
 * Seamlessly switch to view the corresponding logs, application traces or uptime information for a component.
 
-To get started, you need to <<xpack-metrics-getting-started, start collecting metrics data from your infrastructure>>. Then you can <<infra-ui, use the Infrastructure application to inspect and analyze your data>>.
+To get started, you need to <<xpack-metrics-getting-started, start collecting metrics data from your infrastructure>>. Then you can <<infra-ui, use the Metrics application to inspect and analyze your data>>.
 
 [role="screenshot"]
 image::infrastructure/images/infra-sysmon.png[Infrastructure Overview in Kibana]

docs/infrastructure/infra-ui.asciidoc

@@ -1,8 +1,8 @@
 [role="xpack"]
 [[infra-ui]]
-== Using the Infrastructure app
+== Using the Metrics app
 
-Use the Infrastructure app in {kib} to monitor your infrastructure and identify problems in real time.
+Use the Metrics app in {kib} to monitor your infrastructure and identify problems in real time.
 You can explore metrics for hosts, containers, and services.
 You can also drill down to view more detailed metrics, or seamlessly switch to view the corresponding logs, application traces, and uptime information.
 
@@ -62,7 +62,7 @@ Select *Auto-refresh* to keep up-to-date metrics information coming in, or *Stop
 [[infra-configure-source]]
 === Configure the data to use for your metrics
 
-The default source configuration for metrics is specified in the {kibana-ref}/infrastructure-ui-settings-kb.html[Infrastructure app settings] in the {kibana-ref}/settings.html[Kibana configuration file].
+The default source configuration for metrics is specified in the {kibana-ref}/infrastructure-ui-settings-kb.html[Metrics app settings] in the {kibana-ref}/settings.html[Kibana configuration file].
 The default configuration uses the `metricbeat-*` index pattern to query the data.
 The default configuration also defines field settings for things like timestamps and container names.
 

docs/infrastructure/metrics-explorer.asciidoc

@@ -2,7 +2,7 @@
 [[metrics-explorer]]
 == Metrics Explorer
 
-Metrics Explorer in the Infrastructure app in Kibana allows you to group and visualise multiple customisable metrics for one or more components in a graphical format.
+Metrics Explorer in the Metrics app in Kibana allows you to group and visualise multiple customisable metrics for one or more components in a graphical format.
 This can be a starting point for further investigations.
 You can also save your views and add them to {kibana-ref}/dashboard.html[dashboards].
 
@@ -14,7 +14,7 @@ image::infrastructure/images/metrics-explorer-screen.png[Metrics Explorer in Kib
 === Metrics Explorer requirements and considerations
 
 * Metrics Explorer uses data collected from {metricbeat-ref}/metricbeat-overview.html[Metricbeat].
-* You need read permissions on `metricbeat-*` or the metric index specified in the Infrastructure configuration.
+* You need read permissions on `metricbeat-*` or the metric index specified in the Metrics configuration.
 * Metrics Explorer uses the timestamp field set in the Infrastructure configuration.
 By default that is set to `@timestamp`.
 * The interval for the X Axis is set to `auto`.
@@ -30,7 +30,7 @@ After that, we'll filter down to a specific host and explore the outbound traffi
 Before we start, if you don't have any Metricbeat data, you'll need to head over to our
 {metricbeat-ref}/metricbeat-overview.html[Metricbeat documentation] to install Metricbeat and start collecting data.
 
-1. When you have Metricbeat running and collecting data, open Kibana and navigate to *Infrastructure*.
+1. When you have Metricbeat running and collecting data, open Kibana and navigate to *Metrics*.
 The *Inventory* tab shows the host or hosts you are monitoring.
 
 2. Select the *Metrics Explorer* tab.

docs/infrastructure/view-metrics.asciidoc

@@ -3,7 +3,7 @@
 
 == Viewing infrastructure metrics
 
-When you select *View Metrics* for a component in your infrastructure from the <<infra-ui, Infrastructure app in Kibana>>, you can view detailed metrics for that component, and for any related components.
+When you select *View Metrics* for a component in your infrastructure from the <<infra-ui, Metrics app in Kibana>>, you can view detailed metrics for that component, and for any related components.
 You can also view additional component metadata.
 
 [role="screenshot"]

docs/logs/index.asciidoc

@@ -10,7 +10,7 @@ The Logs app has a compact, console-like display that you can customize.
 You can filter the logs by various fields, start and stop live streaming, and highlight text of interest.
 
 You can open the Logs app from the *Logs* tab in Kibana.
-You can also open the Logs app directly from a component in the Infrastructure app.
+You can also open the Logs app directly from a component in the Metrics app.
 In this case, you will only see the logs for the selected component.
 
 * <<xpack-logs-getting-started>>

docs/management/dashboard_only_mode/index.asciidoc

@@ -2,7 +2,7 @@
 [[xpack-dashboard-only-mode]]
 == Dashboard-only mode
 
-deprecated[7.4.0, Using the `kibana_dashboard_only_user` role is deprecated. Use <<kibana-feature-privileges,feature privileges>> instead.]
+deprecated[7.4.0, "Using the `kibana_dashboard_only_user` role is deprecated. Use <<kibana-feature-privileges,feature privileges>> instead."]
 
 In dashboard-only mode, users have access to only the *Dashboard* app. 
 Users can view and filter the dashboards, but cannot create, edit, or delete

docs/settings/general-infra-logs-ui-settings.asciidoc

@@ -1,4 +1,4 @@
-`xpack.infra.enabled`:: Set to `false` to disable the Logs and Infrastructure UI plugin {kib}. Defaults to `true`.
+`xpack.infra.enabled`:: Set to `false` to disable the Logs and Metrics UI plugin {kib}. Defaults to `true`.
 
 `xpack.infra.sources.default.logAlias`:: Index pattern for matching indices that contain log data. Defaults to `filebeat-*,kibana_sample_data_logs*`. To match multiple wildcard patterns, use a comma to separate the names, with no space after the comma. For example, `logstash-app1-*,default-logs-*`.
 

docs/settings/infrastructure-ui-settings.asciidoc

@@ -1,14 +1,14 @@
 [role="xpack"]
 [[infrastructure-ui-settings-kb]]
-=== Infrastructure UI settings in Kibana
+=== Metrics UI settings in Kibana
 ++++
-<titleabbrev>Infrastructure UI settings</titleabbrev>
+<titleabbrev>Metrics UI settings</titleabbrev>
 ++++
 
-You do not need to configure any settings to use the Infrastructure UI. It is enabled by default.
+You do not need to configure any settings to use the Metrics UI. It is enabled by default.
 
 [float]
 [[general-infra-ui-settings-kb]]
-==== General Infrastructure UI settings
+==== General Metrics UI settings
 
 include::general-infra-logs-ui-settings.asciidoc[]

docs/setup/settings.asciidoc

@@ -253,6 +253,10 @@ running behind a proxy. Use the `server.rewriteBasePath` setting to tell Kibana
 if it should remove the basePath from requests it receives, and to prevent a
 deprecation warning at startup. This setting cannot end in a slash (`/`).
 
+[[server-cors]]`server.cors:`:: *Default: `false`* Set to `true` to enable CORS support. This setting is required to configure `server.cors.origin`.
+
+`server.cors.origin:`:: *Default: none* Specifies origins. "origin" must be an array. To use this setting, you must set `server.cors` to `true`. To accept all origins, use `server.cors.origin: ["*"]`.
+
 `server.customResponseHeaders:`:: *Default: `{}`* Header names and values to
   send on all responses to the client from the Kibana server.
 

docs/uptime/overview.asciidoc

@@ -56,7 +56,7 @@ ID and URL, its IP address, and a dedicated sparkline showing its check status o
 image::uptime/images/observability_integrations.png[Observability integrations]
 
 The Monitor list also contains a menu of possible integrations. If Uptime detects Kubernetes or
-Docker related host information, it will provide links to open the Infrastructure UI or Logs UI pre-filtered
+Docker related host information, it will provide links to open the Metrics UI or Logs UI pre-filtered
 for this host. Additionally, this feature supplies links to simply filter the other views on the host's
 IP address, to help you quickly determine if these other solutions contain data relevant to your current
 interest.

package.json

@@ -108,6 +108,7 @@
     "@babel/register": "^7.5.5",
     "@elastic/charts": "^13.5.1",
     "@elastic/datemath": "5.0.2",
+    "@elastic/ems-client": "^1.0.2",
     "@elastic/eui": "14.4.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
@@ -171,7 +172,7 @@
     "hapi": "^17.5.3",
     "hapi-auth-cookie": "^9.0.0",
     "history": "^4.9.0",
-    "hjson": "3.1.2",
+    "hjson": "3.2.0",
     "hoek": "^5.0.4",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^2.2.2",
@@ -257,7 +258,7 @@
     "vega-lib": "4.3.0",
     "vega-lite": "^2.6.0",
     "vega-schema-url-parser": "1.0.0",
-    "vega-tooltip": "^0.19.1",
+    "vega-tooltip": "^0.12.0",
     "vision": "^5.3.3",
     "webpack": "4.41.0",
     "webpack-merge": "4.2.2",
@@ -358,7 +359,7 @@
     "babel-jest": "^24.9.0",
     "babel-plugin-dynamic-import-node": "^2.3.0",
     "babel-plugin-istanbul": "^5.2.0",
-    "backport": "4.7.1",
+    "backport": "4.7.3",
     "chai": "3.5.0",
     "chance": "1.0.18",
     "cheerio": "0.22.0",
@@ -446,7 +447,7 @@
     "strip-ansi": "^3.0.1",
     "supertest": "^3.1.0",
     "supertest-as-promised": "^4.0.2",
-    "tree-kill": "^1.1.0",
+    "tree-kill": "^1.2.1",
     "typescript": "3.5.3",
     "typings-tester": "^0.3.2",
     "vinyl-fs": "^3.0.3",

packages/kbn-dev-utils/package.json

@@ -17,7 +17,7 @@
     "getopts": "^2.2.5",
     "moment": "^2.20.1",
     "rxjs": "^6.2.1",
-    "tree-kill": "^1.2.0",
+    "tree-kill": "^1.2.1",
     "tslib": "^1.9.3"
   },
   "devDependencies": {

packages/kbn-dev-utils/src/proc_runner/proc.ts

@@ -26,7 +26,7 @@ import chalk from 'chalk';
 
 import treeKill from 'tree-kill';
 import { promisify } from 'util';
-const treeKillAsync = promisify(treeKill);
+const treeKillAsync = promisify((...args: [number, string, any]) => treeKill(...args));
 
 import { ToolingLog } from '../tooling_log';
 import { observeLines } from './observe_lines';

packages/kbn-es/package.json

@@ -17,7 +17,7 @@
     "node-fetch": "^2.6.0",
     "simple-git": "^1.91.0",
     "tar-fs": "^1.16.3",
-    "tree-kill": "^1.1.0",
+    "tree-kill": "^1.2.1",
     "yauzl": "^2.10.0"
   }
 }

packages/kbn-es/src/cluster.js

@@ -278,6 +278,7 @@ exports.Cluster = class Cluster {
     this._process = execa(ES_BIN, args, {
       cwd: installPath,
       env: {
+        ...(installPath ? { ES_TMPDIR: path.resolve(installPath, 'ES_TMPDIR') } : {}),
         ...process.env,
         ...(options.bundledJDK ? { JAVA_HOME: '' } : {}),
         ...(options.esEnvVars || {}),

packages/kbn-es/src/install/archive.js

@@ -65,6 +65,10 @@ exports.installArchive = async function installArchive(archive, options = {}) {
   await decompress(dest, installPath);
   log.info('extracted to %s', chalk.bold(installPath));
 
+  const tmpdir = path.resolve(installPath, 'ES_TMPDIR');
+  fs.mkdirSync(tmpdir, { recursive: true });
+  log.info('created %s', chalk.bold(tmpdir));
+
   if (license !== 'oss') {
     // starting in 6.3, security is disabled by default. Since we bootstrap
     // the keystore, we can enable security ourselves.

packages/kbn-i18n/README.md

@@ -61,9 +61,9 @@ data to UI frameworks and provides methods for the direct translation.
 
 Here is the public API exposed by this engine:
 
-- `addMessages(messages: Map<string, string>, [locale: string])` - provides a way to register
+- `addTranslation(newTranslation: Translation, [locale: string])` - provides a way to register
 translations with the engine
-- `getMessages()` - returns messages for the current language
+- `getTranslation()` - returns messages for the current language
 - `setLocale(locale: string)` - tells the engine which language to use by given
 language key
 - `getLocale()` - returns the current locale
@@ -78,6 +78,7 @@ For the detailed explanation, see the section below
 translate message by id. `description` is optional context comment that will be extracted
 by i18n tools and added as a comment next to translation message at `defaultMessages.json`.
 - `init(messages: Map<string, string>)` - initializes the engine
+- `load(translationsUrl: string)` - loads JSON with translations from the specified URL and initializes i18n engine with them.
 
 #### I18n engine internals
 

packages/kbn-test/src/failed_tests_reporter/README.md

@@ -10,7 +10,7 @@ To fetch some JUnit reports from a recent build on CI, visit its `Google Cloud S
 copy(`wget "${Array.from($$('a[href$=".xml"]')).filter(a => a.innerText === 'Download').map(a => a.href.replace('https://storage.cloud.google.com/', 'https://storage.googleapis.com/')).join('" "')}"`)
 ```
 
-This copies a script to download the reporets, which can be executed in the `test/junit` directory.
+This copies a script to download the reports, which you should execute in the `test/junit` directory.
 
 Next, run the CLI in `--dry-run` mode so that it doesn't actually communicate with Github.