Merge branch 'master' into ad_hoc_enrichment_ui

 Conflicts:
	x-pack/plugins/security_solution/cypress/integration/detection_rules/indicator_match_rule.spec.ts

.eslintrc.js

@@ -857,6 +857,18 @@ module.exports = {
         'react-hooks/exhaustive-deps': ['error', { additionalHooks: '^useFetcher$' }],
       },
     },
+    {
+      files: ['x-pack/plugins/apm/**/*.stories.*', 'x-pack/plugins/observability/**/*.stories.*'],
+      rules: {
+        'react/function-component-definition': [
+          'off',
+          {
+            namedComponents: 'function-declaration',
+            unnamedComponents: 'arrow-function',
+          },
+        ],
+      },
+    },
 
     /**
      * Fleet overrides

dev_docs/tutorials/setting_up_a_development_env.mdx

@@ -0,0 +1,89 @@
+---
+id: kibDevTutorialSetupDevEnv
+slug: /kibana-dev-docs/tutorial/setup-dev-env
+title: Setting up a Development Environment
+summary: Learn how to setup a development environemnt for contributing to the Kibana repository
+date: 2021-04-26
+tags: ['kibana', 'onboarding', 'dev', 'architecture', 'setup']
+---
+
+Setting up a development environment is pretty easy.
+
+<DocCallOut title="A note about Windows">
+  In order to support Windows development we currently require you to use one of the following:
+
+  - [Git Bash](https://git-scm.com/download/win)
+  - [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/about)
+
+
+  Before running the steps below, please make sure you have installed [Visual C++ Redistributable for Visual Studio 2015](https://www.microsoft.com/en-us/download/details.aspx?id=48145) and that you are running all commands in either Git Bash or WSL.
+</DocCallOut>
+
+## Get the code
+
+Start by forking [the Kibana repository](https://github.com/elastic/kibana) on Github so that you have a place to stage pull requests and create branches for development.
+
+Then clone the repository to your machine:
+
+```sh
+git clone https://github.com/[YOUR_USERNAME]/kibana.git kibana
+cd kibana
+```
+
+## Install dependencies
+
+Install the version of Node.js listed in the `.node-version` file. This can be automated with tools such as [nvm](https://github.com/creationix/nvm) or [nvm-windows](https://github.com/coreybutler/nvm-windows). As we also include a `.nvmrc` file you can switch to the correct version when using nvm by running:
+
+```sh
+nvm use
+```
+
+Then, install the latest version of yarn using:
+
+```sh
+npm install -g yarn
+```
+
+Finally, boostrap Kibana and install all of the remaining dependencies:
+
+```sh
+yarn kbn bootstrap
+```
+
+Node.js native modules could be in use and node-gyp is the tool used to build them. There are tools you need to install per platform and python versions you need to be using. Please follow the [node-gyp installation steps](https://github.com/nodejs/node-gyp#installation) for your platform.
+
+## Run Elasticsearch
+
+In order to start Kibana you need to run a local version of Elasticsearch. You can startup and initialize the latest Elasticsearch snapshot of the correct version for Kibana by running the following in a new terminal tab/window:
+
+```sh
+yarn es snapshot
+```
+
+You can pass `--license trial` to start Elasticsearch with a trial license, or use the Kibana UI to switch the local version to a trial version which includes all features.
+
+Read about more options for [Running Elasticsearch during development](https://www.elastic.co/guide/en/kibana/current/running-elasticsearch.html), like connecting to a remote host, running from source, preserving data inbetween runs, running remote cluster, etc.
+
+## Run Kibana
+
+In another terminal tab/window you can start Kibana.
+
+```sh
+yarn start
+```
+
+If you include the `--run-examples` flag then all of the [developer examples](https://github.com/elastic/kibana/tree/{branch}/examples). Read more about the advanced options for [Running Kibana](https://www.elastic.co/guide/en/kibana/current/running-kibana-advanced.html).
+
+## Code away!
+
+You are now ready to start developing. Changes to the source files should be picked up automatically and either cause the server to restart, or be served to the browser on the next page refresh.
+
+## Install pre-commit hook (optional)
+
+In case you want to run a couple of checks like linting or check the file casing of the files to commit, we provide a way to install a pre-commit hook. To configure it you just need to run the following:
+
+```sh
+node scripts/register_git_hook
+```
+
+After the script completes the pre-commit hook will be created within the file `.git/hooks/pre-commit`. If you choose to not install it, don’t worry, we still run a quick CI check to provide feedback earliest as we can about the same checks.

docs/api/alerting/legacy/list.asciidoc

@@ -80,6 +80,7 @@ The API returns the following:
       },
       "producer":"stackAlerts",
       "minimumLicenseRequired":"basic",
+      "isExportable":true,
       "enabledInLicense":true,
       "authorizedConsumers":{
          "alerts":{
@@ -113,6 +114,9 @@ Each alert type contains the following properties:
 | `minimumLicenseRequired`
 | The license required to use the alert type.
 
+| `isExportable`
+| Whether the rule type is exportable through the Saved Objects Management UI.
+
 | `enabledInLicense`
 | Whether the alert type is enabled or disabled based on the license.
 

docs/api/alerting/list_rule_types.asciidoc

@@ -82,6 +82,7 @@ The API returns the following:
       },
       "producer":"stackAlerts",
       "minimum_license_required":"basic",
+      "is_exportable":true,
       "enabled_in_license":true,
       "authorized_consumers":{
          "alerts":{
@@ -115,6 +116,9 @@ Each rule type contains the following properties:
 | `minimum_license_required`
 | The license required to use the rule type.
 
+| `is_exportable`
+| Whether the rule type is exportable through the Saved Objects Management UI.
+
 | `enabled_in_license`
 | Whether the rule type is enabled or disabled based on the license.
 

docs/api/task-manager/health.asciidoc

@@ -1,5 +1,5 @@
 [[task-manager-api-health]]
-=== Get Task Manager health API
+== Task Manager health API
 ++++
 <titleabbrev>Get Task Manager health</titleabbrev>
 ++++
@@ -8,20 +8,20 @@ Retrieve the health status of the {kib} Task Manager.
 
 [float]
 [[task-manager-api-health-request]]
-==== Request
+=== Request
 
 `GET <kibana host>:<port>/api/task_manager/_health`
 
 [float]
 [[task-manager-api-health-codes]]
-==== Response code
+=== Response code
 
 `200`::
     Indicates a successful call.
 
 [float]
 [[task-manager-api-health-example]]
-==== Example
+=== Example
 
 Retrieve the health status of the {kib} Task Manager:
 

docs/developer/best-practices/navigation.asciidoc

@@ -47,24 +47,26 @@ console.log(discoverUrl); // http://localhost:5601/bpr/s/space/app/discover
 const discoverUrlWithSomeState = core.http.basePath.prepend(`/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2020-09-10T11:39:50.203Z',to:'2020-09-10T11:40:20.249Z'))&_a=(columns:!(_source),filters:!(),index:'90943e30-9a47-11e8-b64d-95841ca0b247',interval:auto,query:(language:kuery,query:''),sort:!())`);
 ----
 
-Instead, each app should expose {kib-repo}tree/{branch}/src/plugins/share/public/url_generators/README.md[a URL generator].
-Other apps should use those URL generators for creating URLs. 
+Instead, each app should expose {kib-repo}tree/{branch}/src/plugins/share/common/url_service/locators/README.md[a locator].
+Other apps should use those locators for navigation or URL creation. 
 
 [source,typescript jsx]
 ----
-// Properly generated URL to *Discover* app. Generator code is owned by *Discover* app and available on *Discover*'s plugin contract.
-const discoverUrl = discoverUrlGenerator.createUrl({filters, timeRange});
+// Properly generated URL to *Discover* app. Locator code is owned by *Discover* app and available on *Discover*'s plugin contract.
+const discoverUrl = await plugins.discover.locator.getUrl({filters, timeRange});
+// or directly execute navigation
+await plugins.discover.locator.navigate({filters, timeRange});
 ----
 
-To get a better idea, take a look at *Discover* URL generator {kib-repo}tree/{branch}/src/plugins/discover/public/url_generator.ts[implementation].
+To get a better idea, take a look at *Discover* locator {kib-repo}tree/{branch}/src/plugins/discover/public/locator.ts[implementation].
 It allows specifying various **Discover** app state pieces like: index pattern, filters, query, time range and more.
 
-There are two ways to access other's app URL generator in your code:
+There are two ways to access locators of other apps:
 
 1. From a plugin contract of a destination app *(preferred)*. 
-2. Using URL generator service instance on `share` plugin contract (in case an explicit plugin dependency is not possible).
+2. Using locator client in `share` plugin (case an explicit plugin dependency is not possible).
 
-In case you want other apps to link to your app, then you should create a URL generator and expose it on your plugin's contract.
+In case you want other apps to link to your app, then you should create a locator and expose it on your plugin's contract.
 
 
 [[navigating-between-kibana-apps]]

docs/developer/getting-started/monorepo-packages.asciidoc

@@ -107,6 +107,7 @@ yarn kbn watch-bazel
 - @kbn/std
 - @kbn/storybook
 - @kbn/telemetry-utils
+- @kbn/test-subj-selector
 - @kbn/tinymath
 - @kbn/ui-framework
 - @kbn/ui-shared-deps

docs/developer/plugin-list.asciidoc

@@ -191,7 +191,8 @@ so they can properly protect the data within their clusters.
 
 
 |{kib-repo}blob/{branch}/src/plugins/share/README.md[share]
-|Replaces the legacy ui/share module for registering share context menus.
+|The share plugin contains various utilities for displaying sharing context menu,
+generating deep links to other apps, and creating short URLs.
 
 
 |{kib-repo}blob/{branch}/src/plugins/spaces_oss/README.md[spacesOss]

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

@@ -98,6 +98,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [OverlayStart](./kibana-plugin-core-public.overlaystart.md) |  |
 |  [Plugin](./kibana-plugin-core-public.plugin.md) | The interface that should be returned by a <code>PluginInitializer</code>. |
 |  [PluginInitializerContext](./kibana-plugin-core-public.plugininitializercontext.md) | The available core services passed to a <code>PluginInitializer</code> |
+|  [ResolvedSimpleSavedObject](./kibana-plugin-core-public.resolvedsimplesavedobject.md) | This interface is a very simple wrapper for SavedObjects resolved from the server with the [SavedObjectsClient](./kibana-plugin-core-public.savedobjectsclient.md)<!-- -->. |
 |  [SavedObject](./kibana-plugin-core-public.savedobject.md) |  |
 |  [SavedObjectAttributes](./kibana-plugin-core-public.savedobjectattributes.md) | The data for a Saved Object is stored as an object in the <code>attributes</code> property. |
 |  [SavedObjectError](./kibana-plugin-core-public.savedobjecterror.md) |  |
@@ -126,6 +127,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsImportUnknownError](./kibana-plugin-core-public.savedobjectsimportunknownerror.md) | Represents a failure to import due to an unknown reason. |
 |  [SavedObjectsImportUnsupportedTypeError](./kibana-plugin-core-public.savedobjectsimportunsupportedtypeerror.md) | Represents a failure to import due to having an unsupported saved object type. |
 |  [SavedObjectsMigrationVersion](./kibana-plugin-core-public.savedobjectsmigrationversion.md) | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
+|  [SavedObjectsResolveResponse](./kibana-plugin-core-public.savedobjectsresolveresponse.md) |  |
 |  [SavedObjectsStart](./kibana-plugin-core-public.savedobjectsstart.md) |  |
 |  [SavedObjectsUpdateOptions](./kibana-plugin-core-public.savedobjectsupdateoptions.md) |  |
 |  [ToastOptions](./kibana-plugin-core-public.toastoptions.md) | Options available for [IToasts](./kibana-plugin-core-public.itoasts.md) APIs. |

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

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [ResolvedSimpleSavedObject](./kibana-plugin-core-public.resolvedsimplesavedobject.md) &gt; [aliasTargetId](./kibana-plugin-core-public.resolvedsimplesavedobject.aliastargetid.md)
+
+## ResolvedSimpleSavedObject.aliasTargetId property
+
+The ID of the object that the legacy URL alias points to. This is only defined when the outcome is `'aliasMatch'` or `'conflict'`<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+aliasTargetId?: SavedObjectsResolveResponse['aliasTargetId'];
+```

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

@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [ResolvedSimpleSavedObject](./kibana-plugin-core-public.resolvedsimplesavedobject.md)
+
+## ResolvedSimpleSavedObject interface
+
+This interface is a very simple wrapper for SavedObjects resolved from the server with the [SavedObjectsClient](./kibana-plugin-core-public.savedobjectsclient.md)<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+export interface ResolvedSimpleSavedObject<T = unknown> 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [aliasTargetId](./kibana-plugin-core-public.resolvedsimplesavedobject.aliastargetid.md) | <code>SavedObjectsResolveResponse['aliasTargetId']</code> | The ID of the object that the legacy URL alias points to. This is only defined when the outcome is <code>'aliasMatch'</code> or <code>'conflict'</code>. |
+|  [outcome](./kibana-plugin-core-public.resolvedsimplesavedobject.outcome.md) | <code>SavedObjectsResolveResponse['outcome']</code> | The outcome for a successful <code>resolve</code> call is one of the following values:<!-- -->\* <code>'exactMatch'</code> -- One document exactly matched the given ID. \* <code>'aliasMatch'</code> -- One document with a legacy URL alias matched the given ID; in this case the <code>saved_object.id</code> field is different than the given ID. \* <code>'conflict'</code> -- Two documents matched the given ID, one was an exact match and another with a legacy URL alias; in this case the <code>saved_object</code> object is the exact match, and the <code>saved_object.id</code> field is the same as the given ID. |
+|  [savedObject](./kibana-plugin-core-public.resolvedsimplesavedobject.savedobject.md) | <code>SimpleSavedObject&lt;T&gt;</code> | The saved object that was found. |
+

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

@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [ResolvedSimpleSavedObject](./kibana-plugin-core-public.resolvedsimplesavedobject.md) &gt; [outcome](./kibana-plugin-core-public.resolvedsimplesavedobject.outcome.md)
+
+## ResolvedSimpleSavedObject.outcome property
+
+The outcome for a successful `resolve` call is one of the following values:
+
+\* `'exactMatch'` -- One document exactly matched the given ID. \* `'aliasMatch'` -- One document with a legacy URL alias matched the given ID; in this case the `saved_object.id` field is different than the given ID. \* `'conflict'` -- Two documents matched the given ID, one was an exact match and another with a legacy URL alias; in this case the `saved_object` object is the exact match, and the `saved_object.id` field is the same as the given ID.
+
+<b>Signature:</b>
+
+```typescript
+outcome: SavedObjectsResolveResponse['outcome'];
+```

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

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [ResolvedSimpleSavedObject](./kibana-plugin-core-public.resolvedsimplesavedobject.md) &gt; [savedObject](./kibana-plugin-core-public.resolvedsimplesavedobject.savedobject.md)
+
+## ResolvedSimpleSavedObject.savedObject property
+
+The saved object that was found.
+
+<b>Signature:</b>
+
+```typescript
+savedObject: SimpleSavedObject<T>;
+```

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

@@ -19,7 +19,7 @@ export interface SavedObject<T = unknown>
 |  [error](./kibana-plugin-core-public.savedobject.error.md) | <code>SavedObjectError</code> |  |
 |  [id](./kibana-plugin-core-public.savedobject.id.md) | <code>string</code> | The ID of this Saved Object, guaranteed to be unique for all objects of the same <code>type</code> |
 |  [migrationVersion](./kibana-plugin-core-public.savedobject.migrationversion.md) | <code>SavedObjectsMigrationVersion</code> | Information about the migrations that have been applied to this SavedObject. When Kibana starts up, KibanaMigrator detects outdated documents and migrates them based on this value. For each migration that has been applied, the plugin's name is used as a key and the latest migration version as the value. |
-|  [namespaces](./kibana-plugin-core-public.savedobject.namespaces.md) | <code>string[]</code> | Namespace(s) that this saved object exists in. This attribute is only used for multi-namespace saved object types. |
+|  [namespaces](./kibana-plugin-core-public.savedobject.namespaces.md) | <code>string[]</code> | Space(s) that this saved object exists in. This attribute is not used for "global" saved object types which are registered with <code>namespaceType: 'agnostic'</code>. |
 |  [originId](./kibana-plugin-core-public.savedobject.originid.md) | <code>string</code> | The ID of the saved object this originated from. This is set if this object's <code>id</code> was regenerated; that can happen during migration from a legacy single-namespace type, or during import. It is only set during migration or create operations. This is used during import to ensure that ID regeneration is deterministic, so saved objects will be overwritten if they are imported multiple times into a given space. |
 |  [references](./kibana-plugin-core-public.savedobject.references.md) | <code>SavedObjectReference[]</code> | A reference to another saved object. |
 |  [type](./kibana-plugin-core-public.savedobject.type.md) | <code>string</code> | The type of Saved Object. Each plugin can define it's own custom Saved Object types. |

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

@@ -4,7 +4,7 @@
 
 ## SavedObject.namespaces property
 
-Namespace(s) that this saved object exists in. This attribute is only used for multi-namespace saved object types.
+Space(s) that this saved object exists in. This attribute is not used for "global" saved object types which are registered with `namespaceType: 'agnostic'`<!-- -->.
 
 <b>Signature:</b>
 

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

@@ -26,6 +26,7 @@ The constructor for this class is marked as internal. Third-party code should no
 |  [delete](./kibana-plugin-core-public.savedobjectsclient.delete.md) |  | <code>(type: string, id: string, options?: SavedObjectsDeleteOptions &#124; undefined) =&gt; ReturnType&lt;SavedObjectsApi['delete']&gt;</code> | Deletes an object |
 |  [find](./kibana-plugin-core-public.savedobjectsclient.find.md) |  | <code>&lt;T = unknown, A = unknown&gt;(options: SavedObjectsFindOptions) =&gt; Promise&lt;SavedObjectsFindResponsePublic&lt;T, unknown&gt;&gt;</code> | Search for objects |
 |  [get](./kibana-plugin-core-public.savedobjectsclient.get.md) |  | <code>&lt;T = unknown&gt;(type: string, id: string) =&gt; Promise&lt;SimpleSavedObject&lt;T&gt;&gt;</code> | Fetches a single object |
+|  [resolve](./kibana-plugin-core-public.savedobjectsclient.resolve.md) |  | <code>&lt;T = unknown&gt;(type: string, id: string) =&gt; Promise&lt;ResolvedSimpleSavedObject&lt;T&gt;&gt;</code> | Resolves a single object |
 
 ## Methods
 

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

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [SavedObjectsClient](./kibana-plugin-core-public.savedobjectsclient.md) &gt; [resolve](./kibana-plugin-core-public.savedobjectsclient.resolve.md)
+
+## SavedObjectsClient.resolve property
+
+Resolves a single object
+
+<b>Signature:</b>
+
+```typescript
+resolve: <T = unknown>(type: string, id: string) => Promise<ResolvedSimpleSavedObject<T>>;
+```