Merge branch 'master' into task-manager/health

* master: (92 commits)
  [ILM] Data tiers for 7.10 (elastic#76126)
  [ML] Transforms: Fixes styling of preview grid pagination in summary step (elastic#77789)
  [Drilldowns] Beta badge support. Mark URL Drilldown as Beta (elastic#75654)
  Re-enable session lifespan, idle timeout api integration tests and use unique names for the security test reports. (elastic#77746)
  [Alerting] renames code in alerting RBAC exemption to make it easier to maintain (elastic#77598)
  [Alerting & Actions] Overwrite SOs when updating instead of partially updating (elastic#73688)
  fixed react warning in Suspense in alert flyout (elastic#77777)
  [APM] Track usage of Gold+ features (elastic#77630)
  Visualize: Bad request when working with histogram aggregation (elastic#77684)
  remove legacy ES plugin (elastic#77703)
  [Lens] change name of custom query to filters (elastic#77725)
  skip flaky suite (elastic#76239)
  remove visual aspects of baseline job (elastic#77815)
  skip flaky suite (elastic#77835)
  Fixes typo in data recognizer text (elastic#77691)
  management/update trusted_apps jest snapshot
  [build] Use Elastic hosted UBI minimal base image (elastic#77776)
  [APM] Add transaction error rate alert (elastic#76933)
  [Security Solution] [Detections] Remove file validation on import route (elastic#77770)
  [Enterprise Search][tech debt] Add Kea logic paths for easier debugging/defaults (elastic#77698)
  ...

.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=10.22.0
+ARG NODE_VERSION=10.22.1
 
 FROM node:${NODE_VERSION} AS base
 

.ci/Jenkinsfile_baseline_capture

@@ -11,14 +11,14 @@ kibanaPipeline(timeoutMinutes: 120) {
           'CI_PARALLEL_PROCESS_NUMBER=1'
         ]) {
           parallel([
-            'oss-visualRegression': {
-              workers.ci(name: 'oss-visualRegression', size: 's-highmem', ramDisk: true) {
-                kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')()
+            'oss-baseline': {
+              workers.ci(name: 'oss-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
+                kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh')()
               }
             },
-            'xpack-visualRegression': {
-              workers.ci(name: 'xpack-visualRegression', size: 's-highmem', ramDisk: true) {
-                kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')()
+            'xpack-baseline': {
+              workers.ci(name: 'xpack-baseline', size: 's-highmem', ramDisk: true, runErrorReporter: false) {
+                kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh')()
               }
             },
           ])

.github/CODEOWNERS

@@ -59,7 +59,6 @@
 # APM
 /x-pack/plugins/apm/  @elastic/apm-ui
 /x-pack/test/functional/apps/apm/  @elastic/apm-ui
-/src/legacy/core_plugins/apm_oss/  @elastic/apm-ui
 /src/plugins/apm_oss/  @elastic/apm-ui
 /src/apm.js @watson @vigneshshanmugam
 
@@ -83,9 +82,6 @@
 /src/plugins/home/public @elastic/kibana-core-ui
 /src/plugins/home/server/*.ts @elastic/kibana-core-ui
 /src/plugins/home/server/services/ @elastic/kibana-core-ui
-# Exclude tutorial resources folder for now because they are not owned by Kibana app and most will move out soon
-/src/legacy/core_plugins/kibana/public/home/*.ts @elastic/kibana-core-ui
-/src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
 /x-pack/plugins/global_search_bar/ @elastic/kibana-core-ui
 
 # Observability UIs
@@ -167,7 +163,6 @@
 
 # Security
 /src/core/server/csp/  @elastic/kibana-security @elastic/kibana-platform
-/x-pack/legacy/plugins/security/  @elastic/kibana-security
 /x-pack/legacy/plugins/spaces/  @elastic/kibana-security
 /x-pack/plugins/spaces/  @elastic/kibana-security
 /x-pack/plugins/encrypted_saved_objects/  @elastic/kibana-security
@@ -286,8 +281,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 # Core design
 /src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
-/src/legacy/core_plugins/kibana/public/home/**/*.scss @elastic/kibana-core-ui-designers
-/x-pack/legacy/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
@@ -297,7 +290,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/plugins/infra/**/*.scss @elastic/observability-design
 /x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
 /x-pack/plugins/observability/**/*.scss @elastic/observability-design
-/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design 
+/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
 
 # Ent. Search design
 /x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design

.i18nrc.json

@@ -57,7 +57,8 @@
     "visTypeXy": "src/plugins/vis_type_xy",
     "visualizations": "src/plugins/visualizations",
     "visualize": "src/plugins/visualize",
-    "apmOss": "src/plugins/apm_oss"
+    "apmOss": "src/plugins/apm_oss",
+    "usageCollection": "src/plugins/usage_collection"
   },
   "exclude": [
     "src/legacy/ui/ui_render/ui_render_mixin.js"

.node-version

@@ -1 +1 @@
-10.22.0
+10.22.1

.nvmrc

@@ -1 +1 @@
-10.22.0
+10.22.1

docs/api/dashboard/import-dashboard.asciidoc

@@ -23,7 +23,7 @@ experimental[] Import dashboards and corresponding saved objects.
 [[dashboard-api-import-request-body]]
 ==== Request body
 
-Use the complete response body from the <<dashboard-api-export, Export dashboard API>> as the request body. Do not manually construct a payload to the endpoint.
+Use the complete response body from the <<dashboard-api-export, Export dashboard API>> as the request body. Do not manually construct a payload to the endpoint. The max payload size is determined by the `savedObjects.maxImportPayloadBytes` configuration key.
 
 [[dashboard-api-import-response-body]]
 ==== Response body

docs/apm/troubleshooting.asciidoc

@@ -49,7 +49,7 @@ GET /_template/apm-{version}
 *Using Logstash, Kafka, etc.*
 If you're not outputting data directly from APM Server to Elasticsearch (perhaps you're using Logstash or Kafka),
 then the index template will not be set up automatically. Instead, you'll need to
-{apm-server-ref}/configuration-template.html[load the template manually].
+{apm-server-ref}/apm-server-template.html[load the template manually].
 
 *Using a custom index names*
 This problem can also occur if you've customized the index name that you write APM data to.

docs/developer/plugin-list.asciidoc

@@ -494,6 +494,10 @@ in their infrastructure.
 |This plugins adopts some conventions in addition to or in place of conventions in Kibana (at the time of the plugin's creation):
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/xpack_legacy/README.md[xpackLegacy]
+|Contains HTTP endpoints and UiSettings that are slated for removal.
+
+
 |===
 
 include::{kibana-root}/src/plugins/dashboard/README.asciidoc[leveloffset=+1]

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

@@ -23,6 +23,7 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
 |  [getStartServices](./kibana-plugin-core-server.coresetup.getstartservices.md) | <code>StartServicesAccessor&lt;TPluginsStart, TStart&gt;</code> | [StartServicesAccessor](./kibana-plugin-core-server.startservicesaccessor.md) |
 |  [http](./kibana-plugin-core-server.coresetup.http.md) | <code>HttpServiceSetup &amp; {</code><br/><code>        resources: HttpResources;</code><br/><code>    }</code> | [HttpServiceSetup](./kibana-plugin-core-server.httpservicesetup.md) |
 |  [logging](./kibana-plugin-core-server.coresetup.logging.md) | <code>LoggingServiceSetup</code> | [LoggingServiceSetup](./kibana-plugin-core-server.loggingservicesetup.md) |
+|  [metrics](./kibana-plugin-core-server.coresetup.metrics.md) | <code>MetricsServiceSetup</code> | [MetricsServiceSetup](./kibana-plugin-core-server.metricsservicesetup.md) |
 |  [savedObjects](./kibana-plugin-core-server.coresetup.savedobjects.md) | <code>SavedObjectsServiceSetup</code> | [SavedObjectsServiceSetup](./kibana-plugin-core-server.savedobjectsservicesetup.md) |
 |  [status](./kibana-plugin-core-server.coresetup.status.md) | <code>StatusServiceSetup</code> | [StatusServiceSetup](./kibana-plugin-core-server.statusservicesetup.md) |
 |  [uiSettings](./kibana-plugin-core-server.coresetup.uisettings.md) | <code>UiSettingsServiceSetup</code> | [UiSettingsServiceSetup](./kibana-plugin-core-server.uisettingsservicesetup.md) |

docs/development/core/server/kibana-plugin-core-server.coresetup.metrics.md

@@ -0,0 +1,13 @@
+<!-- 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; [CoreSetup](./kibana-plugin-core-server.coresetup.md) &gt; [metrics](./kibana-plugin-core-server.coresetup.metrics.md)
+
+## CoreSetup.metrics property
+
+[MetricsServiceSetup](./kibana-plugin-core-server.metricsservicesetup.md)
+
+<b>Signature:</b>
+
+```typescript
+metrics: MetricsServiceSetup;
+```

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

@@ -20,7 +20,7 @@ export interface CoreStart
 |  [capabilities](./kibana-plugin-core-server.corestart.capabilities.md) | <code>CapabilitiesStart</code> | [CapabilitiesStart](./kibana-plugin-core-server.capabilitiesstart.md) |
 |  [elasticsearch](./kibana-plugin-core-server.corestart.elasticsearch.md) | <code>ElasticsearchServiceStart</code> | [ElasticsearchServiceStart](./kibana-plugin-core-server.elasticsearchservicestart.md) |
 |  [http](./kibana-plugin-core-server.corestart.http.md) | <code>HttpServiceStart</code> | [HttpServiceStart](./kibana-plugin-core-server.httpservicestart.md) |
-|  [metrics](./kibana-plugin-core-server.corestart.metrics.md) | <code>MetricsServiceStart</code> |  |
+|  [metrics](./kibana-plugin-core-server.corestart.metrics.md) | <code>MetricsServiceStart</code> | [MetricsServiceStart](./kibana-plugin-core-server.metricsservicestart.md) |
 |  [savedObjects](./kibana-plugin-core-server.corestart.savedobjects.md) | <code>SavedObjectsServiceStart</code> | [SavedObjectsServiceStart](./kibana-plugin-core-server.savedobjectsservicestart.md) |
 |  [uiSettings](./kibana-plugin-core-server.corestart.uisettings.md) | <code>UiSettingsServiceStart</code> | [UiSettingsServiceStart](./kibana-plugin-core-server.uisettingsservicestart.md) |
 

docs/development/core/server/kibana-plugin-core-server.corestart.metrics.md

@@ -4,6 +4,7 @@
 
 ## CoreStart.metrics property
 
+[MetricsServiceStart](./kibana-plugin-core-server.metricsservicestart.md)
 
 <b>Signature:</b>
 

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

@@ -253,6 +253,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [LegacyElasticsearchClientConfig](./kibana-plugin-core-server.legacyelasticsearchclientconfig.md) |  |
 |  [LifecycleResponseFactory](./kibana-plugin-core-server.lifecycleresponsefactory.md) | Creates an object containing redirection or error response with error details, HTTP headers, and other data transmitted to the client. |
 |  [LoggerConfigType](./kibana-plugin-core-server.loggerconfigtype.md) |  |
+|  [MetricsServiceStart](./kibana-plugin-core-server.metricsservicestart.md) | APIs to retrieves metrics gathered and exposed by the core platform. |
 |  [MIGRATION\_ASSISTANCE\_INDEX\_ACTION](./kibana-plugin-core-server.migration_assistance_index_action.md) |  |
 |  [MIGRATION\_DEPRECATION\_LEVEL](./kibana-plugin-core-server.migration_deprecation_level.md) |  |
 |  [MutatingOperationRefreshSetting](./kibana-plugin-core-server.mutatingoperationrefreshsetting.md) | Elasticsearch Refresh setting for mutating operation |

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

@@ -0,0 +1,13 @@
+<!-- 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; [MetricsServiceStart](./kibana-plugin-core-server.metricsservicestart.md)
+
+## MetricsServiceStart type
+
+APIs to retrieves metrics gathered and exposed by the core platform.
+
+<b>Signature:</b>
+
+```typescript
+export declare type MetricsServiceStart = MetricsServiceSetup;
+```

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

@@ -13,18 +13,22 @@ ServiceStatusLevels: Readonly<{
     available: Readonly<{
         toString: () => "available";
         valueOf: () => 0;
+        toJSON: () => "available";
     }>;
     degraded: Readonly<{
         toString: () => "degraded";
         valueOf: () => 1;
+        toJSON: () => "degraded";
     }>;
     unavailable: Readonly<{
         toString: () => "unavailable";
         valueOf: () => 2;
+        toJSON: () => "unavailable";
     }>;
     critical: Readonly<{
         toString: () => "critical";
         valueOf: () => 3;
+        toJSON: () => "critical";
     }>;
 }>
 ```

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

@@ -12,5 +12,6 @@ export declare type SharedGlobalConfig = RecursiveReadonly<{
     kibana: Pick<KibanaConfigType, typeof SharedGlobalConfigKeys.kibana[number]>;
     elasticsearch: Pick<ElasticsearchConfigType, typeof SharedGlobalConfigKeys.elasticsearch[number]>;
     path: Pick<PathConfigType, typeof SharedGlobalConfigKeys.path[number]>;
+    savedObjects: Pick<SavedObjectsConfigType, typeof SharedGlobalConfigKeys.savedObjects[number]>;
 }>;
 ```

docs/development/core/server/kibana-plugin-core-server.statusservicesetup.isstatuspageanonymous.md

@@ -0,0 +1,13 @@
+<!-- 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; [StatusServiceSetup](./kibana-plugin-core-server.statusservicesetup.md) &gt; [isStatusPageAnonymous](./kibana-plugin-core-server.statusservicesetup.isstatuspageanonymous.md)
+
+## StatusServiceSetup.isStatusPageAnonymous property
+
+Whether or not the status HTTP APIs are available to unauthenticated users when an authentication provider is present.
+
+<b>Signature:</b>
+
+```typescript
+isStatusPageAnonymous: () => boolean;
+```

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

@@ -74,6 +74,7 @@ core.status.set(
 |  [core$](./kibana-plugin-core-server.statusservicesetup.core_.md) | <code>Observable&lt;CoreStatus&gt;</code> | Current status for all Core services. |
 |  [dependencies$](./kibana-plugin-core-server.statusservicesetup.dependencies_.md) | <code>Observable&lt;Record&lt;string, ServiceStatus&gt;&gt;</code> | Current status for all plugins this plugin depends on. Each key of the <code>Record</code> is a plugin id. |
 |  [derivedStatus$](./kibana-plugin-core-server.statusservicesetup.derivedstatus_.md) | <code>Observable&lt;ServiceStatus&gt;</code> | The status of this plugin as derived from its dependencies. |
+|  [isStatusPageAnonymous](./kibana-plugin-core-server.statusservicesetup.isstatuspageanonymous.md) | <code>() =&gt; boolean</code> | Whether or not the status HTTP APIs are available to unauthenticated users when an authentication provider is present. |
 |  [overall$](./kibana-plugin-core-server.statusservicesetup.overall_.md) | <code>Observable&lt;ServiceStatus&gt;</code> | Overall system status for all of Kibana. |
 
 ## Methods

docs/settings/reporting-settings.asciidoc

@@ -104,15 +104,14 @@ security is enabled, `xpack.security.encryptionKey`.
 [cols="2*<"]
 |===
 | `xpack.reporting.queue.pollInterval`
-  | Specifies the number of milliseconds that the reporting poller waits between polling the
-  index for any pending Reporting jobs. Defaults to `3000` (3 seconds).
+  | Specify the {ref}/common-options.html#time-units[time] that the reporting poller waits between polling the index for any
+  pending Reporting jobs. Can be specified as number of milliseconds. Defaults to `3s`.
 
 | [[xpack-reporting-q-timeout]] `xpack.reporting.queue.timeout` {ess-icon}
-  | How long each worker has to produce a report. If your machine is slow or under
-  heavy load, you might need to increase this timeout. Specified in milliseconds.
-  If a Reporting job execution time goes over this time limit, the job will be
-  marked as a failure and there will not be a download available.
-  Defaults to `120000` (two minutes).
+  | {ref}/common-options.html#time-units[How long] each worker has to produce a report. If your machine is slow or under heavy
+  load, you might need to increase this timeout. If a Reporting job execution goes over this time limit, the job is marked as a
+  failure and no download will be available. Can be specified as number of milliseconds.
+  Defaults to `2m`.
 
 |===
 
@@ -127,24 +126,24 @@ control the capturing process.
 |===
 a| `xpack.reporting.capture.timeouts`
 `.openUrl` {ess-icon}
-  | Specify how long to allow the Reporting browser to wait for the "Loading..." screen
-  to dismiss and find the initial data for the Kibana page.  If the time is
-  exceeded, a page screenshot is captured showing the current state, and the download link shows a warning message.
-  Defaults to `60000` (1 minute).
+  | Specify the {ref}/common-options.html#time-units[time] to allow the Reporting browser to wait for the "Loading..." screen
+  to dismiss and find the initial data for the page. If the time is exceeded, a screenshot is captured showing the current
+  page, and the download link shows a warning message. Can be specified as number of milliseconds.
+  Defaults to `1m`.
 
 a| `xpack.reporting.capture.timeouts`
 `.waitForElements` {ess-icon}
-  | Specify how long to allow the Reporting browser to wait for all visualization
-  panels to load on the Kibana page. If the time is exceeded, a page screenshot
-  is captured showing the current state, and the download link shows a warning message. Defaults to `30000` (30
-  seconds).
+  | Specify the {ref}/common-options.html#time-units[time] to allow the Reporting browser to wait for all visualization panels
+  to load on the page. If the time is exceeded, a screenshot is captured showing the current page, and the download link shows
+  a warning message. Can be specified as number of milliseconds.
+  Defaults to `30s`.
 
 a| `xpack.reporting.capture.timeouts`
 `.renderComplete` {ess-icon}
-  | Specify how long to allow the Reporting browser to wait for all visualizations to
-  fetch and render the data. If the time is exceeded, a
-  page screenshot is captured showing the current state, and the download link shows a warning message. Defaults to
-  `30000` (30 seconds).
+  | Specify the {ref}/common-options.html#time-units[time] to allow the Reporting browser to wait for all visualizations to
+  fetch and render the data. If the time is exceeded, a screenshot is captured showing the current page, and the download link shows a
+  warning message. Can be specified as number of milliseconds.
+  Defaults to `30s`.
 
 |===
 
@@ -163,11 +162,10 @@ available, but there will likely be errors in the visualizations in the report.
   job, as many times as this setting. Defaults to `3`.
 
 | `xpack.reporting.capture.loadDelay`
-  | When visualizations are not evented, this is the amount of time before
-  taking a screenshot. All visualizations that ship with {kib} are evented, so this
-  setting should not have much effect. If you are seeing empty images instead of
-  visualizations, try increasing this value.
-  Defaults to `3000` (3 seconds).
+  | Specify the {ref}/common-options.html#time-units[amount of time] before taking a screenshot when visualizations are not evented.
+  All visualizations that ship with {kib} are evented, so this setting should not have much effect. If you are seeing empty images
+  instead of visualizations, try increasing this value.
+  Defaults to `3s`.
 
 | [[xpack-reporting-browser]] `xpack.reporting.capture.browser.type` {ess-icon}
   | Specifies the browser to use to capture screenshots. This setting exists for
@@ -213,17 +211,17 @@ a| `xpack.reporting.capture.browser`
 [cols="2*<"]
 |===
 | [[xpack-reporting-csv]] `xpack.reporting.csv.maxSizeBytes` {ess-icon}
-  | The maximum size of a CSV file before being truncated. This setting exists to prevent
-  large exports from causing performance and storage issues.
-  Defaults to `10485760` (10mB).
+  | The maximum {ref}/common-options.html#byte-units[byte size] of a CSV file before being truncated. This setting exists to
+  prevent large exports from causing performance and storage issues. Can be specified as number of bytes.
+  Defaults to `10mb`.
 
 | `xpack.reporting.csv.scroll.size`
   | Number of documents retrieved from {es} for each scroll iteration during a CSV
   export.
   Defaults to `500`.
 
 | `xpack.reporting.csv.scroll.duration`
-  | Amount of time allowed before {kib} cleans the scroll context during a CSV export.
+  |  Amount of {ref}/common-options.html#time-units[time] allowed before {kib} cleans the scroll context during a CSV export.
   Defaults to `30s`.
 
 | `xpack.reporting.csv.checkForFormulas`

docs/user/alerting/action-types/server-log.asciidoc

@@ -2,7 +2,7 @@
 [[server-log-action-type]]
 === Server log action
 
-This action type writes and entry to the {kib} server log.
+This action type writes an entry to the {kib} server log.
 
 [float]
 [[server-log-connector-configuration]]

docs/user/dashboard/drilldowns.asciidoc

@@ -1,3 +1,4 @@
+[role="xpack"]
 [[drilldowns]]
 == Use drilldowns for dashboard actions