Merge remote-tracking branch 'upstream/master' into nls/tsr-obs

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -29,6 +29,7 @@ kibanaPipeline(timeoutMinutes: 150) {
       withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
         parallel([
           'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
+          'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
           'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
             'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
             'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),

.ci/jobs.yml

@@ -2,6 +2,7 @@
 
 JOB:
   - kibana-intake
+  - x-pack-intake
   - kibana-firefoxSmoke
   - kibana-ciGroup1
   - kibana-ciGroup2

.ci/teamcity/default/jest.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
 
-# This file is temporary and can be removed once #85850 has been
-# merged and the changes included in open PR's (~3 days after merging)
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-default-jest
+
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest x-pack --ci --verbose --maxWorkers=5

.ci/teamcity/oss/jest.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 
-# This file is temporary and can be removed once #85850 has been
-# merged and the changes included in open PR's (~3 days after merging)
-
 set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
 export JOB=kibana-oss-jest
 
-checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest --ci --maxWorkers=5 --verbose
+checks-reporter-with-killswitch "OSS Jest Unit Tests" \
+  node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5

.eslintignore

@@ -36,6 +36,7 @@ snapshots.js
 # package overrides
 /packages/elastic-eslint-config-kibana
 /packages/kbn-interpreter/src/common/lib/grammar.js
+/packages/kbn-tinymath/src/grammar.js
 /packages/kbn-plugin-generator/template
 /packages/kbn-pm/dist
 /packages/kbn-test/src/functional_test_runner/__tests__/fixtures/

.github/CODEOWNERS

@@ -66,6 +66,7 @@
 # APM
 /x-pack/plugins/apm/  @elastic/apm-ui
 /x-pack/test/functional/apps/apm/  @elastic/apm-ui
+/x-pack/test/apm_api_integration/ @elastic/apm-ui
 /src/plugins/apm_oss/  @elastic/apm-ui
 /src/apm.js @elastic/kibana-core @vigneshshanmugam
 /packages/kbn-apm-config-loader/ @elastic/kibana-core @vigneshshanmugam
@@ -80,6 +81,7 @@
 /x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
 /x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
 /x-pack/plugins/apm/server/projections/rum_page_load_transactions.ts @elastic/uptime
+/x-pack/test/apm_api_integration/tests/csm/ @elastic/uptime
 
 # Beats
 /x-pack/plugins/beats_management/  @elastic/beats
@@ -99,7 +101,7 @@
 
 # Observability UIs
 /x-pack/plugins/infra/ @elastic/logs-metrics-ui
-/x-pack/plugins/fleet/ @elastic/ingest-management
+/x-pack/plugins/fleet/ @elastic/fleet
 /x-pack/plugins/observability/ @elastic/observability-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime

.github/paths-labeller.yml

@@ -10,7 +10,7 @@
     - "src/plugins/bfetch/**/*.*"
   - "Team:apm":
     - "x-pack/plugins/apm/**/*.*"
-  - "Team:Ingest Management":
+  - "Team:Fleet":
     - "x-pack/plugins/fleet/**/*.*"
     - "x-pack/test/fleet_api_integration/**/*.*"
   - "Team:uptime":

.teamcity/src/Extensions.kt

@@ -20,21 +20,20 @@ fun BuildType.kibanaAgent(size: Int) {
 }
 
 val testArtifactRules = """
-    target/junit/**/*
     target/kibana-*
-    target/kibana-coverage/**/*
-    target/kibana-security-solution/**/*.png
     target/test-metrics/*
+    target/kibana-security-solution/**/*.png
+    target/junit/**/*
     target/test-suites-ci-plan.json
-    test/**/screenshots/diff/*.png
-    test/**/screenshots/failure/*.png
     test/**/screenshots/session/*.png
+    test/**/screenshots/failure/*.png
+    test/**/screenshots/diff/*.png
     test/functional/failure_debug/html/*.html
-    x-pack/test/**/screenshots/diff/*.png
-    x-pack/test/**/screenshots/failure/*.png
     x-pack/test/**/screenshots/session/*.png
-    x-pack/test/functional/apps/reporting/reports/session/*.pdf
+    x-pack/test/**/screenshots/failure/*.png
+    x-pack/test/**/screenshots/diff/*.png
     x-pack/test/functional/failure_debug/html/*.html
+    x-pack/test/functional/apps/reporting/reports/session/*.pdf
   """.trimIndent()
 
 fun BuildType.addTestSettings() {

.teamcity/src/builds/test/AllTests.kt

@@ -9,5 +9,5 @@ object AllTests : BuildType({
   description = "All Non-Functional Tests"
   type = Type.COMPOSITE
 
-  dependsOn(QuickTests, Jest, JestIntegration, OssApiServerIntegration)
+  dependsOn(QuickTests, Jest, XPackJest, JestIntegration, OssApiServerIntegration)
 })

.teamcity/src/builds/test/Jest.kt

@@ -12,7 +12,7 @@ object Jest : BuildType({
   kibanaAgent(8)
 
   steps {
-    runbld("Jest Unit", "./.ci/teamcity/tests/jest.sh")
+    runbld("Jest Unit", "./.ci/teamcity/oss/jest.sh")
   }
 
   addTestSettings()

.teamcity/src/builds/test/XPackJest.kt

@@ -0,0 +1,19 @@
+package builds.test
+
+import addTestSettings
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import kibanaAgent
+import runbld
+
+object XPackJest : BuildType({
+  name = "X-Pack Jest Unit"
+  description = "Executes X-Pack Jest Unit Tests"
+
+  kibanaAgent(16)
+
+  steps {
+    runbld("X-Pack Jest Unit", "./.ci/teamcity/default/jest.sh")
+  }
+
+  addTestSettings()
+})

.teamcity/src/projects/Kibana.kt

@@ -77,6 +77,7 @@ fun Kibana(config: KibanaConfiguration = KibanaConfiguration()) : Project {
           name = "Jest"
 
           buildType(Jest)
+          buildType(XPackJest)
           buildType(JestIntegration)
         }
 

docs/developer/plugin-list.asciidoc

@@ -150,8 +150,8 @@ It also provides a stateful version of it on the start contract.
 Content is fetched from the remote (https://feeds.elastic.co and https://feeds-staging.elastic.co in dev mode) once a day, with periodic checks if the content needs to be refreshed. All newsfeed content is hosted remotely.
 
 
-|{kib-repo}blob/{branch}/src/plugins/presentation_util/README.md[presentationUtil]
-|Utilities and components used by the presentation-related plugins
+|{kib-repo}blob/{branch}/src/plugins/presentation_util/README.mdx[presentationUtil]
+|The Presentation Utility Plugin is a set of common, shared components and toolkits for solutions within the Presentation space, (e.g. Dashboards, Canvas).
 
 
 |{kib-repo}blob/{branch}/src/plugins/region_map/README.md[regionMap]

docs/development/core/server/kibana-plugin-core-server.elasticsearchclientconfig.md

@@ -9,7 +9,7 @@ Configuration options to be used to create a [cluster client](./kibana-plugin-co
 <b>Signature:</b>
 
 ```typescript
-export declare type ElasticsearchClientConfig = Pick<ElasticsearchConfig, 'customHeaders' | 'logQueries' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'requestHeadersWhitelist' | 'sniffInterval' | 'hosts' | 'username' | 'password'> & {
+export declare type ElasticsearchClientConfig = Pick<ElasticsearchConfig, 'customHeaders' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'requestHeadersWhitelist' | 'sniffInterval' | 'hosts' | 'username' | 'password'> & {
     pingTimeout?: ElasticsearchConfig['pingTimeout'] | ClientOptions['pingTimeout'];
     requestTimeout?: ElasticsearchConfig['requestTimeout'] | ClientOptions['requestTimeout'];
     ssl?: Partial<ElasticsearchConfig['ssl']>;

docs/development/core/server/kibana-plugin-core-server.elasticsearchconfig.md

@@ -27,7 +27,6 @@ export declare class ElasticsearchConfig
 |  [healthCheckDelay](./kibana-plugin-core-server.elasticsearchconfig.healthcheckdelay.md) |  | <code>Duration</code> | The interval between health check requests Kibana sends to the Elasticsearch. |
 |  [hosts](./kibana-plugin-core-server.elasticsearchconfig.hosts.md) |  | <code>string[]</code> | Hosts that the client will connect to. If sniffing is enabled, this list will be used as seeds to discover the rest of your cluster. |
 |  [ignoreVersionMismatch](./kibana-plugin-core-server.elasticsearchconfig.ignoreversionmismatch.md) |  | <code>boolean</code> | Whether to allow kibana to connect to a non-compatible elasticsearch node. |
-|  [logQueries](./kibana-plugin-core-server.elasticsearchconfig.logqueries.md) |  | <code>boolean</code> | Specifies whether all queries to the client should be logged (status code, method, query etc.). |
 |  [password](./kibana-plugin-core-server.elasticsearchconfig.password.md) |  | <code>string</code> | If Elasticsearch is protected with basic authentication, this setting provides the password that the Kibana server uses to perform its administrative functions. |
 |  [pingTimeout](./kibana-plugin-core-server.elasticsearchconfig.pingtimeout.md) |  | <code>Duration</code> | Timeout after which PING HTTP request will be aborted and retried. |
 |  [requestHeadersWhitelist](./kibana-plugin-core-server.elasticsearchconfig.requestheaderswhitelist.md) |  | <code>string[]</code> | List of Kibana client-side headers to send to Elasticsearch when request scoped cluster client is used. If this is an empty array then \*no\* client-side will be sent. |

docs/development/core/server/kibana-plugin-core-server.legacyclusterclient._constructor_.md

@@ -9,7 +9,7 @@ Constructs a new instance of the `LegacyClusterClient` class
 <b>Signature:</b>
 
 ```typescript
-constructor(config: LegacyElasticsearchClientConfig, log: Logger, getAuthHeaders?: GetAuthHeaders);
+constructor(config: LegacyElasticsearchClientConfig, log: Logger, type: string, getAuthHeaders?: GetAuthHeaders);
 ```
 
 ## Parameters
@@ -18,5 +18,6 @@ constructor(config: LegacyElasticsearchClientConfig, log: Logger, getAuthHeaders
 |  --- | --- | --- |
 |  config | <code>LegacyElasticsearchClientConfig</code> |  |
 |  log | <code>Logger</code> |  |
+|  type | <code>string</code> |  |
 |  getAuthHeaders | <code>GetAuthHeaders</code> |  |
 

docs/development/core/server/kibana-plugin-core-server.legacyclusterclient.md

@@ -21,7 +21,7 @@ export declare class LegacyClusterClient implements ILegacyClusterClient
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(config, log, getAuthHeaders)](./kibana-plugin-core-server.legacyclusterclient._constructor_.md) |  | Constructs a new instance of the <code>LegacyClusterClient</code> class |
+|  [(constructor)(config, log, type, getAuthHeaders)](./kibana-plugin-core-server.legacyclusterclient._constructor_.md) |  | Constructs a new instance of the <code>LegacyClusterClient</code> class |
 
 ## Properties
 

docs/development/core/server/kibana-plugin-core-server.legacyelasticsearchclientconfig.md

@@ -11,7 +11,7 @@
 <b>Signature:</b>
 
 ```typescript
-export declare type LegacyElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' | 'log' | 'plugins'> & Pick<ElasticsearchConfig, 'apiVersion' | 'customHeaders' | 'logQueries' | 'requestHeadersWhitelist' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'hosts' | 'username' | 'password'> & {
+export declare type LegacyElasticsearchClientConfig = Pick<ConfigOptions, 'keepAlive' | 'log' | 'plugins'> & Pick<ElasticsearchConfig, 'apiVersion' | 'customHeaders' | 'requestHeadersWhitelist' | 'sniffOnStart' | 'sniffOnConnectionFault' | 'hosts' | 'username' | 'password'> & {
     pingTimeout?: ElasticsearchConfig['pingTimeout'] | ConfigOptions['pingTimeout'];
     requestTimeout?: ElasticsearchConfig['requestTimeout'] | ConfigOptions['requestTimeout'];
     sniffInterval?: ElasticsearchConfig['sniffInterval'] | ConfigOptions['sniffInterval'];

docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.createindexaliasnotfounderror.md

@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) &gt; [createIndexAliasNotFoundError](./kibana-plugin-core-server.savedobjectserrorhelpers.createindexaliasnotfounderror.md)
+
+## SavedObjectsErrorHelpers.createIndexAliasNotFoundError() method
+
+<b>Signature:</b>
+
+```typescript
+static createIndexAliasNotFoundError(alias: string): DecoratedError;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  alias | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`DecoratedError`
+

docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.decorateindexaliasnotfounderror.md

@@ -0,0 +1,23 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) &gt; [decorateIndexAliasNotFoundError](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateindexaliasnotfounderror.md)
+
+## SavedObjectsErrorHelpers.decorateIndexAliasNotFoundError() method
+
+<b>Signature:</b>
+
+```typescript
+static decorateIndexAliasNotFoundError(error: Error, alias: string): DecoratedError;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  error | <code>Error</code> |  |
+|  alias | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`DecoratedError`
+

docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.isgeneralerror.md

@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsErrorHelpers](./kibana-plugin-core-server.savedobjectserrorhelpers.md) &gt; [isGeneralError](./kibana-plugin-core-server.savedobjectserrorhelpers.isgeneralerror.md)
+
+## SavedObjectsErrorHelpers.isGeneralError() method
+
+<b>Signature:</b>
+
+```typescript
+static isGeneralError(error: Error | DecoratedError): boolean;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  error | <code>Error &#124; DecoratedError</code> |  |
+
+<b>Returns:</b>
+
+`boolean`
+

docs/development/core/server/kibana-plugin-core-server.savedobjectserrorhelpers.md

@@ -18,6 +18,7 @@ export declare class SavedObjectsErrorHelpers
 |  [createBadRequestError(reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.createbadrequesterror.md) | <code>static</code> |  |
 |  [createConflictError(type, id, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.createconflicterror.md) | <code>static</code> |  |
 |  [createGenericNotFoundError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.creategenericnotfounderror.md) | <code>static</code> |  |
+|  [createIndexAliasNotFoundError(alias)](./kibana-plugin-core-server.savedobjectserrorhelpers.createindexaliasnotfounderror.md) | <code>static</code> |  |
 |  [createInvalidVersionError(versionInput)](./kibana-plugin-core-server.savedobjectserrorhelpers.createinvalidversionerror.md) | <code>static</code> |  |
 |  [createTooManyRequestsError(type, id)](./kibana-plugin-core-server.savedobjectserrorhelpers.createtoomanyrequestserror.md) | <code>static</code> |  |
 |  [createUnsupportedTypeError(type)](./kibana-plugin-core-server.savedobjectserrorhelpers.createunsupportedtypeerror.md) | <code>static</code> |  |
@@ -27,6 +28,7 @@ export declare class SavedObjectsErrorHelpers
 |  [decorateEsUnavailableError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateesunavailableerror.md) | <code>static</code> |  |
 |  [decorateForbiddenError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateforbiddenerror.md) | <code>static</code> |  |
 |  [decorateGeneralError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorategeneralerror.md) | <code>static</code> |  |
+|  [decorateIndexAliasNotFoundError(error, alias)](./kibana-plugin-core-server.savedobjectserrorhelpers.decorateindexaliasnotfounderror.md) | <code>static</code> |  |
 |  [decorateNotAuthorizedError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decoratenotauthorizederror.md) | <code>static</code> |  |
 |  [decorateRequestEntityTooLargeError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decoraterequestentitytoolargeerror.md) | <code>static</code> |  |
 |  [decorateTooManyRequestsError(error, reason)](./kibana-plugin-core-server.savedobjectserrorhelpers.decoratetoomanyrequestserror.md) | <code>static</code> |  |
@@ -35,6 +37,7 @@ export declare class SavedObjectsErrorHelpers
 |  [isEsCannotExecuteScriptError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isescannotexecutescripterror.md) | <code>static</code> |  |
 |  [isEsUnavailableError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isesunavailableerror.md) | <code>static</code> |  |
 |  [isForbiddenError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isforbiddenerror.md) | <code>static</code> |  |
+|  [isGeneralError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isgeneralerror.md) | <code>static</code> |  |
 |  [isInvalidVersionError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isinvalidversionerror.md) | <code>static</code> |  |
 |  [isNotAuthorizedError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isnotauthorizederror.md) | <code>static</code> |  |
 |  [isNotFoundError(error)](./kibana-plugin-core-server.savedobjectserrorhelpers.isnotfounderror.md) | <code>static</code> |  |

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchinterceptor.handlesearcherror.md

@@ -7,14 +7,14 @@
 <b>Signature:</b>
 
 ```typescript
-protected handleSearchError(e: any, timeoutSignal: AbortSignal, options?: ISearchOptions): Error;
+protected handleSearchError(e: KibanaServerError | AbortError, timeoutSignal: AbortSignal, options?: ISearchOptions): Error;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  e | <code>any</code> |  |
+|  e | <code>KibanaServerError &#124; AbortError</code> |  |
 |  timeoutSignal | <code>AbortSignal</code> |  |
 |  options | <code>ISearchOptions</code> |  |
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.fetch.md

@@ -4,8 +4,12 @@
 
 ## SearchSource.fetch() method
 
-Fetch this source and reject the returned Promise on error
+> Warning: This API is now obsolete.
+> 
+> Use fetch$ instead
+> 
 
+Fetch this source and reject the returned Promise on error
 
 <b>Signature:</b>
 

docs/development/plugins/data/public/kibana-plugin-plugins-data-public.searchsource.fetch_.md

@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [SearchSource](./kibana-plugin-plugins-data-public.searchsource.md) &gt; [fetch$](./kibana-plugin-plugins-data-public.searchsource.fetch_.md)
+
+## SearchSource.fetch$() method
+
+Fetch this source from Elasticsearch, returning an observable over the response(s)
+
+<b>Signature:</b>
+
+```typescript
+fetch$(options?: ISearchOptions): import("rxjs").Observable<import("elasticsearch").SearchResponse<any>>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  options | <code>ISearchOptions</code> |  |
+
+<b>Returns:</b>
+
+`import("rxjs").Observable<import("elasticsearch").SearchResponse<any>>`
+