Merge branch 'master' into dependabot/npm_and_yarn/highlight.js-10.1.2

.ci/Dockerfile

@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=12.19.1
+ARG NODE_VERSION=14.15.1
 
 FROM node:${NODE_VERSION} AS base
 

.github/CODEOWNERS

@@ -187,6 +187,9 @@
 /x-pack/test/saved_object_tagging/ @elastic/kibana-core
 /packages/kbn-config-schema/ @elastic/kibana-core
 /packages/kbn-std/ @elastic/kibana-core
+/packages/kbn-config/ @elastic/kibana-core
+/packages/kbn-logging/ @elastic/kibana-core
+/packages/kbn-legacy-logging/ @elastic/kibana-core
 /src/legacy/server/config/ @elastic/kibana-core
 /src/legacy/server/http/ @elastic/kibana-core
 /src/legacy/server/logging/ @elastic/kibana-core
@@ -259,8 +262,31 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 
 # Enterprise Search
 # Shared
-/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/common/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/shared/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/public/applications/__mocks__/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/* @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/lib/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/__mocks__/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/lib/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/enterprise_search/ @elastic/enterprise-search-frontend
 /x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
+# App Search
+/x-pack/plugins/enterprise_search/public/applications/app_search/ @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/app_search/ @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/app_search/ @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/app_search/ @elastic/app-search-frontend
+# Workplace Search
+/x-pack/plugins/enterprise_search/public/applications/workplace_search/ @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/workplace_search/ @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/workplace_search/ @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/ @elastic/workplace-search-frontend
 
 # Elasticsearch UI
 /src/plugins/dev_tools/ @elastic/es-ui

.i18nrc.json

@@ -27,6 +27,7 @@
       "src/plugins/management"
     ],
     "maps_legacy": "src/plugins/maps_legacy",
+    "monaco": "packages/kbn-monaco/src",
     "indexPatternManagement": "src/plugins/index_pattern_management",
     "advancedSettings": "src/plugins/advanced_settings",
     "kibana_legacy": "src/plugins/kibana_legacy",

.node-version

@@ -1 +1 @@
-12.19.1
+14.15.1

.nvmrc

@@ -1 +1 @@
-12.19.1
+14.15.1

STYLEGUIDE.md

@@ -589,6 +589,24 @@ Do not use setters, they cause more problems than they can solve.
 
 [sideeffect]: http://en.wikipedia.org/wiki/Side_effect_(computer_science)
 
+### Avoid circular dependencies
+
+As part of a future effort to use correct and idempotent build tools we need our code to be
+able to be represented as a directed acyclic graph. We must avoid having circular dependencies 
+both on code and type imports to achieve that. One of the most critical parts is the plugins 
+code. We've developed a tool to identify plugins with circular dependencies which 
+has allowed us to build a list of plugins who have circular dependencies 
+between each other. 
+
+When building plugins we should avoid importing from plugins 
+who are known to have circular dependencies at the moment as well as introducing 
+new circular dependencies. You can run the same tool we use on our CI locally by 
+typing `node scripts/find_plugins_with_circular_deps --debug`. It will error out in 
+case new circular dependencies has been added with your changes 
+(which will also happen in the CI) as well as print out the current list of
+the known circular dependencies which, as mentioned before, should not be imported 
+by your code until the circular dependencies on these have been solved. 
+
 ## SASS files
 
 When writing a new component, create a sibling SASS file of the same name and import directly into the **top** of the JS/TS component file. Doing so ensures the styles are never separated or lost on import and allows for better modularization (smaller individual plugin asset footprint).

docs/api/logstash-configuration-management/create-logstash.asciidoc

@@ -20,9 +20,6 @@ experimental[] Create a centrally-managed Logstash pipeline, or update an existi
 [[logstash-configuration-management-api-create-request-body]]
 ==== Request body
 
-`id`::
-  (Required, string) The pipeline ID.
-
 `description`::
   (Optional, string) The pipeline description.
 

docs/api/saved-objects/create.asciidoc

@@ -9,11 +9,13 @@ experimental[] Create {kib} saved objects.
 [[saved-objects-api-create-request]]
 ==== Request
 
-`POST <kibana host>:<port>/api/saved_objects/<type>` +
+`POST <kibana host>:<port>/api/saved_objects/<type>`
 
 `POST <kibana host>:<port>/api/saved_objects/<type>/<id>`
 
-`POST <kibana host>:<port>/s/<space_id>/saved_objects/<type>`
+`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/<type>`
+
+`POST <kibana host>:<port>/s/<space_id>/api/saved_objects/<type>/<id>`
 
 [[saved-objects-api-create-path-params]]
 ==== Path parameters

docs/api/spaces-management/copy_saved_objects.asciidoc

@@ -51,9 +51,17 @@ You can request to overwrite any objects that already exist in the target space
   (Optional, boolean) When set to `true`, all saved objects related to the specified saved objects will also be copied into the target
   spaces. The default value is `false`.
 
+`createNewCopies`::
+  (Optional, boolean) Creates new copies of saved objects, regenerates each object ID, and resets the origin. When used, potential conflict
+  errors are avoided. The default value is `true`.
++
+NOTE: This cannot be used with the `overwrite` option.
+
 `overwrite`::
   (Optional, boolean) When set to `true`, all conflicts are automatically overidden. When a saved object with a matching `type` and `id`
   exists in the target space, that version is replaced with the version from the source space. The default value is `false`.
++
+NOTE: This cannot be used with the `createNewCopies` option.
 
 [role="child_attributes"]
 [[spaces-api-copy-saved-objects-response-body]]
@@ -128,8 +136,7 @@ $ curl -X POST api/spaces/_copy_saved_objects
     "id": "my-dashboard"
   }],
   "spaces": ["marketing"],
-  "includeReferences": true,
-  "createNewcopies": true
+  "includeReferences": true
 }
 ----
 // KIBANA
@@ -193,7 +200,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
     "id": "my-dashboard"
   }],
   "spaces": ["marketing"],
-  "includeReferences": true
+  "includeReferences": true,
+  "createNewCopies": false
 }
 ----
 // KIBANA
@@ -254,7 +262,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
     "id": "my-dashboard"
   }],
   "spaces": ["marketing", "sales"],
-  "includeReferences": true
+  "includeReferences": true,
+  "createNewCopies": false
 }
 ----
 // KIBANA
@@ -405,7 +414,8 @@ $ curl -X POST api/spaces/_copy_saved_objects
     "id": "my-dashboard"
   }],
   "spaces": ["marketing"],
-  "includeReferences": true
+  "includeReferences": true,
+  "createNewCopies": false
 }
 ----
 // KIBANA

docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc

@@ -45,6 +45,10 @@ Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, w
 `includeReferences`::
   (Optional, boolean) When set to `true`, all saved objects related to the specified saved objects are copied into the target spaces. The `includeReferences` must be the same values used during the failed <<spaces-api-copy-saved-objects, copy saved objects to space API>> operation. The default value is `false`.
 
+`createNewCopies`::
+  (Optional, boolean) Creates new copies of the saved objects, regenerates each object ID, and resets the origin. When enabled during the
+  initial copy, also enable when resolving copy errors. The default value is `true`.
+
 `retries`::
   (Required, object) The retry operations to attempt, which can specify how to resolve different types of errors. Object keys represent the
   target space IDs.
@@ -148,6 +152,7 @@ $ curl -X POST api/spaces/_resolve_copy_saved_objects_errors
     "id": "my-dashboard"
   }],
   "includeReferences": true,
+  "createNewCopies": false,
   "retries": {
     "sales": [
       {
@@ -246,6 +251,7 @@ $ curl -X POST api/spaces/_resolve_copy_saved_objects_errors
     "id": "my-dashboard"
   }],
   "includeReferences": true,
+  "createNewCopies": false,
   "retries": {
     "marketing": [
       {

docs/api/using-api.asciidoc

@@ -61,7 +61,7 @@ For all APIs, you must use a request header. The {kib} APIs support the `kbn-xsr
   By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
 
 * The API endpoint uses the `GET` or `HEAD` operations
-* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
+* The path is allowed using the <<settings-xsrf-allowlist, `server.xsrf.allowlist`>> setting
 * XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
 
 `Content-Type: application/json`::

docs/apm/api.asciidoc

@@ -40,7 +40,7 @@ users interacting with APM APIs must have <<apm-app-api-user,sufficient privileg
   By default, you must use `kbn-xsrf` for all API calls, except in the following scenarios:
 
 * The API endpoint uses the `GET` or `HEAD` operations
-* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
+* The path is allowed using the <<settings-xsrf-allowlist, `server.xsrf.allowlist`>> setting
 * XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
 
 `Content-Type: application/json`::

docs/apm/apm-alerts.asciidoc

@@ -6,7 +6,6 @@
 <titleabbrev>Create an alert</titleabbrev>
 ++++
 
-beta::[]
 
 The APM app integrates with Kibana's {kibana-ref}/alerting-getting-started.html[alerting and actions] feature.
 It provides a set of built-in **actions** and APM specific threshold **alerts** for you to use

docs/developer/best-practices/typescript.asciidoc

@@ -19,7 +19,7 @@ More details are available in the https://www.typescriptlang.org/docs/handbook/p
 ==== Caveats
 This architecture imposes several limitations to which we must comply:
 
-- Projects cannot have circular dependencies. Even though the Kibana platform doesn't support circular dependencies between Kibana plugins, TypeScript (and ES6 modules) does allow circular imports between files. So in theory, you may face a problem when migrating to the TS project references and you will have to resolve this circular dependency. https://github.com/elastic/kibana/issues/78162 is going to provide a tool to find such problem places.
+- Projects cannot have circular dependencies. Even though the Kibana platform doesn't support circular dependencies between Kibana plugins, TypeScript (and ES6 modules) does allow circular imports between files. So in theory, you may face a problem when migrating to the TS project references and you will have to resolve this circular dependency. We've built a tool that can be used to find such problems. Please read the prerequisites section below to know how to use it.
 - A project must emit its type declaration. It's not always possible to generate a type declaration if the compiler cannot infer a type. There are two basic cases:
 
 1. Your plugin exports a type inferring an internal type declared in Kibana codebase. In this case, you'll have to either export an internal type or to declare an exported type explicitly.
@@ -30,6 +30,8 @@ This architecture imposes several limitations to which we must comply:
 Since project refs rely on generated `d.ts` files, the migration order does matter. You can migrate your plugin only when all the plugin dependencies already have migrated. It creates a situation where commonly used plugins (such as `data` or `kibana_react`) have to migrate first.
 Run `node scripts/find_plugins_without_ts_refs.js --id your_plugin_id` to get a list of plugins that should be switched to TS project refs to unblock your plugin migration.
 
+Additionally, in order to migrate into project refs, you also need to make sure your plugin doesn't have circular dependencies with other plugins both on code and type imports. We run a job in the CI for each PR trying to find if new circular dependencies are being added which runs our tool with `node scripts/find_plugins_with_circular_deps`. However there are also a couple of circular dependencies already identified and that are in an allowed list to be solved. You also need to make sure your plugin don't rely in any other plugin into that allowed list. For a complete overview of the circular dependencies both found and in the allowed list as well as the complete circular dependencies path please run the following script locally with the debug flag `node scripts/find_plugins_with_circular_deps --debug` .
+
 [discrete]
 ==== Implementation
 - Make sure all the plugins listed as dependencies in *requiredPlugins*, *optionalPlugins* & *requiredBundles* properties of `kibana.json` manifest file have migrated to TS project references.

docs/developer/contributing/development-unit-tests.asciidoc

@@ -20,11 +20,13 @@ yarn test:mocha
 == Jest
 Jest tests are stored in the same directory as source code files with the `.test.{js,mjs,ts,tsx}` suffix.
 
-*Running Jest Unit Tests*
+Each plugin and package contains it's own `jest.config.js` file to define its root, and any overrides 
+to the jest-preset provided by `@kbn/test`. When working on a single plugin or package, you will find 
+it's more efficient to supply the Jest configuration file when running.
 
 ["source","shell"]
 -----------
-yarn test:jest
+yarn jest --config src/plugins/discover/jest.config.js
 -----------
 
 [discrete]

docs/developer/getting-started/index.asciidoc

@@ -110,6 +110,20 @@ View all available options by running `yarn start --help`
 
 Read about more advanced options for <<running-kibana-advanced>>.
 
+[discrete]
+=== 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:
+
+[source,bash]
+----
+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. 
+
 [discrete]
 === Code away!
 

docs/developer/plugin-list.asciidoc

@@ -507,8 +507,8 @@ Kibana.
 |or
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/spaces[spaces]
-|WARNING: Missing README.
+|{kib-repo}blob/{branch}/x-pack/plugins/spaces/README.md[spaces]
+|See Configuring Kibana Spaces.
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/stack_alerts/README.md[stackAlerts]

docs/developer/plugin/migrating-legacy-plugins-examples.asciidoc

@@ -1143,6 +1143,77 @@ router.get(
 );
 ----
 
+==== Accessing the client from a collector's `fetch` method
+
+At the moment, the `fetch` method's context receives preconfigured 
+<<scoped-services, scoped clients>> for Elasticsearch and SavedObjects. 
+To help in the transition, both, the legacy (`callCluster`) and new clients are provided, 
+but we strongly discourage using the deprecated legacy ones for any new implementation.
+
+[source,typescript]
+----
+usageCollection.makeUsageCollector<MyUsage>({
+  type: 'my-collector',
+  isReady: async () => true, // Logic to confirm the `fetch` method is ready to be called
+  schema: {...},
+  async fetch(context) {
+    const { callCluster, esClient, soClient } = context;
+    
+    // Before:
+    const result = callCluster('search', options)
+
+    // After:
+    const { body: result } = esClient.search(options);
+    
+    return result;
+  }
+});
+----
+
+Regarding the `soClient`, it is encouraged to use it instead of the plugin's owned SavedObject's repository 
+as we used to do in the past.
+
+Before:
+
+[source,typescript]
+----
+function getUsageCollector(
+  usageCollection: UsageCollectionSetup, 
+  getSavedObjectsRepository: () => ISavedObjectsRepository | undefined
+) {
+  usageCollection.makeUsageCollector<MyUsage>({
+    type: 'my-collector',
+    isReady: () => typeof getSavedObjectsRepository() !== 'undefined',
+    schema: {...},
+    async fetch() {
+      const savedObjectsRepository = getSavedObjectsRepository();
+      
+      const { attributes: result } = await savedObjectsRepository.get('my-so-type', 'my-so-id');
+      
+      return result;
+    }
+  });  
+}
+----
+
+After:
+
+[source,typescript]
+----
+function getUsageCollector(usageCollection: UsageCollectionSetup) {
+  usageCollection.makeUsageCollector<MyUsage>({
+    type: 'my-collector',
+    isReady: () => true,
+    schema: {...},
+    async fetch({ soClient }) {
+      const { attributes: result } = await soClient.get('my-so-type', 'my-so-id');
+      
+      return result;
+    }
+  });  
+}
+----
+
 ==== Creating a custom client
 
 Note that the `plugins` option is no longer available on the new

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

@@ -18,7 +18,7 @@ exactRoute?: boolean;
 ```ts
 core.application.register({
   id: 'my_app',
-  title: 'My App'
+  title: 'My App',
   exactRoute: true,
   mount: () => { ... },
 })

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

@@ -27,6 +27,7 @@ export interface App<HistoryLocationState = unknown>
 |  [mount](./kibana-plugin-core-public.app.mount.md) | <code>AppMount&lt;HistoryLocationState&gt; &#124; AppMountDeprecated&lt;HistoryLocationState&gt;</code> | A mount function called when the user navigates to this app's route. May have signature of [AppMount](./kibana-plugin-core-public.appmount.md) or [AppMountDeprecated](./kibana-plugin-core-public.appmountdeprecated.md)<!-- -->. |
 |  [navLinkStatus](./kibana-plugin-core-public.app.navlinkstatus.md) | <code>AppNavLinkStatus</code> | The initial status of the application's navLink. Defaulting to <code>visible</code> if <code>status</code> is <code>accessible</code> and <code>hidden</code> if status is <code>inaccessible</code> See [AppNavLinkStatus](./kibana-plugin-core-public.appnavlinkstatus.md) |
 |  [order](./kibana-plugin-core-public.app.order.md) | <code>number</code> | An ordinal used to sort nav links relative to one another for display. |
+|  [searchDeepLinks](./kibana-plugin-core-public.app.searchdeeplinks.md) | <code>AppSearchDeepLink[]</code> | Array of links that represent secondary in-app locations for the app. |
 |  [status](./kibana-plugin-core-public.app.status.md) | <code>AppStatus</code> | The initial status of the application. Defaulting to <code>accessible</code> |
 |  [title](./kibana-plugin-core-public.app.title.md) | <code>string</code> | The title of the application. |
 |  [tooltip](./kibana-plugin-core-public.app.tooltip.md) | <code>string</code> | A tooltip shown when hovering over app link. |