From 3dea4444b9bbc5dd9ff04d8517ff86d66f4de563 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Mon, 24 Aug 2020 12:07:28 -0400
Subject: [PATCH 001/148] [Lens] Remove beta labels (#75574)

* [Lens] Remove beta labels

* Remove translations

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../editor_frame/workspace_panel/workspace_panel.tsx      | 8 +-------
 x-pack/plugins/lens/public/vis_type_alias.ts              | 4 ++--
 x-pack/plugins/translations/translations/ja-JP.json       | 1 -
 x-pack/plugins/translations/translations/zh-CN.json       | 1 -
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
index 4f914bc65dc7c..06cd858eda210 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/workspace_panel.tsx
@@ -13,7 +13,6 @@ import {
   EuiIcon,
   EuiImage,
   EuiText,
-  EuiBetaBadge,
   EuiButtonEmpty,
   EuiLink,
 } from '@elastic/eui';
@@ -210,10 +209,6 @@ export function InnerWorkspacePanel({
   }
 
   function renderEmptyWorkspace() {
-    const tooltipContent = i18n.translate('xpack.lens.editorFrame.tooltipContent', {
-      defaultMessage:
-        'Lens is in beta and is subject to change.  The design and code is less mature than official GA features and is being provided as-is with no warranties. Beta features are not subject to the support SLA of official GA features',
-    });
     return (
       <div className="eui-textCenter">
         <EuiText textAlign="center" grow={false} color="subdued" data-test-subj="empty-workspace">
@@ -232,8 +227,7 @@ export function InnerWorkspacePanel({
             <FormattedMessage
               id="xpack.lens.editorFrame.emptyWorkspaceHeading"
               defaultMessage="Lens is a new tool for creating visualizations"
-            />{' '}
-            <EuiBetaBadge label="Beta" tooltipContent={tooltipContent} />
+            />
           </p>
           <p>
             <small>
diff --git a/x-pack/plugins/lens/public/vis_type_alias.ts b/x-pack/plugins/lens/public/vis_type_alias.ts
index 3bb2dbbae1f9c..d0dceed03db2f 100644
--- a/x-pack/plugins/lens/public/vis_type_alias.ts
+++ b/x-pack/plugins/lens/public/vis_type_alias.ts
@@ -27,7 +27,7 @@ export const getLensAliasConfig = (): VisTypeAlias => ({
     defaultMessage: `Lens is a simpler way to create basic visualizations`,
   }),
   icon: 'lensApp',
-  stage: 'beta',
+  stage: 'production',
   appExtensions: {
     visualizations: {
       docTypes: ['lens'],
@@ -42,7 +42,7 @@ export const getLensAliasConfig = (): VisTypeAlias => ({
           editUrl: getEditPath(id),
           editApp: 'lens',
           icon: 'lensApp',
-          stage: 'beta',
+          stage: 'production',
           savedObjectType: type,
           typeTitle: i18n.translate('xpack.lens.visTypeAlias.type', { defaultMessage: 'Lens' }),
         };
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 8287f8f42abdc..5572fc85bf130 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -9879,7 +9879,6 @@
     "xpack.lens.editorFrame.quickFunctionsLabel": "クイック機能",
     "xpack.lens.editorFrame.requiredDimensionWarningLabel": "必要な次元",
     "xpack.lens.editorFrame.suggestionPanelTitle": "提案",
-    "xpack.lens.editorFrame.tooltipContent": "レンズはベータ段階で、変更される可能性があります。 デザインとコードはオフィシャル GA 機能よりも完成度が低く、現状のまま保証なしで提供されています。ベータ機能にはオフィシャル GA 機能の SLA が適用されません",
     "xpack.lens.embeddable.failure": "ビジュアライゼーションを表示できませんでした",
     "xpack.lens.embeddableDisplayName": "レンズ",
     "xpack.lens.excludeValueButtonAriaLabel": "{value}を除外",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index aff78ad79ae48..36691eeadb928 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -9882,7 +9882,6 @@
     "xpack.lens.editorFrame.quickFunctionsLabel": "快选函数",
     "xpack.lens.editorFrame.requiredDimensionWarningLabel": "所需尺寸",
     "xpack.lens.editorFrame.suggestionPanelTitle": "建议",
-    "xpack.lens.editorFrame.tooltipContent": "Lens 为公测版，可能会进行更改。 设计和代码相对于正式发行版功能还不够成熟，将按原样提供，且不提供任何保证。公测版功能不受正式发行版功能支持 SLA 的约束",
     "xpack.lens.embeddable.failure": "无法显示可视化",
     "xpack.lens.embeddableDisplayName": "lens",
     "xpack.lens.excludeValueButtonAriaLabel": "排除 {value}",

From 9fa43b4e476aae9ea19fe445ef59425bd581ef39 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Mon, 24 Aug 2020 18:25:02 +0200
Subject: [PATCH 002/148] avoid error when logging invalid response error
 (#75757)

---
 .../client/configure_client.test.ts           | 38 +++++++++++++++++++
 .../elasticsearch/client/configure_client.ts  |  7 +---
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/core/server/elasticsearch/client/configure_client.test.ts b/src/core/server/elasticsearch/client/configure_client.test.ts
index 11e3199a79fd2..716e2fd98a5e1 100644
--- a/src/core/server/elasticsearch/client/configure_client.test.ts
+++ b/src/core/server/elasticsearch/client/configure_client.test.ts
@@ -157,6 +157,44 @@ describe('configureClient', () => {
       `);
     });
 
+    it('logs default error info when the error response body is empty', () => {
+      const client = configureClient(config, { logger, scoped: false });
+
+      let response = createApiResponse({
+        statusCode: 400,
+        headers: {},
+        body: {
+          error: {},
+        },
+      });
+      client.emit('response', new errors.ResponseError(response), response);
+
+      expect(loggingSystemMock.collect(logger).error).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            "[ResponseError]: Response Error",
+          ],
+        ]
+      `);
+
+      logger.error.mockClear();
+
+      response = createApiResponse({
+        statusCode: 400,
+        headers: {},
+        body: {} as any,
+      });
+      client.emit('response', new errors.ResponseError(response), response);
+
+      expect(loggingSystemMock.collect(logger).error).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            "[ResponseError]: Response Error",
+          ],
+        ]
+      `);
+    });
+
     it('logs each queries if `logQueries` is true', () => {
       const client = configureClient(
         createFakeConfig({
diff --git a/src/core/server/elasticsearch/client/configure_client.ts b/src/core/server/elasticsearch/client/configure_client.ts
index 9746ecb538b75..a777344813068 100644
--- a/src/core/server/elasticsearch/client/configure_client.ts
+++ b/src/core/server/elasticsearch/client/configure_client.ts
@@ -21,7 +21,6 @@ import { stringify } from 'querystring';
 import { Client } from '@elastic/elasticsearch';
 import { Logger } from '../../logging';
 import { parseClientOptions, ElasticsearchClientConfig } from './client_config';
-import { isResponseError } from './errors';
 
 export const configureClient = (
   config: ElasticsearchClientConfig,
@@ -39,10 +38,8 @@ const addLogging = (client: Client, logger: Logger, logQueries: boolean) => {
   client.on('response', (error, event) => {
     if (error) {
       const errorMessage =
-        // error details for response errors provided by elasticsearch
-        isResponseError(error)
-          ? `[${event.body.error.type}]: ${event.body.error.reason}`
-          : `[${error.name}]: ${error.message}`;
+        // error details for response errors provided by elasticsearch, defaults to error name/message
+        `[${event.body?.error?.type ?? error.name}]: ${event.body?.error?.reason ?? error.message}`;
 
       logger.error(errorMessage);
     }

From f49f010d906f4ed9de2014964e266e0195c73bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Mon, 24 Aug 2020 17:28:19 +0100
Subject: [PATCH 003/148] [Telemetry] Swallow errors in opt-in remote
 notification from the server (#75641)

---
 src/plugins/telemetry/server/plugin.ts              |  1 +
 src/plugins/telemetry/server/routes/index.ts        |  3 ++-
 .../telemetry/server/routes/telemetry_opt_in.ts     | 13 ++++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/plugins/telemetry/server/plugin.ts b/src/plugins/telemetry/server/plugin.ts
index 6c8888feafc1f..bd7a2a8c1a8ca 100644
--- a/src/plugins/telemetry/server/plugin.ts
+++ b/src/plugins/telemetry/server/plugin.ts
@@ -89,6 +89,7 @@ export class TelemetryPlugin implements Plugin {
       config$,
       currentKibanaVersion,
       isDev,
+      logger: this.logger,
       router,
       telemetryCollectionManager,
     });
diff --git a/src/plugins/telemetry/server/routes/index.ts b/src/plugins/telemetry/server/routes/index.ts
index ad84cb9d2665d..f46c616a734e0 100644
--- a/src/plugins/telemetry/server/routes/index.ts
+++ b/src/plugins/telemetry/server/routes/index.ts
@@ -18,7 +18,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { IRouter } from 'kibana/server';
+import { IRouter, Logger } from 'kibana/server';
 import { TelemetryCollectionManagerPluginSetup } from 'src/plugins/telemetry_collection_manager/server';
 import { registerTelemetryOptInRoutes } from './telemetry_opt_in';
 import { registerTelemetryUsageStatsRoutes } from './telemetry_usage_stats';
@@ -28,6 +28,7 @@ import { TelemetryConfigType } from '../config';
 
 interface RegisterRoutesParams {
   isDev: boolean;
+  logger: Logger;
   config$: Observable<TelemetryConfigType>;
   currentKibanaVersion: string;
   router: IRouter;
diff --git a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
index 7dd15f73029e7..aa1de4b2443a4 100644
--- a/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
+++ b/src/plugins/telemetry/server/routes/telemetry_opt_in.ts
@@ -21,7 +21,7 @@ import moment from 'moment';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { schema } from '@kbn/config-schema';
-import { IRouter } from 'kibana/server';
+import { IRouter, Logger } from 'kibana/server';
 import {
   StatsGetterConfig,
   TelemetryCollectionManagerPluginSetup,
@@ -39,12 +39,14 @@ import { TelemetryConfigType } from '../config';
 interface RegisterOptInRoutesParams {
   currentKibanaVersion: string;
   router: IRouter;
+  logger: Logger;
   config$: Observable<TelemetryConfigType>;
   telemetryCollectionManager: TelemetryCollectionManagerPluginSetup;
 }
 
 export function registerTelemetryOptInRoutes({
   config$,
+  logger,
   router,
   currentKibanaVersion,
   telemetryCollectionManager,
@@ -95,11 +97,16 @@ export function registerTelemetryOptInRoutes({
 
       if (config.sendUsageFrom === 'server') {
         const optInStatusUrl = config.optInStatusUrl;
-        await sendTelemetryOptInStatus(
+        sendTelemetryOptInStatus(
           telemetryCollectionManager,
           { optInStatusUrl, newOptInStatus },
           statsGetterConfig
-        );
+        ).catch((err) => {
+          // The server is likely behind a firewall and can't reach the remote service
+          logger.warn(
+            `Failed to notify "${optInStatusUrl}" from the server about the opt-in selection. Possibly blocked by a firewall? - Error: ${err.message}`
+          );
+        });
       }
 
       await updateTelemetrySavedObject(context.core.savedObjects.client, attributes);

From a3d3abd22d1a7c45d07768d0c3adc15d97a9029a Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Mon, 24 Aug 2020 12:29:52 -0400
Subject: [PATCH 004/148] [Maps] Introduce ILayer#isFittable (#75504)

---
 .../public/actions/data_request_actions.ts    |  6 +-
 .../maps/public/classes/layers/layer.test.ts  | 45 ++++++++++++
 .../maps/public/classes/layers/layer.tsx      |  5 ++
 .../layers/vector_layer/vector_layer.d.ts     |  1 +
 .../fit_to_data/fit_to_data.tsx               | 73 ++++++++++++++-----
 .../toolbar_overlay/fit_to_data/index.ts      |  4 +-
 .../maps/public/selectors/map_selectors.ts    | 14 ----
 7 files changed, 111 insertions(+), 37 deletions(-)

diff --git a/x-pack/plugins/maps/public/actions/data_request_actions.ts b/x-pack/plugins/maps/public/actions/data_request_actions.ts
index 41d9f3fc13b5b..2876f3d668a69 100644
--- a/x-pack/plugins/maps/public/actions/data_request_actions.ts
+++ b/x-pack/plugins/maps/public/actions/data_request_actions.ts
@@ -15,7 +15,6 @@ import { LAYER_STYLE_TYPE, LAYER_TYPE, SOURCE_DATA_REQUEST_ID } from '../../comm
 import {
   getDataFilters,
   getDataRequestDescriptor,
-  getFittableLayers,
   getLayerById,
   getLayerList,
 } from '../selectors/map_selectors';
@@ -324,13 +323,16 @@ export function fitToLayerExtent(layerId: string) {
 
 export function fitToDataBounds(onNoBounds?: () => void) {
   return async (dispatch: Dispatch, getState: () => MapStoreState) => {
-    const layerList = getFittableLayers(getState());
+    const layerList = getLayerList(getState());
 
     if (!layerList.length) {
       return;
     }
 
     const boundsPromises = layerList.map(async (layer: ILayer) => {
+      if (!(await layer.isFittable())) {
+        return null;
+      }
       return layer.getBounds(getDataRequestContext(dispatch, getState, layer.getId()));
     });
 
diff --git a/x-pack/plugins/maps/public/classes/layers/layer.test.ts b/x-pack/plugins/maps/public/classes/layers/layer.test.ts
index f25ecd7106457..7bc91d71f83e2 100644
--- a/x-pack/plugins/maps/public/classes/layers/layer.test.ts
+++ b/x-pack/plugins/maps/public/classes/layers/layer.test.ts
@@ -21,6 +21,10 @@ jest.mock('uuid/v4', () => {
 class MockLayer extends AbstractLayer {}
 
 class MockSource {
+  private readonly _fitToBounds: boolean;
+  constructor({ fitToBounds = true } = {}) {
+    this._fitToBounds = fitToBounds;
+  }
   cloneDescriptor() {
     return {};
   }
@@ -28,6 +32,10 @@ class MockSource {
   getDisplayName() {
     return 'mySource';
   }
+
+  async supportsFitToBounds() {
+    return this._fitToBounds;
+  }
 }
 
 class MockStyle {}
@@ -126,3 +134,40 @@ describe('cloneDescriptor', () => {
     });
   });
 });
+
+describe('isFittable', () => {
+  [
+    {
+      isVisible: true,
+      fitToBounds: true,
+      canFit: true,
+    },
+    {
+      isVisible: false,
+      fitToBounds: true,
+      canFit: false,
+    },
+    {
+      isVisible: true,
+      fitToBounds: false,
+      canFit: false,
+    },
+    {
+      isVisible: false,
+      fitToBounds: false,
+      canFit: false,
+    },
+  ].forEach((test) => {
+    it(`Should take into account layer visibility and bounds-retrieval: ${JSON.stringify(
+      test
+    )}`, async () => {
+      const layerDescriptor = AbstractLayer.createDescriptor({ visible: test.isVisible });
+      const layer = new MockLayer({
+        layerDescriptor,
+        source: (new MockSource({ fitToBounds: test.fitToBounds }) as unknown) as ISource,
+        style: (new MockStyle() as unknown) as IStyle,
+      });
+      expect(await layer.isFittable()).toBe(test.canFit);
+    });
+  });
+});
diff --git a/x-pack/plugins/maps/public/classes/layers/layer.tsx b/x-pack/plugins/maps/public/classes/layers/layer.tsx
index 424100c5a7e3a..8026f48fe6093 100644
--- a/x-pack/plugins/maps/public/classes/layers/layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/layer.tsx
@@ -90,6 +90,7 @@ export interface ILayer {
   supportsLabelsOnTop: () => boolean;
   showJoinEditor(): boolean;
   getJoinsDisabledReason(): string | null;
+  isFittable(): Promise<boolean>;
 }
 export type Footnote = {
   icon: ReactElement<any>;
@@ -233,6 +234,10 @@ export class AbstractLayer implements ILayer {
     return await this.getSource().supportsFitToBounds();
   }
 
+  async isFittable(): Promise<boolean> {
+    return (await this.supportsFitToBounds()) && this.isVisible();
+  }
+
   async getDisplayName(source?: ISource): Promise<string> {
     if (this._descriptor.label) {
       return this._descriptor.label;
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
index e6cb212daddae..ad4479d3a324b 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
@@ -83,4 +83,5 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
   getFeatureById(id: string | number): Feature | null;
   getPropertiesForTooltip(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
   hasJoins(): boolean;
+  isFittable(): Promise<boolean>;
 }
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx
index ca75060c4f8df..3f56d8d50b0f0 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/fit_to_data.tsx
@@ -15,24 +15,59 @@ interface Props {
   fitToBounds: () => void;
 }
 
-export const FitToData: React.FunctionComponent<Props> = ({ layerList, fitToBounds }: Props) => {
-  if (layerList.length === 0) {
-    return null;
+interface State {
+  canFit: boolean;
+}
+
+export class FitToData extends React.Component<Props, State> {
+  _isMounted: boolean = false;
+
+  state = { canFit: false };
+
+  componentDidMount(): void {
+    this._isMounted = true;
+    this._loadCanFit();
   }
 
-  return (
-    <EuiButtonIcon
-      className="mapToolbarOverlay__button"
-      onClick={fitToBounds}
-      data-test-subj="fitToData"
-      iconType="expand"
-      color="text"
-      aria-label={i18n.translate('xpack.maps.fitToData.fitButtonLabel', {
-        defaultMessage: 'Fit to data bounds',
-      })}
-      title={i18n.translate('xpack.maps.fitToData.fitAriaLabel', {
-        defaultMessage: 'Fit to data bounds',
-      })}
-    />
-  );
-};
+  componentWillUnmount(): void {
+    this._isMounted = false;
+  }
+
+  componentDidUpdate(): void {
+    this._loadCanFit();
+  }
+
+  async _loadCanFit() {
+    const promises = this.props.layerList.map(async (layer) => {
+      return await layer.isFittable();
+    });
+    const canFit = (await Promise.all(promises)).some((isFittable) => isFittable);
+    if (this._isMounted && this.state.canFit !== canFit) {
+      this.setState({
+        canFit,
+      });
+    }
+  }
+
+  render() {
+    if (!this.state.canFit) {
+      return null;
+    }
+
+    return (
+      <EuiButtonIcon
+        className="mapToolbarOverlay__button"
+        onClick={this.props.fitToBounds}
+        data-test-subj="fitToData"
+        iconType="expand"
+        color="text"
+        aria-label={i18n.translate('xpack.maps.fitToData.fitButtonLabel', {
+          defaultMessage: 'Fit to data bounds',
+        })}
+        title={i18n.translate('xpack.maps.fitToData.fitAriaLabel', {
+          defaultMessage: 'Fit to data bounds',
+        })}
+      />
+    );
+  }
+}
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/index.ts b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/index.ts
index 51bf0a519e380..8790f6f35c574 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/fit_to_data/index.ts
@@ -8,12 +8,12 @@ import { AnyAction, Dispatch } from 'redux';
 import { connect } from 'react-redux';
 import { MapStoreState } from '../../../reducers/store';
 import { fitToDataBounds } from '../../../actions';
-import { getFittableLayers } from '../../../selectors/map_selectors';
+import { getLayerList } from '../../../selectors/map_selectors';
 import { FitToData } from './fit_to_data';
 
 function mapStateToProps(state: MapStoreState) {
   return {
-    layerList: getFittableLayers(state),
+    layerList: getLayerList(state),
   };
 }
 
diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.ts b/x-pack/plugins/maps/public/selectors/map_selectors.ts
index d48ee24027561..03e0f753812c9 100644
--- a/x-pack/plugins/maps/public/selectors/map_selectors.ts
+++ b/x-pack/plugins/maps/public/selectors/map_selectors.ts
@@ -25,7 +25,6 @@ import { InnerJoin } from '../classes/joins/inner_join';
 import { getSourceByType } from '../classes/sources/source_registry';
 import { GeojsonFileSource } from '../classes/sources/geojson_file_source';
 import {
-  LAYER_TYPE,
   SOURCE_DATA_REQUEST_ID,
   STYLE_TYPE,
   VECTOR_STYLES,
@@ -307,19 +306,6 @@ export function getLayerById(layerId: string | null, state: MapStoreState): ILay
   });
 }
 
-export const getFittableLayers = createSelector(getLayerList, (layerList) => {
-  return layerList.filter((layer) => {
-    // These are the only layer-types that implement bounding-box retrieval reliably
-    // This will _not_ work if Maps will allow register custom layer types
-    const isFittable =
-      layer.getType() === LAYER_TYPE.VECTOR ||
-      layer.getType() === LAYER_TYPE.BLENDED_VECTOR ||
-      layer.getType() === LAYER_TYPE.HEATMAP;
-
-    return isFittable && layer.isVisible();
-  });
-});
-
 export const getHiddenLayerIds = createSelector(getLayerListRaw, (layers) =>
   layers.filter((layer) => !layer.visible).map((layer) => layer.id)
 );

From 8fe62c33a5a6fc96e6b3f94ba0111cfb22760a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Mon, 24 Aug 2020 17:32:52 +0100
Subject: [PATCH 005/148] [Data Telemetry] Rename dataset.* to data_stream.*
 (#75415)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../get_data_telemetry.test.ts                | 56 +++++++++----------
 .../get_data_telemetry/get_data_telemetry.ts  | 56 ++++++++++---------
 2 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts
index ad19def160200..dee718decdc1f 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.test.ts
@@ -59,16 +59,16 @@ describe('get_data_telemetry', () => {
     test('matches some indices and puts them in their own category', () => {
       expect(
         buildDataTelemetryPayload([
-          // APM Indices have known shipper (so we can infer the datasetType from mapping constant)
+          // APM Indices have known shipper (so we can infer the dataStreamType from mapping constant)
           { name: 'apm-7.7.0-error-000001', shipper: 'apm', isECS: true },
           { name: 'apm-7.7.0-metric-000001', shipper: 'apm', isECS: true },
           { name: 'apm-7.7.0-onboarding-2020.05.17', shipper: 'apm', isECS: true },
           { name: 'apm-7.7.0-profile-000001', shipper: 'apm', isECS: true },
           { name: 'apm-7.7.0-span-000001', shipper: 'apm', isECS: true },
           { name: 'apm-7.7.0-transaction-000001', shipper: 'apm', isECS: true },
-          // Packetbeat indices with known shipper (we can infer datasetType from mapping constant)
+          // Packetbeat indices with known shipper (we can infer dataStreamType from mapping constant)
           { name: 'packetbeat-7.7.0-2020.06.11-000001', shipper: 'packetbeat', isECS: true },
-          // Matching patterns from the list => known datasetName but the rest is unknown
+          // Matching patterns from the list => known dataStreamDataset but the rest is unknown
           { name: 'filebeat-12314', docCount: 100, sizeInBytes: 10 },
           { name: 'metricbeat-1234', docCount: 100, sizeInBytes: 10, isECS: false },
           { name: '.app-search-1234', docCount: 0 },
@@ -76,8 +76,8 @@ describe('get_data_telemetry', () => {
           // New Indexing strategy: everything can be inferred from the constant_keyword values
           {
             name: '.ds-logs-nginx.access-default-000001',
-            datasetName: 'nginx.access',
-            datasetType: 'logs',
+            dataStreamDataset: 'nginx.access',
+            dataStreamType: 'logs',
             shipper: 'filebeat',
             isECS: true,
             docCount: 1000,
@@ -85,8 +85,8 @@ describe('get_data_telemetry', () => {
           },
           {
             name: '.ds-logs-nginx.access-default-000002',
-            datasetName: 'nginx.access',
-            datasetType: 'logs',
+            dataStreamDataset: 'nginx.access',
+            dataStreamType: 'logs',
             shipper: 'filebeat',
             isECS: true,
             docCount: 1000,
@@ -94,8 +94,8 @@ describe('get_data_telemetry', () => {
           },
           {
             name: '.ds-traces-something-default-000002',
-            datasetName: 'something',
-            datasetType: 'traces',
+            dataStreamDataset: 'something',
+            dataStreamType: 'traces',
             packageName: 'some-package',
             isECS: true,
             docCount: 1000,
@@ -103,26 +103,26 @@ describe('get_data_telemetry', () => {
           },
           {
             name: '.ds-metrics-something.else-default-000002',
-            datasetName: 'something.else',
-            datasetType: 'metrics',
+            dataStreamDataset: 'something.else',
+            dataStreamType: 'metrics',
             managedBy: 'ingest-manager',
             isECS: true,
             docCount: 1000,
             sizeInBytes: 60,
           },
-          // Filter out if it has datasetName and datasetType but none of the shipper, packageName or managedBy === 'ingest-manager'
+          // Filter out if it has dataStreamDataset and dataStreamType but none of the shipper, packageName or managedBy === 'ingest-manager'
           {
             name: 'some-index-that-should-not-show',
-            datasetName: 'should-not-show',
-            datasetType: 'logs',
+            dataStreamDataset: 'should-not-show',
+            dataStreamType: 'logs',
             isECS: true,
             docCount: 1000,
             sizeInBytes: 60,
           },
           {
             name: 'other-index-that-should-not-show',
-            datasetName: 'should-not-show-either',
-            datasetType: 'metrics',
+            dataStreamDataset: 'should-not-show-either',
+            dataStreamType: 'metrics',
             managedBy: 'me',
             isECS: true,
             docCount: 1000,
@@ -167,7 +167,7 @@ describe('get_data_telemetry', () => {
           doc_count: 0,
         },
         {
-          dataset: { name: 'nginx.access', type: 'logs' },
+          data_stream: { dataset: 'nginx.access', type: 'logs' },
           shipper: 'filebeat',
           index_count: 2,
           ecs_index_count: 2,
@@ -175,7 +175,7 @@ describe('get_data_telemetry', () => {
           size_in_bytes: 1060,
         },
         {
-          dataset: { name: 'something', type: 'traces' },
+          data_stream: { dataset: 'something', type: 'traces' },
           package: { name: 'some-package' },
           index_count: 1,
           ecs_index_count: 1,
@@ -183,7 +183,7 @@ describe('get_data_telemetry', () => {
           size_in_bytes: 60,
         },
         {
-          dataset: { name: 'something.else', type: 'metrics' },
+          data_stream: { dataset: 'something.else', type: 'metrics' },
           index_count: 1,
           ecs_index_count: 1,
           doc_count: 1000,
@@ -236,7 +236,7 @@ describe('get_data_telemetry', () => {
     test('find an index that does not match any index pattern but has mappings metadata', async () => {
       const callCluster = mockCallCluster(
         ['cannot_match_anything'],
-        { isECS: true, datasetType: 'traces', shipper: 'my-beat' },
+        { isECS: true, dataStreamType: 'traces', shipper: 'my-beat' },
         {
           indices: {
             cannot_match_anything: {
@@ -247,7 +247,7 @@ describe('get_data_telemetry', () => {
       );
       await expect(getDataTelemetry(callCluster)).resolves.toStrictEqual([
         {
-          dataset: { name: undefined, type: 'traces' },
+          data_stream: { dataset: undefined, type: 'traces' },
           shipper: 'my-beat',
           index_count: 1,
           ecs_index_count: 1,
@@ -266,7 +266,7 @@ describe('get_data_telemetry', () => {
 
 function mockCallCluster(
   indicesMappings: string[] = [],
-  { isECS = false, datasetName = '', datasetType = '', shipper = '' } = {},
+  { isECS = false, dataStreamDataset = '', dataStreamType = '', shipper = '' } = {},
   indexStats: any = {}
 ) {
   return jest.fn().mockImplementation(async (method: string, opts: any) => {
@@ -279,14 +279,14 @@ function mockCallCluster(
               ...(shipper && { _meta: { beat: shipper } }),
               properties: {
                 ...(isECS && { ecs: { properties: { version: { type: 'keyword' } } } }),
-                ...((datasetType || datasetName) && {
-                  dataset: {
+                ...((dataStreamType || dataStreamDataset) && {
+                  data_stream: {
                     properties: {
-                      ...(datasetName && {
-                        name: { type: 'constant_keyword', value: datasetName },
+                      ...(dataStreamDataset && {
+                        dataset: { type: 'constant_keyword', value: dataStreamDataset },
                       }),
-                      ...(datasetType && {
-                        type: { type: 'constant_keyword', value: datasetType },
+                      ...(dataStreamType && {
+                        type: { type: 'constant_keyword', value: dataStreamType },
                       }),
                     },
                   },
diff --git a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts
index 079f510bb256a..f4734dde251cc 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_data_telemetry/get_data_telemetry.ts
@@ -32,9 +32,9 @@ export interface DataTelemetryBasePayload {
 }
 
 export interface DataTelemetryDocument extends DataTelemetryBasePayload {
-  dataset?: {
-    name?: string;
-    type?: DataTelemetryType | 'unknown' | string; // The union of types is to help autocompletion with some known `dataset.type`s
+  data_stream?: {
+    dataset?: string;
+    type?: DataTelemetryType | string; // The union of types is to help autocompletion with some known `data_stream.type`s
   };
   package?: {
     name: string;
@@ -49,8 +49,8 @@ export interface DataTelemetryIndex {
   name: string;
   packageName?: string; // Populated by Ingest Manager at `_meta.package.name`
   managedBy?: string; // Populated by Ingest Manager at `_meta.managed_by`
-  datasetName?: string; // To be obtained from `mappings.dataset.name` if it's a constant keyword
-  datasetType?: string; // To be obtained from `mappings.dataset.type` if it's a constant keyword
+  dataStreamDataset?: string; // To be obtained from `mappings.data_stream.dataset` if it's a constant keyword
+  dataStreamType?: string; // To be obtained from `mappings.data_stream.type` if it's a constant keyword
   shipper?: string; // To be obtained from `_meta.beat` if it's set
   isECS?: boolean; // Optional because it can't be obtained via Monitoring.
 
@@ -64,8 +64,8 @@ type AtLeastOne<T, U = { [K in keyof T]: Pick<T, K> }> = Partial<T> & U[keyof U]
 
 type DataDescriptor = AtLeastOne<{
   packageName: string;
-  datasetName: string;
-  datasetType: string;
+  dataStreamDataset: string;
+  dataStreamType: string;
   shipper: string;
   patternName: DataPatternName; // When found from the list of the index patterns
 }>;
@@ -75,24 +75,24 @@ function findMatchingDescriptors({
   shipper,
   packageName,
   managedBy,
-  datasetName,
-  datasetType,
+  dataStreamDataset,
+  dataStreamType,
 }: DataTelemetryIndex): DataDescriptor[] {
   // If we already have the data from the indices' mappings...
   if (
     [shipper, packageName].some(Boolean) ||
-    (managedBy === 'ingest-manager' && [datasetType, datasetName].some(Boolean))
+    (managedBy === 'ingest-manager' && [dataStreamType, dataStreamDataset].some(Boolean))
   ) {
     return [
       {
         ...(shipper && { shipper }),
         ...(packageName && { packageName }),
-        ...(datasetName && { datasetName }),
-        ...(datasetType && { datasetType }),
+        ...(dataStreamDataset && { dataStreamDataset }),
+        ...(dataStreamType && { dataStreamType }),
       } as AtLeastOne<{
         packageName: string;
-        datasetName: string;
-        datasetType: string;
+        dataStreamDataset: string;
+        dataStreamType: string;
         shipper: string;
       }>, // Using casting here because TS doesn't infer at least one exists from the if clause
     ];
@@ -149,15 +149,17 @@ export function buildDataTelemetryPayload(indices: DataTelemetryIndex[]): DataTe
   for (const indexCandidate of indexCandidates) {
     const matchingDescriptors = findMatchingDescriptors(indexCandidate);
     for (const {
-      datasetName,
-      datasetType,
+      dataStreamDataset,
+      dataStreamType,
       packageName,
       shipper,
       patternName,
     } of matchingDescriptors) {
-      const key = `${datasetName}-${datasetType}-${packageName}-${shipper}-${patternName}`;
+      const key = `${dataStreamDataset}-${dataStreamType}-${packageName}-${shipper}-${patternName}`;
       acc.set(key, {
-        ...((datasetName || datasetType) && { dataset: { name: datasetName, type: datasetType } }),
+        ...((dataStreamDataset || dataStreamType) && {
+          data_stream: { dataset: dataStreamDataset, type: dataStreamType },
+        }),
         ...(packageName && { package: { name: packageName } }),
         ...(shipper && { shipper }),
         ...(patternName && { pattern_name: patternName }),
@@ -198,9 +200,9 @@ interface IndexMappings {
         managed_by?: string; // Typically "ingest-manager"
       };
       properties: {
-        dataset?: {
+        data_stream?: {
           properties: {
-            name?: {
+            dataset?: {
               type: string;
               value?: string;
             };
@@ -242,10 +244,10 @@ export async function getDataTelemetry(callCluster: LegacyAPICaller) {
           // Does it have `ecs.version` in the mappings? => It follows the ECS conventions
           '*.mappings.properties.ecs.properties.version.type',
 
-          // If `dataset.type` is a `constant_keyword`, it can be reported as a type
-          '*.mappings.properties.dataset.properties.type.value',
-          // If `dataset.name` is a `constant_keyword`, it can be reported as the dataset
-          '*.mappings.properties.dataset.properties.name.value',
+          // If `data_stream.type` is a `constant_keyword`, it can be reported as a type
+          '*.mappings.properties.data_stream.properties.type.value',
+          // If `data_stream.dataset` is a `constant_keyword`, it can be reported as the dataset
+          '*.mappings.properties.data_stream.properties.dataset.value',
         ],
       }),
       // GET <index>/_stats/docs,store?level=indices&filter_path=indices.*.total
@@ -265,8 +267,10 @@ export async function getDataTelemetry(callCluster: LegacyAPICaller) {
         shipper: indexMappings[name]?.mappings?._meta?.beat,
         packageName: indexMappings[name]?.mappings?._meta?.package?.name,
         managedBy: indexMappings[name]?.mappings?._meta?.managed_by,
-        datasetName: indexMappings[name]?.mappings?.properties.dataset?.properties.name?.value,
-        datasetType: indexMappings[name]?.mappings?.properties.dataset?.properties.type?.value,
+        dataStreamDataset:
+          indexMappings[name]?.mappings?.properties.data_stream?.properties.dataset?.value,
+        dataStreamType:
+          indexMappings[name]?.mappings?.properties.data_stream?.properties.type?.value,
       };
 
       const stats = (indexStats?.indices || {})[name];

From f495b7def59bdf88d013551b0d7a504167736b51 Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@hotmail.com>
Date: Mon, 24 Aug 2020 12:42:11 -0400
Subject: [PATCH 006/148] Updated and unskipped lens breadcrumb test after
 #74523 (#75714)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/plugins/lens/public/app_plugin/app.test.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
index 892058d82a80f..2b979f064b8eb 100644
--- a/x-pack/plugins/lens/public/app_plugin/app.test.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
@@ -300,7 +300,7 @@ describe('Lens App', () => {
     ]);
   });
 
-  it.skip('sets originatingApp breadcrumb when the document title changes', async () => {
+  it('sets originatingApp breadcrumb when the document title changes', async () => {
     const defaultArgs = makeDefaultArgs();
     defaultArgs.originatingApp = 'ultraCoolDashboard';
     defaultArgs.getAppNameFromId = () => 'The Coolest Container Ever Made';
@@ -315,11 +315,11 @@ describe('Lens App', () => {
     (defaultArgs.docStorage.load as jest.Mock).mockResolvedValue({
       id: '1234',
       title: 'Daaaaaaadaumching!',
-      expression: 'valid expression',
       state: {
         query: 'fake query',
-        datasourceMetaData: { filterableIndexPatterns: [{ id: '1', title: 'saved' }] },
+        filters: [],
       },
+      references: [],
     });
     await act(async () => {
       instance.setProps({ docId: '1234' });

From c5870589af97658cd48cccca247d9d68f9a6cf97 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Mon, 24 Aug 2020 11:41:47 -0600
Subject: [PATCH 007/148] Expose overall status to plugins (#75503)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...a-plugin-core-server.statusservicesetup.md |  1 +
 ...core-server.statusservicesetup.overall_.md | 20 +++++++++++++++++++
 src/core/server/legacy/legacy_service.ts      |  1 +
 src/core/server/plugins/plugin_context.ts     |  1 +
 src/core/server/server.api.md                 |  1 +
 src/core/server/status/status_service.mock.ts |  1 +
 src/core/server/status/types.ts               | 15 ++++++++++----
 7 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.statusservicesetup.overall_.md

diff --git a/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.md b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.md
index 0551a217520ad..3d3b73ccda25f 100644
--- a/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.md
+++ b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.md
@@ -17,4 +17,5 @@ export interface StatusServiceSetup
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [core$](./kibana-plugin-core-server.statusservicesetup.core_.md) | <code>Observable&lt;CoreStatus&gt;</code> | Current status for all Core services. |
+|  [overall$](./kibana-plugin-core-server.statusservicesetup.overall_.md) | <code>Observable&lt;ServiceStatus&gt;</code> | Overall system status for all of Kibana. |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.overall_.md b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.overall_.md
new file mode 100644
index 0000000000000..bb7c31311d520
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.overall_.md
@@ -0,0 +1,20 @@
+<!-- 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; [overall$](./kibana-plugin-core-server.statusservicesetup.overall_.md)
+
+## StatusServiceSetup.overall$ property
+
+Overall system status for all of Kibana.
+
+<b>Signature:</b>
+
+```typescript
+overall$: Observable<ServiceStatus>;
+```
+
+## Remarks
+
+The level of the overall status will reflect the most severe status of any core service or plugin.
+
+Exposed only for reporting purposes to outside systems and should not be used by plugins. Instead, plugins should only depend on the statuses of [Core](./kibana-plugin-core-server.statusservicesetup.core_.md) or their dependencies.
+
diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
index 0c1e8562a1deb..f39282a6f9cb0 100644
--- a/src/core/server/legacy/legacy_service.ts
+++ b/src/core/server/legacy/legacy_service.ts
@@ -322,6 +322,7 @@ export class LegacyService implements CoreService {
       },
       status: {
         core$: setupDeps.core.status.core$,
+        overall$: setupDeps.core.status.overall$,
       },
       uiSettings: {
         register: setupDeps.core.uiSettings.register,
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
index 5235f3ee6d580..62058f6d478e7 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -178,6 +178,7 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
     },
     status: {
       core$: deps.status.core$,
+      overall$: deps.status.overall$,
     },
     uiSettings: {
       register: deps.uiSettings.register,
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index afc71d39d4a62..cd7f4973f886c 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -2802,6 +2802,7 @@ export type StartServicesAccessor<TPluginsStart extends object = object, TStart
 // @public
 export interface StatusServiceSetup {
     core$: Observable<CoreStatus>;
+    overall$: Observable<ServiceStatus>;
 }
 
 // @public
diff --git a/src/core/server/status/status_service.mock.ts b/src/core/server/status/status_service.mock.ts
index c6eb11be6967c..47ef8659b4079 100644
--- a/src/core/server/status/status_service.mock.ts
+++ b/src/core/server/status/status_service.mock.ts
@@ -39,6 +39,7 @@ const availableCoreStatus: CoreStatus = {
 const createSetupContractMock = () => {
   const setupContract: jest.Mocked<StatusServiceSetup> = {
     core$: new BehaviorSubject(availableCoreStatus),
+    overall$: new BehaviorSubject(available),
   };
 
   return setupContract;
diff --git a/src/core/server/status/types.ts b/src/core/server/status/types.ts
index b04c25a1eee93..2ecf11deb2960 100644
--- a/src/core/server/status/types.ts
+++ b/src/core/server/status/types.ts
@@ -123,13 +123,20 @@ export interface StatusServiceSetup {
    * Current status for all Core services.
    */
   core$: Observable<CoreStatus>;
-}
 
-/** @internal */
-export interface InternalStatusServiceSetup extends StatusServiceSetup {
   /**
-   * Overall system status used for HTTP API
+   * Overall system status for all of Kibana.
+   *
+   * @remarks
+   * The level of the overall status will reflect the most severe status of any core service or plugin.
+   *
+   * Exposed only for reporting purposes to outside systems and should not be used by plugins. Instead, plugins should
+   * only depend on the statuses of {@link StatusServiceSetup.core$ | Core} or their dependencies.
    */
   overall$: Observable<ServiceStatus>;
+}
+
+/** @internal */
+export interface InternalStatusServiceSetup extends StatusServiceSetup {
   isStatusPageAnonymous: () => boolean;
 }

From 9dfcde2ceeb8abec319efe4d16534d6ecddcefe2 Mon Sep 17 00:00:00 2001
From: Frank Hassanabad <frank.hassanabad@elastic.co>
Date: Mon, 24 Aug 2020 12:12:48 -0600
Subject: [PATCH 008/148] Reduces field capabilities event loop block times by
 scaling linearly using hashes (#75718)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

On the `security_solution` project from different customers we have been getting reports of scaling issues and excessive NodeJS event blocking times. After in-depth tracing through some of the index and field capabilities calls we identified two of the "hot paths" running through `field_capabilities` to where it is using double looped arrays rather than hashes. By switching these two hot spots out for hashes we are now able to reduce the event loop block times by an order of magnitude.

Before this PR you can see event loop block times as high as:

```ts
field_cap: 575.131ms
```

And after this PR you will see event loop block times drop by an order of magnitude to:

```ts
field_cap: 31.783ms
```

when you're calling into indexes as large as `filebeat-*`. This number can be higher if you're concatenating several large indexes together trying to get capabilities from each one all at once. We already only call `getFieldCapabilities` with one index at a time to spread out event block times.

The fix is to use a hash within two key areas within these two files:

```ts
src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
```

This effect happens during the query of `SourceQuery`/`IndexFields` within `security_solution` but you should be able to trigger it with any application code who calls into those code paths with large index sizes such as `filebeat-*` anywhere in Kibana.

An explanation of how to see the block times for before and after
---

Add, `console.time('field_cap');` and `console.timeEnd('field_cap');` to where the synchronize code is for testing the optimizations of before and after.

For example around lines 45 with the original code:
```ts
  const esFieldCaps: FieldCapsResponse = await callFieldCapsApi(callCluster, indices);
  console.time('field_cap'); // <--- start timer
  const fieldsFromFieldCapsByName = keyBy(readFieldCapsResponse(esFieldCaps), 'name');

  const allFieldsUnsorted = Object.keys(fieldsFromFieldCapsByName)
    .filter((name) => !name.startsWith('_'))
    .concat(metaFields)
    .reduce(concatIfUniq, [] as string[])
    .map<FieldDescriptor>((name) =>
      defaults({}, fieldsFromFieldCapsByName[name], {
        name,
        type: 'string',
        searchable: false,
        aggregatable: false,
        readFromDocValues: false,
      })
    )
    .map(mergeOverrides);

  const sorted = sortBy(allFieldsUnsorted, 'name');
  console.timeEnd('field_cap'); // <--- outputs the end timer
  return sorted;

```

And around lines 45 with this pull request:

```ts
  const esFieldCaps: FieldCapsResponse = await callFieldCapsApi(callCluster, indices);
  console.time('field_cap'); // <--- start timer
  const fieldsFromFieldCapsByName = keyBy(readFieldCapsResponse(esFieldCaps), 'name');

  const allFieldsUnsorted = Object.keys(fieldsFromFieldCapsByName)
    .filter((name) => !name.startsWith('_'))
    .concat(metaFields)
    .reduce<{ names: string[]; hash: Record<string, string> }>(
      (agg, value) => {
        // This is intentionally using a "hash" and a "push" to be highly optimized with very large indexes
        if (agg.hash[value] != null) {
          return agg;
        } else {
          agg.hash[value] = value;
          agg.names.push(value);
          return agg;
        }
      },
      { names: [], hash: {} }
    )
    .names.map<FieldDescriptor>((name) =>
      defaults({}, fieldsFromFieldCapsByName[name], {
        name,
        type: 'string',
        searchable: false,
        aggregatable: false,
        readFromDocValues: false,
      })
    )
    .map(mergeOverrides);

  const sorted = sortBy(allFieldsUnsorted, 'name');
  console.timeEnd('field_cap'); // <--- outputs the end timer
  return sorted;

```

And then reload the security solutions application web page or generically anything that is going to call filebeat-* index or another large index or you could concatenate several indexes together as well to test out the performance. For security solutions we can just visit any page such as this one below which has a filebeat-* index:

```
http://localhost:5601/app/security/timelines/
```

Be sure to load it _twice_ for testing as NodeJS will sometimes report better numbers the second time as it does optimizations after the first time it encounters some code paths.

You should begin to see numbers similar to this in the before:

```ts
field_cap: 575.131ms
```

This indicates that it is blocking the event loop for around half a second before this fix. If an application adds additional indexes on-top of `filebeat`, or if it tries to execute other code after this (which we do in security solutions) then the block times will climb even higher.


However, after this fix, the m^n are changed to use hashing so this only climb by some constant * n where n is your fields and for filebeat-* it will should very low around:

```ts
field_cap: 31.783ms
```

### Checklist

Unit tests already present, so this shouldn't break anything 🤞 .
- [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
---
 .../field_capabilities/field_capabilities.ts  | 20 +++++++----
 .../field_capabilities/field_caps_response.ts | 34 ++++++++++++++-----
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
index b4b86b73a5f4a..6b26c82dc95e7 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_capabilities.ts
@@ -25,10 +25,6 @@ import { FieldCapsResponse, readFieldCapsResponse } from './field_caps_response'
 import { mergeOverrides } from './overrides';
 import { FieldDescriptor } from '../../index_patterns_fetcher';
 
-export function concatIfUniq<T>(arr: T[], value: T) {
-  return arr.includes(value) ? arr : arr.concat(value);
-}
-
 /**
  *  Get the field capabilities for field in `indices`, excluding
  *  all internal/underscore-prefixed fields that are not in `metaFields`
@@ -49,8 +45,20 @@ export async function getFieldCapabilities(
   const allFieldsUnsorted = Object.keys(fieldsFromFieldCapsByName)
     .filter((name) => !name.startsWith('_'))
     .concat(metaFields)
-    .reduce(concatIfUniq, [] as string[])
-    .map<FieldDescriptor>((name) =>
+    .reduce<{ names: string[]; hash: Record<string, string> }>(
+      (agg, value) => {
+        // This is intentionally using a "hash" and a "push" to be highly optimized with very large indexes
+        if (agg.hash[value] != null) {
+          return agg;
+        } else {
+          agg.hash[value] = value;
+          agg.names.push(value);
+          return agg;
+        }
+      },
+      { names: [], hash: {} }
+    )
+    .names.map<FieldDescriptor>((name) =>
       defaults({}, fieldsFromFieldCapsByName[name], {
         name,
         type: 'string',
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
index cb1ec6a2ebcf3..861b92569faf2 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -93,8 +93,12 @@ export interface FieldCapsResponse {
  */
 export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): FieldDescriptor[] {
   const capsByNameThenType = fieldCapsResponse.fields;
-  const kibanaFormattedCaps: FieldDescriptor[] = Object.keys(capsByNameThenType).map(
-    (fieldName) => {
+
+  const kibanaFormattedCaps = Object.keys(capsByNameThenType).reduce<{
+    array: FieldDescriptor[];
+    hash: Record<string, FieldDescriptor>;
+  }>(
+    (agg, fieldName) => {
       const capsByType = capsByNameThenType[fieldName];
       const types = Object.keys(capsByType);
 
@@ -119,7 +123,7 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie
       // ignore the conflict and carry on (my wayward son)
       const uniqueKibanaTypes = uniq(types.map(castEsToKbnFieldTypeName));
       if (uniqueKibanaTypes.length > 1) {
-        return {
+        const field = {
           name: fieldName,
           type: 'conflict',
           esTypes: types,
@@ -134,10 +138,14 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie
             {}
           ),
         };
+        // This is intentionally using a "hash" and a "push" to be highly optimized with very large indexes
+        agg.array.push(field);
+        agg.hash[fieldName] = field;
+        return agg;
       }
 
       const esType = types[0];
-      return {
+      const field = {
         name: fieldName,
         type: castEsToKbnFieldTypeName(esType),
         esTypes: types,
@@ -145,11 +153,19 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie
         aggregatable: isAggregatable,
         readFromDocValues: shouldReadFieldFromDocValues(isAggregatable, esType),
       };
+      // This is intentionally using a "hash" and a "push" to be highly optimized with very large indexes
+      agg.array.push(field);
+      agg.hash[fieldName] = field;
+      return agg;
+    },
+    {
+      array: [],
+      hash: {},
     }
   );
 
   // Get all types of sub fields. These could be multi fields or children of nested/object types
-  const subFields = kibanaFormattedCaps.filter((field) => {
+  const subFields = kibanaFormattedCaps.array.filter((field) => {
     return field.name.includes('.');
   });
 
@@ -161,9 +177,9 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie
       .map((_, index, parentFieldNameParts) => {
         return parentFieldNameParts.slice(0, index + 1).join('.');
       });
-    const parentFieldCaps = parentFieldNames.map((parentFieldName) => {
-      return kibanaFormattedCaps.find((caps) => caps.name === parentFieldName);
-    });
+    const parentFieldCaps = parentFieldNames.map(
+      (parentFieldName) => kibanaFormattedCaps.hash[parentFieldName]
+    );
     const parentFieldCapsAscending = parentFieldCaps.reverse();
 
     if (parentFieldCaps && parentFieldCaps.length > 0) {
@@ -188,7 +204,7 @@ export function readFieldCapsResponse(fieldCapsResponse: FieldCapsResponse): Fie
     }
   });
 
-  return kibanaFormattedCaps.filter((field) => {
+  return kibanaFormattedCaps.array.filter((field) => {
     return !['object', 'nested'].includes(field.type);
   });
 }

From d20c653bb47e5ed1c58ff28baaeaf0aaa0bb5150 Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Mon, 24 Aug 2020 11:56:14 -0700
Subject: [PATCH 009/148] [DOCS] Adds redirect for rbac content (#75803)

---
 docs/developer/architecture/security/rbac.asciidoc | 6 +++---
 docs/redirects.asciidoc                            | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/developer/architecture/security/rbac.asciidoc b/docs/developer/architecture/security/rbac.asciidoc
index 7b35a91ca73d0..451e833651a70 100644
--- a/docs/developer/architecture/security/rbac.asciidoc
+++ b/docs/developer/architecture/security/rbac.asciidoc
@@ -1,4 +1,4 @@
-[[development-security-rbac]]
+[[development-rbac]]
 == Role-based access control
 
 Role-based access control (RBAC) in {kib} relies upon the
@@ -7,7 +7,7 @@ that {es} exposes. This allows {kib} to define the privileges that
 {kib} wishes to grant to users, assign them to the relevant users using roles,
 and then authorize the user to perform a specific action. This is handled within
 a secured instance of the `SavedObjectsClient` and available transparently to
-consumers when using `request.getSavedObjectsClient()` or 
+consumers when using `request.getSavedObjectsClient()` or
 `savedObjects.getScopedSavedObjectsClient()`.
 
 [[development-rbac-privileges]]
@@ -77,7 +77,7 @@ The application is created by concatenating the prefix of `kibana-` with the val
  }
 ----------------------------------
 
-Roles that grant <<kibana-privileges>> should be managed using the <<role-management-api>> or the *Management -> Security -> Roles* page, not directly using the {es} {ref}/security-api.html#security-role-apis[role management API]. This role can then be assigned to users using the {es} 
+Roles that grant <<kibana-privileges>> should be managed using the <<role-management-api>> or the *Management -> Security -> Roles* page, not directly using the {es} {ref}/security-api.html#security-role-apis[role management API]. This role can then be assigned to users using the {es}
 {ref}/security-api.html#security-user-apis[user management APIs].
 
 [[development-rbac-authorization]]
diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc
index 58687d99627b6..1a20c1df582e6 100644
--- a/docs/redirects.asciidoc
+++ b/docs/redirects.asciidoc
@@ -90,3 +90,8 @@ Watcher error reports have been removed and replaced with Kibana's <<apm-alerts,
 To create error alerts with new tool, select **Alerts** - **Create threshold alert** - **Error rate**.
 
 More information on this new feature is available in <<apm-alerts>>.
+
+[role="exclude",id="development-security-rbac"]
+== Role-based access control
+
+This content has moved to the <<development-rbac, Security>> page.

From 4e3f47ac62f3a7cc4a882204f76b547fa8c93155 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Mon, 24 Aug 2020 21:39:57 +0200
Subject: [PATCH 010/148] migrate 'core' ui settings to core (#75544)

* migrate ui settings to core

* add basic test on service

* add unit tests

* adapt buildNum schema

* use any for buildNum...

* move i18n keys to core prefix

* translate added validation messages

* using number for schema for buildNum

* move state:storeInSessionStorage setting to core

* remove overrides config validation

* remove defaultRoute from config schema
---
 .../settings/accessibility.test.ts            |  44 +++
 .../ui_settings/settings/accessibility.ts     |  40 +++
 .../ui_settings/settings/date_formats.test.ts | 104 ++++++
 .../ui_settings/settings/date_formats.ts      | 168 ++++++++++
 .../server/ui_settings/settings/index.test.ts |  44 +++
 src/core/server/ui_settings/settings/index.ts |  39 +++
 .../server/ui_settings/settings/misc.test.ts  |  42 +++
 src/core/server/ui_settings/settings/misc.ts  |  42 +++
 .../ui_settings/settings/navigation.test.ts   |  56 ++++
 .../server/ui_settings/settings/navigation.ts |  72 +++++
 .../settings/notifications.test.ts            | 118 +++++++
 .../ui_settings/settings/notifications.ts     | 120 +++++++
 .../server/ui_settings/settings/state.test.ts |  43 +++
 src/core/server/ui_settings/settings/state.ts |  40 +++
 .../server/ui_settings/settings/theme.test.ts |  57 ++++
 src/core/server/ui_settings/settings/theme.ts |  51 +++
 .../server/ui_settings/ui_settings_config.ts  |  15 +-
 .../ui_settings_service.test.mock.ts          |   6 +-
 .../ui_settings/ui_settings_service.test.ts   |  11 +-
 .../server/ui_settings/ui_settings_service.ts |   3 +
 .../kibana/server/ui_setting_defaults.js      | 300 ------------------
 .../translations/translations/ja-JP.json      |  82 ++---
 .../translations/translations/zh-CN.json      |  82 ++---
 23 files changed, 1181 insertions(+), 398 deletions(-)
 create mode 100644 src/core/server/ui_settings/settings/accessibility.test.ts
 create mode 100644 src/core/server/ui_settings/settings/accessibility.ts
 create mode 100644 src/core/server/ui_settings/settings/date_formats.test.ts
 create mode 100644 src/core/server/ui_settings/settings/date_formats.ts
 create mode 100644 src/core/server/ui_settings/settings/index.test.ts
 create mode 100644 src/core/server/ui_settings/settings/index.ts
 create mode 100644 src/core/server/ui_settings/settings/misc.test.ts
 create mode 100644 src/core/server/ui_settings/settings/misc.ts
 create mode 100644 src/core/server/ui_settings/settings/navigation.test.ts
 create mode 100644 src/core/server/ui_settings/settings/navigation.ts
 create mode 100644 src/core/server/ui_settings/settings/notifications.test.ts
 create mode 100644 src/core/server/ui_settings/settings/notifications.ts
 create mode 100644 src/core/server/ui_settings/settings/state.test.ts
 create mode 100644 src/core/server/ui_settings/settings/state.ts
 create mode 100644 src/core/server/ui_settings/settings/theme.test.ts
 create mode 100644 src/core/server/ui_settings/settings/theme.ts

diff --git a/src/core/server/ui_settings/settings/accessibility.test.ts b/src/core/server/ui_settings/settings/accessibility.test.ts
new file mode 100644
index 0000000000000..8d8f9d00fadaa
--- /dev/null
+++ b/src/core/server/ui_settings/settings/accessibility.test.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UiSettingsParams } from '../../../types';
+import { getAccessibilitySettings } from './accessibility';
+
+describe('accessibility settings', () => {
+  const accessibilitySettings = getAccessibilitySettings();
+
+  const getValidationFn = (setting: UiSettingsParams) => (value: any) =>
+    setting.schema.validate(value);
+
+  describe('accessibility:disableAnimations', () => {
+    const validate = getValidationFn(accessibilitySettings['accessibility:disableAnimations']);
+
+    it('should only accept boolean', () => {
+      expect(() => validate(true)).not.toThrow();
+      expect(() => validate(false)).not.toThrow();
+
+      expect(() => validate(42)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [boolean] but got [number]"`
+      );
+      expect(() => validate('foo')).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [boolean] but got [string]"`
+      );
+    });
+  });
+});
diff --git a/src/core/server/ui_settings/settings/accessibility.ts b/src/core/server/ui_settings/settings/accessibility.ts
new file mode 100644
index 0000000000000..ddf3e53d91189
--- /dev/null
+++ b/src/core/server/ui_settings/settings/accessibility.ts
@@ -0,0 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { i18n } from '@kbn/i18n';
+import { UiSettingsParams } from '../../../types';
+
+export const getAccessibilitySettings = (): Record<string, UiSettingsParams> => {
+  return {
+    'accessibility:disableAnimations': {
+      name: i18n.translate('core.ui_settings.params.disableAnimationsTitle', {
+        defaultMessage: 'Disable Animations',
+      }),
+      value: false,
+      description: i18n.translate('core.ui_settings.params.disableAnimationsText', {
+        defaultMessage:
+          'Turn off all unnecessary animations in the Kibana UI. Refresh the page to apply the changes.',
+      }),
+      category: ['accessibility'],
+      requiresPageReload: true,
+      schema: schema.boolean(),
+    },
+  };
+};
diff --git a/src/core/server/ui_settings/settings/date_formats.test.ts b/src/core/server/ui_settings/settings/date_formats.test.ts
new file mode 100644
index 0000000000000..3c179af0b1d09
--- /dev/null
+++ b/src/core/server/ui_settings/settings/date_formats.test.ts
@@ -0,0 +1,104 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment-timezone';
+import { UiSettingsParams } from '../../../types';
+import { getDateFormatSettings } from './date_formats';
+
+describe('accessibility settings', () => {
+  const dateFormatSettings = getDateFormatSettings();
+
+  const getValidationFn = (setting: UiSettingsParams) => (value: any) =>
+    setting.schema.validate(value);
+
+  describe('dateFormat', () => {
+    const validate = getValidationFn(dateFormatSettings.dateFormat);
+
+    it('should only accept string values', () => {
+      expect(() => validate('some format')).not.toThrow();
+
+      expect(() => validate(42)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [string] but got [number]"`
+      );
+      expect(() => validate(true)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [string] but got [boolean]"`
+      );
+    });
+  });
+
+  describe('dateFormat:tz', () => {
+    const validate = getValidationFn(dateFormatSettings['dateFormat:tz']);
+
+    it('should only accept valid timezones or `Browser`', () => {
+      expect(() => validate('Browser')).not.toThrow();
+      expect(() => validate('UTC')).not.toThrow();
+
+      expect(() => validate('EST')).toThrowErrorMatchingInlineSnapshot(`"Invalid timezone: EST"`);
+      expect(() => validate('random string')).toThrowErrorMatchingInlineSnapshot(
+        `"Invalid timezone: random string"`
+      );
+    });
+  });
+
+  describe('dateFormat:scaled', () => {
+    const validate = getValidationFn(dateFormatSettings['dateFormat:scaled']);
+
+    it('should only accept string values', () => {
+      expect(() => validate('some format')).not.toThrow();
+
+      expect(() => validate(42)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [string] but got [number]"`
+      );
+      expect(() => validate(true)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [string] but got [boolean]"`
+      );
+    });
+  });
+
+  describe('dateFormat:dow', () => {
+    const [validDay] = moment.weekdays();
+    const validate = getValidationFn(dateFormatSettings['dateFormat:dow']);
+
+    it('should only accept DOW values', () => {
+      expect(() => validate(validDay)).not.toThrow();
+
+      expect(() => validate('invalid value')).toThrowErrorMatchingInlineSnapshot(
+        `"Invalid day of week: invalid value"`
+      );
+      expect(() => validate(true)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [string] but got [boolean]"`
+      );
+    });
+  });
+
+  describe('dateNanosFormat', () => {
+    const validate = getValidationFn(dateFormatSettings.dateNanosFormat);
+
+    it('should only accept string values', () => {
+      expect(() => validate('some format')).not.toThrow();
+
+      expect(() => validate(42)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [string] but got [number]"`
+      );
+      expect(() => validate(true)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [string] but got [boolean]"`
+      );
+    });
+  });
+});
diff --git a/src/core/server/ui_settings/settings/date_formats.ts b/src/core/server/ui_settings/settings/date_formats.ts
new file mode 100644
index 0000000000000..22351d36ac4bd
--- /dev/null
+++ b/src/core/server/ui_settings/settings/date_formats.ts
@@ -0,0 +1,168 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment-timezone';
+import { schema } from '@kbn/config-schema';
+import { i18n } from '@kbn/i18n';
+import { UiSettingsParams } from '../../../types';
+
+export const getDateFormatSettings = (): Record<string, UiSettingsParams> => {
+  const weekdays = moment.weekdays().slice();
+  const [defaultWeekday] = weekdays;
+
+  const timezones = [
+    'Browser',
+    ...moment.tz
+      .names()
+      // We need to filter out some time zones, that moment.js knows about, but Elasticsearch
+      // does not understand and would fail thus with a 400 bad request when using them.
+      .filter((tz) => !['America/Nuuk', 'EST', 'HST', 'ROC', 'MST'].includes(tz)),
+  ];
+
+  return {
+    dateFormat: {
+      name: i18n.translate('core.ui_settings.params.dateFormatTitle', {
+        defaultMessage: 'Date format',
+      }),
+      value: 'MMM D, YYYY @ HH:mm:ss.SSS',
+      description: i18n.translate('core.ui_settings.params.dateFormatText', {
+        defaultMessage: 'When displaying a pretty formatted date, use this {formatLink}',
+        description:
+          'Part of composite text: core.ui_settings.params.dateFormatText + ' +
+          'core.ui_settings.params.dateFormat.optionsLinkText',
+        values: {
+          formatLink:
+            '<a href="https://momentjs.com/docs/#/displaying/format/" target="_blank" rel="noopener noreferrer">' +
+            i18n.translate('core.ui_settings.params.dateFormat.optionsLinkText', {
+              defaultMessage: 'format',
+            }) +
+            '</a>',
+        },
+      }),
+      schema: schema.string(),
+    },
+    'dateFormat:tz': {
+      name: i18n.translate('core.ui_settings.params.dateFormat.timezoneTitle', {
+        defaultMessage: 'Timezone for date formatting',
+      }),
+      value: 'Browser',
+      description: i18n.translate('core.ui_settings.params.dateFormat.timezoneText', {
+        defaultMessage:
+          'Which timezone should be used. {defaultOption} will use the timezone detected by your browser.',
+        values: {
+          defaultOption: '"Browser"',
+        },
+      }),
+      type: 'select',
+      options: timezones,
+      requiresPageReload: true,
+      schema: schema.string({
+        validate: (value) => {
+          if (!timezones.includes(value)) {
+            return i18n.translate(
+              'core.ui_settings.params.dateFormat.timezone.invalidValidationMessage',
+              {
+                defaultMessage: 'Invalid timezone: {timezone}',
+                values: {
+                  timezone: value,
+                },
+              }
+            );
+          }
+        },
+      }),
+    },
+    'dateFormat:scaled': {
+      name: i18n.translate('core.ui_settings.params.dateFormat.scaledTitle', {
+        defaultMessage: 'Scaled date format',
+      }),
+      type: 'json',
+      value: `[
+  ["", "HH:mm:ss.SSS"],
+  ["PT1S", "HH:mm:ss"],
+  ["PT1M", "HH:mm"],
+  ["PT1H", "YYYY-MM-DD HH:mm"],
+  ["P1DT", "YYYY-MM-DD"],
+  ["P1YT", "YYYY"]
+]`,
+      description: i18n.translate('core.ui_settings.params.dateFormat.scaledText', {
+        defaultMessage:
+          'Values that define the format used in situations where time-based ' +
+          'data is rendered in order, and formatted timestamps should adapt to the ' +
+          'interval between measurements. Keys are {intervalsLink}.',
+        description:
+          'Part of composite text: core.ui_settings.params.dateFormat.scaledText + ' +
+          'core.ui_settings.params.dateFormat.scaled.intervalsLinkText',
+        values: {
+          intervalsLink:
+            '<a href="http://en.wikipedia.org/wiki/ISO_8601#Time_intervals" target="_blank" rel="noopener noreferrer">' +
+            i18n.translate('core.ui_settings.params.dateFormat.scaled.intervalsLinkText', {
+              defaultMessage: 'ISO8601 intervals',
+            }) +
+            '</a>',
+        },
+      }),
+      schema: schema.string(),
+    },
+    'dateFormat:dow': {
+      name: i18n.translate('core.ui_settings.params.dateFormat.dayOfWeekTitle', {
+        defaultMessage: 'Day of week',
+      }),
+      value: defaultWeekday,
+      description: i18n.translate('core.ui_settings.params.dateFormat.dayOfWeekText', {
+        defaultMessage: 'What day should weeks start on?',
+      }),
+      type: 'select',
+      options: weekdays,
+      schema: schema.string({
+        validate: (value) => {
+          if (!weekdays.includes(value)) {
+            return i18n.translate(
+              'core.ui_settings.params.dayOfWeekText.invalidValidationMessage',
+              {
+                defaultMessage: 'Invalid day of week: {dayOfWeek}',
+                values: {
+                  dayOfWeek: value,
+                },
+              }
+            );
+          }
+        },
+      }),
+    },
+    dateNanosFormat: {
+      name: i18n.translate('core.ui_settings.params.dateNanosFormatTitle', {
+        defaultMessage: 'Date with nanoseconds format',
+      }),
+      value: 'MMM D, YYYY @ HH:mm:ss.SSSSSSSSS',
+      description: i18n.translate('core.ui_settings.params.dateNanosFormatText', {
+        defaultMessage: 'Used for the {dateNanosLink} datatype of Elasticsearch',
+        values: {
+          dateNanosLink:
+            '<a href="https://www.elastic.co/guide/en/elasticsearch/reference/master/date_nanos.html" target="_blank" rel="noopener noreferrer">' +
+            i18n.translate('core.ui_settings.params.dateNanosLinkTitle', {
+              defaultMessage: 'date_nanos',
+            }) +
+            '</a>',
+        },
+      }),
+      schema: schema.string(),
+    },
+  };
+};
diff --git a/src/core/server/ui_settings/settings/index.test.ts b/src/core/server/ui_settings/settings/index.test.ts
new file mode 100644
index 0000000000000..e234160fbb4a1
--- /dev/null
+++ b/src/core/server/ui_settings/settings/index.test.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getAccessibilitySettings } from './accessibility';
+import { getDateFormatSettings } from './date_formats';
+import { getMiscUiSettings } from './misc';
+import { getNavigationSettings } from './navigation';
+import { getNotificationsSettings } from './notifications';
+import { getThemeSettings } from './theme';
+import { getCoreSettings } from './index';
+import { getStateSettings } from './state';
+
+describe('getCoreSettings', () => {
+  it('should not have setting overlaps', () => {
+    const coreSettingsLength = Object.keys(getCoreSettings()).length;
+    const summedLength = [
+      getAccessibilitySettings(),
+      getDateFormatSettings(),
+      getMiscUiSettings(),
+      getNavigationSettings(),
+      getNotificationsSettings(),
+      getThemeSettings(),
+      getStateSettings(),
+    ].reduce((sum, settings) => sum + Object.keys(settings).length, 0);
+
+    expect(coreSettingsLength).toBe(summedLength);
+  });
+});
diff --git a/src/core/server/ui_settings/settings/index.ts b/src/core/server/ui_settings/settings/index.ts
new file mode 100644
index 0000000000000..88baf7cd22eed
--- /dev/null
+++ b/src/core/server/ui_settings/settings/index.ts
@@ -0,0 +1,39 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UiSettingsParams } from '../../../types';
+import { getAccessibilitySettings } from './accessibility';
+import { getDateFormatSettings } from './date_formats';
+import { getMiscUiSettings } from './misc';
+import { getNavigationSettings } from './navigation';
+import { getNotificationsSettings } from './notifications';
+import { getThemeSettings } from './theme';
+import { getStateSettings } from './state';
+
+export const getCoreSettings = (): Record<string, UiSettingsParams> => {
+  return {
+    ...getAccessibilitySettings(),
+    ...getDateFormatSettings(),
+    ...getMiscUiSettings(),
+    ...getNavigationSettings(),
+    ...getNotificationsSettings(),
+    ...getThemeSettings(),
+    ...getStateSettings(),
+  };
+};
diff --git a/src/core/server/ui_settings/settings/misc.test.ts b/src/core/server/ui_settings/settings/misc.test.ts
new file mode 100644
index 0000000000000..db2c039d9b42c
--- /dev/null
+++ b/src/core/server/ui_settings/settings/misc.test.ts
@@ -0,0 +1,42 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UiSettingsParams } from '../../../types';
+import { getMiscUiSettings } from './misc';
+
+describe('misc settings', () => {
+  const miscSettings = getMiscUiSettings();
+
+  const getValidationFn = (setting: UiSettingsParams) => (value: any) =>
+    setting.schema.validate(value);
+
+  describe('truncate:maxHeight', () => {
+    const validate = getValidationFn(miscSettings['truncate:maxHeight']);
+
+    it('should only accept positive numeric values', () => {
+      expect(() => validate(127)).not.toThrow();
+      expect(() => validate(-12)).toThrowErrorMatchingInlineSnapshot(
+        `"Value must be equal to or greater than [0]."`
+      );
+      expect(() => validate('foo')).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [number] but got [string]"`
+      );
+    });
+  });
+});
diff --git a/src/core/server/ui_settings/settings/misc.ts b/src/core/server/ui_settings/settings/misc.ts
new file mode 100644
index 0000000000000..d158b07839c65
--- /dev/null
+++ b/src/core/server/ui_settings/settings/misc.ts
@@ -0,0 +1,42 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { schema } from '@kbn/config-schema';
+import { UiSettingsParams } from '../types';
+
+export const getMiscUiSettings = (): Record<string, UiSettingsParams> => {
+  return {
+    'truncate:maxHeight': {
+      name: i18n.translate('core.ui_settings.params.maxCellHeightTitle', {
+        defaultMessage: 'Maximum table cell height',
+      }),
+      value: 115,
+      description: i18n.translate('core.ui_settings.params.maxCellHeightText', {
+        defaultMessage:
+          'The maximum height that a cell in a table should occupy. Set to 0 to disable truncation',
+      }),
+      schema: schema.number({ min: 0 }),
+    },
+    buildNum: {
+      readonly: true,
+      schema: schema.maybe(schema.number()),
+    },
+  };
+};
diff --git a/src/core/server/ui_settings/settings/navigation.test.ts b/src/core/server/ui_settings/settings/navigation.test.ts
new file mode 100644
index 0000000000000..40cd0e1724683
--- /dev/null
+++ b/src/core/server/ui_settings/settings/navigation.test.ts
@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UiSettingsParams } from '../../../types';
+import { getNavigationSettings } from './navigation';
+
+describe('navigation settings', () => {
+  const navigationSettings = getNavigationSettings();
+
+  const getValidationFn = (setting: UiSettingsParams) => (value: any) =>
+    setting.schema.validate(value);
+
+  describe('defaultRoute', () => {
+    const validate = getValidationFn(navigationSettings.defaultRoute);
+
+    it('should only accept relative urls', () => {
+      expect(() => validate('/some-url')).not.toThrow();
+      expect(() => validate('http://some-url')).toThrowErrorMatchingInlineSnapshot(
+        `"Must be a relative URL."`
+      );
+      expect(() => validate(125)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [string] but got [number]"`
+      );
+    });
+  });
+
+  describe('pageNavigation', () => {
+    const validate = getValidationFn(navigationSettings.pageNavigation);
+
+    it('should only accept valid values', () => {
+      expect(() => validate('modern')).not.toThrow();
+      expect(() => validate('legacy')).not.toThrow();
+      expect(() => validate('invalid')).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: expected value to equal [modern]
+- [1]: expected value to equal [legacy]"
+`);
+    });
+  });
+});
diff --git a/src/core/server/ui_settings/settings/navigation.ts b/src/core/server/ui_settings/settings/navigation.ts
new file mode 100644
index 0000000000000..6483e86a1395a
--- /dev/null
+++ b/src/core/server/ui_settings/settings/navigation.ts
@@ -0,0 +1,72 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { i18n } from '@kbn/i18n';
+import { UiSettingsParams } from '../../../types';
+import { isRelativeUrl } from '../../../utils';
+
+export const getNavigationSettings = (): Record<string, UiSettingsParams> => {
+  return {
+    defaultRoute: {
+      name: i18n.translate('core.ui_settings.params.defaultRoute.defaultRouteTitle', {
+        defaultMessage: 'Default route',
+      }),
+      value: '/app/home',
+      schema: schema.string({
+        validate(value) {
+          if (!value.startsWith('/') || !isRelativeUrl(value)) {
+            return i18n.translate(
+              'core.ui_settings.params.defaultRoute.defaultRouteIsRelativeValidationMessage',
+              {
+                defaultMessage: 'Must be a relative URL.',
+              }
+            );
+          }
+        },
+      }),
+      description: i18n.translate('core.ui_settings.params.defaultRoute.defaultRouteText', {
+        defaultMessage:
+          'This setting specifies the default route when opening Kibana. ' +
+          'You can use this setting to modify the landing page when opening Kibana. ' +
+          'The route must be a relative URL.',
+      }),
+    },
+    pageNavigation: {
+      name: i18n.translate('core.ui_settings.params.pageNavigationName', {
+        defaultMessage: 'Side nav style',
+      }),
+      value: 'modern',
+      description: i18n.translate('core.ui_settings.params.pageNavigationDesc', {
+        defaultMessage: 'Change the style of navigation',
+      }),
+      type: 'select',
+      options: ['modern', 'legacy'],
+      optionLabels: {
+        modern: i18n.translate('core.ui_settings.params.pageNavigationModern', {
+          defaultMessage: 'Modern',
+        }),
+        legacy: i18n.translate('core.ui_settings.params.pageNavigationLegacy', {
+          defaultMessage: 'Legacy',
+        }),
+      },
+      schema: schema.oneOf([schema.literal('modern'), schema.literal('legacy')]),
+    },
+  };
+};
diff --git a/src/core/server/ui_settings/settings/notifications.test.ts b/src/core/server/ui_settings/settings/notifications.test.ts
new file mode 100644
index 0000000000000..e1bdf63c7e0d5
--- /dev/null
+++ b/src/core/server/ui_settings/settings/notifications.test.ts
@@ -0,0 +1,118 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UiSettingsParams } from '../../../types';
+import { getNotificationsSettings } from './notifications';
+
+describe('notifications settings', () => {
+  const notificationsSettings = getNotificationsSettings();
+
+  const getValidationFn = (setting: UiSettingsParams) => (value: any) =>
+    setting.schema.validate(value);
+
+  describe('notifications:banner', () => {
+    const validate = getValidationFn(notificationsSettings['notifications:banner']);
+
+    it('should only accept string values', () => {
+      expect(() => validate('some text')).not.toThrow();
+      expect(() => validate(true)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [string] but got [boolean]"`
+      );
+      expect(() => validate(12)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [string] but got [number]"`
+      );
+    });
+  });
+
+  describe('notifications:lifetime:banner', () => {
+    const validate = getValidationFn(notificationsSettings['notifications:lifetime:banner']);
+
+    it('should only accept positive numeric values or `Infinity`', () => {
+      expect(() => validate(42)).not.toThrow();
+      expect(() => validate('Infinity')).not.toThrow();
+      expect(() => validate(-12)).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: Value must be equal to or greater than [0].
+- [1]: expected value to equal [Infinity]"
+`);
+      expect(() => validate('foo')).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: expected value of type [number] but got [string]
+- [1]: expected value to equal [Infinity]"
+`);
+    });
+  });
+
+  describe('notifications:lifetime:error', () => {
+    const validate = getValidationFn(notificationsSettings['notifications:lifetime:error']);
+
+    it('should only accept positive numeric values or `Infinity`', () => {
+      expect(() => validate(42)).not.toThrow();
+      expect(() => validate('Infinity')).not.toThrow();
+      expect(() => validate(-12)).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: Value must be equal to or greater than [0].
+- [1]: expected value to equal [Infinity]"
+`);
+      expect(() => validate('foo')).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: expected value of type [number] but got [string]
+- [1]: expected value to equal [Infinity]"
+`);
+    });
+  });
+
+  describe('notifications:lifetime:warning', () => {
+    const validate = getValidationFn(notificationsSettings['notifications:lifetime:warning']);
+
+    it('should only accept positive numeric values or `Infinity`', () => {
+      expect(() => validate(42)).not.toThrow();
+      expect(() => validate('Infinity')).not.toThrow();
+      expect(() => validate(-12)).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: Value must be equal to or greater than [0].
+- [1]: expected value to equal [Infinity]"
+`);
+      expect(() => validate('foo')).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: expected value of type [number] but got [string]
+- [1]: expected value to equal [Infinity]"
+`);
+    });
+  });
+
+  describe('notifications:lifetime:info', () => {
+    const validate = getValidationFn(notificationsSettings['notifications:lifetime:info']);
+
+    it('should only accept positive numeric values or `Infinity`', () => {
+      expect(() => validate(42)).not.toThrow();
+      expect(() => validate('Infinity')).not.toThrow();
+      expect(() => validate(-12)).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: Value must be equal to or greater than [0].
+- [1]: expected value to equal [Infinity]"
+`);
+      expect(() => validate('foo')).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: expected value of type [number] but got [string]
+- [1]: expected value to equal [Infinity]"
+`);
+    });
+  });
+});
diff --git a/src/core/server/ui_settings/settings/notifications.ts b/src/core/server/ui_settings/settings/notifications.ts
new file mode 100644
index 0000000000000..7d9e70dc90364
--- /dev/null
+++ b/src/core/server/ui_settings/settings/notifications.ts
@@ -0,0 +1,120 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { i18n } from '@kbn/i18n';
+import { UiSettingsParams } from '../../../types';
+
+export const getNotificationsSettings = (): Record<string, UiSettingsParams> => {
+  return {
+    'notifications:banner': {
+      name: i18n.translate('core.ui_settings.params.notifications.bannerTitle', {
+        defaultMessage: 'Custom banner notification',
+      }),
+      value: '',
+      type: 'markdown',
+      description: i18n.translate('core.ui_settings.params.notifications.bannerText', {
+        defaultMessage:
+          'A custom banner intended for temporary notices to all users. {markdownLink}.',
+        description:
+          'Part of composite text: core.ui_settings.params.notifications.bannerText + ' +
+          'core.ui_settings.params.notifications.banner.markdownLinkText',
+        values: {
+          markdownLink:
+            `<a href="https://help.github.com/articles/basic-writing-and-formatting-syntax/"
+            target="_blank" rel="noopener">` +
+            i18n.translate('core.ui_settings.params.notifications.banner.markdownLinkText', {
+              defaultMessage: 'Markdown supported',
+            }) +
+            '</a>',
+        },
+      }),
+      category: ['notifications'],
+      schema: schema.string(),
+    },
+    'notifications:lifetime:banner': {
+      name: i18n.translate('core.ui_settings.params.notifications.bannerLifetimeTitle', {
+        defaultMessage: 'Banner notification lifetime',
+      }),
+      value: 3000000,
+      description: i18n.translate('core.ui_settings.params.notifications.bannerLifetimeText', {
+        defaultMessage:
+          'The time in milliseconds which a banner notification will be displayed on-screen for. ' +
+          'Setting to {infinityValue} will disable the countdown.',
+        values: {
+          infinityValue: 'Infinity',
+        },
+      }),
+      type: 'number',
+      category: ['notifications'],
+      schema: schema.oneOf([schema.number({ min: 0 }), schema.literal('Infinity')]),
+    },
+    'notifications:lifetime:error': {
+      name: i18n.translate('core.ui_settings.params.notifications.errorLifetimeTitle', {
+        defaultMessage: 'Error notification lifetime',
+      }),
+      value: 300000,
+      description: i18n.translate('core.ui_settings.params.notifications.errorLifetimeText', {
+        defaultMessage:
+          'The time in milliseconds which an error notification will be displayed on-screen for. ' +
+          'Setting to {infinityValue} will disable.',
+        values: {
+          infinityValue: 'Infinity',
+        },
+      }),
+      type: 'number',
+      category: ['notifications'],
+      schema: schema.oneOf([schema.number({ min: 0 }), schema.literal('Infinity')]),
+    },
+    'notifications:lifetime:warning': {
+      name: i18n.translate('core.ui_settings.params.notifications.warningLifetimeTitle', {
+        defaultMessage: 'Warning notification lifetime',
+      }),
+      value: 10000,
+      description: i18n.translate('core.ui_settings.params.notifications.warningLifetimeText', {
+        defaultMessage:
+          'The time in milliseconds which a warning notification will be displayed on-screen for. ' +
+          'Setting to {infinityValue} will disable.',
+        values: {
+          infinityValue: 'Infinity',
+        },
+      }),
+      type: 'number',
+      category: ['notifications'],
+      schema: schema.oneOf([schema.number({ min: 0 }), schema.literal('Infinity')]),
+    },
+    'notifications:lifetime:info': {
+      name: i18n.translate('core.ui_settings.params.notifications.infoLifetimeTitle', {
+        defaultMessage: 'Info notification lifetime',
+      }),
+      value: 5000,
+      description: i18n.translate('core.ui_settings.params.notifications.infoLifetimeText', {
+        defaultMessage:
+          'The time in milliseconds which an information notification will be displayed on-screen for. ' +
+          'Setting to {infinityValue} will disable.',
+        values: {
+          infinityValue: 'Infinity',
+        },
+      }),
+      type: 'number',
+      category: ['notifications'],
+      schema: schema.oneOf([schema.number({ min: 0 }), schema.literal('Infinity')]),
+    },
+  };
+};
diff --git a/src/core/server/ui_settings/settings/state.test.ts b/src/core/server/ui_settings/settings/state.test.ts
new file mode 100644
index 0000000000000..7be30abe71bb0
--- /dev/null
+++ b/src/core/server/ui_settings/settings/state.test.ts
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UiSettingsParams } from '../../../types';
+import { getStateSettings } from './state';
+
+describe('state settings', () => {
+  const state = getStateSettings();
+
+  const getValidationFn = (setting: UiSettingsParams) => (value: any) =>
+    setting.schema.validate(value);
+
+  describe('state:storeInSessionStorage', () => {
+    const validate = getValidationFn(state['state:storeInSessionStorage']);
+
+    it('should only accept boolean values', () => {
+      expect(() => validate(true)).not.toThrow();
+      expect(() => validate(false)).not.toThrow();
+      expect(() => validate('foo')).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [boolean] but got [string]"`
+      );
+      expect(() => validate(12)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [boolean] but got [number]"`
+      );
+    });
+  });
+});
diff --git a/src/core/server/ui_settings/settings/state.ts b/src/core/server/ui_settings/settings/state.ts
new file mode 100644
index 0000000000000..ee85cc8442599
--- /dev/null
+++ b/src/core/server/ui_settings/settings/state.ts
@@ -0,0 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { i18n } from '@kbn/i18n';
+import { UiSettingsParams } from '../../../types';
+
+export const getStateSettings = (): Record<string, UiSettingsParams> => {
+  return {
+    'state:storeInSessionStorage': {
+      name: i18n.translate('core.ui_settings.params.storeUrlTitle', {
+        defaultMessage: 'Store URLs in session storage',
+      }),
+      value: false,
+      description: i18n.translate('core.ui_settings.params.storeUrlText', {
+        defaultMessage:
+          'The URL can sometimes grow to be too large for some browsers to handle. ' +
+          'To counter-act this we are testing if storing parts of the URL in session storage could help. ' +
+          'Please let us know how it goes!',
+      }),
+      schema: schema.boolean(),
+    },
+  };
+};
diff --git a/src/core/server/ui_settings/settings/theme.test.ts b/src/core/server/ui_settings/settings/theme.test.ts
new file mode 100644
index 0000000000000..eb18bcc2dd0c7
--- /dev/null
+++ b/src/core/server/ui_settings/settings/theme.test.ts
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { UiSettingsParams } from '../../../types';
+import { getThemeSettings } from './theme';
+
+describe('theme settings', () => {
+  const themeSettings = getThemeSettings();
+
+  const getValidationFn = (setting: UiSettingsParams) => (value: any) =>
+    setting.schema.validate(value);
+
+  describe('theme:darkMode', () => {
+    const validate = getValidationFn(themeSettings['theme:darkMode']);
+
+    it('should only accept boolean values', () => {
+      expect(() => validate(true)).not.toThrow();
+      expect(() => validate(false)).not.toThrow();
+      expect(() => validate('foo')).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [boolean] but got [string]"`
+      );
+      expect(() => validate(12)).toThrowErrorMatchingInlineSnapshot(
+        `"expected value of type [boolean] but got [number]"`
+      );
+    });
+  });
+
+  describe('theme:version', () => {
+    const validate = getValidationFn(themeSettings['theme:version']);
+
+    it('should only accept valid values', () => {
+      expect(() => validate('v7')).not.toThrow();
+      expect(() => validate('v8 (beta)')).not.toThrow();
+      expect(() => validate('v12')).toThrowErrorMatchingInlineSnapshot(`
+"types that failed validation:
+- [0]: expected value to equal [v7]
+- [1]: expected value to equal [v8 (beta)]"
+`);
+    });
+  });
+});
diff --git a/src/core/server/ui_settings/settings/theme.ts b/src/core/server/ui_settings/settings/theme.ts
new file mode 100644
index 0000000000000..9f1857932f010
--- /dev/null
+++ b/src/core/server/ui_settings/settings/theme.ts
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { i18n } from '@kbn/i18n';
+import { UiSettingsParams } from '../../../types';
+
+export const getThemeSettings = (): Record<string, UiSettingsParams> => {
+  return {
+    'theme:darkMode': {
+      name: i18n.translate('core.ui_settings.params.darkModeTitle', {
+        defaultMessage: 'Dark mode',
+      }),
+      value: false,
+      description: i18n.translate('core.ui_settings.params.darkModeText', {
+        defaultMessage: `Enable a dark mode for the Kibana UI. A page refresh is required for the setting to be applied.`,
+      }),
+      requiresPageReload: true,
+      schema: schema.boolean(),
+    },
+    'theme:version': {
+      name: i18n.translate('core.ui_settings.params.themeVersionTitle', {
+        defaultMessage: 'Theme version',
+      }),
+      value: 'v7',
+      type: 'select',
+      options: ['v7', 'v8 (beta)'],
+      description: i18n.translate('core.ui_settings.params.themeVersionText', {
+        defaultMessage: `Switch between the theme used for the current and next version of Kibana. A page refresh is required for the setting to be applied.`,
+      }),
+      requiresPageReload: true,
+      schema: schema.oneOf([schema.literal('v7'), schema.literal('v8 (beta)')]),
+    },
+  };
+};
diff --git a/src/core/server/ui_settings/ui_settings_config.ts b/src/core/server/ui_settings/ui_settings_config.ts
index a0ac48e2dd089..3a3573a06d492 100644
--- a/src/core/server/ui_settings/ui_settings_config.ts
+++ b/src/core/server/ui_settings/ui_settings_config.ts
@@ -27,20 +27,7 @@ const deprecations: ConfigDeprecationProvider = ({ unused, renameFromRoot }) =>
 ];
 
 const configSchema = schema.object({
-  overrides: schema.object(
-    {
-      defaultRoute: schema.maybe(
-        schema.string({
-          validate(value) {
-            if (!value.startsWith('/')) {
-              return 'must start with a slash';
-            }
-          },
-        })
-      ),
-    },
-    { unknowns: 'allow' }
-  ),
+  overrides: schema.object({}, { unknowns: 'allow' }),
 });
 
 export type UiSettingsConfigType = TypeOf<typeof configSchema>;
diff --git a/src/core/server/ui_settings/ui_settings_service.test.mock.ts b/src/core/server/ui_settings/ui_settings_service.test.mock.ts
index 586ad3049ed6a..b4e98f55e159b 100644
--- a/src/core/server/ui_settings/ui_settings_service.test.mock.ts
+++ b/src/core/server/ui_settings/ui_settings_service.test.mock.ts
@@ -18,7 +18,11 @@
  */
 
 export const MockUiSettingsClientConstructor = jest.fn();
-
 jest.doMock('./ui_settings_client', () => ({
   UiSettingsClient: MockUiSettingsClientConstructor,
 }));
+
+export const getCoreSettingsMock = jest.fn();
+jest.doMock('./settings', () => ({
+  getCoreSettings: getCoreSettingsMock,
+}));
diff --git a/src/core/server/ui_settings/ui_settings_service.test.ts b/src/core/server/ui_settings/ui_settings_service.test.ts
index 096ca347e6f4b..0c17a3a614d60 100644
--- a/src/core/server/ui_settings/ui_settings_service.test.ts
+++ b/src/core/server/ui_settings/ui_settings_service.test.ts
@@ -19,7 +19,10 @@
 import { BehaviorSubject } from 'rxjs';
 import { schema } from '@kbn/config-schema';
 
-import { MockUiSettingsClientConstructor } from './ui_settings_service.test.mock';
+import {
+  MockUiSettingsClientConstructor,
+  getCoreSettingsMock,
+} from './ui_settings_service.test.mock';
 import { UiSettingsService, SetupDeps } from './ui_settings_service';
 import { httpServiceMock } from '../http/http_service.mock';
 import { savedObjectsClientMock } from '../mocks';
@@ -58,6 +61,7 @@ describe('uiSettings', () => {
 
   afterEach(() => {
     MockUiSettingsClientConstructor.mockClear();
+    getCoreSettingsMock.mockClear();
   });
 
   describe('#setup', () => {
@@ -67,6 +71,11 @@ describe('uiSettings', () => {
       expect(setupDeps.savedObjects.registerType).toHaveBeenCalledWith(uiSettingsType);
     });
 
+    it('calls `getCoreSettings`', async () => {
+      await service.setup(setupDeps);
+      expect(getCoreSettingsMock).toHaveBeenCalledTimes(1);
+    });
+
     describe('#register', () => {
       it('throws if registers the same key twice', async () => {
         const setup = await service.setup(setupDeps);
diff --git a/src/core/server/ui_settings/ui_settings_service.ts b/src/core/server/ui_settings/ui_settings_service.ts
index 93593b29221da..8598cf7a62287 100644
--- a/src/core/server/ui_settings/ui_settings_service.ts
+++ b/src/core/server/ui_settings/ui_settings_service.ts
@@ -36,6 +36,7 @@ import {
 import { mapToObject } from '../../utils/';
 import { uiSettingsType } from './saved_objects';
 import { registerRoutes } from './routes';
+import { getCoreSettings } from './settings';
 
 export interface SetupDeps {
   http: InternalHttpServiceSetup;
@@ -60,6 +61,8 @@ export class UiSettingsService
 
     savedObjects.registerType(uiSettingsType);
     registerRoutes(http.createRouter(''));
+    this.register(getCoreSettings());
+
     const config = await this.config$.pipe(first()).toPromise();
     this.overrides = config.overrides;
 
diff --git a/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js b/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js
index 625c2c02510db..2562657a71624 100644
--- a/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js
+++ b/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js
@@ -17,159 +17,11 @@
  * under the License.
  */
 
-import moment from 'moment-timezone';
 import { i18n } from '@kbn/i18n';
-import { schema } from '@kbn/config-schema';
-
-import { isRelativeUrl } from '../../../../core/server';
 
 export function getUiSettingDefaults() {
-  const weekdays = moment.weekdays().slice();
-  const [defaultWeekday] = weekdays;
-
   // wrapped in provider so that a new instance is given to each app/test
   return {
-    buildNum: {
-      readonly: true,
-    },
-    'state:storeInSessionStorage': {
-      name: i18n.translate('kbn.advancedSettings.storeUrlTitle', {
-        defaultMessage: 'Store URLs in session storage',
-      }),
-      value: false,
-      description: i18n.translate('kbn.advancedSettings.storeUrlText', {
-        defaultMessage:
-          'The URL can sometimes grow to be too large for some browsers to handle. ' +
-          'To counter-act this we are testing if storing parts of the URL in session storage could help. ' +
-          'Please let us know how it goes!',
-      }),
-    },
-    defaultRoute: {
-      name: i18n.translate('kbn.advancedSettings.defaultRoute.defaultRouteTitle', {
-        defaultMessage: 'Default route',
-      }),
-      value: '/app/home',
-      schema: schema.string({
-        validate(value) {
-          if (!value.startsWith('/') || !isRelativeUrl(value)) {
-            return i18n.translate(
-              'kbn.advancedSettings.defaultRoute.defaultRouteIsRelativeValidationMessage',
-              {
-                defaultMessage: 'Must be a relative URL.',
-              }
-            );
-          }
-        },
-      }),
-      description: i18n.translate('kbn.advancedSettings.defaultRoute.defaultRouteText', {
-        defaultMessage:
-          'This setting specifies the default route when opening Kibana. ' +
-          'You can use this setting to modify the landing page when opening Kibana. ' +
-          'The route must be a relative URL.',
-      }),
-    },
-    dateFormat: {
-      name: i18n.translate('kbn.advancedSettings.dateFormatTitle', {
-        defaultMessage: 'Date format',
-      }),
-      value: 'MMM D, YYYY @ HH:mm:ss.SSS',
-      description: i18n.translate('kbn.advancedSettings.dateFormatText', {
-        defaultMessage: 'When displaying a pretty formatted date, use this {formatLink}',
-        description:
-          'Part of composite text: kbn.advancedSettings.dateFormatText + ' +
-          'kbn.advancedSettings.dateFormat.optionsLinkText',
-        values: {
-          formatLink:
-            '<a href="https://momentjs.com/docs/#/displaying/format/" target="_blank" rel="noopener noreferrer">' +
-            i18n.translate('kbn.advancedSettings.dateFormat.optionsLinkText', {
-              defaultMessage: 'format',
-            }) +
-            '</a>',
-        },
-      }),
-    },
-    'dateFormat:tz': {
-      name: i18n.translate('kbn.advancedSettings.dateFormat.timezoneTitle', {
-        defaultMessage: 'Timezone for date formatting',
-      }),
-      value: 'Browser',
-      description: i18n.translate('kbn.advancedSettings.dateFormat.timezoneText', {
-        defaultMessage:
-          'Which timezone should be used. {defaultOption} will use the timezone detected by your browser.',
-        values: {
-          defaultOption: '"Browser"',
-        },
-      }),
-      type: 'select',
-      options: [
-        'Browser',
-        ...moment.tz
-          .names()
-          // We need to filter out some time zones, that moment.js knows about, but Elasticsearch
-          // does not understand and would fail thus with a 400 bad request when using them.
-          .filter((tz) => !['America/Nuuk', 'EST', 'HST', 'ROC', 'MST'].includes(tz)),
-      ],
-      requiresPageReload: true,
-    },
-    'dateFormat:scaled': {
-      name: i18n.translate('kbn.advancedSettings.dateFormat.scaledTitle', {
-        defaultMessage: 'Scaled date format',
-      }),
-      type: 'json',
-      value: `[
-  ["", "HH:mm:ss.SSS"],
-  ["PT1S", "HH:mm:ss"],
-  ["PT1M", "HH:mm"],
-  ["PT1H", "YYYY-MM-DD HH:mm"],
-  ["P1DT", "YYYY-MM-DD"],
-  ["P1YT", "YYYY"]
-]`,
-      description: i18n.translate('kbn.advancedSettings.dateFormat.scaledText', {
-        defaultMessage:
-          'Values that define the format used in situations where time-based ' +
-          'data is rendered in order, and formatted timestamps should adapt to the ' +
-          'interval between measurements. Keys are {intervalsLink}.',
-        description:
-          'Part of composite text: kbn.advancedSettings.dateFormat.scaledText + ' +
-          'kbn.advancedSettings.dateFormat.scaled.intervalsLinkText',
-        values: {
-          intervalsLink:
-            '<a href="http://en.wikipedia.org/wiki/ISO_8601#Time_intervals" target="_blank" rel="noopener noreferrer">' +
-            i18n.translate('kbn.advancedSettings.dateFormat.scaled.intervalsLinkText', {
-              defaultMessage: 'ISO8601 intervals',
-            }) +
-            '</a>',
-        },
-      }),
-    },
-    'dateFormat:dow': {
-      name: i18n.translate('kbn.advancedSettings.dateFormat.dayOfWeekTitle', {
-        defaultMessage: 'Day of week',
-      }),
-      value: defaultWeekday,
-      description: i18n.translate('kbn.advancedSettings.dateFormat.dayOfWeekText', {
-        defaultMessage: 'What day should weeks start on?',
-      }),
-      type: 'select',
-      options: weekdays,
-    },
-    dateNanosFormat: {
-      name: i18n.translate('kbn.advancedSettings.dateNanosFormatTitle', {
-        defaultMessage: 'Date with nanoseconds format',
-      }),
-      value: 'MMM D, YYYY @ HH:mm:ss.SSSSSSSSS',
-      description: i18n.translate('kbn.advancedSettings.dateNanosFormatText', {
-        defaultMessage: 'Used for the {dateNanosLink} datatype of Elasticsearch',
-        values: {
-          dateNanosLink:
-            '<a href="https://www.elastic.co/guide/en/elasticsearch/reference/master/date_nanos.html" target="_blank" rel="noopener noreferrer">' +
-            i18n.translate('kbn.advancedSettings.dateNanosLinkTitle', {
-              defaultMessage: 'date_nanos',
-            }) +
-            '</a>',
-        },
-      }),
-    },
     'visualization:tileMap:maxPrecision': {
       name: i18n.translate('kbn.advancedSettings.visualization.tileMap.maxPrecisionTitle', {
         defaultMessage: 'Maximum tile map precision',
@@ -248,157 +100,5 @@ export function getUiSettingDefaults() {
       }),
       category: ['visualization'],
     },
-    'truncate:maxHeight': {
-      name: i18n.translate('kbn.advancedSettings.maxCellHeightTitle', {
-        defaultMessage: 'Maximum table cell height',
-      }),
-      value: 115,
-      description: i18n.translate('kbn.advancedSettings.maxCellHeightText', {
-        defaultMessage:
-          'The maximum height that a cell in a table should occupy. Set to 0 to disable truncation',
-      }),
-    },
-    'theme:darkMode': {
-      name: i18n.translate('kbn.advancedSettings.darkModeTitle', {
-        defaultMessage: 'Dark mode',
-      }),
-      value: false,
-      description: i18n.translate('kbn.advancedSettings.darkModeText', {
-        defaultMessage: `Enable a dark mode for the Kibana UI. A page refresh is required for the setting to be applied.`,
-      }),
-      requiresPageReload: true,
-    },
-    'theme:version': {
-      name: i18n.translate('kbn.advancedSettings.themeVersionTitle', {
-        defaultMessage: 'Theme version',
-      }),
-      value: 'v7',
-      type: 'select',
-      options: ['v7', 'v8 (beta)'],
-      description: i18n.translate('kbn.advancedSettings.themeVersionText', {
-        defaultMessage: `Switch between the theme used for the current and next version of Kibana. A page refresh is required for the setting to be applied.`,
-      }),
-      requiresPageReload: true,
-    },
-    'notifications:banner': {
-      name: i18n.translate('kbn.advancedSettings.notifications.bannerTitle', {
-        defaultMessage: 'Custom banner notification',
-      }),
-      value: '',
-      type: 'markdown',
-      description: i18n.translate('kbn.advancedSettings.notifications.bannerText', {
-        defaultMessage:
-          'A custom banner intended for temporary notices to all users. {markdownLink}.',
-        description:
-          'Part of composite text: kbn.advancedSettings.notifications.bannerText + ' +
-          'kbn.advancedSettings.notifications.banner.markdownLinkText',
-        values: {
-          markdownLink:
-            `<a href="https://help.github.com/articles/basic-writing-and-formatting-syntax/"
-            target="_blank" rel="noopener">` +
-            i18n.translate('kbn.advancedSettings.notifications.banner.markdownLinkText', {
-              defaultMessage: 'Markdown supported',
-            }) +
-            '</a>',
-        },
-      }),
-      category: ['notifications'],
-    },
-    'notifications:lifetime:banner': {
-      name: i18n.translate('kbn.advancedSettings.notifications.bannerLifetimeTitle', {
-        defaultMessage: 'Banner notification lifetime',
-      }),
-      value: 3000000,
-      description: i18n.translate('kbn.advancedSettings.notifications.bannerLifetimeText', {
-        defaultMessage:
-          'The time in milliseconds which a banner notification will be displayed on-screen for. ' +
-          'Setting to {infinityValue} will disable the countdown.',
-        values: {
-          infinityValue: 'Infinity',
-        },
-      }),
-      type: 'number',
-      category: ['notifications'],
-    },
-    'notifications:lifetime:error': {
-      name: i18n.translate('kbn.advancedSettings.notifications.errorLifetimeTitle', {
-        defaultMessage: 'Error notification lifetime',
-      }),
-      value: 300000,
-      description: i18n.translate('kbn.advancedSettings.notifications.errorLifetimeText', {
-        defaultMessage:
-          'The time in milliseconds which an error notification will be displayed on-screen for. ' +
-          'Setting to {infinityValue} will disable.',
-        values: {
-          infinityValue: 'Infinity',
-        },
-      }),
-      type: 'number',
-      category: ['notifications'],
-    },
-    'notifications:lifetime:warning': {
-      name: i18n.translate('kbn.advancedSettings.notifications.warningLifetimeTitle', {
-        defaultMessage: 'Warning notification lifetime',
-      }),
-      value: 10000,
-      description: i18n.translate('kbn.advancedSettings.notifications.warningLifetimeText', {
-        defaultMessage:
-          'The time in milliseconds which a warning notification will be displayed on-screen for. ' +
-          'Setting to {infinityValue} will disable.',
-        values: {
-          infinityValue: 'Infinity',
-        },
-      }),
-      type: 'number',
-      category: ['notifications'],
-    },
-    'notifications:lifetime:info': {
-      name: i18n.translate('kbn.advancedSettings.notifications.infoLifetimeTitle', {
-        defaultMessage: 'Info notification lifetime',
-      }),
-      value: 5000,
-      description: i18n.translate('kbn.advancedSettings.notifications.infoLifetimeText', {
-        defaultMessage:
-          'The time in milliseconds which an information notification will be displayed on-screen for. ' +
-          'Setting to {infinityValue} will disable.',
-        values: {
-          infinityValue: 'Infinity',
-        },
-      }),
-      type: 'number',
-      category: ['notifications'],
-    },
-    'accessibility:disableAnimations': {
-      name: i18n.translate('kbn.advancedSettings.disableAnimationsTitle', {
-        defaultMessage: 'Disable Animations',
-      }),
-      value: false,
-      description: i18n.translate('kbn.advancedSettings.disableAnimationsText', {
-        defaultMessage:
-          'Turn off all unnecessary animations in the Kibana UI. Refresh the page to apply the changes.',
-      }),
-      category: ['accessibility'],
-      requiresPageReload: true,
-    },
-    pageNavigation: {
-      name: i18n.translate('kbn.advancedSettings.pageNavigationName', {
-        defaultMessage: 'Side nav style',
-      }),
-      value: 'modern',
-      description: i18n.translate('kbn.advancedSettings.pageNavigationDesc', {
-        defaultMessage: 'Change the style of navigation',
-      }),
-      type: 'select',
-      options: ['modern', 'legacy'],
-      optionLabels: {
-        modern: i18n.translate('kbn.advancedSettings.pageNavigationModern', {
-          defaultMessage: 'Modern',
-        }),
-        legacy: i18n.translate('kbn.advancedSettings.pageNavigationLegacy', {
-          defaultMessage: 'Legacy',
-        }),
-      },
-      schema: schema.oneOf([schema.literal('modern'), schema.literal('legacy')]),
-    },
   };
 }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 5572fc85bf130..da5392848475b 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -526,6 +526,47 @@
     "core.ui.securityNavList.label": "セキュリティ",
     "core.ui.welcomeErrorMessage": "Elasticが正常に読み込まれませんでした。詳細はサーバーアウトプットを確認してください。",
     "core.ui.welcomeMessage": "Elasticの読み込み中",
+    "core.ui_settings.params.darkModeText": "Kibana UI のダークモードを有効にします。この設定を適用するにはページの更新が必要です。",
+    "core.ui_settings.params.darkModeTitle": "ダークモード",
+    "core.ui_settings.params.dateFormat.dayOfWeekText": "週の初めの曜日を設定します",
+    "core.ui_settings.params.dateFormat.dayOfWeekTitle": "曜日",
+    "core.ui_settings.params.dateFormat.optionsLinkText": "フォーマット",
+    "core.ui_settings.params.dateFormat.scaled.intervalsLinkText": "ISO8601 間隔",
+    "core.ui_settings.params.dateFormat.scaledText": "時間ベースのデータが順番にレンダリングされ、フォーマットされたタイムスタンプが測定値の間隔に適応すべき状況で使用されるフォーマットを定義する値です。キーは {intervalsLink}。",
+    "core.ui_settings.params.dateFormat.scaledTitle": "スケーリングされたデータフォーマットです",
+    "core.ui_settings.params.dateFormat.timezoneText": "使用されるタイムゾーンです。{defaultOption} ではご使用のブラウザにより検知されたタイムゾーンが使用されます。",
+    "core.ui_settings.params.dateFormat.timezoneTitle": "データフォーマットのタイムゾーン",
+    "core.ui_settings.params.dateFormatText": "きちんとフォーマットされたデータを表示する際、この {formatLink} を使用します",
+    "core.ui_settings.params.dateFormatTitle": "データフォーマット",
+    "core.ui_settings.params.dateNanosFormatText": "Elasticsearch の {dateNanosLink} データタイプに使用されます",
+    "core.ui_settings.params.dateNanosFormatTitle": "ナノ秒フォーマットでの日付",
+    "core.ui_settings.params.dateNanosLinkTitle": "date_nanos",
+    "core.ui_settings.params.defaultRoute.defaultRouteIsRelativeValidationMessage": "相対 URL でなければなりません。",
+    "core.ui_settings.params.defaultRoute.defaultRouteText": "この設定は、Kibana 起動時のデフォルトのルートを設定します。この設定で、Kibana 起動時のランディングページを変更できます。経路は相対 URL でなければなりません。",
+    "core.ui_settings.params.defaultRoute.defaultRouteTitle": "デフォルトのルート",
+    "core.ui_settings.params.disableAnimationsText": "Kibana UI の不要なアニメーションをオフにします。変更を適用するにはページを更新してください。",
+    "core.ui_settings.params.disableAnimationsTitle": "アニメーションを無効にする",
+    "core.ui_settings.params.maxCellHeightText": "表のセルが使用する高さの上限です。この切り捨てを無効にするには 0 に設定します",
+    "core.ui_settings.params.maxCellHeightTitle": "表のセルの高さの上限",
+    "core.ui_settings.params.notifications.banner.markdownLinkText": "マークダウン対応",
+    "core.ui_settings.params.notifications.bannerLifetimeText": "バナー通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定するとカウントダウンが無効になります。",
+    "core.ui_settings.params.notifications.bannerLifetimeTitle": "バナー通知時間",
+    "core.ui_settings.params.notifications.bannerText": "すべてのユーザーへの一時的な通知を目的としたカスタムバナーです。{markdownLink}",
+    "core.ui_settings.params.notifications.bannerTitle": "カスタムバナー通知",
+    "core.ui_settings.params.notifications.errorLifetimeText": "エラー通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
+    "core.ui_settings.params.notifications.errorLifetimeTitle": "エラー通知時間",
+    "core.ui_settings.params.notifications.infoLifetimeText": "情報通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
+    "core.ui_settings.params.notifications.infoLifetimeTitle": "情報通知時間",
+    "core.ui_settings.params.notifications.warningLifetimeText": "警告通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
+    "core.ui_settings.params.notifications.warningLifetimeTitle": "警告通知時間",
+    "core.ui_settings.params.pageNavigationDesc": "ナビゲーションのスタイルを変更",
+    "core.ui_settings.params.pageNavigationLegacy": "レガシー",
+    "core.ui_settings.params.pageNavigationModern": "モダン",
+    "core.ui_settings.params.pageNavigationName": "サイドナビゲーションスタイル",
+    "core.ui_settings.params.themeVersionText": "現在のバージョンと次のバージョンのKibanaで使用されるテーマを切り替えます。この設定を適用するにはページの更新が必要です。",
+    "core.ui_settings.params.themeVersionTitle": "テーマバージョン",
+    "core.ui_settings.params.storeUrlText": "URL は長くなりすぎてブラウザが対応できない場合があります。セッションストレージに URL の一部を保存することがで　この問題に対処できるかテストしています。結果を教えてください！",
+    "core.ui_settings.params.storeUrlTitle": "セッションストレージに URL を格納",
     "dashboard.actions.toggleExpandPanelMenuItem.expandedDisplayName": "最小化",
     "dashboard.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "全画面",
     "dashboard.addExistingVisualizationLinkText": "既存のユーザーを追加",
@@ -2734,47 +2775,6 @@
     "inspector.requests.statisticsTabLabel": "統計",
     "inspector.title": "インスペクター",
     "inspector.view": "{viewName} を表示",
-    "kbn.advancedSettings.darkModeText": "Kibana UI のダークモードを有効にします。この設定を適用するにはページの更新が必要です。",
-    "kbn.advancedSettings.darkModeTitle": "ダークモード",
-    "kbn.advancedSettings.dateFormat.dayOfWeekText": "週の初めの曜日を設定します",
-    "kbn.advancedSettings.dateFormat.dayOfWeekTitle": "曜日",
-    "kbn.advancedSettings.dateFormat.optionsLinkText": "フォーマット",
-    "kbn.advancedSettings.dateFormat.scaled.intervalsLinkText": "ISO8601 間隔",
-    "kbn.advancedSettings.dateFormat.scaledText": "時間ベースのデータが順番にレンダリングされ、フォーマットされたタイムスタンプが測定値の間隔に適応すべき状況で使用されるフォーマットを定義する値です。キーは {intervalsLink}。",
-    "kbn.advancedSettings.dateFormat.scaledTitle": "スケーリングされたデータフォーマットです",
-    "kbn.advancedSettings.dateFormat.timezoneText": "使用されるタイムゾーンです。{defaultOption} ではご使用のブラウザにより検知されたタイムゾーンが使用されます。",
-    "kbn.advancedSettings.dateFormat.timezoneTitle": "データフォーマットのタイムゾーン",
-    "kbn.advancedSettings.dateFormatText": "きちんとフォーマットされたデータを表示する際、この {formatLink} を使用します",
-    "kbn.advancedSettings.dateFormatTitle": "データフォーマット",
-    "kbn.advancedSettings.dateNanosFormatText": "Elasticsearch の {dateNanosLink} データタイプに使用されます",
-    "kbn.advancedSettings.dateNanosFormatTitle": "ナノ秒フォーマットでの日付",
-    "kbn.advancedSettings.dateNanosLinkTitle": "date_nanos",
-    "kbn.advancedSettings.defaultRoute.defaultRouteIsRelativeValidationMessage": "相対 URL でなければなりません。",
-    "kbn.advancedSettings.defaultRoute.defaultRouteText": "この設定は、Kibana 起動時のデフォルトのルートを設定します。この設定で、Kibana 起動時のランディングページを変更できます。経路は相対 URL でなければなりません。",
-    "kbn.advancedSettings.defaultRoute.defaultRouteTitle": "デフォルトのルート",
-    "kbn.advancedSettings.disableAnimationsText": "Kibana UI の不要なアニメーションをオフにします。変更を適用するにはページを更新してください。",
-    "kbn.advancedSettings.disableAnimationsTitle": "アニメーションを無効にする",
-    "kbn.advancedSettings.maxCellHeightText": "表のセルが使用する高さの上限です。この切り捨てを無効にするには 0 に設定します",
-    "kbn.advancedSettings.maxCellHeightTitle": "表のセルの高さの上限",
-    "kbn.advancedSettings.notifications.banner.markdownLinkText": "マークダウン対応",
-    "kbn.advancedSettings.notifications.bannerLifetimeText": "バナー通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定するとカウントダウンが無効になります。",
-    "kbn.advancedSettings.notifications.bannerLifetimeTitle": "バナー通知時間",
-    "kbn.advancedSettings.notifications.bannerText": "すべてのユーザーへの一時的な通知を目的としたカスタムバナーです。{markdownLink}",
-    "kbn.advancedSettings.notifications.bannerTitle": "カスタムバナー通知",
-    "kbn.advancedSettings.notifications.errorLifetimeText": "エラー通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
-    "kbn.advancedSettings.notifications.errorLifetimeTitle": "エラー通知時間",
-    "kbn.advancedSettings.notifications.infoLifetimeText": "情報通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
-    "kbn.advancedSettings.notifications.infoLifetimeTitle": "情報通知時間",
-    "kbn.advancedSettings.notifications.warningLifetimeText": "警告通知が画面に表示されるミリ秒単位での時間です。{infinityValue} に設定すると無効になります。",
-    "kbn.advancedSettings.notifications.warningLifetimeTitle": "警告通知時間",
-    "kbn.advancedSettings.pageNavigationDesc": "ナビゲーションのスタイルを変更",
-    "kbn.advancedSettings.pageNavigationLegacy": "レガシー",
-    "kbn.advancedSettings.pageNavigationModern": "モダン",
-    "kbn.advancedSettings.pageNavigationName": "サイドナビゲーションスタイル",
-    "kbn.advancedSettings.storeUrlText": "URL は長くなりすぎてブラウザが対応できない場合があります。セッションストレージに URL の一部を保存することがで　この問題に対処できるかテストしています。結果を教えてください！",
-    "kbn.advancedSettings.storeUrlTitle": "セッションストレージに URL を格納",
-    "kbn.advancedSettings.themeVersionText": "現在のバージョンと次のバージョンのKibanaで使用されるテーマを切り替えます。この設定を適用するにはページの更新が必要です。",
-    "kbn.advancedSettings.themeVersionTitle": "テーマバージョン",
     "kbn.advancedSettings.visualization.showRegionMapWarningsText": "用語がマップの形に合わない場合に地域マップに警告を表示するかどうかです。",
     "kbn.advancedSettings.visualization.showRegionMapWarningsTitle": "地域マップに警告を表示",
     "kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText": "ディメンションの説明",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 36691eeadb928..e892ff228cd49 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -526,6 +526,47 @@
     "core.ui.securityNavList.label": "安全",
     "core.ui.welcomeErrorMessage": "Elastic 未正确加载。检查服务器输出以了解详情。",
     "core.ui.welcomeMessage": "正在加载 Elastic",
+    "core.ui_settings.params.darkModeText": "为 Kibana UI 启用深色模式需要刷新页面，才能应用设置。",
+    "core.ui_settings.params.darkModeTitle": "深色模式",
+    "core.ui_settings.params.dateFormat.dayOfWeekText": "一周从哪一日开始？",
+    "core.ui_settings.params.dateFormat.dayOfWeekTitle": "周内日",
+    "core.ui_settings.params.dateFormat.optionsLinkText": "格式",
+    "core.ui_settings.params.dateFormat.scaled.intervalsLinkText": "ISO8601 时间间隔",
+    "core.ui_settings.params.dateFormat.scaledText": "定义在基于时间的数据按顺序呈现且格式化时间戳应适应度量时间间隔时所用格式的值。键是 {intervalsLink}。",
+    "core.ui_settings.params.dateFormat.scaledTitle": "缩放的日期格式",
+    "core.ui_settings.params.dateFormat.timezoneText": "应使用哪个时区。{defaultOption} 将使用您的浏览器检测到的时区。",
+    "core.ui_settings.params.dateFormat.timezoneTitle": "用于设置日期格式的时区",
+    "core.ui_settings.params.dateFormatText": "显示格式正确的日期时，请使用此{formatLink}",
+    "core.ui_settings.params.dateFormatTitle": "日期格式",
+    "core.ui_settings.params.dateNanosFormatText": "用于 Elasticsearch 的 {dateNanosLink} 数据类型",
+    "core.ui_settings.params.dateNanosFormatTitle": "纳秒格式的日期",
+    "core.ui_settings.params.dateNanosLinkTitle": "date_nanos",
+    "core.ui_settings.params.defaultRoute.defaultRouteIsRelativeValidationMessage": "必须是相对 URL。",
+    "core.ui_settings.params.defaultRoute.defaultRouteText": "此设置指定打开 Kibana 时的默认路由。您可以使用此设置修改打开 Kibana 时的登陆页面。路由必须是相对 URL。",
+    "core.ui_settings.params.defaultRoute.defaultRouteTitle": "默认路由",
+    "core.ui_settings.params.disableAnimationsText": "在 Kibana UI 中关闭所有没有必要的动画。刷新页面以应用更改。",
+    "core.ui_settings.params.disableAnimationsTitle": "禁用动画",
+    "core.ui_settings.params.maxCellHeightText": "表中单元格应占用的最大高度。设置为 0 可禁用截短",
+    "core.ui_settings.params.maxCellHeightTitle": "最大表单元格高度",
+    "core.ui_settings.params.notifications.banner.markdownLinkText": "Markdown 受支持",
+    "core.ui_settings.params.notifications.bannerLifetimeText": "在屏幕上显示横幅通知的时间（毫秒）。设置为 {infinityValue} 将禁用倒计时。",
+    "core.ui_settings.params.notifications.bannerLifetimeTitle": "横幅通知生存时间",
+    "core.ui_settings.params.notifications.bannerText": "用于向所有用户发送临时通知的定制横幅。{markdownLink}",
+    "core.ui_settings.params.notifications.bannerTitle": "定制横幅通知",
+    "core.ui_settings.params.notifications.errorLifetimeText": "在屏幕上显示错误通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
+    "core.ui_settings.params.notifications.errorLifetimeTitle": "错误通知生存时间",
+    "core.ui_settings.params.notifications.infoLifetimeText": "在屏幕上显示信息通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
+    "core.ui_settings.params.notifications.infoLifetimeTitle": "信息通知生存时间",
+    "core.ui_settings.params.notifications.warningLifetimeText": "在屏幕上显示警告通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
+    "core.ui_settings.params.notifications.warningLifetimeTitle": "警告通知生存时间",
+    "core.ui_settings.params.pageNavigationDesc": "更改导航样式",
+    "core.ui_settings.params.pageNavigationLegacy": "旧版",
+    "core.ui_settings.params.pageNavigationModern": "现代",
+    "core.ui_settings.params.pageNavigationName": "侧边导航样式",
+    "core.ui_settings.params.themeVersionText": "在用于 Kibana 当前和下一版本的主题间切换。需要刷新页面，才能应用设置。",
+    "core.ui_settings.params.themeVersionTitle": "主题版本",
+    "core.ui_settings.params.storeUrlText": "URL 有时会变得过长，以使得某些浏览器无法处理。为此，我们正在测试将 URL 的各个组成部分存储在会话存储中是否会有帮助。请告知我们这样做的效果！",
+    "core.ui_settings.params.storeUrlTitle": "将 URL 存储在会话存储中",
     "dashboard.actions.toggleExpandPanelMenuItem.expandedDisplayName": "最小化",
     "dashboard.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "全屏",
     "dashboard.addExistingVisualizationLinkText": "将现有",
@@ -2735,47 +2776,6 @@
     "inspector.requests.statisticsTabLabel": "统计信息",
     "inspector.title": "检查器",
     "inspector.view": "视图：{viewName}",
-    "kbn.advancedSettings.darkModeText": "为 Kibana UI 启用深色模式需要刷新页面，才能应用设置。",
-    "kbn.advancedSettings.darkModeTitle": "深色模式",
-    "kbn.advancedSettings.dateFormat.dayOfWeekText": "一周从哪一日开始？",
-    "kbn.advancedSettings.dateFormat.dayOfWeekTitle": "周内日",
-    "kbn.advancedSettings.dateFormat.optionsLinkText": "格式",
-    "kbn.advancedSettings.dateFormat.scaled.intervalsLinkText": "ISO8601 时间间隔",
-    "kbn.advancedSettings.dateFormat.scaledText": "定义在基于时间的数据按顺序呈现且格式化时间戳应适应度量时间间隔时所用格式的值。键是 {intervalsLink}。",
-    "kbn.advancedSettings.dateFormat.scaledTitle": "缩放的日期格式",
-    "kbn.advancedSettings.dateFormat.timezoneText": "应使用哪个时区。{defaultOption} 将使用您的浏览器检测到的时区。",
-    "kbn.advancedSettings.dateFormat.timezoneTitle": "用于设置日期格式的时区",
-    "kbn.advancedSettings.dateFormatText": "显示格式正确的日期时，请使用此{formatLink}",
-    "kbn.advancedSettings.dateFormatTitle": "日期格式",
-    "kbn.advancedSettings.dateNanosFormatText": "用于 Elasticsearch 的 {dateNanosLink} 数据类型",
-    "kbn.advancedSettings.dateNanosFormatTitle": "纳秒格式的日期",
-    "kbn.advancedSettings.dateNanosLinkTitle": "date_nanos",
-    "kbn.advancedSettings.defaultRoute.defaultRouteIsRelativeValidationMessage": "必须是相对 URL。",
-    "kbn.advancedSettings.defaultRoute.defaultRouteText": "此设置指定打开 Kibana 时的默认路由。您可以使用此设置修改打开 Kibana 时的登陆页面。路由必须是相对 URL。",
-    "kbn.advancedSettings.defaultRoute.defaultRouteTitle": "默认路由",
-    "kbn.advancedSettings.disableAnimationsText": "在 Kibana UI 中关闭所有没有必要的动画。刷新页面以应用更改。",
-    "kbn.advancedSettings.disableAnimationsTitle": "禁用动画",
-    "kbn.advancedSettings.maxCellHeightText": "表中单元格应占用的最大高度。设置为 0 可禁用截短",
-    "kbn.advancedSettings.maxCellHeightTitle": "最大表单元格高度",
-    "kbn.advancedSettings.notifications.banner.markdownLinkText": "Markdown 受支持",
-    "kbn.advancedSettings.notifications.bannerLifetimeText": "在屏幕上显示横幅通知的时间（毫秒）。设置为 {infinityValue} 将禁用倒计时。",
-    "kbn.advancedSettings.notifications.bannerLifetimeTitle": "横幅通知生存时间",
-    "kbn.advancedSettings.notifications.bannerText": "用于向所有用户发送临时通知的定制横幅。{markdownLink}",
-    "kbn.advancedSettings.notifications.bannerTitle": "定制横幅通知",
-    "kbn.advancedSettings.notifications.errorLifetimeText": "在屏幕上显示错误通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
-    "kbn.advancedSettings.notifications.errorLifetimeTitle": "错误通知生存时间",
-    "kbn.advancedSettings.notifications.infoLifetimeText": "在屏幕上显示信息通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
-    "kbn.advancedSettings.notifications.infoLifetimeTitle": "信息通知生存时间",
-    "kbn.advancedSettings.notifications.warningLifetimeText": "在屏幕上显示警告通知的时间（毫秒）。设置为 {infinityValue} 将禁用。",
-    "kbn.advancedSettings.notifications.warningLifetimeTitle": "警告通知生存时间",
-    "kbn.advancedSettings.pageNavigationDesc": "更改导航样式",
-    "kbn.advancedSettings.pageNavigationLegacy": "旧版",
-    "kbn.advancedSettings.pageNavigationModern": "现代",
-    "kbn.advancedSettings.pageNavigationName": "侧边导航样式",
-    "kbn.advancedSettings.storeUrlText": "URL 有时会变得过长，以使得某些浏览器无法处理。为此，我们正在测试将 URL 的各个组成部分存储在会话存储中是否会有帮助。请告知我们这样做的效果！",
-    "kbn.advancedSettings.storeUrlTitle": "将 URL 存储在会话存储中",
-    "kbn.advancedSettings.themeVersionText": "在用于 Kibana 当前和下一版本的主题间切换。需要刷新页面，才能应用设置。",
-    "kbn.advancedSettings.themeVersionTitle": "主题版本",
     "kbn.advancedSettings.visualization.showRegionMapWarningsText": "词无法联接到地图上的形状时，区域地图是否显示警告。",
     "kbn.advancedSettings.visualization.showRegionMapWarningsTitle": "显示区域地图警告",
     "kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText": "单元格维度的解释",

From 0758df87fcf461ed90fa6d49bf14f2b2c921f031 Mon Sep 17 00:00:00 2001
From: Ryland Herrick <ryalnd@gmail.com>
Date: Mon, 24 Aug 2020 15:38:35 -0500
Subject: [PATCH 011/148] [Security Solution][Detections] Cleaning up
 mocks/tests (#74920)

* Simplify our kibana mocks

* Simpler mock factory that returns an object instead of a thunk
  * We can use mockReturnValue instead of mockImplementation to
  accomplish the same
  * Allows us to replace createStartServices mock
* Uses unknown instead of any for mocks

* Clean up our manual use of kibana mocks in tests

* Since our useKibana mock returns a consistent mock, we can modify its
return value instead of re-mocking the entire thing
* Removes unnecessary uses of clearing/resetting mocks
  * If your mocks are configured at the beginning of each test this is
  usually unnecessary.
  * I left one case of clearAllMocks in all_cases/index.test since it
  defined several mock functions that were persistent across tests, and
  it was easier than moving their definitions to a beforeEach
* Removes some unnecessary overrides that seemed due to storage
previously not being mocked

* Rename some old occurrences of SIEM

* Cross-reference similar hooks via JSDoc

There's a good chance that the consumer might want the OTHER hook, so
let's make that discoverable.

* Adds jest tests for our useListsConfig hook

* adds mocks for the hooks upon which it depends

* Add a mock for our useListsConfig hook

Leverages this mock factory in our manual mock for this hook.

* Remove unneeded eslint exception

* Move kibana_react mocks into their own .mock file

We're trying to consolidate mocks to this pattern so that they're easier
to find and reuse.

* Remove intermediate mock factory

This was only being consumed by our general createStartServicesMock.

* Replace security_solution's alias for a core mock

This is just noise/tech debt, we should use the core mock directly when
we can.

* Remove unnecessary wrapper around core mocks

Instead let's just reference the core mocks themselves.

* Remove outdated references from upstream

* More accurate mock

Throw an error of the same type if an unexpected key is used.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../lists/public/common/mocks/kibana_core.ts  |  12 --
 .../lists/public/exceptions/api.test.ts       | 186 ++++++++----------
 .../hooks/persist_exception_item.test.ts      |   4 +-
 .../hooks/persist_exception_list.test.ts      |   4 +-
 .../public/exceptions/hooks/use_api.test.ts   |   4 +-
 .../hooks/use_exception_list.test.ts          |   4 +-
 .../cases/components/all_cases/index.test.tsx |  16 +-
 .../configure_cases/__mock__/index.tsx        |  10 -
 .../components/configure_cases/index.test.tsx |  46 ++---
 .../use_all_cases_modal/index.test.tsx        |  17 +-
 .../draggable_wrapper_hover_content.test.tsx  |   4 +-
 .../add_exception_modal/index.test.tsx        |   9 +-
 .../edit_exception_modal/index.test.tsx       |   9 +-
 .../exceptions/use_add_exception.test.tsx     |   4 +-
 ...tch_or_create_rule_exception_list.test.tsx |   4 +-
 .../ml/hooks/use_installed_security_jobs.ts   |   3 +
 .../ml_popover/hooks/use_security_jobs.ts     |   9 +-
 .../common/components/ml_popover/types.ts     |   2 +-
 .../components/query_bar/index.test.tsx       |  34 +---
 .../super_date_picker/index.test.tsx          |   2 +-
 .../common/components/top_n/index.test.tsx    |   4 +-
 .../use_messages_storage.test.tsx             |   6 +-
 .../common/lib/kibana/__mocks__/index.ts      |  12 +-
 .../common/lib/kibana/kibana_react.mock.ts    | 103 ++++++++++
 .../mock/endpoint/app_context_render.tsx      |   2 +-
 .../public/common/mock/index.ts               |   1 -
 .../public/common/mock/kibana_core.ts         |  15 --
 .../public/common/mock/kibana_react.ts        | 126 ------------
 .../public/common/mock/test_providers.tsx     |   7 +-
 .../lists/__mocks__/use_lists_config.tsx      |   4 +-
 .../lists/use_lists_config.mock.ts            |  15 ++
 .../lists/use_lists_config.test.tsx           |  86 ++++++++
 .../lists/use_lists_index.mock.ts             |  14 ++
 .../lists/use_lists_privileges.mock.ts        |  14 ++
 .../detection_engine/rules/all/index.test.tsx |  56 +++---
 .../recent_cases/no_cases/index.test.tsx      |  20 +-
 .../data_providers/data_providers.test.tsx    |   5 +-
 .../data_providers/providers.test.tsx         |   4 +-
 .../components/timeline/header/index.test.tsx |   4 +-
 .../timeline/query_bar/index.test.tsx         |   4 +-
 .../containers/local_storage/index.test.ts    |  11 +-
 41 files changed, 429 insertions(+), 467 deletions(-)
 delete mode 100644 x-pack/plugins/lists/public/common/mocks/kibana_core.ts
 create mode 100644 x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
 delete mode 100644 x-pack/plugins/security_solution/public/common/mock/kibana_core.ts
 delete mode 100644 x-pack/plugins/security_solution/public/common/mock/kibana_react.ts
 create mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.mock.ts
 create mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_index.mock.ts
 create mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_privileges.mock.ts

diff --git a/x-pack/plugins/lists/public/common/mocks/kibana_core.ts b/x-pack/plugins/lists/public/common/mocks/kibana_core.ts
deleted file mode 100644
index c078e8ccd5ea1..0000000000000
--- a/x-pack/plugins/lists/public/common/mocks/kibana_core.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { coreMock } from '../../../../../../src/core/public/mocks';
-import { CoreStart } from '../../../../../../src/core/public';
-
-export type GlobalServices = Pick<CoreStart, 'http'>;
-
-export const createKibanaCoreStartMock = (): GlobalServices => coreMock.createStart();
diff --git a/x-pack/plugins/lists/public/exceptions/api.test.ts b/x-pack/plugins/lists/public/exceptions/api.test.ts
index 9add15c533d14..457a8708ec341 100644
--- a/x-pack/plugins/lists/public/exceptions/api.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/api.test.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { createKibanaCoreStartMock } from '../common/mocks/kibana_core';
+import { coreMock } from '../../../../../src/core/public/mocks';
 import { getExceptionListSchemaMock } from '../../common/schemas/response/exception_list_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../common/schemas/response/exception_list_item_schema.mock';
 import { getCreateExceptionListSchemaMock } from '../../common/schemas/request/create_exception_list_schema.mock';
@@ -34,39 +34,28 @@ import { ApiCallByIdProps, ApiCallByListIdProps } from './types';
 
 const abortCtrl = new AbortController();
 
-jest.mock('../common/mocks/kibana_core', () => ({
-  createKibanaCoreStartMock: (): jest.Mock => jest.fn(),
-}));
-const fetchMock = jest.fn();
+describe('Exceptions Lists API', () => {
+  let httpMock: ReturnType<typeof coreMock.createStart>['http'];
 
-/*
- This is a little funky, in order for typescript to not
- yell at us for converting 'Pick<CoreStart, "http">' to type 'Mock<any, any>'
- have to first convert to type 'unknown'
- */
-const mockKibanaHttpService = ((createKibanaCoreStartMock() as unknown) as jest.Mock).mockReturnValue(
-  {
-    fetch: fetchMock,
-  }
-);
+  beforeEach(() => {
+    httpMock = coreMock.createStart().http;
+  });
 
-describe('Exceptions Lists API', () => {
   describe('#addExceptionList', () => {
     beforeEach(() => {
-      fetchMock.mockClear();
-      fetchMock.mockResolvedValue(getExceptionListSchemaMock());
+      httpMock.fetch.mockResolvedValue(getExceptionListSchemaMock());
     });
 
     test('it invokes "addExceptionList" with expected url and body values', async () => {
       const payload = getCreateExceptionListSchemaMock();
       await addExceptionList({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         list: payload,
         signal: abortCtrl.signal,
       });
       // TODO Would like to just use getExceptionListSchemaMock() here, but
       // validation returns object in different order, making the strings not match
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists', {
         body: JSON.stringify(payload),
         method: 'POST',
         signal: abortCtrl.signal,
@@ -76,7 +65,7 @@ describe('Exceptions Lists API', () => {
     test('it returns expected exception list on success', async () => {
       const payload = getCreateExceptionListSchemaMock();
       const exceptionResponse = await addExceptionList({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         list: payload,
         signal: abortCtrl.signal,
       });
@@ -90,7 +79,7 @@ describe('Exceptions Lists API', () => {
 
       await expect(
         addExceptionList({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           list: (payload as unknown) as ExceptionListSchema,
           signal: abortCtrl.signal,
         })
@@ -101,11 +90,11 @@ describe('Exceptions Lists API', () => {
       const payload = getCreateExceptionListSchemaMock();
       const badPayload = getExceptionListSchemaMock();
       delete badPayload.id;
-      fetchMock.mockResolvedValue(badPayload);
+      httpMock.fetch.mockResolvedValue(badPayload);
 
       await expect(
         addExceptionList({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           list: payload,
           signal: abortCtrl.signal,
         })
@@ -115,20 +104,19 @@ describe('Exceptions Lists API', () => {
 
   describe('#addExceptionListItem', () => {
     beforeEach(() => {
-      fetchMock.mockClear();
-      fetchMock.mockResolvedValue(getExceptionListItemSchemaMock());
+      httpMock.fetch.mockResolvedValue(getExceptionListItemSchemaMock());
     });
 
     test('it invokes "addExceptionListItem" with expected url and body values', async () => {
       const payload = getCreateExceptionListItemSchemaMock();
       await addExceptionListItem({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listItem: payload,
         signal: abortCtrl.signal,
       });
       // TODO Would like to just use getExceptionListSchemaMock() here, but
       // validation returns object in different order, making the strings not match
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists/items', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists/items', {
         body: JSON.stringify(payload),
         method: 'POST',
         signal: abortCtrl.signal,
@@ -138,7 +126,7 @@ describe('Exceptions Lists API', () => {
     test('it returns expected exception list on success', async () => {
       const payload = getCreateExceptionListItemSchemaMock();
       const exceptionResponse = await addExceptionListItem({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listItem: payload,
         signal: abortCtrl.signal,
       });
@@ -152,7 +140,7 @@ describe('Exceptions Lists API', () => {
 
       await expect(
         addExceptionListItem({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           listItem: (payload as unknown) as ExceptionListItemSchema,
           signal: abortCtrl.signal,
         })
@@ -163,11 +151,11 @@ describe('Exceptions Lists API', () => {
       const payload = getCreateExceptionListItemSchemaMock();
       const badPayload = getExceptionListItemSchemaMock();
       delete badPayload.id;
-      fetchMock.mockResolvedValue(badPayload);
+      httpMock.fetch.mockResolvedValue(badPayload);
 
       await expect(
         addExceptionListItem({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           listItem: payload,
           signal: abortCtrl.signal,
         })
@@ -177,20 +165,19 @@ describe('Exceptions Lists API', () => {
 
   describe('#updateExceptionList', () => {
     beforeEach(() => {
-      fetchMock.mockClear();
-      fetchMock.mockResolvedValue(getExceptionListSchemaMock());
+      httpMock.fetch.mockResolvedValue(getExceptionListSchemaMock());
     });
 
     test('it invokes "updateExceptionList" with expected url and body values', async () => {
       const payload = getUpdateExceptionListSchemaMock();
       await updateExceptionList({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         list: payload,
         signal: abortCtrl.signal,
       });
       // TODO Would like to just use getExceptionListSchemaMock() here, but
       // validation returns object in different order, making the strings not match
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists', {
         body: JSON.stringify(payload),
         method: 'PUT',
         signal: abortCtrl.signal,
@@ -200,7 +187,7 @@ describe('Exceptions Lists API', () => {
     test('it returns expected exception list on success', async () => {
       const payload = getUpdateExceptionListSchemaMock();
       const exceptionResponse = await updateExceptionList({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         list: payload,
         signal: abortCtrl.signal,
       });
@@ -213,7 +200,7 @@ describe('Exceptions Lists API', () => {
 
       await expect(
         updateExceptionList({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           list: payload,
           signal: abortCtrl.signal,
         })
@@ -224,11 +211,11 @@ describe('Exceptions Lists API', () => {
       const payload = getUpdateExceptionListSchemaMock();
       const badPayload = getExceptionListSchemaMock();
       delete badPayload.id;
-      fetchMock.mockResolvedValue(badPayload);
+      httpMock.fetch.mockResolvedValue(badPayload);
 
       await expect(
         updateExceptionList({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           list: payload,
           signal: abortCtrl.signal,
         })
@@ -238,20 +225,19 @@ describe('Exceptions Lists API', () => {
 
   describe('#updateExceptionListItem', () => {
     beforeEach(() => {
-      fetchMock.mockClear();
-      fetchMock.mockResolvedValue(getExceptionListItemSchemaMock());
+      httpMock.fetch.mockResolvedValue(getExceptionListItemSchemaMock());
     });
 
     test('it invokes "updateExceptionListItem" with expected url and body values', async () => {
       const payload = getUpdateExceptionListItemSchemaMock();
       await updateExceptionListItem({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listItem: payload,
         signal: abortCtrl.signal,
       });
       // TODO Would like to just use getExceptionListSchemaMock() here, but
       // validation returns object in different order, making the strings not match
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists/items', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists/items', {
         body: JSON.stringify(payload),
         method: 'PUT',
         signal: abortCtrl.signal,
@@ -261,7 +247,7 @@ describe('Exceptions Lists API', () => {
     test('it returns expected exception list on success', async () => {
       const payload = getUpdateExceptionListItemSchemaMock();
       const exceptionResponse = await updateExceptionListItem({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listItem: payload,
         signal: abortCtrl.signal,
       });
@@ -274,7 +260,7 @@ describe('Exceptions Lists API', () => {
 
       await expect(
         updateExceptionListItem({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           listItem: payload,
           signal: abortCtrl.signal,
         })
@@ -285,11 +271,11 @@ describe('Exceptions Lists API', () => {
       const payload = getUpdateExceptionListItemSchemaMock();
       const badPayload = getExceptionListItemSchemaMock();
       delete badPayload.id;
-      fetchMock.mockResolvedValue(badPayload);
+      httpMock.fetch.mockResolvedValue(badPayload);
 
       await expect(
         updateExceptionListItem({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           listItem: payload,
           signal: abortCtrl.signal,
         })
@@ -299,18 +285,17 @@ describe('Exceptions Lists API', () => {
 
   describe('#fetchExceptionListById', () => {
     beforeEach(() => {
-      fetchMock.mockClear();
-      fetchMock.mockResolvedValue(getExceptionListSchemaMock());
+      httpMock.fetch.mockResolvedValue(getExceptionListSchemaMock());
     });
 
     test('it invokes "fetchExceptionListById" with expected url and body values', async () => {
       await fetchExceptionListById({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: '1',
         namespaceType: 'single',
         signal: abortCtrl.signal,
       });
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists', {
         method: 'GET',
         query: {
           id: '1',
@@ -322,7 +307,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns expected exception list on success', async () => {
       const exceptionResponse = await fetchExceptionListById({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: '1',
         namespaceType: 'single',
         signal: abortCtrl.signal,
@@ -332,7 +317,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error and does not make request if request payload fails decode', async () => {
       const payload = ({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: 1,
         namespaceType: 'single',
         signal: abortCtrl.signal,
@@ -345,11 +330,11 @@ describe('Exceptions Lists API', () => {
     test('it returns error if response payload fails decode', async () => {
       const badPayload = getExceptionListSchemaMock();
       delete badPayload.id;
-      fetchMock.mockResolvedValue(badPayload);
+      httpMock.fetch.mockResolvedValue(badPayload);
 
       await expect(
         fetchExceptionListById({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           id: '1',
           namespaceType: 'single',
           signal: abortCtrl.signal,
@@ -360,14 +345,13 @@ describe('Exceptions Lists API', () => {
 
   describe('#fetchExceptionListsItemsByListIds', () => {
     beforeEach(() => {
-      fetchMock.mockClear();
-      fetchMock.mockResolvedValue(getFoundExceptionListItemSchemaMock());
+      httpMock.fetch.mockResolvedValue(getFoundExceptionListItemSchemaMock());
     });
 
     test('it invokes "fetchExceptionListsItemsByListIds" with expected url and body values', async () => {
       await fetchExceptionListsItemsByListIds({
         filterOptions: [],
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listIds: ['myList', 'myOtherListId'],
         namespaceTypes: ['single', 'single'],
         pagination: {
@@ -377,7 +361,7 @@ describe('Exceptions Lists API', () => {
         signal: abortCtrl.signal,
       });
 
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists/items/_find', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists/items/_find', {
         method: 'GET',
         query: {
           list_id: 'myList,myOtherListId',
@@ -397,7 +381,7 @@ describe('Exceptions Lists API', () => {
             tags: [],
           },
         ],
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listIds: ['myList'],
         namespaceTypes: ['single'],
         pagination: {
@@ -407,7 +391,7 @@ describe('Exceptions Lists API', () => {
         signal: abortCtrl.signal,
       });
 
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists/items/_find', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists/items/_find', {
         method: 'GET',
         query: {
           filter: 'exception-list.attributes.entries.field:hello world*',
@@ -428,7 +412,7 @@ describe('Exceptions Lists API', () => {
             tags: [],
           },
         ],
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listIds: ['myList'],
         namespaceTypes: ['agnostic'],
         pagination: {
@@ -438,7 +422,7 @@ describe('Exceptions Lists API', () => {
         signal: abortCtrl.signal,
       });
 
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists/items/_find', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists/items/_find', {
         method: 'GET',
         query: {
           filter: 'exception-list-agnostic.attributes.entries.field:hello world*',
@@ -459,7 +443,7 @@ describe('Exceptions Lists API', () => {
             tags: ['malware'],
           },
         ],
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listIds: ['myList'],
         namespaceTypes: ['agnostic'],
         pagination: {
@@ -469,7 +453,7 @@ describe('Exceptions Lists API', () => {
         signal: abortCtrl.signal,
       });
 
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists/items/_find', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists/items/_find', {
         method: 'GET',
         query: {
           filter: 'exception-list-agnostic.attributes.tags:malware',
@@ -490,7 +474,7 @@ describe('Exceptions Lists API', () => {
             tags: ['malware'],
           },
         ],
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listIds: ['myList'],
         namespaceTypes: ['agnostic'],
         pagination: {
@@ -500,7 +484,7 @@ describe('Exceptions Lists API', () => {
         signal: abortCtrl.signal,
       });
 
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists/items/_find', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists/items/_find', {
         method: 'GET',
         query: {
           filter:
@@ -517,7 +501,7 @@ describe('Exceptions Lists API', () => {
     test('it returns expected format when call succeeds', async () => {
       const exceptionResponse = await fetchExceptionListsItemsByListIds({
         filterOptions: [],
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listIds: ['endpoint_list_id'],
         namespaceTypes: ['single'],
         pagination: {
@@ -532,7 +516,7 @@ describe('Exceptions Lists API', () => {
     test('it returns error and does not make request if request payload fails decode', async () => {
       const payload = ({
         filterOptions: [],
-        http: mockKibanaHttpService(),
+        http: httpMock,
         listIds: ['myList'],
         namespaceTypes: ['not a namespace type'],
         pagination: {
@@ -549,12 +533,12 @@ describe('Exceptions Lists API', () => {
     test('it returns error if response payload fails decode', async () => {
       const badPayload = getExceptionListItemSchemaMock();
       delete badPayload.id;
-      fetchMock.mockResolvedValue(badPayload);
+      httpMock.fetch.mockResolvedValue(badPayload);
 
       await expect(
         fetchExceptionListsItemsByListIds({
           filterOptions: [],
-          http: mockKibanaHttpService(),
+          http: httpMock,
           listIds: ['myList'],
           namespaceTypes: ['single'],
           pagination: {
@@ -571,18 +555,17 @@ describe('Exceptions Lists API', () => {
 
   describe('#fetchExceptionListItemById', () => {
     beforeEach(() => {
-      fetchMock.mockClear();
-      fetchMock.mockResolvedValue(getExceptionListItemSchemaMock());
+      httpMock.fetch.mockResolvedValue(getExceptionListItemSchemaMock());
     });
 
     test('it invokes "fetchExceptionListItemById" with expected url and body values', async () => {
       await fetchExceptionListItemById({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: '1',
         namespaceType: 'single',
         signal: abortCtrl.signal,
       });
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists/items', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists/items', {
         method: 'GET',
         query: {
           id: '1',
@@ -594,7 +577,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns expected format when call succeeds', async () => {
       const exceptionResponse = await fetchExceptionListItemById({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: '1',
         namespaceType: 'single',
         signal: abortCtrl.signal,
@@ -604,7 +587,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error and does not make request if request payload fails decode', async () => {
       const payload = ({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: '1',
         namespaceType: 'not a namespace type',
         signal: abortCtrl.signal,
@@ -617,11 +600,11 @@ describe('Exceptions Lists API', () => {
     test('it returns error if response payload fails decode', async () => {
       const badPayload = getExceptionListItemSchemaMock();
       delete badPayload.id;
-      fetchMock.mockResolvedValue(badPayload);
+      httpMock.fetch.mockResolvedValue(badPayload);
 
       await expect(
         fetchExceptionListItemById({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           id: '1',
           namespaceType: 'single',
           signal: abortCtrl.signal,
@@ -632,18 +615,17 @@ describe('Exceptions Lists API', () => {
 
   describe('#deleteExceptionListById', () => {
     beforeEach(() => {
-      fetchMock.mockClear();
-      fetchMock.mockResolvedValue(getExceptionListSchemaMock());
+      httpMock.fetch.mockResolvedValue(getExceptionListSchemaMock());
     });
 
     test('check parameter url, body when deleting exception item', async () => {
       await deleteExceptionListById({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: '1',
         namespaceType: 'single',
         signal: abortCtrl.signal,
       });
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists', {
         method: 'DELETE',
         query: {
           id: '1',
@@ -655,7 +637,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns expected format when call succeeds', async () => {
       const exceptionResponse = await deleteExceptionListById({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: '1',
         namespaceType: 'single',
         signal: abortCtrl.signal,
@@ -665,7 +647,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error and does not make request if request payload fails decode', async () => {
       const payload = ({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: 1,
         namespaceType: 'single',
         signal: abortCtrl.signal,
@@ -678,11 +660,11 @@ describe('Exceptions Lists API', () => {
     test('it returns error if response payload fails decode', async () => {
       const badPayload = getExceptionListSchemaMock();
       delete badPayload.id;
-      fetchMock.mockResolvedValue(badPayload);
+      httpMock.fetch.mockResolvedValue(badPayload);
 
       await expect(
         deleteExceptionListById({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           id: '1',
           namespaceType: 'single',
           signal: abortCtrl.signal,
@@ -693,18 +675,17 @@ describe('Exceptions Lists API', () => {
 
   describe('#deleteExceptionListItemById', () => {
     beforeEach(() => {
-      fetchMock.mockClear();
-      fetchMock.mockResolvedValue(getExceptionListItemSchemaMock());
+      httpMock.fetch.mockResolvedValue(getExceptionListItemSchemaMock());
     });
 
     test('check parameter url, body when deleting exception item', async () => {
       await deleteExceptionListItemById({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: '1',
         namespaceType: 'single',
         signal: abortCtrl.signal,
       });
-      expect(fetchMock).toHaveBeenCalledWith('/api/exception_lists/items', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/exception_lists/items', {
         method: 'DELETE',
         query: {
           id: '1',
@@ -716,7 +697,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns expected format when call succeeds', async () => {
       const exceptionResponse = await deleteExceptionListItemById({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: '1',
         namespaceType: 'single',
         signal: abortCtrl.signal,
@@ -726,7 +707,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error and does not make request if request payload fails decode', async () => {
       const payload = ({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         id: 1,
         namespaceType: 'single',
         signal: abortCtrl.signal,
@@ -739,11 +720,11 @@ describe('Exceptions Lists API', () => {
     test('it returns error if response payload fails decode', async () => {
       const badPayload = getExceptionListItemSchemaMock();
       delete badPayload.id;
-      fetchMock.mockResolvedValue(badPayload);
+      httpMock.fetch.mockResolvedValue(badPayload);
 
       await expect(
         deleteExceptionListItemById({
-          http: mockKibanaHttpService(),
+          http: httpMock,
           id: '1',
           namespaceType: 'single',
           signal: abortCtrl.signal,
@@ -754,16 +735,15 @@ describe('Exceptions Lists API', () => {
 
   describe('#addEndpointExceptionList', () => {
     beforeEach(() => {
-      fetchMock.mockClear();
-      fetchMock.mockResolvedValue(getExceptionListSchemaMock());
+      httpMock.fetch.mockResolvedValue(getExceptionListSchemaMock());
     });
 
     test('it invokes "addEndpointExceptionList" with expected url and body values', async () => {
       await addEndpointExceptionList({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         signal: abortCtrl.signal,
       });
-      expect(fetchMock).toHaveBeenCalledWith('/api/endpoint_list', {
+      expect(httpMock.fetch).toHaveBeenCalledWith('/api/endpoint_list', {
         method: 'POST',
         signal: abortCtrl.signal,
       });
@@ -771,16 +751,16 @@ describe('Exceptions Lists API', () => {
 
     test('it returns expected exception list on success', async () => {
       const exceptionResponse = await addEndpointExceptionList({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         signal: abortCtrl.signal,
       });
       expect(exceptionResponse).toEqual(getExceptionListSchemaMock());
     });
 
     test('it returns an empty object when list already exists', async () => {
-      fetchMock.mockResolvedValue({});
+      httpMock.fetch.mockResolvedValue({});
       const exceptionResponse = await addEndpointExceptionList({
-        http: mockKibanaHttpService(),
+        http: httpMock,
         signal: abortCtrl.signal,
       });
       expect(exceptionResponse).toEqual({});
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts
index ebee2cbace9cc..9460432cbc9c9 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_item.test.ts
@@ -6,16 +6,16 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 
+import { coreMock } from '../../../../../../src/core/public/mocks';
 import * as api from '../api';
 import { getCreateExceptionListItemSchemaMock } from '../../../common/schemas/request/create_exception_list_item_schema.mock';
 import { getUpdateExceptionListItemSchemaMock } from '../../../common/schemas/request/update_exception_list_item_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
-import { createKibanaCoreStartMock } from '../../common/mocks/kibana_core';
 import { PersistHookProps } from '../types';
 
 import { ReturnPersistExceptionItem, usePersistExceptionItem } from './persist_exception_item';
 
-const mockKibanaHttpService = createKibanaCoreStartMock().http;
+const mockKibanaHttpService = coreMock.createStart().http;
 
 describe('usePersistExceptionItem', () => {
   const onError = jest.fn();
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts
index 0541f893e2797..d5dfe1174d009 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/persist_exception_list.test.ts
@@ -6,16 +6,16 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 
+import { coreMock } from '../../../../../../src/core/public/mocks';
 import * as api from '../api';
 import { getCreateExceptionListSchemaMock } from '../../../common/schemas/request/create_exception_list_schema.mock';
 import { getUpdateExceptionListSchemaMock } from '../../../common/schemas/request/update_exception_list_schema.mock';
 import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
-import { createKibanaCoreStartMock } from '../../common/mocks/kibana_core';
 import { PersistHookProps } from '../types';
 
 import { ReturnPersistExceptionList, usePersistExceptionList } from './persist_exception_list';
 
-const mockKibanaHttpService = createKibanaCoreStartMock().http;
+const mockKibanaHttpService = coreMock.createStart().http;
 
 describe('usePersistExceptionList', () => {
   const onError = jest.fn();
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts
index c93155274937e..6469dc49c460f 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/use_api.test.ts
@@ -6,8 +6,8 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 
+import { coreMock } from '../../../../../../src/core/public/mocks';
 import * as api from '../api';
-import { createKibanaCoreStartMock } from '../../common/mocks/kibana_core';
 import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
 import { getFoundExceptionListItemSchemaMock } from '../../../common/schemas/response/found_exception_list_item_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
@@ -16,7 +16,7 @@ import { ApiCallByIdProps, ApiCallByListIdProps } from '../types';
 
 import { ExceptionsApi, useApi } from './use_api';
 
-const mockKibanaHttpService = createKibanaCoreStartMock().http;
+const mockKibanaHttpService = coreMock.createStart().http;
 
 describe('useApi', () => {
   const onErrorMock = jest.fn();
diff --git a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list.test.ts b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list.test.ts
index 3a8b1713b901b..5c544c7e96e33 100644
--- a/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/hooks/use_exception_list.test.ts
@@ -6,15 +6,15 @@
 
 import { act, renderHook } from '@testing-library/react-hooks';
 
+import { coreMock } from '../../../../../../src/core/public/mocks';
 import * as api from '../api';
-import { createKibanaCoreStartMock } from '../../common/mocks/kibana_core';
 import { getFoundExceptionListItemSchemaMock } from '../../../common/schemas/response/found_exception_list_item_schema.mock';
 import { ExceptionListItemSchema } from '../../../common/schemas';
 import { UseExceptionListProps, UseExceptionListSuccess } from '../types';
 
 import { ReturnExceptionListAndItems, useExceptionList } from './use_exception_list';
 
-const mockKibanaHttpService = createKibanaCoreStartMock().http;
+const mockKibanaHttpService = coreMock.createStart().http;
 
 describe('useExceptionList', () => {
   const onErrorMock = jest.fn();
diff --git a/x-pack/plugins/security_solution/public/cases/components/all_cases/index.test.tsx b/x-pack/plugins/security_solution/public/cases/components/all_cases/index.test.tsx
index f5ed151ebac3c..e6e0823214195 100644
--- a/x-pack/plugins/security_solution/public/cases/components/all_cases/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/all_cases/index.test.tsx
@@ -15,7 +15,6 @@ import { useGetCasesMockState } from '../../containers/mock';
 import * as i18n from './translations';
 
 import { useKibana } from '../../../common/lib/kibana';
-import { createUseKibanaMock } from '../../../common/mock/kibana_react';
 import { getEmptyTagValue } from '../../../common/components/empty_value';
 import { useDeleteCases } from '../../containers/use_delete_cases';
 import { useGetCases } from '../../containers/use_get_cases';
@@ -28,7 +27,7 @@ jest.mock('../../containers/use_delete_cases');
 jest.mock('../../containers/use_get_cases');
 jest.mock('../../containers/use_get_cases_status');
 
-const useKibanaMock = useKibana as jest.Mock;
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 const useDeleteCasesMock = useDeleteCases as jest.Mock;
 const useGetCasesMock = useGetCases as jest.Mock;
 const useGetCasesStatusMock = useGetCasesStatus as jest.Mock;
@@ -97,23 +96,16 @@ describe('AllCases', () => {
   });
   /* eslint-enable no-console */
   beforeEach(() => {
-    jest.resetAllMocks();
+    jest.clearAllMocks();
     navigateToApp = jest.fn();
-    const kibanaMock = createUseKibanaMock()();
-    useKibanaMock.mockReturnValue({
-      ...kibanaMock,
-      services: {
-        application: {
-          navigateToApp,
-        },
-      },
-    });
+    useKibanaMock().services.application.navigateToApp = navigateToApp;
     useUpdateCasesMock.mockReturnValue(defaultUpdateCases);
     useGetCasesMock.mockReturnValue(defaultGetCases);
     useDeleteCasesMock.mockReturnValue(defaultDeleteCases);
     useGetCasesStatusMock.mockReturnValue(defaultCasesStatus);
     moment.tz.setDefault('UTC');
   });
+
   it('should render AllCases', () => {
     const wrapper = mount(
       <TestProviders>
diff --git a/x-pack/plugins/security_solution/public/cases/components/configure_cases/__mock__/index.tsx b/x-pack/plugins/security_solution/public/cases/components/configure_cases/__mock__/index.tsx
index 23c76953a6a0f..08303ddc9397e 100644
--- a/x-pack/plugins/security_solution/public/cases/components/configure_cases/__mock__/index.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/configure_cases/__mock__/index.tsx
@@ -8,10 +8,7 @@ import { Connector } from '../../../containers/configure/types';
 import { ReturnConnectors } from '../../../containers/configure/use_connectors';
 import { connectorsMock } from '../../../containers/configure/mock';
 import { ReturnUseCaseConfigure } from '../../../containers/configure/use_configure';
-import { createUseKibanaMock } from '../../../../common/mock/kibana_react';
 export { mapping } from '../../../containers/configure/mock';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { actionTypeRegistryMock } from '../../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
 
 export const connectors: Connector[] = connectorsMock;
 
@@ -46,10 +43,3 @@ export const useConnectorsResponse: ReturnConnectors = {
   connectors,
   refetchConnectors: jest.fn(),
 };
-
-export const kibanaMockImplementationArgs = {
-  services: {
-    ...createUseKibanaMock()().services,
-    triggers_actions_ui: { actionTypeRegistry: actionTypeRegistryMock.create() },
-  },
-};
diff --git a/x-pack/plugins/security_solution/public/cases/components/configure_cases/index.test.tsx b/x-pack/plugins/security_solution/public/cases/components/configure_cases/index.test.tsx
index 7974116f4dc43..3c17a9191d20c 100644
--- a/x-pack/plugins/security_solution/public/cases/components/configure_cases/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/configure_cases/index.test.tsx
@@ -15,38 +15,39 @@ import {
   ActionsConnectorsContextProvider,
   ConnectorAddFlyout,
   ConnectorEditFlyout,
+  TriggersAndActionsUIPublicPluginStart,
 } from '../../../../../triggers_actions_ui/public';
+import { actionTypeRegistryMock } from '../../../../../triggers_actions_ui/public/application/action_type_registry.mock';
 
 import { useKibana } from '../../../common/lib/kibana';
 import { useConnectors } from '../../containers/configure/use_connectors';
 import { useCaseConfigure } from '../../containers/configure/use_configure';
 import { useGetUrlSearch } from '../../../common/components/navigation/use_get_url_search';
 
-import {
-  connectors,
-  searchURL,
-  useCaseConfigureResponse,
-  useConnectorsResponse,
-  kibanaMockImplementationArgs,
-} from './__mock__';
+import { connectors, searchURL, useCaseConfigureResponse, useConnectorsResponse } from './__mock__';
 
 jest.mock('../../../common/lib/kibana');
 jest.mock('../../containers/configure/use_connectors');
 jest.mock('../../containers/configure/use_configure');
 jest.mock('../../../common/components/navigation/use_get_url_search');
 
-const useKibanaMock = useKibana as jest.Mock;
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 const useConnectorsMock = useConnectors as jest.Mock;
 const useCaseConfigureMock = useCaseConfigure as jest.Mock;
 const useGetUrlSearchMock = useGetUrlSearch as jest.Mock;
+
 describe('ConfigureCases', () => {
+  beforeEach(() => {
+    useKibanaMock().services.triggers_actions_ui = ({
+      actionTypeRegistry: actionTypeRegistryMock.create(),
+    } as unknown) as TriggersAndActionsUIPublicPluginStart;
+  });
+
   describe('rendering', () => {
     let wrapper: ReactWrapper;
     beforeEach(() => {
-      jest.resetAllMocks();
       useCaseConfigureMock.mockImplementation(() => useCaseConfigureResponse);
       useConnectorsMock.mockImplementation(() => ({ ...useConnectorsResponse, connectors: [] }));
-      useKibanaMock.mockImplementation(() => kibanaMockImplementationArgs);
       useGetUrlSearchMock.mockImplementation(() => searchURL);
 
       wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
@@ -84,8 +85,8 @@ describe('ConfigureCases', () => {
 
   describe('Unhappy path', () => {
     let wrapper: ReactWrapper;
+
     beforeEach(() => {
-      jest.resetAllMocks();
       useCaseConfigureMock.mockImplementation(() => ({
         ...useCaseConfigureResponse,
         closureType: 'close-by-user',
@@ -98,7 +99,6 @@ describe('ConfigureCases', () => {
         },
       }));
       useConnectorsMock.mockImplementation(() => ({ ...useConnectorsResponse, connectors: [] }));
-      useKibanaMock.mockImplementation(() => kibanaMockImplementationArgs);
       useGetUrlSearchMock.mockImplementation(() => searchURL);
       wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
     });
@@ -122,7 +122,6 @@ describe('ConfigureCases', () => {
     let wrapper: ReactWrapper;
 
     beforeEach(() => {
-      jest.resetAllMocks();
       useCaseConfigureMock.mockImplementation(() => ({
         ...useCaseConfigureResponse,
         mapping: connectors[0].config.incidentConfiguration.mapping,
@@ -136,7 +135,6 @@ describe('ConfigureCases', () => {
         },
       }));
       useConnectorsMock.mockImplementation(() => useConnectorsResponse);
-      useKibanaMock.mockImplementation(() => kibanaMockImplementationArgs);
       useGetUrlSearchMock.mockImplementation(() => searchURL);
 
       wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
@@ -211,9 +209,6 @@ describe('ConfigureCases', () => {
     let wrapper: ReactWrapper;
 
     beforeEach(() => {
-      jest.resetAllMocks();
-      jest.restoreAllMocks();
-      jest.clearAllMocks();
       useCaseConfigureMock.mockImplementation(() => ({
         ...useCaseConfigureResponse,
         mapping: connectors[1].config.incidentConfiguration.mapping,
@@ -230,7 +225,6 @@ describe('ConfigureCases', () => {
         ...useConnectorsResponse,
         loading: true,
       }));
-      useKibanaMock.mockImplementation(() => kibanaMockImplementationArgs);
       useGetUrlSearchMock.mockImplementation(() => searchURL);
       wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
     });
@@ -262,7 +256,6 @@ describe('ConfigureCases', () => {
     let wrapper: ReactWrapper;
 
     beforeEach(() => {
-      jest.resetAllMocks();
       useCaseConfigureMock.mockImplementation(() => ({
         ...useCaseConfigureResponse,
         connectorId: 'servicenow-1',
@@ -270,7 +263,6 @@ describe('ConfigureCases', () => {
       }));
 
       useConnectorsMock.mockImplementation(() => useConnectorsResponse);
-      useKibanaMock.mockImplementation(() => kibanaMockImplementationArgs);
       useGetUrlSearchMock.mockImplementation(() => searchURL);
       wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
     });
@@ -305,7 +297,6 @@ describe('ConfigureCases', () => {
     let wrapper: ReactWrapper;
 
     beforeEach(() => {
-      jest.resetAllMocks();
       useCaseConfigureMock.mockImplementation(() => ({
         ...useCaseConfigureResponse,
         loading: true,
@@ -313,7 +304,6 @@ describe('ConfigureCases', () => {
       useConnectorsMock.mockImplementation(() => ({
         ...useConnectorsResponse,
       }));
-      useKibanaMock.mockImplementation(() => kibanaMockImplementationArgs);
       useGetUrlSearchMock.mockImplementation(() => searchURL);
       wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
     });
@@ -329,10 +319,10 @@ describe('ConfigureCases', () => {
 
   describe('connectors', () => {
     let wrapper: ReactWrapper;
-    const persistCaseConfigure = jest.fn();
+    let persistCaseConfigure: jest.Mock;
 
     beforeEach(() => {
-      jest.resetAllMocks();
+      persistCaseConfigure = jest.fn();
       useCaseConfigureMock.mockImplementation(() => ({
         ...useCaseConfigureResponse,
         mapping: connectors[0].config.incidentConfiguration.mapping,
@@ -347,7 +337,6 @@ describe('ConfigureCases', () => {
         persistCaseConfigure,
       }));
       useConnectorsMock.mockImplementation(() => useConnectorsResponse);
-      useKibanaMock.mockImplementation(() => kibanaMockImplementationArgs);
       useGetUrlSearchMock.mockImplementation(() => searchURL);
 
       wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
@@ -396,10 +385,10 @@ describe('ConfigureCases', () => {
 
 describe('closure options', () => {
   let wrapper: ReactWrapper;
-  const persistCaseConfigure = jest.fn();
+  let persistCaseConfigure: jest.Mock;
 
   beforeEach(() => {
-    jest.resetAllMocks();
+    persistCaseConfigure = jest.fn();
     useCaseConfigureMock.mockImplementation(() => ({
       ...useCaseConfigureResponse,
       mapping: connectors[0].config.incidentConfiguration.mapping,
@@ -414,7 +403,6 @@ describe('closure options', () => {
       persistCaseConfigure,
     }));
     useConnectorsMock.mockImplementation(() => useConnectorsResponse);
-    useKibanaMock.mockImplementation(() => kibanaMockImplementationArgs);
     useGetUrlSearchMock.mockImplementation(() => searchURL);
 
     wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
@@ -435,7 +423,6 @@ describe('closure options', () => {
 
 describe('user interactions', () => {
   beforeEach(() => {
-    jest.resetAllMocks();
     useCaseConfigureMock.mockImplementation(() => ({
       ...useCaseConfigureResponse,
       mapping: connectors[1].config.incidentConfiguration.mapping,
@@ -449,7 +436,6 @@ describe('user interactions', () => {
       },
     }));
     useConnectorsMock.mockImplementation(() => useConnectorsResponse);
-    useKibanaMock.mockImplementation(() => kibanaMockImplementationArgs);
     useGetUrlSearchMock.mockImplementation(() => searchURL);
   });
 
diff --git a/x-pack/plugins/security_solution/public/cases/components/use_all_cases_modal/index.test.tsx b/x-pack/plugins/security_solution/public/cases/components/use_all_cases_modal/index.test.tsx
index b5bf68cbf6dc8..3b203e81cd074 100644
--- a/x-pack/plugins/security_solution/public/cases/components/use_all_cases_modal/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/use_all_cases_modal/index.test.tsx
@@ -14,26 +14,17 @@ import '../../../common/mock/match_media';
 import { TimelineId } from '../../../../common/types/timeline';
 import { useAllCasesModal, UseAllCasesModalProps, UseAllCasesModalReturnedValues } from '.';
 import { TestProviders } from '../../../common/mock';
-import { createUseKibanaMock } from '../../../common/mock/kibana_react';
 
 jest.mock('../../../common/lib/kibana');
 
-const useKibanaMock = useKibana as jest.Mock;
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 describe('useAllCasesModal', () => {
-  const navigateToApp = jest.fn(() => Promise.resolve());
+  let navigateToApp: jest.Mock;
 
   beforeEach(() => {
-    jest.clearAllMocks();
-    const kibanaMock = createUseKibanaMock()();
-    useKibanaMock.mockImplementation(() => ({
-      ...kibanaMock,
-      services: {
-        application: {
-          navigateToApp,
-        },
-      },
-    }));
+    navigateToApp = jest.fn();
+    useKibanaMock().services.application.navigateToApp = navigateToApp;
   });
 
   it('init', async () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx
index 8e76a88572e42..b53da42da55f8 100644
--- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/draggable_wrapper_hover_content.test.tsx
@@ -7,12 +7,12 @@
 import { mount, ReactWrapper } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { useWithSource } from '../../containers/source';
 import { mockBrowserFields } from '../../containers/source/mock';
 import '../../mock/match_media';
 import { useKibana } from '../../lib/kibana';
 import { TestProviders } from '../../mock';
-import { createKibanaCoreStartMock } from '../../mock/kibana_core';
 import { FilterManager } from '../../../../../../../src/plugins/data/public';
 import { useAddToTimeline } from '../../hooks/use_add_to_timeline';
 
@@ -60,7 +60,7 @@ jest.mock('../../../timelines/components/manage_timeline', () => {
   };
 });
 
-const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
+const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
 const timelineId = TimelineId.active;
 const field = 'process.name';
 const value = 'nice';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.test.tsx
index 2b713636862bb..cef92ce2a7817 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.test.tsx
@@ -11,14 +11,13 @@ import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
 import { act } from 'react-dom/test-utils';
 
 import { AddExceptionModal } from './';
-import { useKibana, useCurrentUser } from '../../../../common/lib/kibana';
+import { useCurrentUser } from '../../../../common/lib/kibana';
 import { getExceptionListSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_schema.mock';
 import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules';
 import { stubIndexPattern } from 'src/plugins/data/common/index_patterns/index_pattern.stub';
 import { useAddOrUpdateException } from '../use_add_exception';
 import { useFetchOrCreateRuleExceptionList } from '../use_fetch_or_create_rule_exception_list';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
-import { createUseKibanaMock } from '../../../mock/kibana_react';
 import { TimelineNonEcsData, Ecs } from '../../../../graphql/types';
 import * as builder from '../builder';
 import * as helpers from '../helpers';
@@ -33,8 +32,6 @@ jest.mock('../use_add_exception');
 jest.mock('../use_fetch_or_create_rule_exception_list');
 jest.mock('../builder');
 
-const useKibanaMock = useKibana as jest.Mock;
-
 describe('When the add exception modal is opened', () => {
   const ruleName = 'test rule';
   let defaultEndpointItems: jest.SpyInstance<ReturnType<
@@ -49,10 +46,6 @@ describe('When the add exception modal is opened', () => {
       .spyOn(builder, 'ExceptionBuilderComponent')
       .mockReturnValue(<></>);
 
-    const kibanaMock = createUseKibanaMock()();
-    useKibanaMock.mockImplementation(() => ({
-      ...kibanaMock,
-    }));
     (useAddOrUpdateException as jest.Mock).mockImplementation(() => [
       { isLoading: false },
       jest.fn(),
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
index 8ad80eba569c7..6ff218ca06059 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
@@ -11,7 +11,7 @@ import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
 import { act } from 'react-dom/test-utils';
 
 import { EditExceptionModal } from './';
-import { useKibana, useCurrentUser } from '../../../../common/lib/kibana';
+import { useCurrentUser } from '../../../../common/lib/kibana';
 import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules';
 import {
   stubIndexPattern,
@@ -19,7 +19,6 @@ import {
 } from 'src/plugins/data/common/index_patterns/index_pattern.stub';
 import { useAddOrUpdateException } from '../use_add_exception';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
-import { createUseKibanaMock } from '../../../mock/kibana_react';
 import { getExceptionListItemSchemaMock } from '../../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
 import { EntriesArray } from '../../../../../../lists/common/schemas/types';
 import * as builder from '../builder';
@@ -31,8 +30,6 @@ jest.mock('../use_fetch_or_create_rule_exception_list');
 jest.mock('../../../../detections/containers/detection_engine/alerts/use_signal_index');
 jest.mock('../builder');
 
-const useKibanaMock = useKibana as jest.Mock;
-
 describe('When the edit exception modal is opened', () => {
   const ruleName = 'test rule';
 
@@ -45,10 +42,6 @@ describe('When the edit exception modal is opened', () => {
       .spyOn(builder, 'ExceptionBuilderComponent')
       .mockReturnValue(<></>);
 
-    const kibanaMock = createUseKibanaMock()();
-    useKibanaMock.mockImplementation(() => ({
-      ...kibanaMock,
-    }));
     (useSignalIndex as jest.Mock).mockReturnValue({
       loading: false,
       signalIndexName: 'test-signal',
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
index cb1a80abedb27..6611ee2385d10 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
@@ -5,6 +5,7 @@
  */
 
 import { act, renderHook, RenderHookResult } from '@testing-library/react-hooks';
+import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { KibanaServices } from '../../../common/lib/kibana';
 
 import * as alertsApi from '../../../detections/containers/detection_engine/alerts/api';
@@ -14,7 +15,6 @@ import * as buildAlertStatusFilterHelper from '../../../detections/components/al
 import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
 import { getCreateExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/request/create_exception_list_item_schema.mock';
 import { getUpdateExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/request/update_exception_list_item_schema.mock';
-import { createKibanaCoreStartMock } from '../../../common/mock/kibana_core';
 import {
   ExceptionListItemSchema,
   CreateExceptionListItemSchema,
@@ -27,7 +27,7 @@ import {
   AddOrUpdateExceptionItemsFunc,
 } from './use_add_exception';
 
-const mockKibanaHttpService = createKibanaCoreStartMock().http;
+const mockKibanaHttpService = coreMock.createStart().http;
 const mockKibanaServices = KibanaServices.get as jest.Mock;
 jest.mock('../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
index 6dbf5922e0a97..39d88bd8e4724 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
@@ -6,11 +6,11 @@
 
 import { act, renderHook, RenderHookResult } from '@testing-library/react-hooks';
 
+import { coreMock } from '../../../../../../../src/core/public/mocks';
 import * as rulesApi from '../../../detections/containers/detection_engine/rules/api';
 import * as listsApi from '../../../../../lists/public/exceptions/api';
 import { getExceptionListSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_schema.mock';
 import { savedRuleMock } from '../../../detections/containers/detection_engine/rules/mock';
-import { createKibanaCoreStartMock } from '../../mock/kibana_core';
 import { ExceptionListType } from '../../../lists_plugin_deps';
 import { ListArray } from '../../../../common/detection_engine/schemas/types';
 import { getListArrayMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
@@ -20,7 +20,7 @@ import {
   ReturnUseFetchOrCreateRuleExceptionList,
 } from './use_fetch_or_create_rule_exception_list';
 
-const mockKibanaHttpService = createKibanaCoreStartMock().http;
+const mockKibanaHttpService = coreMock.createStart().http;
 jest.mock('../../../detections/containers/detection_engine/rules/api');
 
 describe('useFetchOrCreateRuleExceptionList', () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts
index a9a728f81cc6c..dde5eebe624bc 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/hooks/use_installed_security_jobs.ts
@@ -29,6 +29,9 @@ export interface UseInstalledSecurityJobsReturn {
  * Use the corresponding helper functions to filter the job list as
  * necessary (running jobs, etc).
  *
+ * NOTE: If you need to include jobs that are not currently installed, try the
+ * {@link useInstalledSecurityJobs} hook.
+ *
  */
 export const useInstalledSecurityJobs = (): UseInstalledSecurityJobsReturn => {
   const [jobs, setJobs] = useState<MlSummaryJob[]>([]);
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs.ts b/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs.ts
index e8809e8366eed..2ba5cb84d272d 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/hooks/use_security_jobs.ts
@@ -32,6 +32,7 @@ export interface UseSecurityJobsReturn {
  * list as necessary. E.g. installed jobs, running jobs, etc.
  *
  * NOTE: If the user is not an ml admin, jobs will be empty and isMlAdmin will be false.
+ * If you only need installed jobs, try the {@link useInstalledSecurityJobs} hook.
  *
  * @param refetchData
  */
@@ -39,7 +40,7 @@ export const useSecurityJobs = (refetchData: boolean): UseSecurityJobsReturn =>
   const [jobs, setJobs] = useState<SecurityJob[]>([]);
   const [loading, setLoading] = useState(true);
   const mlCapabilities = useMlCapabilities();
-  const [siemDefaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
+  const [securitySolutionDefaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
   const http = useHttp();
   const { addError } = useAppToasts();
 
@@ -54,12 +55,12 @@ export const useSecurityJobs = (refetchData: boolean): UseSecurityJobsReturn =>
     async function fetchSecurityJobIdsFromGroupsData() {
       if (isMlAdmin && isLicensed) {
         try {
-          // Batch fetch all installed jobs, ML modules, and check which modules are compatible with siemDefaultIndex
+          // Batch fetch all installed jobs, ML modules, and check which modules are compatible with securitySolutionDefaultIndex
           const [jobSummaryData, modulesData, compatibleModules] = await Promise.all([
             getJobsSummary({ http, signal: abortCtrl.signal }),
             getModules({ signal: abortCtrl.signal }),
             checkRecognizer({
-              indexPatternName: siemDefaultIndex,
+              indexPatternName: securitySolutionDefaultIndex,
               signal: abortCtrl.signal,
             }),
           ]);
@@ -89,7 +90,7 @@ export const useSecurityJobs = (refetchData: boolean): UseSecurityJobsReturn =>
       isSubscribed = false;
       abortCtrl.abort();
     };
-  }, [refetchData, isMlAdmin, isLicensed, siemDefaultIndex, addError, http]);
+  }, [refetchData, isMlAdmin, isLicensed, securitySolutionDefaultIndex, addError, http]);
 
   return { isLicensed, isMlAdmin, jobs, loading };
 };
diff --git a/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts b/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts
index c839f5110fe7f..7120fcf4a9e55 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml_popover/types.ts
@@ -111,7 +111,7 @@ export interface CustomURL {
 }
 
 /**
- * Representation of an ML Job as used by the SIEM App -- a composition of ModuleJob and MlSummaryJob
+ * Representation of an ML Job as used by the Security Solution App -- a composition of ModuleJob and MlSummaryJob
  * that includes necessary metadata like moduleName, defaultIndexPattern, etc.
  */
 export interface SecurityJob extends MlSummaryJob {
diff --git a/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
index aac83ce650d86..aa61688f1f986 100644
--- a/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/query_bar/index.test.tsx
@@ -7,14 +7,13 @@
 import { mount } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { DEFAULT_FROM, DEFAULT_TO } from '../../../../common/constants';
 import { TestProviders, mockIndexPattern } from '../../mock';
-import { createKibanaCoreStartMock } from '../../mock/kibana_core';
 import { FilterManager, SearchBar } from '../../../../../../../src/plugins/data/public';
 import { QueryBar, QueryBarComponentProps } from '.';
-import { createKibanaContextProviderMock } from '../../mock/kibana_react';
 
-const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
+const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
 
 describe('QueryBar ', () => {
   // We are doing that because we need to wrapped this component with redux
@@ -187,13 +186,9 @@ describe('QueryBar ', () => {
 
   describe('state', () => {
     test('clears draftQuery when filterQueryDraft has been cleared', () => {
-      const KibanaWithStorageProvider = createKibanaContextProviderMock();
-
       const Proxy = (props: QueryBarComponentProps) => (
         <TestProviders>
-          <KibanaWithStorageProvider services={{ storage: { get: jest.fn() } }}>
-            <QueryBar {...props} />
-          </KibanaWithStorageProvider>
+          <QueryBar {...props} />
         </TestProviders>
       );
 
@@ -231,13 +226,9 @@ describe('QueryBar ', () => {
 
   describe('#onQueryChange', () => {
     test(' is the only reference that changed when filterQueryDraft props get updated', () => {
-      const KibanaWithStorageProvider = createKibanaContextProviderMock();
-
       const Proxy = (props: QueryBarComponentProps) => (
         <TestProviders>
-          <KibanaWithStorageProvider services={{ storage: { get: jest.fn() } }}>
-            <QueryBar {...props} />
-          </KibanaWithStorageProvider>
+          <QueryBar {...props} />
         </TestProviders>
       );
 
@@ -382,24 +373,9 @@ describe('QueryBar ', () => {
 
   describe('SavedQueryManagementComponent state', () => {
     test('popover should hidden when "Save current query" button was clicked', () => {
-      const KibanaWithStorageProvider = createKibanaContextProviderMock();
-
       const Proxy = (props: QueryBarComponentProps) => (
         <TestProviders>
-          <KibanaWithStorageProvider
-            services={{
-              data: {
-                query: {
-                  savedQueries: {
-                    findSavedQueries: jest.fn().mockResolvedValue({ total: 0, queries: [] }),
-                    getAllSavedQueries: jest.fn().mockResolvedValue([]),
-                  },
-                },
-              },
-            }}
-          >
-            <QueryBar {...props} />
-          </KibanaWithStorageProvider>
+          <QueryBar {...props} />
         </TestProviders>
       );
 
diff --git a/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.test.tsx
index 0795e46c9e45f..956ee4b05f9d6 100644
--- a/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/super_date_picker/index.test.tsx
@@ -17,7 +17,7 @@ import {
   kibanaObservable,
   createSecuritySolutionStorageMock,
 } from '../../mock';
-import { createUseUiSetting$Mock } from '../../mock/kibana_react';
+import { createUseUiSetting$Mock } from '../../lib/kibana/kibana_react.mock';
 import { createStore, State } from '../../store';
 
 import { SuperDatePicker, makeMapStateToProps } from '.';
diff --git a/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx
index 1e93fdb936728..31318122eb564 100644
--- a/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx
@@ -18,7 +18,6 @@ import {
   createSecuritySolutionStorageMock,
   mockIndexPattern,
 } from '../../mock';
-import { createKibanaCoreStartMock } from '../../mock/kibana_core';
 import { FilterManager } from '../../../../../../../src/plugins/data/public';
 import { createStore, State } from '../../store';
 
@@ -29,6 +28,7 @@ import {
   getTimelineDefaults,
 } from '../../../timelines/components/manage_timeline';
 import { TimelineId } from '../../../../common/types/timeline';
+import { coreMock } from '../../../../../../../src/core/public/mocks';
 
 jest.mock('react-router-dom', () => {
   const original = jest.requireActual('react-router-dom');
@@ -45,7 +45,7 @@ jest.mock('../link_to');
 jest.mock('../../lib/kibana');
 jest.mock('../../../timelines/store/timeline/actions');
 
-const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
+const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
 
 const field = 'process.name';
 const value = 'nice';
diff --git a/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.test.tsx b/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.test.tsx
index 7085894e4a51c..58f5c1a9beb2e 100644
--- a/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/local_storage/use_messages_storage.test.tsx
@@ -6,17 +6,13 @@
 
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useKibana } from '../../lib/kibana';
-import { createUseKibanaMock } from '../../mock/kibana_react';
 import { useMessagesStorage, UseMessagesStorage } from './use_messages_storage';
 
 jest.mock('../../lib/kibana');
-const useKibanaMock = useKibana as jest.Mock;
 
 describe('useLocalStorage', () => {
   beforeEach(() => {
-    const services = { ...createUseKibanaMock()().services };
-    useKibanaMock.mockImplementation(() => ({ services }));
-    services.storage.store.clear();
+    useKibana().services.storage.clear();
   });
 
   it('should return an empty array when there is no messages', async () => {
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts
index 5f4285f2747ae..573ef92f7e069 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/__mocks__/index.ts
@@ -9,19 +9,21 @@ import {
   createKibanaContextProviderMock,
   createUseUiSettingMock,
   createUseUiSetting$Mock,
-  createUseKibanaMock,
+  createStartServicesMock,
   createWithKibanaMock,
-} from '../../../mock/kibana_react';
+} from '../kibana_react.mock';
 
 export const KibanaServices = { get: jest.fn(), getKibanaVersion: jest.fn(() => '8.0.0') };
-export const useKibana = jest.fn(createUseKibanaMock());
+export const useKibana = jest.fn().mockReturnValue({ services: createStartServicesMock() });
 export const useUiSetting = jest.fn(createUseUiSettingMock());
 export const useUiSetting$ = jest.fn(createUseUiSetting$Mock());
-export const useHttp = jest.fn(() => useKibana().services.http);
+export const useHttp = jest.fn().mockReturnValue(createStartServicesMock().http);
 export const useTimeZone = jest.fn();
 export const useDateFormat = jest.fn();
 export const useBasePath = jest.fn(() => '/test/base/path');
-export const useToasts = jest.fn(() => notificationServiceMock.createStartContract().toasts);
+export const useToasts = jest
+  .fn()
+  .mockReturnValue(notificationServiceMock.createStartContract().toasts);
 export const useCurrentUser = jest.fn();
 export const withKibana = jest.fn(createWithKibanaMock());
 export const KibanaContextProvider = jest.fn(createKibanaContextProviderMock());
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
new file mode 100644
index 0000000000000..c026b65853a4c
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/* eslint-disable react/display-name */
+
+import React from 'react';
+
+import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
+import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
+import { securityMock } from '../../../../../../plugins/security/public/mocks';
+import {
+  DEFAULT_APP_TIME_RANGE,
+  DEFAULT_APP_REFRESH_INTERVAL,
+  DEFAULT_INDEX_KEY,
+  DEFAULT_DATE_FORMAT,
+  DEFAULT_DATE_FORMAT_TZ,
+  DEFAULT_DARK_MODE,
+  DEFAULT_TIME_RANGE,
+  DEFAULT_REFRESH_RATE_INTERVAL,
+  DEFAULT_FROM,
+  DEFAULT_TO,
+  DEFAULT_INTERVAL_PAUSE,
+  DEFAULT_INTERVAL_VALUE,
+  DEFAULT_BYTES_FORMAT,
+  DEFAULT_INDEX_PATTERN,
+} from '../../../../common/constants';
+import { StartServices } from '../../../types';
+import { createSecuritySolutionStorageMock } from '../../mock/mock_local_storage';
+
+const mockUiSettings: Record<string, unknown> = {
+  [DEFAULT_TIME_RANGE]: { from: 'now-15m', to: 'now', mode: 'quick' },
+  [DEFAULT_REFRESH_RATE_INTERVAL]: { pause: false, value: 0 },
+  [DEFAULT_APP_TIME_RANGE]: {
+    from: DEFAULT_FROM,
+    to: DEFAULT_TO,
+  },
+  [DEFAULT_APP_REFRESH_INTERVAL]: {
+    pause: DEFAULT_INTERVAL_PAUSE,
+    value: DEFAULT_INTERVAL_VALUE,
+  },
+  [DEFAULT_INDEX_KEY]: DEFAULT_INDEX_PATTERN,
+  [DEFAULT_BYTES_FORMAT]: '0,0.[0]b',
+  [DEFAULT_DATE_FORMAT_TZ]: 'UTC',
+  [DEFAULT_DATE_FORMAT]: 'MMM D, YYYY @ HH:mm:ss.SSS',
+  [DEFAULT_DARK_MODE]: false,
+};
+
+export const createUseUiSettingMock = () => (key: string, defaultValue?: unknown): unknown => {
+  const result = mockUiSettings[key];
+
+  if (typeof result != null) return result;
+
+  if (defaultValue != null) {
+    return defaultValue;
+  }
+
+  throw new TypeError(`Unexpected config key: ${key}`);
+};
+
+export const createUseUiSetting$Mock = () => {
+  const useUiSettingMock = createUseUiSettingMock();
+
+  return (key: string, defaultValue?: unknown): [unknown, () => void] | undefined => [
+    useUiSettingMock(key, defaultValue),
+    jest.fn(),
+  ];
+};
+
+export const createStartServicesMock = (): StartServices => {
+  const core = coreMock.createStart();
+  core.uiSettings.get.mockImplementation(createUseUiSettingMock());
+  const { storage } = createSecuritySolutionStorageMock();
+  const data = dataPluginMock.createStartContract();
+  const security = securityMock.createSetup();
+
+  const services = ({
+    ...core,
+    data,
+    security,
+    storage,
+  } as unknown) as StartServices;
+
+  return services;
+};
+
+export const createWithKibanaMock = () => {
+  const services = createStartServicesMock();
+
+  return (Component: unknown) => (props: unknown) => {
+    return React.createElement(Component as string, { ...(props as object), kibana: { services } });
+  };
+};
+
+export const createKibanaContextProviderMock = () => {
+  const services = createStartServicesMock();
+
+  return ({ children }: { children: React.ReactNode }) =>
+    React.createElement(KibanaContextProvider, { services }, children);
+};
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
index 1ed459521cc79..1b9e95f7d0737 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/app_context_render.tsx
@@ -17,7 +17,7 @@ import { apolloClientObservable, kibanaObservable } from '../test_providers';
 import { createStore, State } from '../../store';
 import { AppRootProvider } from './app_root_provider';
 import { managementMiddlewareFactory } from '../../../management/store/middleware';
-import { createKibanaContextProviderMock } from '../kibana_react';
+import { createKibanaContextProviderMock } from '../../lib/kibana/kibana_react.mock';
 import { SUB_PLUGINS_REDUCER, mockGlobalState, createSecuritySolutionStorageMock } from '..';
 
 type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
diff --git a/x-pack/plugins/security_solution/public/common/mock/index.ts b/x-pack/plugins/security_solution/public/common/mock/index.ts
index 678ad4d84b586..7e076772c42fb 100644
--- a/x-pack/plugins/security_solution/public/common/mock/index.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/index.ts
@@ -16,4 +16,3 @@ export * from './test_providers';
 export * from './utils';
 export * from './mock_ecs';
 export * from './timeline_results';
-export * from './kibana_react';
diff --git a/x-pack/plugins/security_solution/public/common/mock/kibana_core.ts b/x-pack/plugins/security_solution/public/common/mock/kibana_core.ts
deleted file mode 100644
index f8eed75cf9bf1..0000000000000
--- a/x-pack/plugins/security_solution/public/common/mock/kibana_core.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { coreMock } from '../../../../../../src/core/public/mocks';
-import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
-import { securityMock } from '../../../../../plugins/security/public/mocks';
-
-export const createKibanaCoreStartMock = () => coreMock.createStart();
-export const createKibanaPluginsStartMock = () => ({
-  data: dataPluginMock.createStartContract(),
-  security: securityMock.createSetup(),
-});
diff --git a/x-pack/plugins/security_solution/public/common/mock/kibana_react.ts b/x-pack/plugins/security_solution/public/common/mock/kibana_react.ts
deleted file mode 100644
index bdb8ca85b0d77..0000000000000
--- a/x-pack/plugins/security_solution/public/common/mock/kibana_react.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/* eslint-disable react/display-name */
-
-import React from 'react';
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
-
-import {
-  DEFAULT_APP_TIME_RANGE,
-  DEFAULT_APP_REFRESH_INTERVAL,
-  DEFAULT_INDEX_KEY,
-  DEFAULT_DATE_FORMAT,
-  DEFAULT_DATE_FORMAT_TZ,
-  DEFAULT_DARK_MODE,
-  DEFAULT_TIME_RANGE,
-  DEFAULT_REFRESH_RATE_INTERVAL,
-  DEFAULT_FROM,
-  DEFAULT_TO,
-  DEFAULT_INTERVAL_PAUSE,
-  DEFAULT_INTERVAL_VALUE,
-  DEFAULT_BYTES_FORMAT,
-  DEFAULT_INDEX_PATTERN,
-} from '../../../common/constants';
-import { createKibanaCoreStartMock, createKibanaPluginsStartMock } from './kibana_core';
-import { StartServices } from '../../types';
-import { createSecuritySolutionStorageMock } from './mock_local_storage';
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const mockUiSettings: Record<string, any> = {
-  [DEFAULT_TIME_RANGE]: { from: 'now-15m', to: 'now', mode: 'quick' },
-  [DEFAULT_REFRESH_RATE_INTERVAL]: { pause: false, value: 0 },
-  [DEFAULT_APP_TIME_RANGE]: {
-    from: DEFAULT_FROM,
-    to: DEFAULT_TO,
-  },
-  [DEFAULT_APP_REFRESH_INTERVAL]: {
-    pause: DEFAULT_INTERVAL_PAUSE,
-    value: DEFAULT_INTERVAL_VALUE,
-  },
-  [DEFAULT_INDEX_KEY]: DEFAULT_INDEX_PATTERN,
-  [DEFAULT_BYTES_FORMAT]: '0,0.[0]b',
-  [DEFAULT_DATE_FORMAT_TZ]: 'UTC',
-  [DEFAULT_DATE_FORMAT]: 'MMM D, YYYY @ HH:mm:ss.SSS',
-  [DEFAULT_DARK_MODE]: false,
-};
-
-export const createUseUiSettingMock = () => <T extends unknown = string>(
-  key: string,
-  defaultValue?: T
-): T => {
-  const result = mockUiSettings[key];
-
-  if (typeof result != null) return result;
-
-  if (defaultValue != null) {
-    return defaultValue;
-  }
-
-  throw new Error(`Unexpected config key: ${key}`);
-};
-
-export const createUseUiSetting$Mock = () => {
-  const useUiSettingMock = createUseUiSettingMock();
-
-  return <T extends unknown = string>(
-    key: string,
-    defaultValue?: T
-  ): [T, () => void] | undefined => [useUiSettingMock(key, defaultValue), jest.fn()];
-};
-
-export const createKibanaObservable$Mock = createKibanaCoreStartMock;
-
-export const createUseKibanaMock = () => {
-  const core = createKibanaCoreStartMock();
-  const plugins = createKibanaPluginsStartMock();
-  const useUiSetting = createUseUiSettingMock();
-  const { storage } = createSecuritySolutionStorageMock();
-
-  const services = {
-    ...core,
-    ...plugins,
-    uiSettings: {
-      ...core.uiSettings,
-      get: useUiSetting,
-    },
-    storage,
-  };
-
-  return () => ({ services });
-};
-
-export const createStartServices = () => {
-  const core = createKibanaCoreStartMock();
-  const plugins = createKibanaPluginsStartMock();
-
-  const services = ({
-    ...core,
-    ...plugins,
-  } as unknown) as StartServices;
-
-  return services;
-};
-
-export const createWithKibanaMock = () => {
-  const kibana = createUseKibanaMock()();
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return (Component: any) => (props: any) => {
-    return React.createElement(Component, { ...props, kibana });
-  };
-};
-
-export const createKibanaContextProviderMock = () => {
-  const kibana = createUseKibanaMock()();
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return ({ services, ...rest }: any) =>
-    React.createElement(KibanaContextProvider, {
-      ...rest,
-      services: { ...kibana.services, ...services },
-    });
-};
diff --git a/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx b/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
index 010d2fac18af5..9ead8171bfef6 100644
--- a/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
@@ -19,7 +19,10 @@ import { ThemeProvider } from 'styled-components';
 
 import { createStore, State } from '../store';
 import { mockGlobalState } from './global_state';
-import { createKibanaContextProviderMock, createStartServices } from './kibana_react';
+import {
+  createKibanaContextProviderMock,
+  createStartServicesMock,
+} from '../lib/kibana/kibana_react.mock';
 import { FieldHook, useForm } from '../../shared_imports';
 import { SUB_PLUGINS_REDUCER } from './utils';
 import { createSecuritySolutionStorageMock, localStorageMock } from './mock_local_storage';
@@ -38,7 +41,7 @@ export const apolloClient = new ApolloClient({
 });
 
 export const apolloClientObservable = new BehaviorSubject(apolloClient);
-export const kibanaObservable = new BehaviorSubject(createStartServices());
+export const kibanaObservable = new BehaviorSubject(createStartServicesMock());
 
 Object.defineProperty(window, 'localStorage', {
   value: localStorageMock(),
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/__mocks__/use_lists_config.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/__mocks__/use_lists_config.tsx
index 0f8e0fba1e3af..291587e9f69c5 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/__mocks__/use_lists_config.tsx
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/__mocks__/use_lists_config.tsx
@@ -4,4 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const useListsConfig = jest.fn().mockReturnValue({});
+import { getUseListsConfigMock } from '../use_lists_config.mock';
+
+export const useListsConfig = jest.fn(getUseListsConfigMock);
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.mock.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.mock.ts
new file mode 100644
index 0000000000000..90f47972a3a2e
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.mock.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UseListsConfigReturn } from './use_lists_config';
+
+export const getUseListsConfigMock: () => jest.Mocked<UseListsConfigReturn> = () => ({
+  canManageIndex: null,
+  canWriteIndex: null,
+  enabled: true,
+  loading: false,
+  needsConfiguration: false,
+});
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.test.tsx
new file mode 100644
index 0000000000000..a5ff29e2091b0
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_config.test.tsx
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { renderHook } from '@testing-library/react-hooks';
+
+import { useKibana } from '../../../../common/lib/kibana';
+import { useListsIndex } from './use_lists_index';
+import { useListsPrivileges } from './use_lists_privileges';
+import { getUseListsIndexMock } from './use_lists_index.mock';
+import { getUseListsPrivilegesMock } from './use_lists_privileges.mock';
+import { useListsConfig } from './use_lists_config';
+
+jest.mock('../../../../common/lib/kibana');
+jest.mock('./use_lists_index');
+jest.mock('./use_lists_privileges');
+
+describe('useListsConfig', () => {
+  let listsIndexMock: ReturnType<typeof getUseListsIndexMock>;
+  let listsPrivilegesMock: ReturnType<typeof getUseListsPrivilegesMock>;
+
+  beforeEach(() => {
+    listsIndexMock = getUseListsIndexMock();
+    listsPrivilegesMock = getUseListsPrivilegesMock();
+    (useListsIndex as jest.Mock).mockReturnValue(listsIndexMock);
+    (useListsPrivileges as jest.Mock).mockReturnValue(listsPrivilegesMock);
+  });
+
+  it("returns the user's write permissions", () => {
+    listsPrivilegesMock.canWriteIndex = false;
+    const { result } = renderHook(() => useListsConfig());
+    expect(result.current.canWriteIndex).toEqual(false);
+
+    listsPrivilegesMock.canWriteIndex = true;
+    const { result: result2 } = renderHook(() => useListsConfig());
+    expect(result2.current.canWriteIndex).toEqual(true);
+  });
+
+  describe('when lists are disabled', () => {
+    beforeEach(() => {
+      useKibana().services.lists = undefined;
+    });
+
+    it('indicates that lists are not enabled, and need configuration', () => {
+      const { result } = renderHook(() => useListsConfig());
+      expect(result.current.enabled).toEqual(false);
+      expect(result.current.needsConfiguration).toEqual(true);
+    });
+  });
+
+  describe('when lists are enabled but indexes do not exist', () => {
+    beforeEach(() => {
+      useKibana().services.lists = {};
+      listsIndexMock.indexExists = false;
+    });
+
+    it('needs configuration if the user cannot manage indexes', () => {
+      listsPrivilegesMock.canManageIndex = false;
+
+      const { result } = renderHook(() => useListsConfig());
+      expect(result.current.needsConfiguration).toEqual(true);
+      expect(listsIndexMock.createIndex).not.toHaveBeenCalled();
+    });
+
+    it('attempts to create the indexes if the user can manage indexes', () => {
+      listsPrivilegesMock.canManageIndex = true;
+
+      renderHook(() => useListsConfig());
+      expect(listsIndexMock.createIndex).toHaveBeenCalled();
+    });
+  });
+
+  describe('when lists are enabled and indexes exist', () => {
+    beforeEach(() => {
+      useKibana().services.lists = {};
+      listsIndexMock.indexExists = true;
+    });
+
+    it('does not need configuration', () => {
+      const { result } = renderHook(() => useListsConfig());
+      expect(result.current.needsConfiguration).toEqual(false);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_index.mock.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_index.mock.ts
new file mode 100644
index 0000000000000..e2169442d80e6
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_index.mock.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UseListsIndexReturn } from './use_lists_index';
+
+export const getUseListsIndexMock: () => jest.Mocked<UseListsIndexReturn> = () => ({
+  createIndex: jest.fn(),
+  indexExists: null,
+  error: null,
+  loading: false,
+});
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_privileges.mock.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_privileges.mock.ts
new file mode 100644
index 0000000000000..4f583a72460e2
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/lists/use_lists_privileges.mock.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UseListsPrivilegesReturn } from './use_lists_privileges';
+
+export const getUseListsPrivilegesMock: () => jest.Mocked<UseListsPrivilegesReturn> = () => ({
+  isAuthenticated: null,
+  canManageIndex: null,
+  canWriteIndex: null,
+  loading: false,
+});
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx
index b07caa754aec9..9f486dc11e99d 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.test.tsx
@@ -9,7 +9,6 @@ import { shallow, mount } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 
 import '../../../../../common/mock/match_media';
-import { createKibanaContextProviderMock } from '../../../../../common/mock/kibana_react';
 import { TestProviders } from '../../../../../common/mock';
 // we don't have the types for waitFor just yet, so using "as waitFor" until when we do
 import { wait as waitFor } from '@testing-library/react';
@@ -182,23 +181,20 @@ describe('AllRules', () => {
   });
 
   it('renders rules tab', async () => {
-    const KibanaContext = createKibanaContextProviderMock();
     const wrapper = mount(
       <TestProviders>
-        <KibanaContext services={{ storage: { get: jest.fn() } }}>
-          <AllRules
-            createPrePackagedRules={jest.fn()}
-            hasNoPermissions={false}
-            loading={false}
-            loadingCreatePrePackagedRules={false}
-            refetchPrePackagedRulesStatus={jest.fn()}
-            rulesCustomInstalled={1}
-            rulesInstalled={0}
-            rulesNotInstalled={0}
-            rulesNotUpdated={0}
-            setRefreshRulesData={jest.fn()}
-          />
-        </KibanaContext>
+        <AllRules
+          createPrePackagedRules={jest.fn()}
+          hasNoPermissions={false}
+          loading={false}
+          loadingCreatePrePackagedRules={false}
+          refetchPrePackagedRulesStatus={jest.fn()}
+          rulesCustomInstalled={1}
+          rulesInstalled={0}
+          rulesNotInstalled={0}
+          rulesNotUpdated={0}
+          setRefreshRulesData={jest.fn()}
+        />
       </TestProviders>
     );
 
@@ -211,24 +207,20 @@ describe('AllRules', () => {
   });
 
   it('renders monitoring tab when monitoring tab clicked', async () => {
-    const KibanaContext = createKibanaContextProviderMock();
-
     const wrapper = mount(
       <TestProviders>
-        <KibanaContext services={{ storage: { get: jest.fn() } }}>
-          <AllRules
-            createPrePackagedRules={jest.fn()}
-            hasNoPermissions={false}
-            loading={false}
-            loadingCreatePrePackagedRules={false}
-            refetchPrePackagedRulesStatus={jest.fn()}
-            rulesCustomInstalled={1}
-            rulesInstalled={0}
-            rulesNotInstalled={0}
-            rulesNotUpdated={0}
-            setRefreshRulesData={jest.fn()}
-          />
-        </KibanaContext>
+        <AllRules
+          createPrePackagedRules={jest.fn()}
+          hasNoPermissions={false}
+          loading={false}
+          loadingCreatePrePackagedRules={false}
+          refetchPrePackagedRulesStatus={jest.fn()}
+          rulesCustomInstalled={1}
+          rulesInstalled={0}
+          rulesNotInstalled={0}
+          rulesNotUpdated={0}
+          setRefreshRulesData={jest.fn()}
+        />
       </TestProviders>
     );
     const monitoringTab = wrapper.find('[data-test-subj="allRulesTableTab-monitoring"] button');
diff --git a/x-pack/plugins/security_solution/public/overview/components/recent_cases/no_cases/index.test.tsx b/x-pack/plugins/security_solution/public/overview/components/recent_cases/no_cases/index.test.tsx
index 99902a31975d0..446679ae26d9e 100644
--- a/x-pack/plugins/security_solution/public/overview/components/recent_cases/no_cases/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/recent_cases/no_cases/index.test.tsx
@@ -9,29 +9,19 @@ import { mount } from 'enzyme';
 
 import { useKibana } from '../../../../common/lib/kibana';
 import '../../../../common/mock/match_media';
-import { createUseKibanaMock, TestProviders } from '../../../../common/mock';
+import { TestProviders } from '../../../../common/mock';
 import { NoCases } from '.';
 
 jest.mock('../../../../common/lib/kibana');
 
-const useKibanaMock = useKibana as jest.Mock;
-
-let navigateToApp: jest.Mock;
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 describe('RecentCases', () => {
+  let navigateToApp: jest.Mock;
+
   beforeEach(() => {
-    jest.resetAllMocks();
     navigateToApp = jest.fn();
-    const kibanaMock = createUseKibanaMock()();
-    useKibanaMock.mockReturnValue({
-      ...kibanaMock,
-      services: {
-        application: {
-          navigateToApp,
-          getUrlForApp: jest.fn(),
-        },
-      },
-    });
+    useKibanaMock().services.application.navigateToApp = navigateToApp;
   });
 
   it('if no cases, you should be able to create a case by clicking on the link "start a new case"', () => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/data_providers.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/data_providers.test.tsx
index 754d7f9c47edf..d48be25b08897 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/data_providers.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/data_providers.test.tsx
@@ -15,8 +15,9 @@ import { DataProvider } from './data_provider';
 import { mockDataProviders } from './mock/mock_data_providers';
 import { ManageGlobalTimeline, getTimelineDefaults } from '../../manage_timeline';
 import { FilterManager } from '../../../../../../../../src/plugins/data/public/query/filter_manager';
-import { createKibanaCoreStartMock } from '../../../../common/mock/kibana_core';
-const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
+import { coreMock } from '../../../../../../../../src/core/public/mocks';
+
+const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
 
 const filterManager = new FilterManager(mockUiSettingsForFilterManager);
 describe('DataProviders', () => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.test.tsx
index b788f70cb2e4a..3f371349aa750 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/providers.test.tsx
@@ -7,7 +7,7 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
-import { createKibanaCoreStartMock } from '../../../../common/mock/kibana_core';
+import { coreMock } from '../../../../../../../../src/core/public/mocks';
 import { TestProviders } from '../../../../common/mock/test_providers';
 import { DroppableWrapper } from '../../../../common/components/drag_and_drop/droppable_wrapper';
 import { FilterManager } from '../../../../../../../../src/plugins/data/public';
@@ -18,7 +18,7 @@ import { DELETE_CLASS_NAME, ENABLE_CLASS_NAME, EXCLUDE_CLASS_NAME } from './prov
 import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 import { ManageGlobalTimeline, getTimelineDefaults } from '../../manage_timeline';
 
-const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
+const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
 
 describe('Providers', () => {
   const isLoading: boolean = true;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
index e7b0ce7b7428e..329bcf24ba7ed 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/header/index.test.tsx
@@ -7,8 +7,8 @@
 import { shallow } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '../../../../../../../../src/core/public/mocks';
 import { mockIndexPattern } from '../../../../common/mock';
-import { createKibanaCoreStartMock } from '../../../../common/mock/kibana_core';
 import { TestProviders } from '../../../../common/mock/test_providers';
 import { FilterManager } from '../../../../../../../../src/plugins/data/public';
 import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
@@ -17,7 +17,7 @@ import { useMountAppended } from '../../../../common/utils/use_mount_appended';
 import { TimelineHeader } from '.';
 import { TimelineStatus, TimelineType } from '../../../../../common/types/timeline';
 
-const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
+const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
 
 jest.mock('../../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx
index 75f684c629c70..6c8fd4975c657 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_bar/index.test.tsx
@@ -7,11 +7,11 @@
 import { mount } from 'enzyme';
 import React from 'react';
 
+import { coreMock } from '../../../../../../../../src/core/public/mocks';
 import { DEFAULT_FROM, DEFAULT_TO } from '../../../../../common/constants';
 import { mockBrowserFields } from '../../../../common/containers/source/mock';
 import { convertKueryToElasticSearchQuery } from '../../../../common/lib/keury';
 import { mockIndexPattern, TestProviders } from '../../../../common/mock';
-import { createKibanaCoreStartMock } from '../../../../common/mock/kibana_core';
 import { QueryBar } from '../../../../common/components/query_bar';
 import { FilterManager } from '../../../../../../../../src/plugins/data/public';
 import { mockDataProviders } from '../data_providers/mock/mock_data_providers';
@@ -19,7 +19,7 @@ import { buildGlobalQuery } from '../helpers';
 
 import { QueryBarTimeline, QueryBarTimelineComponentProps, getDataProviderFilter } from './index';
 
-const mockUiSettingsForFilterManager = createKibanaCoreStartMock().uiSettings;
+const mockUiSettingsForFilterManager = coreMock.createStart().uiSettings;
 
 jest.mock('../../../../common/lib/kibana');
 
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.test.ts b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.test.ts
index e1bccbdff4889..7a8750b279b85 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/local_storage/index.test.ts
@@ -15,23 +15,16 @@ import {
 import { TimelineId } from '../../../../common/types/timeline';
 import { mockTimelineModel, createSecuritySolutionStorageMock } from '../../../common/mock';
 import { useKibana } from '../../../common/lib/kibana';
-import { createUseKibanaMock } from '../../../common/mock/kibana_react';
 
 jest.mock('../../../common/lib/kibana');
 
-const useKibanaMock = useKibana as jest.Mock;
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 describe('SiemLocalStorage', () => {
   const { localStorage, storage } = createSecuritySolutionStorageMock();
 
   beforeEach(() => {
-    jest.resetAllMocks();
-    useKibanaMock.mockImplementation(() => ({
-      services: {
-        ...createUseKibanaMock()().services,
-        storage,
-      },
-    }));
+    useKibanaMock().services.storage = storage;
     localStorage.clear();
   });
 

From 6dbc2f7fd150052c468c1eec99475f04f250bc97 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Mon, 24 Aug 2020 13:43:09 -0700
Subject: [PATCH 012/148] skip flaky suite (#75699)

---
 test/functional/apps/visualize/_vega_chart.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/functional/apps/visualize/_vega_chart.ts b/test/functional/apps/visualize/_vega_chart.ts
index b59d9590bb62a..f599afa3afc32 100644
--- a/test/functional/apps/visualize/_vega_chart.ts
+++ b/test/functional/apps/visualize/_vega_chart.ts
@@ -50,7 +50,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const retry = getService('retry');
   const browser = getService('browser');
 
-  describe('vega chart in visualize app', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/75699
+  describe.skip('vega chart in visualize app', () => {
     before(async () => {
       log.debug('navigateToApp visualize');
       await PageObjects.visualize.navigateToNewVisualization();

From 1fbb6e57a1d38eb376b22bcc0082805fd0671e0a Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Mon, 24 Aug 2020 13:46:58 -0700
Subject: [PATCH 013/148] skip flaky suite (#75697)

---
 .../cypress/integration/url_compatibility.spec.ts                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x-pack/plugins/security_solution/cypress/integration/url_compatibility.spec.ts b/x-pack/plugins/security_solution/cypress/integration/url_compatibility.spec.ts
index 7146cf70dc8c8..d55a8faae021d 100644
--- a/x-pack/plugins/security_solution/cypress/integration/url_compatibility.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/url_compatibility.spec.ts
@@ -18,6 +18,7 @@ const ABSOLUTE_DATE = {
   startTime: '2019-08-01T20:03:29.186Z',
 };
 
+// FLAKY: https://github.com/elastic/kibana/issues/75697
 describe.skip('URL compatibility', () => {
   it('Redirects to Detection alerts from old Detections URL', () => {
     loginAndWaitForPage(DETECTIONS);

From 637e87d0fbf9990cefe80aea055af2b377d2fc5c Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Mon, 24 Aug 2020 13:52:31 -0700
Subject: [PATCH 014/148] skip flaky suite (#75794)

---
 .../cypress/integration/timeline_local_storage.spec.ts         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/security_solution/cypress/integration/timeline_local_storage.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timeline_local_storage.spec.ts
index 383ebe2220585..c2ff2c58687f3 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timeline_local_storage.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timeline_local_storage.spec.ts
@@ -13,7 +13,8 @@ import { TABLE_COLUMN_EVENTS_MESSAGE } from '../screens/hosts/external_events';
 import { waitsForEventsToBeLoaded, openEventsViewerFieldsBrowser } from '../tasks/hosts/events';
 import { removeColumn, resetFields } from '../tasks/timeline';
 
-describe('persistent timeline', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/75794
+describe.skip('persistent timeline', () => {
   before(() => {
     loginAndWaitForPage(HOSTS_URL);
     openEvents();

From 0e3ba45ea93e231490429bbd1ebcc4ccba078e5a Mon Sep 17 00:00:00 2001
From: Caroline Horn <549577+cchaos@users.noreply.github.com>
Date: Mon, 24 Aug 2020 17:03:25 -0400
Subject: [PATCH 015/148] Update CODEOWNERS for design (again) (#75801)

---
 .github/CODEOWNERS | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 52df586b8bda7..66fb31cc91d5a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,7 +8,6 @@
 /x-pack/plugins/lens/ @elastic/kibana-app
 /x-pack/plugins/graph/ @elastic/kibana-app
 /src/plugins/dashboard/ @elastic/kibana-app
-/src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
 /src/plugins/discover/ @elastic/kibana-app
 /src/plugins/input_control_vis/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
@@ -59,7 +58,6 @@
 
 # APM
 /x-pack/plugins/apm/  @elastic/apm-ui
-/x-pack/plugins/apm/**/*.scss @elastic/observability-design
 /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
@@ -70,7 +68,6 @@
 
 # Canvas
 /x-pack/plugins/canvas/  @elastic/kibana-canvas
-/x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/test/functional/apps/canvas/  @elastic/kibana-canvas
 
 # Core UI
@@ -80,18 +77,14 @@
 /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/**/*.scss @elastic/kibana-core-ui-designers
 /src/legacy/core_plugins/kibana/public/home/np_ready/ @elastic/kibana-core-ui
 
 # Observability UIs
 /x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui
 /x-pack/plugins/infra/ @elastic/logs-metrics-ui
-/x-pack/plugins/infra/**/*.scss @elastic/observability-design
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
-/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/observability-ui
-/x-pack/plugins/observability/**/*.scss @elastic/observability-design
 /x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
@@ -165,14 +158,10 @@
 # Security
 /src/core/server/csp/  @elastic/kibana-security @elastic/kibana-platform
 /x-pack/legacy/plugins/security/  @elastic/kibana-security
-/x-pack/legacy/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/legacy/plugins/spaces/  @elastic/kibana-security
-/x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/plugins/spaces/  @elastic/kibana-security
-/x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/plugins/encrypted_saved_objects/  @elastic/kibana-security
 /x-pack/plugins/security/  @elastic/kibana-security
-/x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
 /x-pack/test/api_integration/apis/security/ @elastic/kibana-security
 /x-pack/test/encrypted_saved_objects_api_integration/ @elastic/kibana-security
 /x-pack/test/functional/apps/security/ @elastic/kibana-security
@@ -220,13 +209,9 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/ @elastic/kibana-alerting-services
 /x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
 
-# Design
-**/*.scss  @elastic/kibana-design
-
 # Enterprise Search
 /x-pack/plugins/enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
 /x-pack/test/functional_enterprise_search/ @elastic/app-search-frontend @elastic/workplace-search-frontend
-/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
 
 # Elasticsearch UI
 /src/plugins/dev_tools/ @elastic/es-ui
@@ -255,7 +240,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 
 # Endpoint
 /x-pack/plugins/endpoint/ @elastic/endpoint-app-team @elastic/siem
-/x-pack/plugins/endpoint/**/*.scss @elastic/security-design
 /x-pack/test/api_integration/apis/endpoint/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/endpoint_api_integration_no_ingest/ @elastic/endpoint-app-team @elastic/siem
 /x-pack/test/security_solution_endpoint/ @elastic/endpoint-app-team @elastic/siem
@@ -265,7 +249,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 
 # Security Solution
 /x-pack/plugins/security_solution/ @elastic/siem @elastic/endpoint-app-team
-/x-pack/plugins/security_solution/**/*.scss @elastic/security-design
 /x-pack/test/detection_engine_api_integration @elastic/siem @elastic/endpoint-app-team
 /x-pack/test/lists_api_integration @elastic/siem @elastic/endpoint-app-team
 /x-pack/test/api_integration/apis/security_solution @elastic/siem @elastic/endpoint-app-team
@@ -274,3 +257,29 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 
 # Security Intelligence And Analytics
 /x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
+
+# Design (at the bottom for specificity of SASS files)
+**/*.scss  @elastic/kibana-design
+
+# 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
+
+# Observability design
+/x-pack/plugins/apm/**/*.scss @elastic/observability-design
+/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
+
+# Ent. Search design
+/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design
+
+# Security design
+/x-pack/plugins/endpoint/**/*.scss @elastic/security-design
+/x-pack/plugins/security_solution/**/*.scss @elastic/security-design
+

From 3256992b351560ea4de9dd924dcec9c2cd10598f Mon Sep 17 00:00:00 2001
From: Catherine Liu <catherine.liu@elastic.co>
Date: Mon, 24 Aug 2020 14:28:50 -0700
Subject: [PATCH 016/148] [Canvas] Adds function reference docs generator
 (#49402)

Co-authored-by: Corey Robertson <corey.robertson@elastic.co>
---
 .../canvas/canvas-function-reference.asciidoc |  14 +-
 .../canvas_plugin_src/functions/common/if.ts  |   3 +-
 .../canvas_plugin_src/functions/common/neq.ts |   3 +
 .../functions/common/switch.ts                |   1 +
 .../functions/common/tail.ts                  |   1 +
 .../i18n/functions/dict/alter_column.ts       |   6 +-
 .../plugins/canvas/i18n/functions/dict/as.ts  |   2 +-
 .../canvas/i18n/functions/dict/axis_config.ts |   8 +-
 .../canvas/i18n/functions/dict/case.ts        |   4 +-
 .../canvas/i18n/functions/dict/compare.ts     |  30 +-
 .../i18n/functions/dict/container_style.ts    |   2 +-
 .../canvas/i18n/functions/dict/date.ts        |   3 +-
 .../i18n/functions/dict/dropdown_control.ts   |   4 +-
 .../plugins/canvas/i18n/functions/dict/eq.ts  |   2 +-
 .../canvas/i18n/functions/dict/filterrows.ts  |   2 +-
 .../canvas/i18n/functions/dict/formatdate.ts  |   2 +-
 .../i18n/functions/dict/formatnumber.ts       |   6 +-
 .../canvas/i18n/functions/dict/get_cell.ts    |   2 +-
 .../canvas/i18n/functions/dict/head.ts        |   2 +-
 .../plugins/canvas/i18n/functions/dict/if.ts  |   2 +-
 .../canvas/i18n/functions/dict/join_rows.ts   |  10 +-
 .../canvas/i18n/functions/dict/location.ts    |   3 +-
 .../canvas/i18n/functions/dict/map_center.ts  |   4 +-
 .../canvas/i18n/functions/dict/map_column.ts  |   6 +-
 .../canvas/i18n/functions/dict/markdown.ts    |   6 +-
 .../canvas/i18n/functions/dict/math.ts        |   5 +-
 .../canvas/i18n/functions/dict/metric.ts      |   4 +-
 .../plugins/canvas/i18n/functions/dict/pie.ts |  12 +-
 .../canvas/i18n/functions/dict/plot.ts        |  12 +-
 .../plugins/canvas/i18n/functions/dict/ply.ts |   4 +-
 .../canvas/i18n/functions/dict/pointseries.ts |   4 +-
 .../canvas/i18n/functions/dict/progress.ts    |   2 +-
 .../canvas/i18n/functions/dict/render.ts      |   2 +-
 .../i18n/functions/dict/repeat_image.ts       |   2 +-
 .../canvas/i18n/functions/dict/replace.ts     |   2 +-
 .../i18n/functions/dict/reveal_image.ts       |   2 +-
 .../canvas/i18n/functions/dict/rounddate.ts   |   2 +-
 .../canvas/i18n/functions/dict/row_count.ts   |   2 +-
 .../canvas/i18n/functions/dict/saved_lens.ts  |   6 +-
 .../canvas/i18n/functions/dict/saved_map.ts   |   4 +-
 .../functions/dict/saved_visualization.ts     |   8 +-
 .../i18n/functions/dict/series_style.ts       |   2 +-
 .../canvas/i18n/functions/dict/shape.ts       |   2 +-
 .../canvas/i18n/functions/dict/sort.ts        |   9 +-
 .../i18n/functions/dict/static_column.ts      |   6 +-
 .../canvas/i18n/functions/dict/switch.ts      |   4 +-
 .../canvas/i18n/functions/dict/table.ts       |   4 +-
 .../canvas/i18n/functions/dict/time_range.ts  |   2 +-
 .../canvas/i18n/functions/dict/timefilter.ts  |   2 +-
 .../canvas/i18n/functions/dict/timelion.ts    |   2 +-
 .../plugins/canvas/i18n/functions/dict/to.ts  |   3 +-
 .../canvas/i18n/functions/dict/urlparam.ts    |   6 +-
 x-pack/plugins/canvas/public/application.tsx  |   6 +-
 .../function_examples.ts                      | 444 ++++++++++++++++++
 .../function_reference_generator.tsx          |  36 ++
 .../generate_function_reference.ts            | 259 ++++++++++
 .../function_reference_generator/index.ts     |   7 +
 .../public/components/help_menu/help_menu.js  |  45 --
 .../public/components/help_menu/help_menu.tsx |  59 +++
 .../help_menu/{index.js => index.ts}          |   0
 .../translations/translations/ja-JP.json      |   8 -
 .../translations/translations/zh-CN.json      |   8 -
 62 files changed, 935 insertions(+), 180 deletions(-)
 create mode 100644 x-pack/plugins/canvas/public/components/function_reference_generator/function_examples.ts
 create mode 100644 x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
 create mode 100644 x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts
 create mode 100644 x-pack/plugins/canvas/public/components/function_reference_generator/index.ts
 delete mode 100644 x-pack/plugins/canvas/public/components/help_menu/help_menu.js
 create mode 100644 x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
 rename x-pack/plugins/canvas/public/components/help_menu/{index.js => index.ts} (100%)

diff --git a/docs/canvas/canvas-function-reference.asciidoc b/docs/canvas/canvas-function-reference.asciidoc
index 657e3ec8b8bb1..3ae513708f189 100644
--- a/docs/canvas/canvas-function-reference.asciidoc
+++ b/docs/canvas/canvas-function-reference.asciidoc
@@ -897,7 +897,7 @@ Default: `"-_index:.kibana"`
 |`string`
 |An index or index pattern. For example, `"logstash-*"`.
 
-Default: `_all`
+Default: `"_all"`
 |===
 
 *Returns:* `number`
@@ -965,7 +965,7 @@ Default: `1000`
 |`string`
 |An index or index pattern. For example, `"logstash-*"`.
 
-Default: `_all`
+Default: `"_all"`
 
 |`metaFields`
 |`string`
@@ -1026,7 +1026,7 @@ Alias: `tz`
 |`string`
 |The timezone to use for date operations. Valid ISO8601 formats and UTC offsets both work.
 
-Default: `UTC`
+Default: `"UTC"`
 |===
 
 *Returns:* `datatable`
@@ -1238,7 +1238,7 @@ filters
 |`string`
 |The horizontal text alignment.
 
-Default: `left`
+Default: `"left"`
 
 |`color`
 |`string`
@@ -1280,7 +1280,7 @@ Default: `false`
 |`string`
 |The font weight. For example, `"normal"`, `"bold"`, `"bolder"`, `"lighter"`, `"100"`, `"200"`, `"300"`, `"400"`, `"500"`, `"600"`, `"700"`, `"800"`, or `"900"`.
 
-Default: `normal`
+Default: `"normal"`
 |===
 
 *Returns:* `style`
@@ -2469,7 +2469,7 @@ Alias: `shape`
 |`string`
 |Pick a shape.
 
-Default: `square`
+Default: `"square"`
 
 |`border`
 
@@ -2732,7 +2732,7 @@ Aliases: `c`, `field`
 |`string`
 |The column or field that you want to filter.
 
-Default: `@timestamp`
+Default: `"@timestamp"`
 
 |`compact`
 |`boolean`
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts
index 6b9464843fca4..9cbd5ed3ee68a 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts
@@ -20,9 +20,10 @@ export function ifFn(): ExpressionFunctionDefinition<'if', unknown, Arguments, u
     help,
     args: {
       condition: {
-        types: ['boolean', 'null'],
+        types: ['boolean'],
         aliases: ['_'],
         help: argHelp.condition,
+        required: true,
       },
       then: {
         resolve: false,
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts
index 4066a35ea41f2..c4ba5771408a5 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts
@@ -20,6 +20,9 @@ export function neq(): ExpressionFunctionDefinition<'neq', Input, Arguments, boo
     name: 'neq',
     type: 'boolean',
     help,
+    context: {
+      types: ['boolean', 'number', 'string', 'null'],
+    },
     args: {
       value: {
         aliases: ['_'],
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts
index bb70bec561a11..453beb4c1106b 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts
@@ -25,6 +25,7 @@ export function switchFn(): ExpressionFunctionDefinition<'switch', unknown, Argu
         aliases: ['_'],
         resolve: false,
         multi: true,
+        required: true,
         help: argHelp.case,
       },
       default: {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.ts
index 5105beb586f72..568e67db7f86c 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.ts
@@ -26,6 +26,7 @@ export function tail(): ExpressionFunctionDefinition<'tail', Datatable, Argument
         aliases: ['_'],
         types: ['number'],
         help: argHelp.count,
+        default: 1,
       },
     },
     fn: (input, args) => ({
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/alter_column.ts b/x-pack/plugins/canvas/i18n/functions/dict/alter_column.ts
index f201e73d717eb..5f206399b42da 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/alter_column.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/alter_column.ts
@@ -13,14 +13,14 @@ import { DATATABLE_COLUMN_TYPES } from '../../../common/lib/constants';
 export const help: FunctionHelp<FunctionFactory<typeof alterColumn>> = {
   help: i18n.translate('xpack.canvas.functions.alterColumnHelpText', {
     defaultMessage:
-      'Converts between core types, including {list}, and {end}, and rename columns. ' +
+      'Converts between core types, including {list}, and {end}, and renames columns. ' +
       'See also {mapColumnFn} and {staticColumnFn}.',
     values: {
       list: Object.values(DATATABLE_COLUMN_TYPES)
         .slice(0, -1)
         .map((type) => `\`${type}\``)
         .join(', '),
-      end: Object.values(DATATABLE_COLUMN_TYPES).slice(-1)[0],
+      end: `\`${Object.values(DATATABLE_COLUMN_TYPES).slice(-1)[0]}\``,
       mapColumnFn: '`mapColumn`',
       staticColumnFn: '`staticColumn`',
     },
@@ -33,7 +33,7 @@ export const help: FunctionHelp<FunctionFactory<typeof alterColumn>> = {
       defaultMessage: 'The resultant column name. Leave blank to not rename.',
     }),
     type: i18n.translate('xpack.canvas.functions.alterColumn.args.typeHelpText', {
-      defaultMessage: 'The type to convert the column to. Leave blank to not change type.',
+      defaultMessage: 'The type to convert the column to. Leave blank to not change the type.',
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/as.ts b/x-pack/plugins/canvas/i18n/functions/dict/as.ts
index e95aa641c71b8..6154159d5e452 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/as.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/as.ts
@@ -20,7 +20,7 @@ export const help: FunctionHelp<FunctionFactory<typeof asFn>> = {
   }),
   args: {
     name: i18n.translate('xpack.canvas.functions.as.args.nameHelpText', {
-      defaultMessage: 'A name to give the column.',
+      defaultMessage: 'The name to give the column.',
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/axis_config.ts b/x-pack/plugins/canvas/i18n/functions/dict/axis_config.ts
index 7cf0ec6c58761..bedd677209baa 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/axis_config.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/axis_config.ts
@@ -21,14 +21,14 @@ export const help: FunctionHelp<FunctionFactory<typeof axisConfig>> = {
   args: {
     max: i18n.translate('xpack.canvas.functions.axisConfig.args.maxHelpText', {
       defaultMessage:
-        'The maximum value displayed in the axis. Must be a number or a date in milliseconds since epoch or {ISO8601} string.',
+        'The maximum value displayed in the axis. Must be a number, a date in milliseconds since epoch, or an {ISO8601} string.',
       values: {
         ISO8601,
       },
     }),
     min: i18n.translate('xpack.canvas.functions.axisConfig.args.minHelpText', {
       defaultMessage:
-        'The minimum value displayed in the axis. Must be a number or a date in milliseconds since epoch or {ISO8601} string.',
+        'The minimum value displayed in the axis. Must be a number, a date in milliseconds since epoch, or an {ISO8601} string.',
       values: {
         ISO8601,
       },
@@ -40,14 +40,14 @@ export const help: FunctionHelp<FunctionFactory<typeof axisConfig>> = {
           .slice(0, -1)
           .map((position) => `\`"${position}"\``)
           .join(', '),
-        end: Object.values(Position).slice(-1)[0],
+        end: `\`"${Object.values(Position).slice(-1)[0]}"\``,
       },
     }),
     show: i18n.translate('xpack.canvas.functions.axisConfig.args.showHelpText', {
       defaultMessage: 'Show the axis labels?',
     }),
     tickSize: i18n.translate('xpack.canvas.functions.axisConfig.args.tickSizeHelpText', {
-      defaultMessage: 'The increment size between each tick. Use for `number` axes only',
+      defaultMessage: 'The increment size between each tick. Use for `number` axes only.',
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/case.ts b/x-pack/plugins/canvas/i18n/functions/dict/case.ts
index 8f0689e5e3837..884542420999c 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/case.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/case.ts
@@ -34,14 +34,14 @@ export const help: FunctionHelp<FunctionFactory<typeof caseFn>> = {
     }),
     if: i18n.translate('xpack.canvas.functions.case.args.ifHelpText', {
       defaultMessage:
-        'This value indicates whether the condition is met, usually using a sub-expression. The {IF_ARG} argument overrides the {WHEN_ARG} argument when both are provided.',
+        'This value indicates whether the condition is met. The {IF_ARG} argument overrides the {WHEN_ARG} argument when both are provided.',
       values: {
         IF_ARG,
         WHEN_ARG,
       },
     }),
     then: i18n.translate('xpack.canvas.functions.case.args.thenHelpText', {
-      defaultMessage: 'The value to return if the condition is met.',
+      defaultMessage: 'The value returned if the condition is met.',
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/compare.ts b/x-pack/plugins/canvas/i18n/functions/dict/compare.ts
index 5697881503b84..cb57fde0cfcb6 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/compare.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/compare.ts
@@ -22,20 +22,20 @@ export const help: FunctionHelp<FunctionFactory<typeof compare>> = {
   help: i18n.translate('xpack.canvas.functions.compareHelpText', {
     defaultMessage:
       'Compares the {CONTEXT} to specified value to determine {BOOLEAN_TRUE} or {BOOLEAN_FALSE}. Usually used in combination with `{ifFn}` or `{caseFn}`. ' +
-      'This only works with primitive types, such as {examples}. See also `{eqFn}`, `{gtFn}`, `{gteFn}`, `{ltFn}`, `{lteFn}`, `{neqFn}`',
+      'This only works with primitive types, such as {examples}. See also {eqFn}, {gtFn}, {gteFn}, {ltFn}, {lteFn}, {neqFn}',
     values: {
       CONTEXT,
       BOOLEAN_TRUE,
       BOOLEAN_FALSE,
-      ifFn: 'if',
+      ifFn: '`if`',
       caseFn: 'case',
       examples: [TYPE_NUMBER, TYPE_STRING, TYPE_BOOLEAN, TYPE_NULL].join(', '),
-      eqFn: 'eq',
-      gtFn: 'gt',
-      gteFn: 'gte',
-      ltFn: 'lt',
-      lteFn: 'lte',
-      neqFn: 'neq',
+      eqFn: '`eq`',
+      gtFn: '`gt`',
+      gteFn: '`gte`',
+      ltFn: '`lt`',
+      lteFn: '`lte`',
+      neqFn: '`neq`',
     },
   }),
   args: {
@@ -44,13 +44,13 @@ export const help: FunctionHelp<FunctionFactory<typeof compare>> = {
         'The operator to use in the comparison: {eq} (equal to), {gt} (greater than), {gte} (greater than or equal to)' +
         ', {lt} (less than), {lte} (less than or equal to), {ne} or {neq} (not equal to).',
       values: {
-        eq: Operation.EQ,
-        gt: Operation.GT,
-        gte: Operation.GTE,
-        lt: Operation.LT,
-        lte: Operation.LTE,
-        ne: Operation.NE,
-        neq: Operation.NEQ,
+        eq: `\`"${Operation.EQ}"\``,
+        gt: `\`"${Operation.GT}"\``,
+        gte: `\`"${Operation.GTE}"\``,
+        lt: `\`"${Operation.LT}"\``,
+        lte: `\`"${Operation.LTE}"\``,
+        ne: `\`"${Operation.NE}"\``,
+        neq: `\`"${Operation.NEQ}"\``,
       },
     }),
     to: i18n.translate('xpack.canvas.functions.compare.args.toHelpText', {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/container_style.ts b/x-pack/plugins/canvas/i18n/functions/dict/container_style.ts
index bef2ccc2a8e3b..f51206d7990a9 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/container_style.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/container_style.ts
@@ -74,7 +74,7 @@ export const help: FunctionHelp<FunctionFactory<typeof containerStyle>> = {
       },
     }),
     padding: i18n.translate('xpack.canvas.functions.containerStyle.args.paddingHelpText', {
-      defaultMessage: 'The distance of the content, in pixels, from border.',
+      defaultMessage: 'The distance of the content, in pixels, from the border.',
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/date.ts b/x-pack/plugins/canvas/i18n/functions/dict/date.ts
index 6964b62bcc582..1ccab1eb775af 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/date.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/date.ts
@@ -29,7 +29,8 @@ export const help: FunctionHelp<FunctionFactory<typeof date>> = {
       },
     }),
     format: i18n.translate('xpack.canvas.functions.date.args.formatHelpText', {
-      defaultMessage: 'The {MOMENTJS} format used to parse the specified date string. See {url}.',
+      defaultMessage:
+        'The {MOMENTJS} format used to parse the specified date string. For more information, see {url}.',
       values: {
         MOMENTJS,
         url: 'https://momentjs.com/docs/#/displaying/',
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/dropdown_control.ts b/x-pack/plugins/canvas/i18n/functions/dict/dropdown_control.ts
index 0d051a4f5f068..312e0e795ed0b 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/dropdown_control.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/dropdown_control.ts
@@ -11,7 +11,7 @@ import { FunctionFactory } from '../../../types';
 
 export const help: FunctionHelp<FunctionFactory<typeof dropdownControl>> = {
   help: i18n.translate('xpack.canvas.functions.dropdownControlHelpText', {
-    defaultMessage: 'Configures a drop-down filter control element.',
+    defaultMessage: 'Configures a dropdown filter control element.',
   }),
   args: {
     filterColumn: i18n.translate(
@@ -22,7 +22,7 @@ export const help: FunctionHelp<FunctionFactory<typeof dropdownControl>> = {
     ),
     valueColumn: i18n.translate('xpack.canvas.functions.dropdownControl.args.valueColumnHelpText', {
       defaultMessage:
-        'The column or field from which to extract the unique values for the drop-down control.',
+        'The column or field from which to extract the unique values for the dropdown control.',
     }),
     filterGroup: i18n.translate('xpack.canvas.functions.dropdownControl.args.filterGroupHelpText', {
       defaultMessage: 'The group name for the filter.',
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/eq.ts b/x-pack/plugins/canvas/i18n/functions/dict/eq.ts
index a856a81452cd7..23f74068afa74 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/eq.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/eq.ts
@@ -12,7 +12,7 @@ import { CONTEXT } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof eq>> = {
   help: i18n.translate('xpack.canvas.functions.eqHelpText', {
-    defaultMessage: 'Return whether the {CONTEXT} is equal to the argument.',
+    defaultMessage: 'Returns whether the {CONTEXT} is equal to the argument.',
     values: {
       CONTEXT,
     },
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/filterrows.ts b/x-pack/plugins/canvas/i18n/functions/dict/filterrows.ts
index 3c1b6d87a9be5..26f1cab51b459 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/filterrows.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/filterrows.ts
@@ -12,7 +12,7 @@ import { DATATABLE, TYPE_BOOLEAN, BOOLEAN_TRUE, BOOLEAN_FALSE } from '../../cons
 
 export const help: FunctionHelp<FunctionFactory<typeof filterrows>> = {
   help: i18n.translate('xpack.canvas.functions.filterrowsHelpText', {
-    defaultMessage: 'Filter rows in a {DATATABLE} based on the return value of a sub-expression.',
+    defaultMessage: 'Filters rows in a {DATATABLE} based on the return value of a sub-expression.',
     values: {
       DATATABLE,
     },
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/formatdate.ts b/x-pack/plugins/canvas/i18n/functions/dict/formatdate.ts
index 9b60c2f69f120..385403ce75573 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/formatdate.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/formatdate.ts
@@ -25,7 +25,7 @@ export const help: FunctionHelp<FunctionFactory<typeof formatdate>> = {
       defaultMessage: 'A {MOMENTJS} format. For example, {example}. See {url}.',
       values: {
         MOMENTJS,
-        example: `"MM/DD/YYYY"`,
+        example: '`"MM/DD/YYYY"`',
         url: 'https://momentjs.com/docs/#/displaying/',
       },
     }),
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/formatnumber.ts b/x-pack/plugins/canvas/i18n/functions/dict/formatnumber.ts
index f3e8a8858fc36..3dfcf3a9e476f 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/formatnumber.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/formatnumber.ts
@@ -12,7 +12,7 @@ import { NUMERALJS } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof formatnumber>> = {
   help: i18n.translate('xpack.canvas.functions.formatnumberHelpText', {
-    defaultMessage: 'Formats a number into a formatted number string using {NUMERALJS}.',
+    defaultMessage: 'Formats a number into a formatted number string using the {NUMERALJS}.',
     values: {
       NUMERALJS,
     },
@@ -22,8 +22,8 @@ export const help: FunctionHelp<FunctionFactory<typeof formatnumber>> = {
     format: i18n.translate('xpack.canvas.functions.formatnumber.args.formatHelpText', {
       defaultMessage: 'A {NUMERALJS} format string. For example, {example1} or {example2}.',
       values: {
-        example1: `"0.0a"`,
-        example2: `"0%"`,
+        example1: '`"0.0a"`',
+        example2: '`"0%"`',
         NUMERALJS,
       },
     }),
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/get_cell.ts b/x-pack/plugins/canvas/i18n/functions/dict/get_cell.ts
index 79cc4f7e5c303..1cd4cd054d5d9 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/get_cell.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/get_cell.ts
@@ -12,7 +12,7 @@ import { DATATABLE } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof getCell>> = {
   help: i18n.translate('xpack.canvas.functions.getCellHelpText', {
-    defaultMessage: 'Fetchs a single cell from a {DATATABLE}.',
+    defaultMessage: 'Fetches a single cell from a {DATATABLE}.',
     values: {
       DATATABLE,
     },
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/head.ts b/x-pack/plugins/canvas/i18n/functions/dict/head.ts
index 4c61339c29c28..8aef4afd63ef6 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/head.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/head.ts
@@ -12,7 +12,7 @@ import { DATATABLE } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof head>> = {
   help: i18n.translate('xpack.canvas.functions.headHelpText', {
-    defaultMessage: 'Retrieves the first {n} rows from the {DATATABLE}. See also {tailFn}',
+    defaultMessage: 'Retrieves the first {n} rows from the {DATATABLE}. See also {tailFn}.',
     values: {
       n: 'N',
       DATATABLE,
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/if.ts b/x-pack/plugins/canvas/i18n/functions/dict/if.ts
index 9cac3d10b2834..5f840fad91e5c 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/if.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/if.ts
@@ -12,7 +12,7 @@ import { BOOLEAN_TRUE, BOOLEAN_FALSE, CONTEXT } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof ifFn>> = {
   help: i18n.translate('xpack.canvas.functions.ifHelpText', {
-    defaultMessage: 'Perform conditional logic',
+    defaultMessage: 'Performs conditional logic.',
   }),
   args: {
     condition: i18n.translate('xpack.canvas.functions.if.args.conditionHelpText', {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/join_rows.ts b/x-pack/plugins/canvas/i18n/functions/dict/join_rows.ts
index 59684f7cf1cd8..36293d41a5279 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/join_rows.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/join_rows.ts
@@ -11,20 +11,20 @@ import { FunctionFactory } from '../../../types';
 
 export const help: FunctionHelp<FunctionFactory<typeof joinRows>> = {
   help: i18n.translate('xpack.canvas.functions.joinRowsHelpText', {
-    defaultMessage: 'Join values from rows in a datatable into a string',
+    defaultMessage: 'Concatenates values from rows in a `datatable` into a single string.',
   }),
   args: {
     column: i18n.translate('xpack.canvas.functions.joinRows.args.columnHelpText', {
-      defaultMessage: 'The column to join values from',
+      defaultMessage: 'The column or field from which to extract the values.',
     }),
     separator: i18n.translate('xpack.canvas.functions.joinRows.args.separatorHelpText', {
-      defaultMessage: 'The separator to use between row values',
+      defaultMessage: 'The delimiter to insert between each extracted value.',
     }),
     quote: i18n.translate('xpack.canvas.functions.joinRows.args.quoteHelpText', {
-      defaultMessage: 'The quote character around values',
+      defaultMessage: 'The quote character to wrap around each extracted value.',
     }),
     distinct: i18n.translate('xpack.canvas.functions.joinRows.args.distinctHelpText', {
-      defaultMessage: 'Removes duplicate values?',
+      defaultMessage: 'Extract only unique values?',
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/location.ts b/x-pack/plugins/canvas/i18n/functions/dict/location.ts
index 7c0497da8361d..3bd98914ecb11 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/location.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/location.ts
@@ -14,10 +14,11 @@ export const help: FunctionHelp<FunctionFactory<typeof location>> = {
     defaultMessage:
       'Find your current location using the {geolocationAPI} of the browser. ' +
       'Performance can vary, but is fairly accurate. ' +
-      'See {url}.',
+      'See {url}. Don’t use {locationFn} if you plan to generate PDFs as this function requires user input.',
     values: {
       geolocationAPI: 'Geolocation API',
       url: 'https://developer.mozilla.org/en-US/docs/Web/API/Navigator/geolocation',
+      locationFn: '`location`',
     },
   }),
   args: {},
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts b/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts
index 3022ad07089d2..5409808752687 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts
@@ -11,7 +11,7 @@ import { FunctionFactory } from '../../../types';
 
 export const help: FunctionHelp<FunctionFactory<typeof mapCenter>> = {
   help: i18n.translate('xpack.canvas.functions.mapCenterHelpText', {
-    defaultMessage: `Returns an object with the center coordinates and zoom level of the map`,
+    defaultMessage: `Returns an object with the center coordinates and zoom level of the map.`,
   }),
   args: {
     lat: i18n.translate('xpack.canvas.functions.mapCenter.args.latHelpText', {
@@ -21,7 +21,7 @@ export const help: FunctionHelp<FunctionFactory<typeof mapCenter>> = {
       defaultMessage: `Longitude for the center of the map`,
     }),
     zoom: i18n.translate('xpack.canvas.functions.savedMap.args.zoomHelpText', {
-      defaultMessage: `The zoom level of the map`,
+      defaultMessage: `Zoom level of the map`,
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/map_column.ts b/x-pack/plugins/canvas/i18n/functions/dict/map_column.ts
index 589dd9b1dad87..2666a08999fb8 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/map_column.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/map_column.ts
@@ -14,10 +14,10 @@ export const help: FunctionHelp<FunctionFactory<typeof mapColumn>> = {
   help: i18n.translate('xpack.canvas.functions.mapColumnHelpText', {
     defaultMessage:
       'Adds a column calculated as the result of other columns. ' +
-      'Changes are made only when you provide arguments. ' +
-      'See also {mapColumnFn} and {staticColumnFn}.',
+      'Changes are made only when you provide arguments.' +
+      'See also {alterColumnFn} and {staticColumnFn}.',
     values: {
-      mapColumnFn: '`mapColumn`',
+      alterColumnFn: '`alterColumn`',
       staticColumnFn: '`staticColumn`',
     },
   }),
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/markdown.ts b/x-pack/plugins/canvas/i18n/functions/dict/markdown.ts
index aa2845ba4ec3a..093bdaecccb35 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/markdown.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/markdown.ts
@@ -33,13 +33,13 @@ export const help: FunctionHelp<FunctionFactory<typeof markdown>> = {
         'The {CSS} font properties for the content. For example, {fontFamily} or {fontWeight}.',
       values: {
         CSS,
-        fontFamily: 'font-family',
-        fontWeight: 'font-weight',
+        fontFamily: '"font-family"',
+        fontWeight: '"font-weight"',
       },
     }),
     openLinksInNewTab: i18n.translate('xpack.canvas.functions.markdown.args.openLinkHelpText', {
       defaultMessage:
-        'A true/false value for opening links in a new tab. Default value is false. Setting to true will open all links in a new tab.',
+        'A true or false value for opening links in a new tab. The default value is `false`. Setting to `true` opens all links in a new tab.',
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/math.ts b/x-pack/plugins/canvas/i18n/functions/dict/math.ts
index 752009fb9c320..4469c629fa6fd 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/math.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/math.ts
@@ -8,12 +8,12 @@ import { i18n } from '@kbn/i18n';
 import { math } from '../../../canvas_plugin_src/functions/common/math';
 import { FunctionHelp } from '../function_help';
 import { FunctionFactory } from '../../../types';
-import { DATATABLE, CONTEXT, TINYMATH, TINYMATH_URL } from '../../constants';
+import { DATATABLE, CONTEXT, TINYMATH, TINYMATH_URL, TYPE_NUMBER } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof math>> = {
   help: i18n.translate('xpack.canvas.functions.mathHelpText', {
     defaultMessage:
-      'Interprets a {TINYMATH} math expression using a number or {DATATABLE} as {CONTEXT}. ' +
+      'Interprets a {TINYMATH} math expression using a {TYPE_NUMBER} or {DATATABLE} as {CONTEXT}. ' +
       'The {DATATABLE} columns are available by their column name. ' +
       'If the {CONTEXT} is a number it is available as {value}.',
     values: {
@@ -21,6 +21,7 @@ export const help: FunctionHelp<FunctionFactory<typeof math>> = {
       CONTEXT,
       DATATABLE,
       value: '`value`',
+      TYPE_NUMBER,
     },
   }),
   args: {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/metric.ts b/x-pack/plugins/canvas/i18n/functions/dict/metric.ts
index 8258226e5dfc3..f84456b03a86e 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/metric.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/metric.ts
@@ -40,8 +40,8 @@ export const help: FunctionHelp<FunctionFactory<typeof metric>> = {
     metricFormat: i18n.translate('xpack.canvas.functions.metric.args.metricFormatHelpText', {
       defaultMessage: 'A {NUMERALJS} format string. For example, {example1} or {example2}.',
       values: {
-        example1: `"0.0a"`,
-        example2: `"0%"`,
+        example1: '`"0.0a"`',
+        example2: '`"0%"`',
         NUMERALJS,
       },
     }),
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/pie.ts b/x-pack/plugins/canvas/i18n/functions/dict/pie.ts
index 2e4bfc88a273a..149c2f8f1e634 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/pie.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/pie.ts
@@ -8,12 +8,12 @@ import { i18n } from '@kbn/i18n';
 import { pie } from '../../../canvas_plugin_src/functions/common/pie';
 import { FunctionHelp } from '../function_help';
 import { FunctionFactory } from '../../../types';
-import { Position } from '../../../types';
+import { Legend } from '../../../types';
 import { CSS, FONT_FAMILY, FONT_WEIGHT, BOOLEAN_FALSE } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof pie>> = {
   help: i18n.translate('xpack.canvas.functions.pieHelpText', {
-    defaultMessage: 'Configure a pie chart element.',
+    defaultMessage: 'Configures a pie chart element.',
   }),
   args: {
     font: i18n.translate('xpack.canvas.functions.pie.args.fontHelpText', {
@@ -38,20 +38,18 @@ export const help: FunctionHelp<FunctionFactory<typeof pie>> = {
     }),
     legend: i18n.translate('xpack.canvas.functions.pie.args.legendHelpText', {
       defaultMessage:
-        'The legend position. For example, {positions}, or {BOOLEAN_FALSE}. When {BOOLEAN_FALSE}, the legend is hidden.',
+        'The legend position. For example, {legend}, or {BOOLEAN_FALSE}. When {BOOLEAN_FALSE}, the legend is hidden.',
       values: {
-        positions: Object.values(Position)
+        legend: Object.values(Legend)
           .map((position) => `\`"${position}"\``)
           .join(', '),
         BOOLEAN_FALSE,
       },
     }),
     palette: i18n.translate('xpack.canvas.functions.pie.args.paletteHelpText', {
-      defaultMessage:
-        'A {palette} object for describing the colors to use in this pie chart. See {paletteFn}.',
+      defaultMessage: 'A {palette} object for describing the colors to use in this pie chart.',
       values: {
         palette: '`palette`',
-        paletteFn: '`palette`',
       },
     }),
     radius: i18n.translate('xpack.canvas.functions.pie.args.radiusHelpText', {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/plot.ts b/x-pack/plugins/canvas/i18n/functions/dict/plot.ts
index 068156f14c91b..aca2476a6592e 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/plot.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/plot.ts
@@ -8,12 +8,12 @@ import { i18n } from '@kbn/i18n';
 import { plot } from '../../../canvas_plugin_src/functions/common/plot';
 import { FunctionHelp } from '../function_help';
 import { FunctionFactory } from '../../../types';
-import { Position } from '../../../types';
+import { Legend } from '../../../types';
 import { CSS, FONT_FAMILY, FONT_WEIGHT, BOOLEAN_FALSE } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof plot>> = {
   help: i18n.translate('xpack.canvas.functions.plotHelpText', {
-    defaultMessage: 'Configure a chart element',
+    defaultMessage: 'Configures a chart element.',
   }),
   args: {
     defaultStyle: i18n.translate('xpack.canvas.functions.plot.args.defaultStyleHelpText', {
@@ -30,20 +30,18 @@ export const help: FunctionHelp<FunctionFactory<typeof plot>> = {
     }),
     legend: i18n.translate('xpack.canvas.functions.plot.args.legendHelpText', {
       defaultMessage:
-        'The legend position. For example, {positions}, or {BOOLEAN_FALSE}. When {BOOLEAN_FALSE}, the legend is hidden.',
+        'The legend position. For example, {legend}, or {BOOLEAN_FALSE}. When {BOOLEAN_FALSE}, the legend is hidden.',
       values: {
-        positions: Object.values(Position)
+        legend: Object.values(Legend)
           .map((position) => `\`"${position}"\``)
           .join(', '),
         BOOLEAN_FALSE,
       },
     }),
     palette: i18n.translate('xpack.canvas.functions.plot.args.paletteHelpText', {
-      defaultMessage:
-        'A {palette} object for describing the colors to use in this chart. See {paletteFn}.',
+      defaultMessage: 'A {palette} object for describing the colors to use in this chart.',
       values: {
         palette: '`palette`',
-        paletteFn: '`palette`',
       },
     }),
     seriesStyle: i18n.translate('xpack.canvas.functions.plot.args.seriesStyleHelpText', {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/ply.ts b/x-pack/plugins/canvas/i18n/functions/dict/ply.ts
index f341965aaa8b2..3bb9c1b3e46a3 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/ply.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/ply.ts
@@ -13,8 +13,8 @@ import { DATATABLE } from '../../constants';
 export const help: FunctionHelp<FunctionFactory<typeof ply>> = {
   help: i18n.translate('xpack.canvas.functions.plyHelpText', {
     defaultMessage:
-      'Subdivides a {DATATABLE} by the unique values of the specified column, ' +
-      'and passes the resulting tables into an expression, then merges the outputs of each expression',
+      'Subdivides a {DATATABLE} by the unique values of the specified columns, ' +
+      'and passes the resulting tables into an expression, then merges the outputs of each expression.',
     values: {
       DATATABLE,
     },
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/pointseries.ts b/x-pack/plugins/canvas/i18n/functions/dict/pointseries.ts
index 1e7c67bb750e3..2579db77ff1b9 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/pointseries.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/pointseries.ts
@@ -35,10 +35,10 @@ export const help: FunctionHelp<FunctionFactory<typeof pointseries>> = {
       defaultMessage: 'The text to show on the mark. Only applicable to supported elements.',
     }),
     x: i18n.translate('xpack.canvas.functions.pointseries.args.xHelpText', {
-      defaultMessage: 'The values along the x-axis.',
+      defaultMessage: 'The values along the X-axis.',
     }),
     y: i18n.translate('xpack.canvas.functions.pointseries.args.yHelpText', {
-      defaultMessage: 'The values along the y-axis.',
+      defaultMessage: 'The values along the Y-axis.',
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/progress.ts b/x-pack/plugins/canvas/i18n/functions/dict/progress.ts
index 1880c5dc807f0..199d5d926f277 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/progress.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/progress.ts
@@ -34,7 +34,7 @@ export const help: FunctionHelp<FunctionFactory<typeof progress>> = {
     }),
     label: i18n.translate('xpack.canvas.functions.progress.args.labelHelpText', {
       defaultMessage:
-        'To show or hide labels, use {BOOLEAN_TRUE} or {BOOLEAN_FALSE}. Alternatively, provide a string to display as a label.',
+        'To show or hide the label, use {BOOLEAN_TRUE} or {BOOLEAN_FALSE}. Alternatively, provide a string to display as a label.',
       values: {
         BOOLEAN_TRUE,
         BOOLEAN_FALSE,
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/render.ts b/x-pack/plugins/canvas/i18n/functions/dict/render.ts
index bf0a5a50b8726..7ddb04de490e5 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/render.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/render.ts
@@ -13,7 +13,7 @@ import { CONTEXT, CSS } from '../../constants';
 export const help: FunctionHelp<FunctionFactory<typeof render>> = {
   help: i18n.translate('xpack.canvas.functions.renderHelpText', {
     defaultMessage:
-      'Render the {CONTEXT} as a specific element and sets element level options, such as background and border styling.',
+      'Renders the {CONTEXT} as a specific element and sets element level options, such as background and border styling.',
     values: {
       CONTEXT,
     },
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/repeat_image.ts b/x-pack/plugins/canvas/i18n/functions/dict/repeat_image.ts
index 222947779a758..4de92b0552bf5 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/repeat_image.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/repeat_image.ts
@@ -17,7 +17,7 @@ export const help: FunctionHelp<FunctionFactory<typeof repeatImage>> = {
   args: {
     emptyImage: i18n.translate('xpack.canvas.functions.repeatImage.args.emptyImageHelpText', {
       defaultMessage:
-        'Fills the difference between the {CONTEXT} and {maxArg} parameter for the element with this image' +
+        'Fills the difference between the {CONTEXT} and {maxArg} parameter for the element with this image. ' +
         'Provide an image asset as a {BASE64} data {URL}, or pass in a sub-expression.',
       values: {
         BASE64,
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/replace.ts b/x-pack/plugins/canvas/i18n/functions/dict/replace.ts
index 085f42b439c46..e99c9740c57d6 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/replace.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/replace.ts
@@ -12,7 +12,7 @@ import { JS } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof replace>> = {
   help: i18n.translate('xpack.canvas.functions.replaceImageHelpText', {
-    defaultMessage: 'Use a regular expression to replace parts of a string.',
+    defaultMessage: 'Uses a regular expression to replace parts of a string.',
   }),
   args: {
     pattern: i18n.translate('xpack.canvas.functions.replace.args.patternHelpText', {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/reveal_image.ts b/x-pack/plugins/canvas/i18n/functions/dict/reveal_image.ts
index 410ca29d7b4d4..6a8909f4acdde 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/reveal_image.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/reveal_image.ts
@@ -13,7 +13,7 @@ import { BASE64, URL } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof revealImage>> = {
   help: i18n.translate('xpack.canvas.functions.revealImageHelpText', {
-    defaultMessage: 'Configure an image reveal element.',
+    defaultMessage: 'Configures an image reveal element.',
   }),
   args: {
     image: i18n.translate('xpack.canvas.functions.revealImage.args.imageHelpText', {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/rounddate.ts b/x-pack/plugins/canvas/i18n/functions/dict/rounddate.ts
index 4805fe16a94f0..d2728b6371398 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/rounddate.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/rounddate.ts
@@ -21,7 +21,7 @@ export const help: FunctionHelp<FunctionFactory<typeof rounddate>> = {
   args: {
     format: i18n.translate('xpack.canvas.functions.rounddate.args.formatHelpText', {
       defaultMessage:
-        'The {MOMENTJS} format to use for bucketing. For example, {example} would round each date to months. See {url}.',
+        'The {MOMENTJS} format to use for bucketing. For example, {example} rounds to months. See {url}.',
       values: {
         example: '`"YYYY-MM"`',
         MOMENTJS,
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/row_count.ts b/x-pack/plugins/canvas/i18n/functions/dict/row_count.ts
index 5b0cecd47fd79..fd7c651238c28 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/row_count.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/row_count.ts
@@ -12,7 +12,7 @@ import { FunctionFactory } from '../../../types';
 export const help: FunctionHelp<FunctionFactory<typeof rowCount>> = {
   help: i18n.translate('xpack.canvas.functions.rowCountHelpText', {
     defaultMessage:
-      'Returns the number of rows. Pair with {plyFn} to get the count of unique column ' +
+      'Returns the number of rows. Pairs with {plyFn} to get the count of unique column ' +
       'values, or combinations of unique column values.',
     values: {
       plyFn: '`ply`',
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/saved_lens.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_lens.ts
index e146a6ca68449..1121aa43f3509 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/saved_lens.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/saved_lens.ts
@@ -11,17 +11,17 @@ import { FunctionFactory } from '../../../types';
 
 export const help: FunctionHelp<FunctionFactory<typeof savedLens>> = {
   help: i18n.translate('xpack.canvas.functions.savedLensHelpText', {
-    defaultMessage: `Returns an embeddable for a saved lens object`,
+    defaultMessage: `Returns an embeddable for a saved Lens visualization object.`,
   }),
   args: {
     id: i18n.translate('xpack.canvas.functions.savedLens.args.idHelpText', {
-      defaultMessage: `The ID of the Saved Lens Object`,
+      defaultMessage: `The ID of the saved Lens visualization object`,
     }),
     timerange: i18n.translate('xpack.canvas.functions.savedLens.args.timerangeHelpText', {
       defaultMessage: `The timerange of data that should be included`,
     }),
     title: i18n.translate('xpack.canvas.functions.savedLens.args.titleHelpText', {
-      defaultMessage: `The title for the lens emebeddable`,
+      defaultMessage: `The title for the Lens visualization object`,
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/saved_map.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_map.ts
index 8615565897434..bacaca523ed2e 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/saved_map.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/saved_map.ts
@@ -11,11 +11,11 @@ import { FunctionFactory } from '../../../types';
 
 export const help: FunctionHelp<FunctionFactory<typeof savedMap>> = {
   help: i18n.translate('xpack.canvas.functions.savedMapHelpText', {
-    defaultMessage: `Returns an embeddable for a saved map object`,
+    defaultMessage: `Returns an embeddable for a saved map object.`,
   }),
   args: {
     id: i18n.translate('xpack.canvas.functions.savedMap.args.idHelpText', {
-      defaultMessage: `The ID of the Saved Map Object`,
+      defaultMessage: `The ID of the saved map object`,
     }),
     center: i18n.translate('xpack.canvas.functions.savedMap.args.centerHelpText', {
       defaultMessage: `The center and zoom level the map should have`,
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/saved_visualization.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_visualization.ts
index 30f88b51e7576..e8cbddc5c1102 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/saved_visualization.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/saved_visualization.ts
@@ -11,22 +11,22 @@ import { FunctionFactory } from '../../../types';
 
 export const help: FunctionHelp<FunctionFactory<typeof savedVisualization>> = {
   help: i18n.translate('xpack.canvas.functions.savedVisualizationHelpText', {
-    defaultMessage: `Returns an embeddable for a saved visualization object`,
+    defaultMessage: `Returns an embeddable for a saved visualization object.`,
   }),
   args: {
     id: i18n.translate('xpack.canvas.functions.savedVisualization.args.idHelpText', {
-      defaultMessage: `The ID of the Saved Visualization Object`,
+      defaultMessage: `The ID of the saved visualization object`,
     }),
     timerange: i18n.translate('xpack.canvas.functions.savedVisualization.args.timerangeHelpText', {
       defaultMessage: `The timerange of data that should be included`,
     }),
     colors: i18n.translate('xpack.canvas.functions.savedVisualization.args.colorsHelpText', {
-      defaultMessage: `Define the color to use for a specific series`,
+      defaultMessage: `Defines the color to use for a specific series`,
     }),
     hideLegend: i18n.translate(
       'xpack.canvas.functions.savedVisualization.args.hideLegendHelpText',
       {
-        defaultMessage: `Should the legend be hidden`,
+        defaultMessage: `Specifies the option to hide the legend`,
       }
     ),
   },
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/series_style.ts b/x-pack/plugins/canvas/i18n/functions/dict/series_style.ts
index 7b3855b528201..3f6daa588b730 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/series_style.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/series_style.ts
@@ -43,7 +43,7 @@ export const help: FunctionHelp<FunctionFactory<typeof seriesStyle>> = {
       defaultMessage: 'The width of the line.',
     }),
     points: i18n.translate('xpack.canvas.functions.seriesStyle.args.pointsHelpText', {
-      defaultMessage: 'Size of points on line',
+      defaultMessage: 'The size of points on line.',
     }),
     stack: i18n.translate('xpack.canvas.functions.seriesStyle.args.stackHelpText', {
       defaultMessage:
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/shape.ts b/x-pack/plugins/canvas/i18n/functions/dict/shape.ts
index bcd6d90faa3f0..ddc988873f113 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/shape.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/shape.ts
@@ -12,7 +12,7 @@ import { SVG } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof shape>> = {
   help: i18n.translate('xpack.canvas.functions.shapeHelpText', {
-    defaultMessage: 'Create a shape.',
+    defaultMessage: 'Creates a shape.',
   }),
   args: {
     shape: i18n.translate('xpack.canvas.functions.shape.args.shapeHelpText', {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/sort.ts b/x-pack/plugins/canvas/i18n/functions/dict/sort.ts
index d539449253058..b768362dd0770 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/sort.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/sort.ts
@@ -12,12 +12,15 @@ import { DATATABLE } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof sort>> = {
   help: i18n.translate('xpack.canvas.functions.sortHelpText', {
-    defaultMessage: 'Sorts a datatable by the specified column.',
+    defaultMessage: 'Sorts a {DATATABLE} by the specified column.',
+    values: {
+      DATATABLE,
+    },
   }),
   args: {
     by: i18n.translate('xpack.canvas.functions.sort.args.byHelpText', {
       defaultMessage:
-        'The column to sort by. When unspecified, the `{DATATABLE}` ' +
+        'The column to sort by. When unspecified, the {DATATABLE} ' +
         'is sorted by the first column.',
       values: {
         DATATABLE,
@@ -25,7 +28,7 @@ export const help: FunctionHelp<FunctionFactory<typeof sort>> = {
     }),
     reverse: i18n.translate('xpack.canvas.functions.sort.args.reverseHelpText', {
       defaultMessage:
-        'Reverses the sorting order. When unspecified, the `{DATATABLE}` ' +
+        'Reverses the sorting order. When unspecified, the {DATATABLE} ' +
         'is sorted in ascending order.',
       values: {
         DATATABLE,
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/static_column.ts b/x-pack/plugins/canvas/i18n/functions/dict/static_column.ts
index 82dbd9910ea3b..f0f7b46a2c0bc 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/static_column.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/static_column.ts
@@ -12,7 +12,7 @@ import { FunctionFactory } from '../../../types';
 export const help: FunctionHelp<FunctionFactory<typeof staticColumn>> = {
   help: i18n.translate('xpack.canvas.functions.staticColumnHelpText', {
     defaultMessage:
-      'Add a column with the same static value in every row. See also {alterColumnFn} and {mapColumnFn}.',
+      'Adds a column with the same static value in every row. See also {alterColumnFn} and {mapColumnFn}.',
     values: {
       alterColumnFn: '`alterColumn`',
       mapColumnFn: '`mapColumn`',
@@ -20,11 +20,11 @@ export const help: FunctionHelp<FunctionFactory<typeof staticColumn>> = {
   }),
   args: {
     name: i18n.translate('xpack.canvas.functions.staticColumn.args.nameHelpText', {
-      defaultMessage: 'The name of the new column column.',
+      defaultMessage: 'The name of the new column.',
     }),
     value: i18n.translate('xpack.canvas.functions.staticColumn.args.valueHelpText', {
       defaultMessage:
-        'The value to insert in each row in the new column. Tip: use a sub-expression to rollup ' +
+        'The value to insert in each row in the new column. TIP: use a sub-expression to rollup ' +
         'other columns into a static value.',
     }),
   },
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/switch.ts b/x-pack/plugins/canvas/i18n/functions/dict/switch.ts
index f65ff7c6fd240..aaf53d2c47c3a 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/switch.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/switch.ts
@@ -14,7 +14,7 @@ export const help: FunctionHelp<FunctionFactory<typeof switchFn>> = {
   help: i18n.translate('xpack.canvas.functions.switchHelpText', {
     defaultMessage:
       'Performs conditional logic with multiple conditions. ' +
-      'See also {caseFn} which builds a {case} to pass to the {switchFn} function.',
+      'See also {caseFn}, which builds a {case} to pass to the {switchFn} function.',
     values: {
       case: '`case`',
       caseFn: '`case`',
@@ -23,7 +23,7 @@ export const help: FunctionHelp<FunctionFactory<typeof switchFn>> = {
   }),
   args: {
     case: i18n.translate('xpack.canvas.functions.switch.args.caseHelpText', {
-      defaultMessage: 'The conditions to check',
+      defaultMessage: 'The conditions to check.',
     }),
     default: i18n.translate('xpack.canvas.functions.switch.args.defaultHelpText', {
       defaultMessage:
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/table.ts b/x-pack/plugins/canvas/i18n/functions/dict/table.ts
index 91a9ae7488234..9fe93b2136fb5 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/table.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/table.ts
@@ -12,7 +12,7 @@ import { CSS, FONT_FAMILY, FONT_WEIGHT, BOOLEAN_FALSE } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof table>> = {
   help: i18n.translate('xpack.canvas.functions.tableHelpText', {
-    defaultMessage: 'Configures a table element',
+    defaultMessage: 'Configures a table element.',
   }),
   args: {
     font: i18n.translate('xpack.canvas.functions.table.args.fontHelpText', {
@@ -35,7 +35,7 @@ export const help: FunctionHelp<FunctionFactory<typeof table>> = {
       defaultMessage: 'The number of rows to display on each page.',
     }),
     showHeader: i18n.translate('xpack.canvas.functions.table.args.showHeaderHelpText', {
-      defaultMessage: 'Show/hide the header row with titles for each column.',
+      defaultMessage: 'Show or hide the header row with titles for each column.',
     }),
   },
 };
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/time_range.ts b/x-pack/plugins/canvas/i18n/functions/dict/time_range.ts
index 476a9978800df..e3fa931a8f07b 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/time_range.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/time_range.ts
@@ -11,7 +11,7 @@ import { FunctionFactory } from '../../../types';
 
 export const help: FunctionHelp<FunctionFactory<typeof timerange>> = {
   help: i18n.translate('xpack.canvas.functions.timerangeHelpText', {
-    defaultMessage: `An object that represents a span of time`,
+    defaultMessage: `An object that represents a span of time.`,
   }),
   args: {
     from: i18n.translate('xpack.canvas.functions.timerange.args.fromHelpText', {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/timefilter.ts b/x-pack/plugins/canvas/i18n/functions/dict/timefilter.ts
index aedcdc9441885..80f2544e11a4e 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/timefilter.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/timefilter.ts
@@ -12,7 +12,7 @@ import { ISO8601, ELASTICSEARCH, DATEMATH } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<typeof timefilter>> = {
   help: i18n.translate('xpack.canvas.functions.timefilterHelpText', {
-    defaultMessage: 'Create a time filter for querying a source.',
+    defaultMessage: 'Creates a time filter for querying a source.',
   }),
   args: {
     column: i18n.translate('xpack.canvas.functions.timefilter.args.columnHelpText', {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/timelion.ts b/x-pack/plugins/canvas/i18n/functions/dict/timelion.ts
index 41bf86055f1e3..d76e30c1ef814 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/timelion.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/timelion.ts
@@ -12,7 +12,7 @@ import { ELASTICSEARCH, DATEMATH, MOMENTJS_TIMEZONE_URL } from '../../constants'
 
 export const help: FunctionHelp<FunctionFactory<ReturnType<typeof timelionFunctionFactory>>> = {
   help: i18n.translate('xpack.canvas.functions.timelionHelpText', {
-    defaultMessage: 'Use Timelion to extract one or more timeseries from many sources.',
+    defaultMessage: 'Uses Timelion to extract one or more time series from many sources.',
   }),
   args: {
     query: i18n.translate('xpack.canvas.functions.timelion.args.query', {
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/to.ts b/x-pack/plugins/canvas/i18n/functions/dict/to.ts
index c618f84aeaf2b..177e4367b6ece 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/to.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/to.ts
@@ -12,7 +12,8 @@ import { CONTEXT } from '../../constants';
 
 export const help: FunctionHelp<FunctionFactory<ReturnType<typeof toFunctionFactory>>> = {
   help: i18n.translate('xpack.canvas.functions.toHelpText', {
-    defaultMessage: 'Explicitly casts the type of the {CONTEXT} to the specified type.',
+    defaultMessage:
+      'Explicitly casts the type of the {CONTEXT} from one type to the specified type.',
     values: {
       CONTEXT,
     },
diff --git a/x-pack/plugins/canvas/i18n/functions/dict/urlparam.ts b/x-pack/plugins/canvas/i18n/functions/dict/urlparam.ts
index b8c044f521029..0331d239d48a9 100644
--- a/x-pack/plugins/canvas/i18n/functions/dict/urlparam.ts
+++ b/x-pack/plugins/canvas/i18n/functions/dict/urlparam.ts
@@ -13,11 +13,11 @@ import { TYPE_STRING, URL } from '../../constants';
 export const help: FunctionHelp<FunctionFactory<typeof urlparam>> = {
   help: i18n.translate('xpack.canvas.functions.urlparamHelpText', {
     defaultMessage:
-      'Retreives a {URL} parameter to use in an expression. ' +
+      'Retrieves a {URL} parameter to use in an expression. ' +
       'The {urlparamFn} function always returns a {TYPE_STRING}. ' +
-      'For example, you can retrieve the value {value} from the parameter {myVar} from the {URL} {example}).',
+      'For example, you can retrieve the value {value} from the parameter {myVar} from the {URL} {example}.',
     values: {
-      example: 'https://localhost:5601/app/canvas?myVar=20',
+      example: '`https://localhost:5601/app/canvas?myVar=20`',
       myVar: '`myVar`',
       TYPE_STRING,
       URL,
diff --git a/x-pack/plugins/canvas/public/application.tsx b/x-pack/plugins/canvas/public/application.tsx
index 482cd04373105..463fb1efbd3b5 100644
--- a/x-pack/plugins/canvas/public/application.tsx
+++ b/x-pack/plugins/canvas/public/application.tsx
@@ -22,7 +22,6 @@ import { registerLanguage } from './lib/monaco_language_def';
 import { SetupRegistries } from './plugin_api';
 import { initRegistries, populateRegistries, destroyRegistries } from './registries';
 import { getDocumentationLinks } from './lib/documentation_links';
-// @ts-expect-error untyped component
 import { HelpMenu } from './components/help_menu/help_menu';
 import { createStore } from './store';
 
@@ -128,7 +127,10 @@ export const initializeCanvas = async (
       },
     ],
     content: (domNode) => {
-      ReactDOM.render(<HelpMenu />, domNode);
+      ReactDOM.render(
+        <HelpMenu functionRegistry={services.expressions.getService().getFunctions()} />,
+        domNode
+      );
       return () => ReactDOM.unmountComponentAtNode(domNode);
     },
   });
diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/function_examples.ts b/x-pack/plugins/canvas/public/components/function_reference_generator/function_examples.ts
new file mode 100644
index 0000000000000..61c1c1588a290
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/function_reference_generator/function_examples.ts
@@ -0,0 +1,444 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface FunctionExample {
+  syntax: string;
+  usage: {
+    expression: string;
+    help?: string;
+  };
+}
+
+interface FunctionExampleDict {
+  [key: string]: FunctionExample;
+}
+
+export const getFunctionExamples = (): FunctionExampleDict => ({
+  all: {
+    syntax: `all {neq "foo"} {neq "bar"} {neq "fizz"}
+all condition={gt 10} condition={lt 20}`,
+    usage: {
+      expression: `filters
+| demodata
+| math "mean(percent_uptime)"
+| formatnumber "0.0%"
+| metric "Average uptime"
+  metricFont={
+    font size=48 family="'Open Sans', Helvetica, Arial, sans-serif"
+      color={
+        if {all {gte 0} {lt 0.8}} then="red" else="green"
+      }
+      align="center" lHeight=48
+  }
+| render`,
+      help:
+        'This sets the color of the metric text to `"red"` if the context passed into `metric` is greater than or equal to 0 and less than 0.8. Otherwise, the color is set to `"green"`.',
+    },
+  },
+  alterColumn: {
+    syntax: `alterColumn "cost" type="string"
+alterColumn column="@timestamp" name="foo"`,
+    usage: {
+      expression: `filters
+| demodata
+| alterColumn "time" name="time_in_ms" type="number"
+| table
+| render`,
+      help:
+        'This renames the `time` column to `time_in_ms` and converts the type of the column’s values from `date` to `number`.',
+    },
+  },
+  any: {
+    syntax: `any {eq "foo"} {eq "bar"} {eq "fizz"}
+any condition={lte 10} condition={gt 30}`,
+    usage: {
+      expression: `filters
+| demodata
+| filterrows {
+    getCell "project" | any {eq "elasticsearch"} {eq "kibana"} {eq "x-pack"}
+  }
+| pointseries color="project" size="max(price)"
+| pie
+| render`,
+      help:
+        'This filters out any rows that don’t contain `"elasticsearch"`, `"kibana"` or `"x-pack"` in the `project` field.',
+    },
+  },
+  as: {
+    syntax: `as
+as "foo"
+as name="bar"`,
+    usage: {
+      expression: `filters
+| demodata
+| ply by="project" fn={math "count(username)" | as "num_users"} fn={math "mean(price)" | as "price"}
+| pointseries x="project" y="num_users" size="price" color="project"
+| plot
+| render`,
+      help: `\`as\` casts any primitive value (\`string\`, \`number\`, \`date\`, \`null\`) into a \`datatable\` with a single row and a single column with the given name (or defaults to \`"value"\` if no name is provided). This is useful when piping a primitive value into a function that only takes \`datatable\` as an input.
+
+In the example, \`ply\` expects each \`fn\` subexpression to return a \`datatable\` in order to merge the results of each \`fn\` back into a \`datatable\`, but using a \`math\` aggregation in the subexpressions returns a single \`math\` value, which is then cast into a \`datatable\` using \`as\`.`,
+    },
+  },
+  asset: {
+    syntax: `asset "asset-52f14f2b-fee6-4072-92e8-cd2642665d02"
+asset id="asset-498f7429-4d56-42a2-a7e4-8bf08d98d114"`,
+    usage: {
+      expression: `image dataurl={asset "asset-c661a7cc-11be-45a1-a401-d7592ea7917a"} mode="contain"
+| render`,
+      help:
+        'The image asset stored with the ID `"asset-c661a7cc-11be-45a1-a401-d7592ea7917a"` is passed into the `dataurl` argument of the `image` function to display the stored asset.',
+    },
+  },
+  axisConfig: {
+    syntax: `axisConfig show=false
+axisConfig position="right" min=0 max=10 tickSize=1`,
+    usage: {
+      expression: `filters
+| demodata
+| pointseries x="size(cost)" y="project" color="project"
+| plot defaultStyle={seriesStyle bars=0.75 horizontalBars=true}
+  legend=false
+  xaxis={axisConfig position="top" min=0 max=400 tickSize=100}
+  yaxis={axisConfig position="right"}
+| render`,
+      help:
+        'This sets the `x-axis` to display on the top of the chart and sets the range of values to `0-400` with ticks displayed at `100` intervals. The `y-axis` is configured to display on the `right`.',
+    },
+  },
+  case: {
+    syntax: `case 0 then="red"
+case when=5 then="yellow"
+case if={lte 50} then="green"`,
+    usage: {
+      expression: `math "random()"
+| progress shape="gauge" label={formatnumber "0%"}
+  font={
+    font size=24 family="'Open Sans', Helvetica, Arial, sans-serif" align="center"
+      color={
+        switch {case if={lte 0.5} then="green"}
+          {case if={all {gt 0.5} {lte 0.75}} then="orange"}
+          default="red"
+      }
+  }
+  valueColor={
+    switch {case if={lte 0.5} then="green"}
+      {case if={all {gt 0.5} {lte 0.75}} then="orange"}
+      default="red"
+  }
+| render`,
+      help:
+        'This sets the color of the progress indicator and the color of the label to `"green"` if the value is less than or equal to `0.5`, `"orange"` if the value is greater than `0.5` and less than or equal to `0.75`, and `"red"` if `none` of the case conditions are met.',
+    },
+  },
+  columns: {
+    syntax: `columns include="@timestamp, projects, cost"
+columns exclude="username, country, age"`,
+    usage: {
+      expression: `filters
+| demodata
+| columns include="price, cost, state, project"
+| table
+| render`,
+      help:
+        'This only keeps the `price`, `cost`, `state`, and `project` columns from the `demodata` data source and removes all other columns.',
+    },
+  },
+  compare: {
+    syntax: `compare "neq" to="elasticsearch"
+compare op="lte" to=100`,
+    usage: {
+      expression: `filters
+| demodata
+| mapColumn project
+  fn={getCell project |
+    switch
+      {case if={compare eq to=kibana} then=kibana}
+      {case if={compare eq to=elasticsearch} then=elasticsearch}
+      default="other"
+  }
+| pointseries size="size(cost)" color="project"
+| pie
+| render`,
+      help:
+        'This maps all `project` values that aren’t `"kibana"` and `"elasticsearch"` to `"other"`. Alternatively, you can use the individual comparator functions instead of compare.',
+    },
+  },
+  containerStyle: {
+    syntax: `containerStyle backgroundColor="red"’
+containerStyle borderRadius="50px"
+containerStyle border="1px solid black"
+containerStyle padding="5px"
+containerStyle opacity="0.5"
+containerStyle overflow="hidden"
+containerStyle backgroundImage={asset id=asset-f40d2292-cf9e-4f2c-8c6f-a504a25e949c}
+  backgroundRepeat="no-repeat"
+  backgroundSize="cover"`,
+    usage: {
+      expression: `shape "star" fill="#E61D35" maintainAspect=true
+| render containerStyle={
+    containerStyle backgroundColor="#F8D546"
+      borderRadius="200px"
+      border="4px solid #05509F"
+      padding="0px"
+      opacity="0.9"
+      overflow="hidden"
+  }`,
+    },
+  },
+  context: {
+    syntax: `context`,
+    usage: {
+      expression: `date
+| formatdate "LLLL"
+| markdown "Last updated: " {context}
+| render`,
+      help:
+        'Using the `context` function allows us to pass the output, or _context_, of the previous function as a value to an argument in the next function. Here we get the formatted date string from the previous function and pass it as `content` for the markdown element.',
+    },
+  },
+  csv: {
+    syntax: `csv "fruit, stock
+  kiwi, 10
+  Banana, 5"`,
+    usage: {
+      expression: `csv "fruit,stock
+  kiwi,10
+  banana,5"
+| pointseries color=fruit size=stock
+| pie
+| render`,
+      help:
+        'This creates a `datatable` with `fruit` and `stock` columns with two rows. This is useful for quickly mocking data.',
+    },
+  },
+  date: {
+    syntax: `date
+date value=1558735195
+date "2019-05-24T21:59:55+0000"
+date "01/31/2019" format="MM/DD/YYYY"`,
+    usage: {
+      expression: `date
+| formatdate "LLL"
+| markdown {context}
+  font={font family="Arial, sans-serif" size=30 align="left"
+    color="#000000"
+    weight="normal"
+    underline=false
+    italic=false}
+| render`,
+      help: 'Using `date` without passing any arguments will return the current date and time.',
+    },
+  },
+  demodata: {
+    syntax: `demodata
+demodata "ci"
+demodata type="shirts"`,
+    usage: {
+      expression: `filters
+| demodata
+| table
+| render`,
+      help: '`demodata` is a mock data set that you can use to start playing around in Canvas.',
+    },
+  },
+  dropdownControl: {
+    syntax: `dropdownControl valueColumn=project filterColumn=project
+dropdownControl valueColumn=agent filterColumn=agent.keyword filterGroup=group1`,
+    usage: {
+      expression: `demodata
+| dropdownControl valueColumn=project filterColumn=project
+| render`,
+      help:
+        'This creates a dropdown filter element. It requires a data source and uses the unique values from the given `valueColumn` (i.e. `project`) and applies the filter to the `project` column. Note: `filterColumn` should point to a keyword type field for Elasticsearch data sources.',
+    },
+  },
+  eq: {
+    syntax: `eq true
+eq null
+eq 10
+eq "foo"`,
+    usage: {
+      expression: `filters
+| demodata
+| mapColumn project
+  fn={getCell project |
+    switch
+      {case if={eq kibana} then=kibana}
+      {case if={eq elasticsearch} then=elasticsearch}
+      default="other"
+  }
+| pointseries size="size(cost)" color="project"
+| pie
+| render`,
+      help:
+        'This changes all values in the project column that don’t equal `"kibana"` or `"elasticsearch"` to `"other"`.',
+    },
+  },
+  escount: {
+    syntax: `escount index="logstash-*"
+escount "currency:\"EUR\"" index="kibana_sample_data_ecommerce"
+escount query="response:404" index="kibana_sample_data_logs"`,
+    usage: {
+      expression: `filters
+| escount "Cancelled:true" index="kibana_sample_data_flights"
+| math "value"
+| progress shape="semicircle"
+  label={formatnumber 0,0}
+  font={font size=24 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align=center}
+  max={filters | escount index="kibana_sample_data_flights"}
+| render`,
+      help:
+        'The first `escount` expression retrieves the number of flights that were cancelled. The second `escount` expression retrieves the total number of flights.',
+    },
+  },
+  esdocs: {
+    syntax: `esdocs index="logstash-*"
+esdocs "currency:\"EUR\"" index="kibana_sample_data_ecommerce"
+esdocs query="response:404" index="kibana_sample_data_logs"
+esdocs index="kibana_sample_data_flights" count=100
+esdocs index="kibana_sample_data_flights" sort="AvgTicketPrice, asc"`,
+    usage: {
+      expression: `filters
+| esdocs index="kibana_sample_data_ecommerce"
+  fields="customer_gender, taxful_total_price, order_date"
+  sort="order_date, asc"
+  count=10000
+| mapColumn "order_date"
+  fn={getCell "order_date" | date {context} | rounddate "YYYY-MM-DD"}
+| alterColumn "order_date" type="date"
+| pointseries x="order_date" y="sum(taxful_total_price)" color="customer_gender"
+| plot defaultStyle={seriesStyle lines=3}
+  palette={palette "#7ECAE3" "#003A4D" gradient=true}
+| render`,
+      help:
+        'This retrieves the first 10000 documents data from the `kibana_sample_data_ecommerce` index sorted by `order_date` in ascending order, and only requests the `customer_gender`, `taxful_total_price`, and `order_date` fields.',
+    },
+  },
+  essql: {
+    syntax: `essql query="SELECT * FROM \"logstash*\""
+essql "SELECT * FROM \"apm*\"" count=10000`,
+    usage: {
+      expression: `filters
+| essql query="SELECT Carrier, FlightDelayMin, AvgTicketPrice FROM   \"kibana_sample_data_flights\""
+| table
+| render`,
+      help:
+        'This retrieves the `Carrier`, `FlightDelayMin`, and `AvgTicketPrice` fields from the "kibana_sample_data_flights" index.',
+    },
+  },
+  exactly: {
+    syntax: `exactly "state" value="running"
+exactly "age" value=50 filterGroup="group2"
+exactly column="project" value="beats"`,
+    usage: {
+      expression: `filters
+| exactly column=project value=elasticsearch
+| demodata
+| pointseries x=project y="mean(age)"
+| plot defaultStyle={seriesStyle bars=1}
+| render`,
+      help:
+        'The `exactly` filter here is added to existing filters retrieved by the `filters` function and further filters down the data to only have `"elasticsearch"` data. The `exactly` filter only applies to this one specific element and will not affect other elements in the workpad.',
+    },
+  },
+  filterrows: {
+    syntax: `filterrows {getCell "project" | eq "kibana"}
+filterrows fn={getCell "age" | gt 50}`,
+    usage: {
+      expression: `filters
+| demodata
+| filterrows {getCell "country" | any {eq "IN"} {eq "US"} {eq "CN"}}
+| mapColumn "@timestamp"
+  fn={getCell "@timestamp" | rounddate "YYYY-MM"}
+| alterColumn "@timestamp" type="date"
+| pointseries x="@timestamp" y="mean(cost)" color="country"
+| plot defaultStyle={seriesStyle points="2" lines="1"}
+  palette={palette "#01A4A4" "#CC6666" "#D0D102" "#616161" "#00A1CB" "#32742C" "#F18D05" "#113F8C" "#61AE24" "#D70060" gradient=false}
+| render`,
+      help:
+        'This uses `filterrows` to only keep data from India (`IN`), the United States (`US`), and China (`CN`).',
+    },
+  },
+  filters: {
+    syntax: `filters
+filters group="timefilter1"
+filters group="timefilter2" group="dropdownfilter1" ungrouped=true`,
+    usage: {
+      expression: `filters group=group2 ungrouped=true
+| demodata
+| pointseries x="project" y="size(cost)" color="project"
+| plot defaultStyle={seriesStyle bars=0.75} legend=false
+  font={
+    font size=14
+    family="'Open Sans', Helvetica, Arial, sans-serif"
+    align="left"
+    color="#FFFFFF"
+    weight="lighter"
+    underline=true
+    italic=true
+  }
+| render`,
+      help:
+        '`filters` sets the existing filters as context and accepts a `group` parameter to opt into specific filter groups. Setting `ungrouped` to `true` opts out of using global filters.',
+    },
+  },
+  font: {
+    syntax: `font size=12
+font family=Arial
+font align=middle
+font color=pink
+font weight=lighter
+font underline=true
+font italic=false
+font lHeight=32`,
+    usage: {
+      expression: `filters
+| demodata
+| pointseries x="project" y="size(cost)" color="project"
+| plot defaultStyle={seriesStyle bars=0.75} legend=false
+  font={
+    font size=14
+    family="'Open Sans', Helvetica, Arial, sans-serif"
+    align="left"
+    color="#FFFFFF"
+    weight="lighter"
+    underline=true
+    italic=true
+  }
+| render`,
+    },
+  },
+  formatdate: {
+    syntax: `formatdate format="YYYY-MM-DD"
+formatdate "MM/DD/YYYY"`,
+    usage: {
+      expression: `filters
+| demodata
+| mapColumn "time" fn={getCell time | formatdate "MMM 'YY"}
+| pointseries x="time" y="sum(price)" color="state"
+| plot defaultStyle={seriesStyle points=5}
+| render`,
+      help:
+        'This transforms the dates in the `time` field into strings that look like `"Jan ‘19"`, `"Feb ‘19"`, etc. using a MomentJS format.',
+    },
+  },
+  formatnumber: {
+    syntax: `formatnumber format="$0,0.00"
+formatnumber "0.0a"`,
+    usage: {
+      expression: `filters
+| demodata
+| math "mean(percent_uptime)"
+| progress shape="gauge"
+  label={formatnumber "0%"}
+  font={font size=24 family="'Open Sans', Helvetica, Arial, sans-serif" color="#000000" align="center"}
+| render`,
+      help:
+        'The `formatnumber` subexpression receives the same `context` as the `progress` function, which is the output of the `math` function. It formats the value into a percentage.',
+    },
+  },
+});
diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx b/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
new file mode 100644
index 0000000000000..c527b322dba57
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/function_reference_generator/function_reference_generator.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC } from 'react';
+import { ExpressionFunction } from 'src/plugins/expressions';
+import { EuiButtonEmpty } from '@elastic/eui';
+import copy from 'copy-to-clipboard';
+import { notifyService } from '../../services';
+import { generateFunctionReference } from './generate_function_reference';
+
+interface Props {
+  functionRegistry: Record<string, ExpressionFunction>;
+}
+
+export const FunctionReferenceGenerator: FC<Props> = ({ functionRegistry }) => {
+  const functionDefinitions = Object.values(functionRegistry);
+
+  const copyDocs = () => {
+    copy(generateFunctionReference(functionDefinitions));
+    notifyService
+      .getService()
+      .success(
+        `Please paste updated docs into '/kibana/docs/canvas/canvas-function-reference.asciidoc' and commit your changes.`,
+        { title: 'Copied function docs to clipboard' }
+      );
+  };
+
+  return (
+    <EuiButtonEmpty color="danger" flush="left" size="xs" iconType="beaker" onClick={copyDocs}>
+      Generate function reference
+    </EuiButtonEmpty>
+  );
+};
diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts b/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts
new file mode 100644
index 0000000000000..bd77fbf62ec5a
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/function_reference_generator/generate_function_reference.ts
@@ -0,0 +1,259 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// @ts-expect-error untyped lib
+import pluralize from 'pluralize';
+import { ExpressionFunction, ExpressionFunctionParameter } from 'src/plugins/expressions';
+import { functions as browserFunctions } from '../../../canvas_plugin_src/functions/browser';
+import { functions as serverFunctions } from '../../../canvas_plugin_src/functions/server';
+import { isValidDataUrl, DATATABLE_COLUMN_TYPES } from '../../../common/lib';
+import { getFunctionExamples, FunctionExample } from './function_examples';
+
+const ALPHABET = 'abcdefghijklmnopqrstuvwxyz'.split('');
+const REQUIRED_ARG_ANNOTATION = '***';
+const MULTI_ARG_ANNOTATION = '†';
+const UNNAMED_ARG = '_Unnamed_';
+const ANY_TYPE = '`any`';
+
+const examplesDict = getFunctionExamples();
+
+const fnList = [
+  ...browserFunctions.map((fn) => fn().name),
+  ...serverFunctions.map((fn) => fn().name),
+  'asset',
+  'filters',
+  'timelion',
+  'to',
+  'font',
+  'var',
+  'var_set',
+  // ignore unsupported embeddables functions for now
+].filter((fn) => !['savedSearch'].includes(fn));
+
+interface FunctionDictionary {
+  [key: string]: ExpressionFunction[];
+}
+
+const wrapInBackTicks = (str: string) => `\`${str}\``;
+const wrapInDoubleQuotes = (str: string) => (str.includes('"') ? str : `"${str}"`);
+const stringSorter = (a: string, b: string) => {
+  if (a < b) {
+    return -1;
+  }
+  if (a > b) {
+    return 1;
+  }
+  return 0;
+};
+
+// Converts reference to another function in a function's help text into an Asciidoc link
+const addFunctionLinks = (help: string, options?: { ignoreList?: string[] }) => {
+  const { ignoreList = [] } = options || {};
+  fnList.forEach((name: string) => {
+    const nameWithBackTicks = wrapInBackTicks(name);
+
+    // ignore functions with the same name as data types, i.e. string, date
+    if (
+      !ignoreList.includes(name) &&
+      !DATATABLE_COLUMN_TYPES.includes(name) &&
+      help.includes(nameWithBackTicks)
+    ) {
+      help = help.replace(nameWithBackTicks, `<<${name}_fn>>`);
+    }
+  });
+
+  return help;
+};
+
+export const generateFunctionReference = (functionDefinitions: ExpressionFunction[]) => {
+  const functionDefs = functionDefinitions.filter((fn: ExpressionFunction) =>
+    fnList.includes(fn.name)
+  );
+  const functionDictionary: FunctionDictionary = {};
+  functionDefs.forEach((fn: ExpressionFunction) => {
+    const firstLetter = fn.name[0];
+
+    if (!functionDictionary[firstLetter]) {
+      functionDictionary[firstLetter] = [];
+    }
+
+    functionDictionary[firstLetter].push(fn);
+  });
+  return `[role="xpack"]
+[[canvas-function-reference]]
+== Canvas function reference
+
+Behind the scenes, Canvas is driven by a powerful expression language,
+with dozens of functions and other capabilities, including table transforms,
+type casting, and sub-expressions.
+
+The Canvas expression language also supports <<canvas-tinymath-functions>>, which
+perform complex math calculations.
+
+A ${REQUIRED_ARG_ANNOTATION} denotes a required argument.
+
+A ${MULTI_ARG_ANNOTATION} denotes an argument can be passed multiple times.
+
+${createAlphabetLinks(functionDictionary)}
+
+${createFunctionDocs(functionDictionary)}`;
+};
+
+const createAlphabetLinks = (functionDictionary: FunctionDictionary) => {
+  return ALPHABET.map((letter: string) =>
+    functionDictionary[letter] ? `<<${letter}_fns>>` : letter.toUpperCase()
+  ).join(' | ');
+};
+
+const createFunctionDocs = (functionDictionary: FunctionDictionary) => {
+  return Object.keys(functionDictionary)
+    .sort()
+    .map(
+      (letter: string) => `[float]
+[[${letter}_fns]]
+== ${letter.toUpperCase()}
+
+${functionDictionary[letter]
+  .sort((a, b) => stringSorter(a.name, b.name))
+  .map(getDocBlock)
+  .join('\n')}`
+    )
+    .join('');
+};
+
+const getDocBlock = (fn: ExpressionFunction) => {
+  const header = `[float]
+[[${fn.name}_fn]]
+=== \`${fn.name}\``;
+
+  const input = fn.inputTypes;
+  const output = fn.type;
+  const args = fn.args;
+  const examples = examplesDict[fn.name];
+  const help = addFunctionLinks(fn.help);
+
+  const argBlock =
+    !args || Object.keys(args).length === 0
+      ? ''
+      : `\n[cols="3*^<"]
+|===
+|Argument |Type |Description
+
+${getArgsTable(args)}
+|===\n`;
+
+  const examplesBlock = !examples ? `` : `${getExamplesBlock(examples)}`;
+
+  return `${header}\n
+${help}
+${examplesBlock}
+*Accepts:* ${input ? input.map(wrapInBackTicks).join(', ') : ANY_TYPE}\n${argBlock}
+*Returns:* ${output ? wrapInBackTicks(output) : 'Depends on your input and arguments'}\n\n`;
+};
+
+const getArgsTable = (args: { [key: string]: ExpressionFunctionParameter }) => {
+  if (!args || Object.keys(args).length === 0) {
+    return 'None';
+  }
+
+  const argNames = Object.keys(args);
+
+  return argNames
+    .sort((a: string, b: string) => {
+      const argA = args[a];
+      const argB = args[b];
+
+      // sorts unnamed arg to the front
+      if (a === '_' || (argA.aliases && argA.aliases.includes('_'))) {
+        return -1;
+      }
+      if (b === '_' || (argB.aliases && argB.aliases.includes('_'))) {
+        return 1;
+      }
+      return stringSorter(a, b);
+    })
+    .map((argName: string) => {
+      const arg = args[argName];
+      const types = arg.types;
+      const aliases = arg.aliases ? [...arg.aliases] : [];
+      let defaultValue = arg.default;
+      const requiredAnnotation = arg.required === true ? ` ${REQUIRED_ARG_ANNOTATION}` : '';
+      const multiAnnotation = arg.multi === true ? ` ${MULTI_ARG_ANNOTATION}` : '';
+
+      if (typeof defaultValue === 'string') {
+        defaultValue = defaultValue.replace('{', '${').replace(/[\r\n/]+/g, '');
+        if (types && types.includes('string')) {
+          defaultValue = wrapInDoubleQuotes(defaultValue);
+        }
+      }
+
+      let displayName = '';
+
+      if (argName === '_') {
+        displayName = UNNAMED_ARG;
+      } else if (aliases && aliases.includes('_')) {
+        displayName = UNNAMED_ARG;
+        aliases[aliases.indexOf('_')] = argName;
+      } else {
+        displayName = wrapInBackTicks(argName);
+      }
+
+      const aliasList =
+        aliases && aliases.length
+          ? `\n\n${pluralize('Alias', aliases.length)}: ${aliases
+              .sort()
+              .map(wrapInBackTicks)
+              .join(', ')}`
+          : '';
+
+      let defaultBlock = '';
+
+      if (isValidDataUrl(arg.default)) {
+        defaultBlock = getDataUrlExampleBlock(displayName, arg.default);
+      } else {
+        defaultBlock =
+          typeof defaultValue !== 'undefined' ? `\n\nDefault: \`${defaultValue}\`` : '';
+      }
+
+      return `|${displayName}${requiredAnnotation}${multiAnnotation}${aliasList}
+|${types && types.length ? types.map(wrapInBackTicks).join(', ') : ANY_TYPE}
+|${arg.help ? addFunctionLinks(arg.help, { ignoreList: argNames }) : ''}${defaultBlock}`;
+    })
+    .join('\n\n');
+};
+
+const getDataUrlExampleBlock = (
+  argName: string,
+  value: string
+) => `\n\nExample value for the ${argName} argument, formatted as a \`base64\` data URL:
+[source, url]
+------------
+${value}
+------------`;
+
+const getExamplesBlock = (examples: FunctionExample) => {
+  const { syntax, usage } = examples;
+  const { expression, help } = usage || {};
+  const syntaxBlock = syntax
+    ? `\n*Expression syntax*
+[source,js]
+----
+${syntax}
+----\n`
+    : '';
+
+  const codeBlock = expression
+    ? `\n*Code example*
+[source,text]
+----
+${expression}
+----\n`
+    : '';
+
+  const codeHelp = help ? `${help}\n` : '';
+
+  return `${syntaxBlock}${codeBlock}${codeHelp}`;
+};
diff --git a/x-pack/plugins/canvas/public/components/function_reference_generator/index.ts b/x-pack/plugins/canvas/public/components/function_reference_generator/index.ts
new file mode 100644
index 0000000000000..337809238bb59
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/function_reference_generator/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { FunctionReferenceGenerator } from './function_reference_generator';
diff --git a/x-pack/plugins/canvas/public/components/help_menu/help_menu.js b/x-pack/plugins/canvas/public/components/help_menu/help_menu.js
deleted file mode 100644
index 4512ce2b4992e..0000000000000
--- a/x-pack/plugins/canvas/public/components/help_menu/help_menu.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { Fragment, PureComponent } from 'react';
-import { EuiButtonEmpty, EuiPortal } from '@elastic/eui';
-import { KeyboardShortcutsDoc } from '../keyboard_shortcuts_doc';
-import { ComponentStrings } from '../../../i18n';
-
-const { HelpMenu: strings } = ComponentStrings;
-
-export class HelpMenu extends PureComponent {
-  state = { isFlyoutVisible: false };
-
-  showFlyout = () => {
-    this.setState({ isFlyoutVisible: true });
-  };
-
-  hideFlyout = () => {
-    this.setState({ isFlyoutVisible: false });
-  };
-
-  render() {
-    return (
-      <Fragment>
-        <EuiButtonEmpty
-          size="xs"
-          flush="left"
-          iconType="keyboardShortcut"
-          onClick={this.showFlyout}
-        >
-          {strings.getKeyboardShortcutsLinkLabel()}
-        </EuiButtonEmpty>
-
-        {this.state.isFlyoutVisible && (
-          <EuiPortal>
-            <KeyboardShortcutsDoc onClose={this.hideFlyout} />
-          </EuiPortal>
-        )}
-      </Fragment>
-    );
-  }
-}
diff --git a/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
new file mode 100644
index 0000000000000..7122ec88f68a9
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/help_menu/help_menu.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useState, lazy, Suspense } from 'react';
+import { EuiButtonEmpty, EuiPortal, EuiSpacer } from '@elastic/eui';
+import { ExpressionFunction } from 'src/plugins/expressions';
+import { ComponentStrings } from '../../../i18n';
+import { KeyboardShortcutsDoc } from '../keyboard_shortcuts_doc';
+
+let FunctionReferenceGenerator: null | React.LazyExoticComponent<any> = null;
+if (process.env.NODE_ENV === 'development') {
+  FunctionReferenceGenerator = lazy(() =>
+    import('../function_reference_generator').then((module) => ({
+      default: module.FunctionReferenceGenerator,
+    }))
+  );
+}
+
+const { HelpMenu: strings } = ComponentStrings;
+
+interface Props {
+  functionRegistry: Record<string, ExpressionFunction>;
+}
+
+export const HelpMenu: FC<Props> = ({ functionRegistry }) => {
+  const [isFlyoutVisible, setFlyoutVisible] = useState(false);
+
+  const showFlyout = () => {
+    setFlyoutVisible(true);
+  };
+
+  const hideFlyout = () => {
+    setFlyoutVisible(false);
+  };
+
+  return (
+    <>
+      <EuiButtonEmpty size="xs" flush="left" iconType="keyboardShortcut" onClick={showFlyout}>
+        {strings.getKeyboardShortcutsLinkLabel()}
+      </EuiButtonEmpty>
+
+      {FunctionReferenceGenerator ? (
+        <Suspense fallback={null}>
+          <EuiSpacer size="s" />
+          <FunctionReferenceGenerator functionRegistry={functionRegistry} />
+        </Suspense>
+      ) : null}
+
+      {isFlyoutVisible && (
+        <EuiPortal>
+          <KeyboardShortcutsDoc onClose={hideFlyout} />
+        </EuiPortal>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/canvas/public/components/help_menu/index.js b/x-pack/plugins/canvas/public/components/help_menu/index.ts
similarity index 100%
rename from x-pack/plugins/canvas/public/components/help_menu/index.js
rename to x-pack/plugins/canvas/public/components/help_menu/index.ts
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index da5392848475b..b51ccbb64767a 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5667,7 +5667,6 @@
     "xpack.canvas.functions.joinRows.args.separatorHelpText": "行の値の間で使用する区切り文字",
     "xpack.canvas.functions.joinRows.columnNotFoundErrorMessage": "列が見つかりません。'{column}'",
     "xpack.canvas.functions.joinRowsHelpText": "データベースの行の値を文字列に結合",
-    "xpack.canvas.functions.locationHelpText": "ブラウザの {geolocationAPI} を使用して現在位置を取得します。パフォーマンスに違いはありますが、比較的正確です。{url} を参照。",
     "xpack.canvas.functions.lt.args.valueHelpText": "{CONTEXT} と比較される値です。",
     "xpack.canvas.functions.lte.args.valueHelpText": "{CONTEXT} と比較される値です。",
     "xpack.canvas.functions.lteHelpText": "{CONTEXT} が引数以下かを戻します。",
@@ -5676,7 +5675,6 @@
     "xpack.canvas.functions.mapCenterHelpText": "マップの中央座標とズームレベルのオブジェクトに戻ります。",
     "xpack.canvas.functions.mapColumn.args.expressionHelpText": "単一行 {DATATABLE} として各行に渡される {CANVAS} 表現です。",
     "xpack.canvas.functions.mapColumn.args.nameHelpText": "結果の列の名前です。",
-    "xpack.canvas.functions.mapColumnHelpText": "他の列の結果として計算された列を追加します。引数が提供された場合のみ変更が加えられます。{mapColumnFn} と {staticColumnFn} もご参照ください。",
     "xpack.canvas.functions.markdown.args.contentHelpText": "{MARKDOWN} を含むテキストの文字列です。連結させるには、{stringFn} 関数を複数回渡します。",
     "xpack.canvas.functions.markdown.args.fontHelpText": "コンテンツの {CSS} フォントプロパティです。例: {fontFamily} または {fontWeight}。",
     "xpack.canvas.functions.markdown.args.openLinkHelpText": "新しいタブでリンクを開くための true/false 値。デフォルト値は false です。true に設定するとすべてのリンクが新しいタブで開くようになります。",
@@ -5686,7 +5684,6 @@
     "xpack.canvas.functions.math.emptyExpressionErrorMessage": "空の表現",
     "xpack.canvas.functions.math.executionFailedErrorMessage": "数式の実行に失敗しました。列名を確認してください",
     "xpack.canvas.functions.math.tooManyResultsErrorMessage": "表現は 1 つの数字を返す必要があります。表現を {mean} または {sum} で囲んでみてください",
-    "xpack.canvas.functions.mathHelpText": "数字または {DATATABLE} を {CONTEXT} として使用して {TINYMATH} 数式を解釈します。{DATATABLE} 列は列名で表示されます。{CONTEXT} が数字の場合は、{value} と表示されます。",
     "xpack.canvas.functions.metric.args.labelFontHelpText": "ラベルの {CSS} フォントプロパティです。例: {FONT_FAMILY} または {FONT_WEIGHT}。",
     "xpack.canvas.functions.metric.args.labelHelpText": "メトリックを説明するテキストです。",
     "xpack.canvas.functions.metric.args.metricFontHelpText": "メトリックの {CSS} フォントプロパティです。例: {FONT_FAMILY} または {FONT_WEIGHT}。",
@@ -5702,16 +5699,12 @@
     "xpack.canvas.functions.pie.args.holeHelpText": "円グラフに穴をあけます、0～100 で円グラフの半径のパーセンテージを指定します。",
     "xpack.canvas.functions.pie.args.labelRadiusHelpText": "ラベルの円の半径として使用する、コンテナーの面積のパーセンテージです。",
     "xpack.canvas.functions.pie.args.labelsHelpText": "円グラフのラベルを表示しますか？",
-    "xpack.canvas.functions.pie.args.legendHelpText": "凡例の配置です。例: {positions}、または {BOOLEAN_FALSE}。{BOOLEAN_FALSE} の場合、凡例は非表示になります。",
-    "xpack.canvas.functions.pie.args.paletteHelpText": "この円グラフに使用されている色を説明する {palette} オブジェクトです。{paletteFn} をご覧ください。",
     "xpack.canvas.functions.pie.args.radiusHelpText": "利用可能なスペースのパーセンテージで示された円グラフの半径です (0 から 1 の間)。半径を自動的に設定するには {auto} を使用します。",
     "xpack.canvas.functions.pie.args.seriesStyleHelpText": "特定の数列のスタイルです",
     "xpack.canvas.functions.pie.args.tiltHelpText": "「1」 が完全に垂直、「0」が完全に水平を表す傾きのパーセンテージです。",
     "xpack.canvas.functions.pieHelpText": "円グラフのエレメントを構成します。",
     "xpack.canvas.functions.plot.args.defaultStyleHelpText": "すべての数列に使用するデフォルトのスタイルです。",
     "xpack.canvas.functions.plot.args.fontHelpText": "表の {CSS} フォントプロパティです。例: {FONT_FAMILY} または {FONT_WEIGHT}。",
-    "xpack.canvas.functions.plot.args.legendHelpText": "凡例の配置です。例: {positions}、または {BOOLEAN_FALSE}。{BOOLEAN_FALSE} の場合、凡例は非表示になります。",
-    "xpack.canvas.functions.plot.args.paletteHelpText": "このチャートに使用される色を説明する {palette} オブジェクトです。{paletteFn} をご覧ください。",
     "xpack.canvas.functions.plot.args.seriesStyleHelpText": "特定の数列のスタイルです",
     "xpack.canvas.functions.plot.args.xaxisHelpText": "軸の構成です。{BOOLEAN_FALSE} の場合、軸は非表示になります。",
     "xpack.canvas.functions.plot.args.yaxisHelpText": "軸の構成です。{BOOLEAN_FALSE} の場合、軸は非表示になります。",
@@ -5795,7 +5788,6 @@
     "xpack.canvas.functions.shapeHelpText": "図形を作成します。",
     "xpack.canvas.functions.sort.args.byHelpText": "並べ替えの基準となる列です。指定されていない場合、「{DATATABLE}」は初めの列で並べられます。",
     "xpack.canvas.functions.sort.args.reverseHelpText": "並び順を反転させます。指定されていない場合、「{DATATABLE}」は昇順で並べられます。",
-    "xpack.canvas.functions.sortHelpText": "データ表を指定された列で並べ替えます。",
     "xpack.canvas.functions.staticColumn.args.nameHelpText": "新しい列の名前です。",
     "xpack.canvas.functions.staticColumn.args.valueHelpText": "新しい列の各行に挿入する値です。ヒント: 部分式を使用して他の列を静的値にロールアップします。",
     "xpack.canvas.functions.staticColumnHelpText": "すべての行に同じ静的値の列を追加します。{alterColumnFn} および {mapColumnFn} もご参照ください。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index e892ff228cd49..a2b612cd6dad1 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -5669,7 +5669,6 @@
     "xpack.canvas.functions.joinRows.args.separatorHelpText": "用于分隔行值的分隔符",
     "xpack.canvas.functions.joinRows.columnNotFoundErrorMessage": "找不到列：“{column}”",
     "xpack.canvas.functions.joinRowsHelpText": "将数据库中的行的值联接成字符串",
-    "xpack.canvas.functions.locationHelpText": "使用浏览器的 {geolocationAPI} 查找您的当前位置。性能可能会因浏览器而异，但相当准确。请参见 {url}。",
     "xpack.canvas.functions.lt.args.valueHelpText": "与 {CONTEXT} 比较的值。",
     "xpack.canvas.functions.lte.args.valueHelpText": "与 {CONTEXT} 比较的值。",
     "xpack.canvas.functions.lteHelpText": "返回 {CONTEXT} 是否小于或等于参数。",
@@ -5678,7 +5677,6 @@
     "xpack.canvas.functions.mapCenterHelpText": "返回具有地图中心坐标和缩放级别的对象",
     "xpack.canvas.functions.mapColumn.args.expressionHelpText": "作为单行 {DATATABLE} 传递到每一行的 {CANVAS} 表达式。",
     "xpack.canvas.functions.mapColumn.args.nameHelpText": "结果列的名称。",
-    "xpack.canvas.functions.mapColumnHelpText": "添加计算为其他列的结果的列。只有提供参数时，才会进行更改。另请参见 {mapColumnFn} 和 {staticColumnFn}。",
     "xpack.canvas.functions.markdown.args.contentHelpText": "包含 {MARKDOWN} 的文本字符串。要进行串联，请传递 {stringFn} 函数多次。",
     "xpack.canvas.functions.markdown.args.fontHelpText": "内容的 {CSS} 字体属性。例如：{fontFamily} 或 {fontWeight}。",
     "xpack.canvas.functions.markdown.args.openLinkHelpText": "表示是否在新选项卡中打开链接的 true/false 值。默认值为 false。设置为 true 将在新选项卡中打开所有链接。",
@@ -5688,7 +5686,6 @@
     "xpack.canvas.functions.math.emptyExpressionErrorMessage": "空表达式",
     "xpack.canvas.functions.math.executionFailedErrorMessage": "无法执行数学表达式。检查您的列名称",
     "xpack.canvas.functions.math.tooManyResultsErrorMessage": "表达式必须返回单个数字。尝试将您的表达式包装在 {mean} 或 {sum} 中",
-    "xpack.canvas.functions.mathHelpText": "通过将数字或 {DATATABLE} 用作 {CONTEXT} 来解析 {TINYMATH} 数学表达式。{DATATABLE} 列可通过列名来使用。如果 {CONTEXT} 是数字，其可用作 {value}。",
     "xpack.canvas.functions.metric.args.labelFontHelpText": "标签的 {CSS} 字体属性。例如 {FONT_FAMILY} 或 {FONT_WEIGHT}。",
     "xpack.canvas.functions.metric.args.labelHelpText": "描述指标的文本。",
     "xpack.canvas.functions.metric.args.metricFontHelpText": "指标的 {CSS} 字体属性。例如 {FONT_FAMILY} 或 {FONT_WEIGHT}。",
@@ -5704,16 +5701,12 @@
     "xpack.canvas.functions.pie.args.holeHelpText": "在饼图中绘制介于 `0` and `100`（饼图半径的百分比）之间的孔洞。",
     "xpack.canvas.functions.pie.args.labelRadiusHelpText": "要用作标签圆形半径的容器面积百分比。",
     "xpack.canvas.functions.pie.args.labelsHelpText": "显示饼图标签？",
-    "xpack.canvas.functions.pie.args.legendHelpText": "图例位置。例如 {positions} 或 {BOOLEAN_FALSE}。为 {BOOLEAN_FALSE} 时，图例隐藏。",
-    "xpack.canvas.functions.pie.args.paletteHelpText": "用于描述要在饼图上使用的颜色的 {palette} 对象。请参见 {paletteFn}。",
     "xpack.canvas.functions.pie.args.radiusHelpText": "饼图的半径，表示为可用空间的百分比（介于 `0` 和 `1` 之间）。要自动设置半径，请使用 {auto}。",
     "xpack.canvas.functions.pie.args.seriesStyleHelpText": "特定序列的样式",
     "xpack.canvas.functions.pie.args.tiltHelpText": "倾斜百分比，其中 `1` 为完全垂直，`0` 为完全水平。",
     "xpack.canvas.functions.pieHelpText": "配置饼图元素。",
     "xpack.canvas.functions.plot.args.defaultStyleHelpText": "要用于每个序列的默认样式。",
     "xpack.canvas.functions.plot.args.fontHelpText": "标签的 {CSS} 字体属性。例如 {FONT_FAMILY} 或 {FONT_WEIGHT}。",
-    "xpack.canvas.functions.plot.args.legendHelpText": "图例位置。例如 {positions} 或 {BOOLEAN_FALSE}。为 {BOOLEAN_FALSE} 时，图例隐藏。",
-    "xpack.canvas.functions.plot.args.paletteHelpText": "用于描述要在此图表上使用的颜色的 {palette} 对象。请参见 {paletteFn}。",
     "xpack.canvas.functions.plot.args.seriesStyleHelpText": "特定序列的样式",
     "xpack.canvas.functions.plot.args.xaxisHelpText": "轴配置。为 {BOOLEAN_FALSE} 时，轴隐藏。",
     "xpack.canvas.functions.plot.args.yaxisHelpText": "轴配置。为 {BOOLEAN_FALSE} 时，轴隐藏。",
@@ -5797,7 +5790,6 @@
     "xpack.canvas.functions.shapeHelpText": "创建形状。",
     "xpack.canvas.functions.sort.args.byHelpText": "排序要依据的列。未指定时，将按第一列排序 `{DATATABLE}`。",
     "xpack.canvas.functions.sort.args.reverseHelpText": "反转排序顺序。未指定时，将升序排序 `{DATATABLE}`。",
-    "xpack.canvas.functions.sortHelpText": "按指定列排序数据库。",
     "xpack.canvas.functions.staticColumn.args.nameHelpText": "新列的名称。",
     "xpack.canvas.functions.staticColumn.args.valueHelpText": "在每一行新列中要插入的值。提示：使用子表达式将其他列汇总为静态值。",
     "xpack.canvas.functions.staticColumnHelpText": "在每一行添加具有相同静态值的列。另见 {alterColumnFn} 和 {mapColumnFn}。",

From 90bd654d7e7b43b64eaf2053c2803d3b44ba6c72 Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Mon, 24 Aug 2020 15:07:00 -0700
Subject: [PATCH 017/148] [Enterprise Search] Create HttpLogic Kea store, add
 http interceptors, and manage error connecting at top app-level (#75790)

* [Setup] Change error connecting status code to 502

- For clearer error handling

* Set up new HttpProvider/Logic Kea store & listeners

- This allows us to:
  - connect() directly to HttpLogic in other Kea logic files that need to make http calls, instead of passing in http manually via args
  - Set http interceptors & remove them interceptors on unmount within Kea
  - Share state derived from http (e.g. errorConnecting, readOnlyMode) between both AS & WS (but allow each app to handle that state differently if needed)

+ Refactors necessary for these changes:
  - Kea types - add events key, clarify that mount returns an unmount function, fix reducer state type
  - ReactDOM unmount - remove resetContext({}), was preventing logic from unmounting properly

* Update AS & WS to show error connecting component at app level

* [WS] Remove errorConnecting logic & http arg from Overview

- Since main app is now handling errorConnecting
- http can now be connected directly from HttpLogic Kea store, so no need to pass it
+ minor cleanup in logic_overview.test.ts - remove unneeded unmount(), act(), switch to HttpLogic mock

* [AS] Add top-level ErrorConnecting component & remove error logic from EngineOverview

* [AS] Clean up/move EngineOverview child components into subfolder

- delete old ErrorState component
- move LoadingState, EmptyState, and EngineOverviewHeader into subfolders in engine_overview

* PR feedback: Update test assertions 404 copy
---
 .../components/empty_state.scss}              |   0
 .../components/empty_state.test.tsx}          |  27 +----
 .../components}/empty_state.tsx               |  12 +-
 .../components/header.test.tsx}               |   8 +-
 .../components/header.tsx}                    |   4 +-
 .../components}/index.ts                      |   2 +-
 .../components/loading_state.test.tsx         |  19 +++
 .../components}/loading_state.tsx             |   8 +-
 .../engine_overview/engine_overview.test.tsx  |  12 +-
 .../engine_overview/engine_overview.tsx       |  18 +--
 .../error_connecting.test.tsx                 |  19 +++
 .../error_connecting.tsx}                     |   6 +-
 .../index.ts                                  |   2 +-
 .../applications/app_search/index.test.tsx    |  21 +++-
 .../public/applications/app_search/index.tsx  |  23 ++--
 .../public/applications/index.tsx             |   5 +-
 .../shared/http/http_logic.test.ts            | 110 ++++++++++++++++++
 .../applications/shared/http/http_logic.ts    |  86 ++++++++++++++
 .../shared/http/http_provider.test.tsx        |  44 +++++++
 .../shared/http/http_provider.tsx             |  28 +++++
 .../public/applications/shared/http/index.ts  |   8 ++
 .../public/applications/shared/types.ts       |   8 +-
 .../overview/__mocks__/overview_logic.mock.ts |   1 -
 .../components/overview/overview.test.tsx     |   8 --
 .../components/overview/overview.tsx          |  11 +-
 .../overview/overview_logic.test.ts           |  52 +--------
 .../components/overview/overview_logic.ts     |  27 +----
 .../workplace_search/index.test.tsx           |  49 ++++----
 .../applications/workplace_search/index.tsx   |  23 ++--
 .../enterprise_search/public/plugin.ts        |   2 +
 .../server/routes/app_search/engines.test.ts  |  10 +-
 .../server/routes/app_search/engines.ts       |   2 +-
 .../routes/workplace_search/overview.test.ts  |  10 +-
 .../routes/workplace_search/overview.ts       |   2 +-
 34 files changed, 460 insertions(+), 207 deletions(-)
 rename x-pack/plugins/enterprise_search/public/applications/app_search/components/{empty_states/empty_states.scss => engine_overview/components/empty_state.scss} (100%)
 rename x-pack/plugins/enterprise_search/public/applications/app_search/components/{empty_states/empty_states.test.tsx => engine_overview/components/empty_state.test.tsx} (55%)
 rename x-pack/plugins/enterprise_search/public/applications/app_search/components/{empty_states => engine_overview/components}/empty_state.tsx (84%)
 rename x-pack/plugins/enterprise_search/public/applications/app_search/components/{engine_overview_header/engine_overview_header.test.tsx => engine_overview/components/header.test.tsx} (77%)
 rename x-pack/plugins/enterprise_search/public/applications/app_search/components/{engine_overview_header/engine_overview_header.tsx => engine_overview/components/header.tsx} (92%)
 rename x-pack/plugins/enterprise_search/public/applications/app_search/components/{empty_states => engine_overview/components}/index.ts (87%)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/loading_state.test.tsx
 rename x-pack/plugins/enterprise_search/public/applications/app_search/components/{empty_states => engine_overview/components}/loading_state.tsx (73%)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx
 rename x-pack/plugins/enterprise_search/public/applications/app_search/components/{empty_states/error_state.tsx => error_connecting/error_connecting.tsx} (81%)
 rename x-pack/plugins/enterprise_search/public/applications/app_search/components/{engine_overview_header => error_connecting}/index.ts (78%)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/http/index.ts

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/empty_states.scss b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/empty_state.scss
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/empty_states.scss
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/empty_state.scss
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/empty_states.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/empty_state.test.tsx
similarity index 55%
rename from x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/empty_states.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/empty_state.test.tsx
index 25a9fa7430c40..7e6876bc9b3a4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/empty_states.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/empty_state.test.tsx
@@ -4,28 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import '../../../__mocks__/shallow_usecontext.mock';
+import '../../../../__mocks__/shallow_usecontext.mock';
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { EuiEmptyPrompt, EuiButton, EuiLoadingContent } from '@elastic/eui';
-import { ErrorStatePrompt } from '../../../shared/error_state';
+import { EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 
-jest.mock('../../../shared/telemetry', () => ({
+jest.mock('../../../../shared/telemetry', () => ({
   sendTelemetry: jest.fn(),
   SendAppSearchTelemetry: jest.fn(),
 }));
-import { sendTelemetry } from '../../../shared/telemetry';
+import { sendTelemetry } from '../../../../shared/telemetry';
 
-import { ErrorState, EmptyState, LoadingState } from './';
-
-describe('ErrorState', () => {
-  it('renders', () => {
-    const wrapper = shallow(<ErrorState />);
-
-    expect(wrapper.find(ErrorStatePrompt)).toHaveLength(1);
-  });
-});
+import { EmptyState } from './';
 
 describe('EmptyState', () => {
   it('renders', () => {
@@ -44,11 +35,3 @@ describe('EmptyState', () => {
     (sendTelemetry as jest.Mock).mockClear();
   });
 });
-
-describe('LoadingState', () => {
-  it('renders', () => {
-    const wrapper = shallow(<LoadingState />);
-
-    expect(wrapper.find(EuiLoadingContent)).toHaveLength(2);
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/empty_state.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/empty_state.tsx
similarity index 84%
rename from x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/empty_state.tsx
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/empty_state.tsx
index 9b0edb423bc52..58691cf09b4a5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/empty_state.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/empty_state.tsx
@@ -8,14 +8,14 @@ import React, { useContext } from 'react';
 import { EuiPageContent, EuiEmptyPrompt, EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { sendTelemetry } from '../../../shared/telemetry';
-import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
-import { KibanaContext, IKibanaContext } from '../../../index';
-import { CREATE_ENGINES_PATH } from '../../routes';
+import { sendTelemetry } from '../../../../shared/telemetry';
+import { SetAppSearchChrome as SetPageChrome } from '../../../../shared/kibana_chrome';
+import { KibanaContext, IKibanaContext } from '../../../../index';
+import { CREATE_ENGINES_PATH } from '../../../routes';
 
-import { EngineOverviewHeader } from '../engine_overview_header';
+import { EngineOverviewHeader } from './header';
 
-import './empty_states.scss';
+import './empty_state.scss';
 
 export const EmptyState: React.FC = () => {
   const {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview_header/engine_overview_header.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/header.test.tsx
similarity index 77%
rename from x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview_header/engine_overview_header.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/header.test.tsx
index 7d2106f2a56f7..7f22ce132d405 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview_header/engine_overview_header.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/header.test.tsx
@@ -4,15 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import '../../../__mocks__/shallow_usecontext.mock';
+import '../../../../__mocks__/shallow_usecontext.mock';
 
 import React from 'react';
 import { shallow } from 'enzyme';
 
-jest.mock('../../../shared/telemetry', () => ({ sendTelemetry: jest.fn() }));
-import { sendTelemetry } from '../../../shared/telemetry';
+jest.mock('../../../../shared/telemetry', () => ({ sendTelemetry: jest.fn() }));
+import { sendTelemetry } from '../../../../shared/telemetry';
 
-import { EngineOverviewHeader } from '../engine_overview_header';
+import { EngineOverviewHeader } from './';
 
 describe('EngineOverviewHeader', () => {
   it('renders', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview_header/engine_overview_header.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/header.tsx
similarity index 92%
rename from x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview_header/engine_overview_header.tsx
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/header.tsx
index 7f67d00f5df91..1a1ae295d4828 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview_header/engine_overview_header.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/header.tsx
@@ -15,8 +15,8 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { sendTelemetry } from '../../../shared/telemetry';
-import { KibanaContext, IKibanaContext } from '../../../index';
+import { sendTelemetry } from '../../../../shared/telemetry';
+import { KibanaContext, IKibanaContext } from '../../../../index';
 
 export const EngineOverviewHeader: React.FC = () => {
   const {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/index.ts
similarity index 87%
rename from x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/index.ts
index e92bf214c4cc7..794053f184f8c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/index.ts
@@ -4,6 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+export { EngineOverviewHeader } from './header';
 export { LoadingState } from './loading_state';
 export { EmptyState } from './empty_state';
-export { ErrorState } from './error_state';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/loading_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/loading_state.test.tsx
new file mode 100644
index 0000000000000..c894500550a0b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/loading_state.test.tsx
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { EuiLoadingContent } from '@elastic/eui';
+
+import { LoadingState } from './';
+
+describe('LoadingState', () => {
+  it('renders', () => {
+    const wrapper = shallow(<LoadingState />);
+
+    expect(wrapper.find(EuiLoadingContent)).toHaveLength(2);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/loading_state.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/loading_state.tsx
similarity index 73%
rename from x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/loading_state.tsx
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/loading_state.tsx
index 221091b79dc54..07643560df3c7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/loading_state.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/loading_state.tsx
@@ -7,17 +7,15 @@
 import React from 'react';
 import { EuiPageContent, EuiSpacer, EuiLoadingContent } from '@elastic/eui';
 
-import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
-import { EngineOverviewHeader } from '../engine_overview_header';
-
-import './empty_states.scss';
+import { SetAppSearchChrome as SetPageChrome } from '../../../../shared/kibana_chrome';
+import { EngineOverviewHeader } from './header';
 
 export const LoadingState: React.FC = () => {
   return (
     <>
       <SetPageChrome isRoot />
       <EngineOverviewHeader />
-      <EuiPageContent className="emptyState">
+      <EuiPageContent paddingSize="l">
         <EuiLoadingContent lines={5} />
         <EuiSpacer size="xxl" />
         <EuiLoadingContent lines={4} />
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
index 45ab5dc5b9ab1..c2379fb33bd71 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.test.tsx
@@ -12,7 +12,7 @@ import { shallow, ReactWrapper } from 'enzyme';
 
 import { mountWithAsyncContext, mockKibanaContext } from '../../../__mocks__';
 
-import { LoadingState, EmptyState, ErrorState } from '../empty_states';
+import { LoadingState, EmptyState } from './components';
 import { EngineTable } from './engine_table';
 
 import { EngineOverview } from './';
@@ -40,16 +40,6 @@ describe('EngineOverview', () => {
 
       expect(wrapper.find(EmptyState)).toHaveLength(1);
     });
-
-    it('hasErrorConnecting', async () => {
-      const wrapper = await mountWithAsyncContext(<EngineOverview />, {
-        http: {
-          ...mockHttp,
-          get: () => ({ invalidPayload: true }),
-        },
-      });
-      expect(wrapper.find(ErrorState)).toHaveLength(1);
-    });
   });
 
   describe('happy-path states', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
index acac5d17665b7..74bcd9aeafb28 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
@@ -22,8 +22,7 @@ import { KibanaContext, IKibanaContext } from '../../../index';
 import EnginesIcon from '../../assets/engine.svg';
 import MetaEnginesIcon from '../../assets/meta_engine.svg';
 
-import { LoadingState, EmptyState, ErrorState } from '../empty_states';
-import { EngineOverviewHeader } from '../engine_overview_header';
+import { EngineOverviewHeader, LoadingState, EmptyState } from './components';
 import { EngineTable } from './engine_table';
 
 import './engine_overview.scss';
@@ -42,8 +41,6 @@ export const EngineOverview: React.FC = () => {
   const { license } = useContext(LicenseContext) as ILicenseContext;
 
   const [isLoading, setIsLoading] = useState(true);
-  const [hasErrorConnecting, setHasErrorConnecting] = useState(false);
-
   const [engines, setEngines] = useState([]);
   const [enginesPage, setEnginesPage] = useState(1);
   const [enginesTotal, setEnginesTotal] = useState(0);
@@ -57,16 +54,12 @@ export const EngineOverview: React.FC = () => {
     });
   };
   const setEnginesData = async (params: IGetEnginesParams, callbacks: ISetEnginesCallbacks) => {
-    try {
-      const response = await getEnginesData(params);
+    const response = await getEnginesData(params);
 
-      callbacks.setResults(response.results);
-      callbacks.setResultsTotal(response.meta.page.total_results);
+    callbacks.setResults(response.results);
+    callbacks.setResultsTotal(response.meta.page.total_results);
 
-      setIsLoading(false);
-    } catch (error) {
-      setHasErrorConnecting(true);
-    }
+    setIsLoading(false);
   };
 
   useEffect(() => {
@@ -85,7 +78,6 @@ export const EngineOverview: React.FC = () => {
     }
   }, [license, metaEnginesPage]);
 
-  if (hasErrorConnecting) return <ErrorState />;
   if (isLoading) return <LoadingState />;
   if (!engines.length) return <EmptyState />;
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx
new file mode 100644
index 0000000000000..8d48875a8e1f5
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.test.tsx
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { ErrorStatePrompt } from '../../../shared/error_state';
+import { ErrorConnecting } from './';
+
+describe('ErrorConnecting', () => {
+  it('renders', () => {
+    const wrapper = shallow(<ErrorConnecting />);
+
+    expect(wrapper.find(ErrorStatePrompt)).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/error_state.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx
similarity index 81%
rename from x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/error_state.tsx
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx
index c5a5f1fbb921f..34eb76d11a663 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/empty_states/error_state.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/error_connecting.tsx
@@ -10,17 +10,13 @@ import { EuiPageContent } from '@elastic/eui';
 import { ErrorStatePrompt } from '../../../shared/error_state';
 import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SendAppSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
-import { EngineOverviewHeader } from '../engine_overview_header';
 
-import './empty_states.scss';
-
-export const ErrorState: React.FC = () => {
+export const ErrorConnecting: React.FC = () => {
   return (
     <>
       <SetPageChrome isRoot />
       <SendTelemetry action="error" metric="cannot_connect" />
 
-      <EngineOverviewHeader />
       <EuiPageContent>
         <ErrorStatePrompt />
       </EuiPageContent>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview_header/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/index.ts
similarity index 78%
rename from x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview_header/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/index.ts
index 2d37f037e21e5..c8b71e1a6e791 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview_header/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/error_connecting/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { EngineOverviewHeader } from './engine_overview_header';
+export { ErrorConnecting } from './error_connecting';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
index 0f4072c591bc7..94e9127bbed74 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.test.tsx
@@ -12,8 +12,10 @@ import { Redirect } from 'react-router-dom';
 import { shallow } from 'enzyme';
 import { useValues, useActions } from 'kea';
 
-import { SetupGuide } from './components/setup_guide';
 import { Layout, SideNav, SideNavLink } from '../shared/layout';
+import { SetupGuide } from './components/setup_guide';
+import { ErrorConnecting } from './components/error_connecting';
+import { EngineOverview } from './components/engine_overview';
 import { AppSearch, AppSearchUnconfigured, AppSearchConfigured, AppSearchNav } from './';
 
 describe('AppSearch', () => {
@@ -42,12 +44,17 @@ describe('AppSearchUnconfigured', () => {
 });
 
 describe('AppSearchConfigured', () => {
-  it('renders with layout', () => {
+  beforeEach(() => {
+    // Mock resets
+    (useValues as jest.Mock).mockImplementation(() => ({}));
     (useActions as jest.Mock).mockImplementation(() => ({ initializeAppData: () => {} }));
+  });
 
+  it('renders with layout', () => {
     const wrapper = shallow(<AppSearchConfigured />);
 
     expect(wrapper.find(Layout)).toHaveLength(1);
+    expect(wrapper.find(EngineOverview)).toHaveLength(1);
   });
 
   it('initializes app data with passed props', () => {
@@ -62,12 +69,20 @@ describe('AppSearchConfigured', () => {
   it('does not re-initialize app data', () => {
     const initializeAppData = jest.fn();
     (useActions as jest.Mock).mockImplementation(() => ({ initializeAppData }));
-    (useValues as jest.Mock).mockImplementationOnce(() => ({ hasInitialized: true }));
+    (useValues as jest.Mock).mockImplementation(() => ({ hasInitialized: true }));
 
     shallow(<AppSearchConfigured />);
 
     expect(initializeAppData).not.toHaveBeenCalled();
   });
+
+  it('renders ErrorConnecting', () => {
+    (useValues as jest.Mock).mockImplementation(() => ({ errorConnecting: true }));
+
+    const wrapper = shallow(<AppSearchConfigured />);
+
+    expect(wrapper.find(ErrorConnecting)).toHaveLength(1);
+  });
 });
 
 describe('AppSearchNav', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
index 5f4734630624c..234201a157ec9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
@@ -11,6 +11,7 @@ import { useActions, useValues } from 'kea';
 import { i18n } from '@kbn/i18n';
 
 import { KibanaContext, IKibanaContext } from '../index';
+import { HttpLogic, IHttpLogicValues } from '../shared/http';
 import { AppLogic, IAppLogicActions, IAppLogicValues } from './app_logic';
 import { IInitialAppData } from '../../../common/types';
 
@@ -27,6 +28,7 @@ import {
 } from './routes';
 
 import { SetupGuide } from './components/setup_guide';
+import { ErrorConnecting } from './components/error_connecting';
 import { EngineOverview } from './components/engine_overview';
 
 export const AppSearch: React.FC<IInitialAppData> = (props) => {
@@ -48,6 +50,7 @@ export const AppSearchUnconfigured: React.FC = () => (
 export const AppSearchConfigured: React.FC<IInitialAppData> = (props) => {
   const { hasInitialized } = useValues(AppLogic) as IAppLogicValues;
   const { initializeAppData } = useActions(AppLogic) as IAppLogicActions;
+  const { errorConnecting } = useValues(HttpLogic) as IHttpLogicValues;
 
   useEffect(() => {
     if (!hasInitialized) initializeAppData(props);
@@ -60,14 +63,18 @@ export const AppSearchConfigured: React.FC<IInitialAppData> = (props) => {
       </Route>
       <Route>
         <Layout navigation={<AppSearchNav />}>
-          <Switch>
-            <Route exact path={ROOT_PATH}>
-              <Redirect to={ENGINES_PATH} />
-            </Route>
-            <Route exact path={ENGINES_PATH}>
-              <EngineOverview />
-            </Route>
-          </Switch>
+          {errorConnecting ? (
+            <ErrorConnecting />
+          ) : (
+            <Switch>
+              <Route exact path={ROOT_PATH}>
+                <Redirect to={ENGINES_PATH} />
+              </Route>
+              <Route exact path={ENGINES_PATH}>
+                <EngineOverview />
+              </Route>
+            </Switch>
+          )}
         </Layout>
       </Route>
     </Switch>
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.tsx b/x-pack/plugins/enterprise_search/public/applications/index.tsx
index d6cc6e81509b2..60e4cedf413f2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.tsx
@@ -22,6 +22,7 @@ import {
 } from 'src/core/public';
 import { ClientConfigType, ClientData, PluginsSetup } from '../plugin';
 import { LicenseProvider } from './shared/licensing';
+import { HttpProvider } from './shared/http';
 import { IExternalUrl } from './shared/enterprise_search_url';
 import { IInitialAppData } from '../../common/types';
 
@@ -48,7 +49,7 @@ export const renderApp = (
   core: CoreStart,
   plugins: PluginsSetup,
   config: ClientConfigType,
-  { externalUrl, ...initialData }: ClientData
+  { externalUrl, errorConnecting, ...initialData }: ClientData
 ) => {
   resetContext({ createStore: true });
   const store = getContext().store as Store;
@@ -67,6 +68,7 @@ export const renderApp = (
       >
         <LicenseProvider license$={plugins.licensing.license$}>
           <Provider store={store}>
+            <HttpProvider http={core.http} errorConnecting={errorConnecting} />
             <Router history={params.history}>
               <App {...initialData} />
             </Router>
@@ -77,7 +79,6 @@ export const renderApp = (
     params.element
   );
   return () => {
-    resetContext({});
     ReactDOM.unmountComponentAtNode(params.element);
   };
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts
new file mode 100644
index 0000000000000..a6957340d33d3
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.test.ts
@@ -0,0 +1,110 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { resetContext } from 'kea';
+
+import { httpServiceMock } from 'src/core/public/mocks';
+
+import { HttpLogic } from './http_logic';
+
+describe('HttpLogic', () => {
+  const mockHttp = httpServiceMock.createSetupContract();
+  const DEFAULT_VALUES = {
+    http: null,
+    httpInterceptors: [],
+    errorConnecting: false,
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    resetContext({});
+  });
+
+  it('has expected default values', () => {
+    HttpLogic.mount();
+    expect(HttpLogic.values).toEqual(DEFAULT_VALUES);
+  });
+
+  describe('initializeHttp()', () => {
+    it('sets values based on passed props', () => {
+      HttpLogic.mount();
+      HttpLogic.actions.initializeHttp({ http: mockHttp, errorConnecting: true });
+
+      expect(HttpLogic.values).toEqual({
+        http: mockHttp,
+        httpInterceptors: [],
+        errorConnecting: true,
+      });
+    });
+  });
+
+  describe('setErrorConnecting()', () => {
+    it('sets errorConnecting value', () => {
+      HttpLogic.mount();
+      HttpLogic.actions.setErrorConnecting(true);
+      expect(HttpLogic.values.errorConnecting).toEqual(true);
+
+      HttpLogic.actions.setErrorConnecting(false);
+      expect(HttpLogic.values.errorConnecting).toEqual(false);
+    });
+  });
+
+  describe('http interceptors', () => {
+    describe('initializeHttpInterceptors()', () => {
+      beforeEach(() => {
+        HttpLogic.mount();
+        jest.spyOn(HttpLogic.actions, 'setHttpInterceptors');
+        jest.spyOn(HttpLogic.actions, 'setErrorConnecting');
+        HttpLogic.actions.initializeHttp({ http: mockHttp });
+
+        HttpLogic.actions.initializeHttpInterceptors();
+      });
+
+      it('calls http.intercept and sets an array of interceptors', () => {
+        mockHttp.intercept.mockImplementationOnce(() => 'removeInterceptorFn' as any);
+        HttpLogic.actions.initializeHttpInterceptors();
+
+        expect(mockHttp.intercept).toHaveBeenCalled();
+        expect(HttpLogic.actions.setHttpInterceptors).toHaveBeenCalledWith(['removeInterceptorFn']);
+      });
+
+      describe('errorConnectingInterceptor', () => {
+        it('handles errors connecting to Enterprise Search', async () => {
+          const { responseError } = mockHttp.intercept.mock.calls[0][0] as any;
+          await responseError({ response: { url: '/api/app_search/engines', status: 502 } });
+
+          expect(HttpLogic.actions.setErrorConnecting).toHaveBeenCalled();
+        });
+
+        it('does not handle non-502 Enterprise Search errors', async () => {
+          const { responseError } = mockHttp.intercept.mock.calls[0][0] as any;
+          await responseError({ response: { url: '/api/workplace_search/overview', status: 404 } });
+
+          expect(HttpLogic.actions.setErrorConnecting).not.toHaveBeenCalled();
+        });
+
+        it('does not handle errors for unrelated calls', async () => {
+          const { responseError } = mockHttp.intercept.mock.calls[0][0] as any;
+          await responseError({ response: { url: '/api/some_other_plugin/', status: 502 } });
+
+          expect(HttpLogic.actions.setErrorConnecting).not.toHaveBeenCalled();
+        });
+      });
+    });
+
+    it('sets httpInterceptors and calls all valid remove functions on unmount', () => {
+      const unmount = HttpLogic.mount();
+      const httpInterceptors = [jest.fn(), undefined, jest.fn()] as any;
+
+      HttpLogic.actions.setHttpInterceptors(httpInterceptors);
+      expect(HttpLogic.values.httpInterceptors).toEqual(httpInterceptors);
+
+      unmount();
+      expect(httpInterceptors[0]).toHaveBeenCalledTimes(1);
+      expect(httpInterceptors[2]).toHaveBeenCalledTimes(1);
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
new file mode 100644
index 0000000000000..7bf7a19ed451f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { kea } from 'kea';
+
+import { HttpSetup } from 'src/core/public';
+
+import { IKeaLogic, IKeaParams, TKeaReducers } from '../../shared/types';
+
+export interface IHttpLogicValues {
+  http: HttpSetup;
+  httpInterceptors: Function[];
+  errorConnecting: boolean;
+}
+export interface IHttpLogicActions {
+  initializeHttp({ http, errorConnecting }: { http: HttpSetup; errorConnecting?: boolean }): void;
+  initializeHttpInterceptors(): void;
+  setHttpInterceptors(httpInterceptors: Function[]): void;
+  setErrorConnecting(errorConnecting: boolean): void;
+}
+
+export const HttpLogic = kea({
+  actions: (): IHttpLogicActions => ({
+    initializeHttp: ({ http, errorConnecting }) => ({ http, errorConnecting }),
+    initializeHttpInterceptors: () => null,
+    setHttpInterceptors: (httpInterceptors) => ({ httpInterceptors }),
+    setErrorConnecting: (errorConnecting) => ({ errorConnecting }),
+  }),
+  reducers: (): TKeaReducers<IHttpLogicValues, IHttpLogicActions> => ({
+    http: [
+      (null as unknown) as HttpSetup,
+      {
+        initializeHttp: (_, { http }) => http,
+      },
+    ],
+    httpInterceptors: [
+      [],
+      {
+        setHttpInterceptors: (_, { httpInterceptors }) => httpInterceptors,
+      },
+    ],
+    errorConnecting: [
+      false,
+      {
+        initializeHttp: (_, { errorConnecting }) => !!errorConnecting,
+        setErrorConnecting: (_, { errorConnecting }) => errorConnecting,
+      },
+    ],
+  }),
+  listeners: ({ values, actions }) => ({
+    initializeHttpInterceptors: () => {
+      const httpInterceptors = [];
+
+      const errorConnectingInterceptor = values.http.intercept({
+        responseError: async (httpResponse) => {
+          const { url, status } = httpResponse.response!;
+          const hasErrorConnecting = status === 502;
+          const isApiResponse =
+            url.includes('/api/app_search/') || url.includes('/api/workplace_search/');
+
+          if (isApiResponse && hasErrorConnecting) {
+            actions.setErrorConnecting(true);
+          }
+          return httpResponse;
+        },
+      });
+      httpInterceptors.push(errorConnectingInterceptor);
+
+      // TODO: Read only mode interceptor
+      actions.setHttpInterceptors(httpInterceptors);
+    },
+  }),
+  events: ({ values }) => ({
+    beforeUnmount: () => {
+      values.httpInterceptors.forEach((removeInterceptorFn?: Function) => {
+        if (removeInterceptorFn) removeInterceptorFn();
+      });
+    },
+  }),
+} as IKeaParams<IHttpLogicValues, IHttpLogicActions>) as IKeaLogic<
+  IHttpLogicValues,
+  IHttpLogicActions
+>;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.test.tsx
new file mode 100644
index 0000000000000..81106235780d6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.test.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import '../../__mocks__/shallow_usecontext.mock';
+import '../../__mocks__/kea.mock';
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { useActions } from 'kea';
+
+import { HttpProvider } from './';
+
+describe('HttpProvider', () => {
+  const props = {
+    http: {} as any,
+    errorConnecting: false,
+  };
+  const initializeHttp = jest.fn();
+  const initializeHttpInterceptors = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useActions as jest.Mock).mockImplementationOnce(() => ({
+      initializeHttp,
+      initializeHttpInterceptors,
+    }));
+  });
+
+  it('does not render', () => {
+    const wrapper = shallow(<HttpProvider {...props} />);
+
+    expect(wrapper.isEmptyRender()).toBe(true);
+  });
+
+  it('calls initialization actions on mount', () => {
+    shallow(<HttpProvider {...props} />);
+
+    expect(initializeHttp).toHaveBeenCalledWith(props);
+    expect(initializeHttpInterceptors).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.tsx
new file mode 100644
index 0000000000000..6febc1869054f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.tsx
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect } from 'react';
+import { useActions } from 'kea';
+
+import { HttpSetup } from 'src/core/public';
+
+import { HttpLogic, IHttpLogicActions } from './http_logic';
+
+interface IHttpProviderProps {
+  http: HttpSetup;
+  errorConnecting?: boolean;
+}
+
+export const HttpProvider: React.FC<IHttpProviderProps> = (props) => {
+  const { initializeHttp, initializeHttpInterceptors } = useActions(HttpLogic) as IHttpLogicActions;
+
+  useEffect(() => {
+    initializeHttp(props);
+    initializeHttpInterceptors();
+  }, []);
+
+  return null;
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/http/index.ts
new file mode 100644
index 0000000000000..449ff9d56debf
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { HttpLogic, IHttpLogicValues, IHttpLogicActions } from './http_logic';
+export { HttpProvider } from './http_provider';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
index 74bb53ef3a954..a8e08323c5e3b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
@@ -14,7 +14,7 @@ export interface IFlashMessagesProps {
 }
 
 export interface IKeaLogic<IKeaValues, IKeaActions> {
-  mount(): void;
+  mount(): Function;
   values: IKeaValues;
   actions: IKeaActions;
 }
@@ -33,6 +33,7 @@ export interface IKeaLogic<IKeaValues, IKeaActions> {
 export interface IKeaParams<IKeaValues, IKeaActions> {
   selectors?(params: { selectors: IKeaValues }): void;
   listeners?(params: { actions: IKeaActions; values: IKeaValues }): void;
+  events?(params: { actions: IKeaActions; values: IKeaValues }): void;
 }
 
 /**
@@ -47,7 +48,10 @@ export type TKeaReducers<IKeaValues, IKeaActions> = {
   [Value in keyof IKeaValues]?: [
     IKeaValues[Value],
     {
-      [Action in keyof IKeaActions]?: (state: IKeaValues, payload: IKeaValues) => IKeaValues[Value];
+      [Action in keyof IKeaActions]?: (
+        state: IKeaValues[Value],
+        payload: IKeaValues
+      ) => IKeaValues[Value];
     }
   ];
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/__mocks__/overview_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/__mocks__/overview_logic.mock.ts
index 395d2044e7dbc..5588c4fc53b67 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/__mocks__/overview_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/__mocks__/overview_logic.mock.ts
@@ -22,7 +22,6 @@ export const mockLogicValues = {
   personalSourcesCount: 0,
   sourcesCount: 0,
   dataLoading: true,
-  hasErrorConnecting: false,
   flashMessages: {},
 } as IOverviewValues;
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.test.tsx
index 744fd8aeb1951..fee966a56923d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.test.tsx
@@ -11,7 +11,6 @@ import { mockLogicActions, setMockValues } from './__mocks__';
 import React from 'react';
 import { shallow, mount } from 'enzyme';
 
-import { ErrorState } from '../error_state';
 import { Loading } from '../shared/loading';
 import { ViewContentHeader } from '../shared/view_content_header';
 
@@ -27,13 +26,6 @@ describe('Overview', () => {
 
       expect(wrapper.find(Loading)).toHaveLength(1);
     });
-
-    it('hasErrorConnecting', () => {
-      setMockValues({ hasErrorConnecting: true });
-      const wrapper = shallow(<Overview />);
-
-      expect(wrapper.find(ErrorState)).toHaveLength(1);
-    });
   });
 
   describe('happy-path states', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.tsx
index b816eb2973207..6aa3e1e608bfe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.tsx
@@ -6,19 +6,16 @@
 
 // TODO: Remove EuiPage & EuiPageBody before exposing full app
 
-import React, { useContext, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import { EuiPage, EuiPageBody, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { useActions, useValues } from 'kea';
 
 import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
-import { KibanaContext, IKibanaContext } from '../../../index';
 
 import { OverviewLogic, IOverviewActions, IOverviewValues } from './overview_logic';
 
-import { ErrorState } from '../error_state';
-
 import { Loading } from '../shared/loading';
 import { ProductButton } from '../shared/product_button';
 import { ViewContentHeader } from '../shared/view_content_header';
@@ -47,13 +44,10 @@ const HEADER_DESCRIPTION = i18n.translate(
 );
 
 export const Overview: React.FC = () => {
-  const { http } = useContext(KibanaContext) as IKibanaContext;
-
   const { initializeOverview } = useActions(OverviewLogic) as IOverviewActions;
 
   const {
     dataLoading,
-    hasErrorConnecting,
     hasUsers,
     hasOrgSources,
     isOldAccount,
@@ -61,10 +55,9 @@ export const Overview: React.FC = () => {
   } = useValues(OverviewLogic) as IOverviewValues;
 
   useEffect(() => {
-    initializeOverview({ http });
+    initializeOverview();
   }, [initializeOverview]);
 
-  if (hasErrorConnecting) return <ErrorState />;
   if (dataLoading) return <Loading />;
 
   const hideOnboarding = hasUsers && hasOrgSources && isOldAccount && orgName !== defaultOrgName;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.test.ts
index 7df4de4719f31..3fbf0e60b5b49 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.test.ts
@@ -5,24 +5,18 @@
  */
 
 import { resetContext } from 'kea';
-import { act } from 'react-dom/test-utils';
 
-import { mockKibanaContext } from '../../../__mocks__';
+jest.mock('../../../shared/http', () => ({ HttpLogic: { values: { http: { get: jest.fn() } } } }));
+import { HttpLogic } from '../../../shared/http';
 
 import { mockLogicValues } from './__mocks__';
 import { OverviewLogic } from './overview_logic';
 
 describe('OverviewLogic', () => {
-  let unmount: any;
-
   beforeEach(() => {
-    resetContext({});
-    unmount = OverviewLogic.mount() as any;
     jest.clearAllMocks();
-  });
-
-  afterEach(() => {
-    unmount();
+    resetContext({});
+    OverviewLogic.mount();
   });
 
   it('has expected default values', () => {
@@ -91,48 +85,14 @@ describe('OverviewLogic', () => {
     });
   });
 
-  describe('setHasErrorConnecting', () => {
-    it('will set `hasErrorConnecting`', () => {
-      OverviewLogic.actions.setHasErrorConnecting(true);
-
-      expect(OverviewLogic.values.hasErrorConnecting).toEqual(true);
-      expect(OverviewLogic.values.dataLoading).toEqual(false);
-    });
-  });
-
   describe('initializeOverview', () => {
     it('calls API and sets values', async () => {
-      const mockHttp = mockKibanaContext.http;
-      const mockApi = jest.fn(() => mockLogicValues as any);
       const setServerDataSpy = jest.spyOn(OverviewLogic.actions, 'setServerData');
 
-      await act(async () =>
-        OverviewLogic.actions.initializeOverview({
-          http: {
-            ...mockHttp,
-            get: mockApi,
-          },
-        })
-      );
+      await OverviewLogic.actions.initializeOverview();
 
-      expect(mockApi).toHaveBeenCalledWith('/api/workplace_search/overview');
+      expect(HttpLogic.values.http.get).toHaveBeenCalledWith('/api/workplace_search/overview');
       expect(setServerDataSpy).toHaveBeenCalled();
     });
-
-    it('handles error state', async () => {
-      const mockHttp = mockKibanaContext.http;
-      const setHasErrorConnectingSpy = jest.spyOn(OverviewLogic.actions, 'setHasErrorConnecting');
-
-      await act(async () =>
-        OverviewLogic.actions.initializeOverview({
-          http: {
-            ...mockHttp,
-            get: () => Promise.reject(),
-          },
-        })
-      );
-
-      expect(setHasErrorConnectingSpy).toHaveBeenCalled();
-    });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.ts
index 8bb177a2e742b..057bce1b4056c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.ts
@@ -4,9 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { HttpSetup } from 'src/core/public';
-
 import { kea } from 'kea';
+import { HttpLogic } from '../../../shared/http';
 
 import { IAccount, IOrganization } from '../../types';
 import { IFlashMessagesProps, IKeaLogic, TKeaReducers, IKeaParams } from '../../../shared/types';
@@ -32,13 +31,11 @@ export interface IOverviewServerData {
 export interface IOverviewActions {
   setServerData(serverData: IOverviewServerData): void;
   setFlashMessages(flashMessages: IFlashMessagesProps): void;
-  setHasErrorConnecting(hasErrorConnecting: boolean): void;
-  initializeOverview({ http }: { http: HttpSetup }): void;
+  initializeOverview(): void;
 }
 
 export interface IOverviewValues extends IOverviewServerData {
   dataLoading: boolean;
-  hasErrorConnecting: boolean;
   flashMessages: IFlashMessagesProps;
 }
 
@@ -46,8 +43,7 @@ export const OverviewLogic = kea({
   actions: (): IOverviewActions => ({
     setServerData: (serverData) => serverData,
     setFlashMessages: (flashMessages) => ({ flashMessages }),
-    setHasErrorConnecting: (hasErrorConnecting) => ({ hasErrorConnecting }),
-    initializeOverview: ({ http }) => ({ http }),
+    initializeOverview: () => null,
   }),
   reducers: (): TKeaReducers<IOverviewValues, IOverviewActions> => ({
     organization: [
@@ -138,24 +134,13 @@ export const OverviewLogic = kea({
       true,
       {
         setServerData: () => false,
-        setHasErrorConnecting: () => false,
-      },
-    ],
-    hasErrorConnecting: [
-      false,
-      {
-        setHasErrorConnecting: (_, { hasErrorConnecting }) => hasErrorConnecting,
       },
     ],
   }),
   listeners: ({ actions }): Partial<IOverviewActions> => ({
-    initializeOverview: async ({ http }: { http: HttpSetup }) => {
-      try {
-        const response = await http.get('/api/workplace_search/overview');
-        actions.setServerData(response);
-      } catch (error) {
-        actions.setHasErrorConnecting(true);
-      }
+    initializeOverview: async () => {
+      const response = await HttpLogic.values.http.get('/api/workplace_search/overview');
+      actions.setServerData(response);
     },
   }),
 } as IKeaParams<IOverviewValues, IOverviewActions>) as IKeaLogic<IOverviewValues, IOverviewActions>;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
index a55ff64014130..654f4dce0ebf3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
@@ -5,35 +5,44 @@
  */
 
 import '../__mocks__/shallow_usecontext.mock';
+import '../__mocks__/kea.mock';
 
 import React, { useContext } from 'react';
 import { Redirect } from 'react-router-dom';
 import { shallow } from 'enzyme';
+import { useValues } from 'kea';
 
 import { Overview } from './components/overview';
+import { ErrorState } from './components/error_state';
 
 import { WorkplaceSearch } from './';
 
 describe('Workplace Search', () => {
-  describe('/', () => {
-    it('redirects to Setup Guide when enterpriseSearchUrl is not set', () => {
-      (useContext as jest.Mock).mockImplementationOnce(() => ({
-        config: { host: '' },
-      }));
-      const wrapper = shallow(<WorkplaceSearch />);
-
-      expect(wrapper.find(Redirect)).toHaveLength(1);
-      expect(wrapper.find(Overview)).toHaveLength(0);
-    });
-
-    it('renders the Overview when enterpriseSearchUrl is set', () => {
-      (useContext as jest.Mock).mockImplementationOnce(() => ({
-        config: { host: 'https://foo.bar' },
-      }));
-      const wrapper = shallow(<WorkplaceSearch />);
-
-      expect(wrapper.find(Overview)).toHaveLength(1);
-      expect(wrapper.find(Redirect)).toHaveLength(0);
-    });
+  it('redirects to Setup Guide when enterpriseSearchUrl is not set', () => {
+    (useContext as jest.Mock).mockImplementationOnce(() => ({
+      config: { host: '' },
+    }));
+    const wrapper = shallow(<WorkplaceSearch />);
+
+    expect(wrapper.find(Redirect)).toHaveLength(1);
+    expect(wrapper.find(Overview)).toHaveLength(0);
+  });
+
+  it('renders the Overview when enterpriseSearchUrl is set', () => {
+    (useContext as jest.Mock).mockImplementationOnce(() => ({
+      config: { host: 'https://foo.bar' },
+    }));
+    const wrapper = shallow(<WorkplaceSearch />);
+
+    expect(wrapper.find(Overview)).toHaveLength(1);
+    expect(wrapper.find(Redirect)).toHaveLength(0);
+  });
+
+  it('renders ErrorState when the app cannot connect to Enterprise Search', () => {
+    (useValues as jest.Mock).mockImplementationOnce(() => ({ errorConnecting: true }));
+    const wrapper = shallow(<WorkplaceSearch />);
+
+    expect(wrapper.find(ErrorState).exists()).toBe(true);
+    expect(wrapper.find(Overview)).toHaveLength(0);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
index 94462aa8de7d1..b261c83e30dde 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
@@ -6,19 +6,24 @@
 
 import React, { useContext } from 'react';
 import { Route, Redirect, Switch } from 'react-router-dom';
+import { useValues } from 'kea';
 
 import { IInitialAppData } from '../../../common/types';
 import { KibanaContext, IKibanaContext } from '../index';
+import { HttpLogic, IHttpLogicValues } from '../shared/http';
 import { Layout } from '../shared/layout';
 import { WorkplaceSearchNav } from './components/layout/nav';
 
 import { SETUP_GUIDE_PATH } from './routes';
 
 import { SetupGuide } from './components/setup_guide';
+import { ErrorState } from './components/error_state';
 import { Overview } from './components/overview';
 
 export const WorkplaceSearch: React.FC<IInitialAppData> = (props) => {
   const { config } = useContext(KibanaContext) as IKibanaContext;
+  const { errorConnecting } = useValues(HttpLogic) as IHttpLogicValues;
+
   if (!config.host)
     return (
       <Switch>
@@ -37,16 +42,20 @@ export const WorkplaceSearch: React.FC<IInitialAppData> = (props) => {
         <SetupGuide />
       </Route>
       <Route exact path="/">
-        <Overview />
+        {errorConnecting ? <ErrorState /> : <Overview />}
       </Route>
       <Route>
         <Layout navigation={<WorkplaceSearchNav />}>
-          <Switch>
-            <Route exact path="/groups">
-              {/* Will replace with groups component subsequent PR */}
-              <div />
-            </Route>
-          </Switch>
+          {errorConnecting ? (
+            <ErrorState />
+          ) : (
+            <Switch>
+              <Route exact path="/groups">
+                {/* Will replace with groups component subsequent PR */}
+                <div />
+              </Route>
+            </Switch>
+          )}
         </Layout>
       </Route>
     </Switch>
diff --git a/x-pack/plugins/enterprise_search/public/plugin.ts b/x-pack/plugins/enterprise_search/public/plugin.ts
index 148a50fb4a5ce..881fe02af5b09 100644
--- a/x-pack/plugins/enterprise_search/public/plugin.ts
+++ b/x-pack/plugins/enterprise_search/public/plugin.ts
@@ -31,6 +31,7 @@ export interface ClientConfigType {
 }
 export interface ClientData extends IInitialAppData {
   externalUrl: IExternalUrl;
+  errorConnecting?: boolean;
 }
 
 export interface PluginsSetup {
@@ -123,6 +124,7 @@ export class EnterpriseSearchPlugin implements Plugin {
 
       this.hasInitialized = true;
     } catch {
+      this.data.errorConnecting = true;
       // The plugin will attempt to re-fetch config data on page change
     }
   }
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts
index 968ecb95fd931..1ea023ecacdbe 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts
@@ -68,10 +68,11 @@ describe('engine routes', () => {
         ).andReturnError();
       });
 
-      it('should return 404 with a message', async () => {
+      it('should return 502 with a message', async () => {
         await mockRouter.callRoute(mockRequest);
 
-        expect(mockRouter.response.notFound).toHaveBeenCalledWith({
+        expect(mockRouter.response.customError).toHaveBeenCalledWith({
+          statusCode: 502,
           body: 'cannot-connect',
         });
         expect(mockLogger.error).toHaveBeenCalledWith('Cannot connect to App Search: Failed');
@@ -87,10 +88,11 @@ describe('engine routes', () => {
         ).andReturnInvalidData();
       });
 
-      it('should return 404 with a message', async () => {
+      it('should return 502 with a message', async () => {
         await mockRouter.callRoute(mockRequest);
 
-        expect(mockRouter.response.notFound).toHaveBeenCalledWith({
+        expect(mockRouter.response.customError).toHaveBeenCalledWith({
+          statusCode: 502,
           body: 'cannot-connect',
         });
         expect(mockLogger.error).toHaveBeenCalledWith(
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts
index ca83c0e187ddb..7190772fb92bb 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts
@@ -52,7 +52,7 @@ export function registerEnginesRoute({ router, config, log }: IRouteDependencies
         log.error(`Cannot connect to App Search: ${e.toString()}`);
         if (e instanceof Error) log.debug(e.stack as string);
 
-        return response.notFound({ body: 'cannot-connect' });
+        return response.customError({ statusCode: 502, body: 'cannot-connect' });
       }
     }
   );
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts
index 3a4e28b0de5ff..f6534b27b5da0 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts
@@ -63,10 +63,11 @@ describe('engine routes', () => {
         }).andReturnError();
       });
 
-      it('should return 404 with a message', async () => {
+      it('should return 502 with a message', async () => {
         await mockRouter.callRoute(mockRequest);
 
-        expect(mockRouter.response.notFound).toHaveBeenCalledWith({
+        expect(mockRouter.response.customError).toHaveBeenCalledWith({
+          statusCode: 502,
           body: 'cannot-connect',
         });
         expect(mockLogger.error).toHaveBeenCalledWith('Cannot connect to Workplace Search: Failed');
@@ -81,10 +82,11 @@ describe('engine routes', () => {
         }).andReturnInvalidData();
       });
 
-      it('should return 404 with a message', async () => {
+      it('should return 502 with a message', async () => {
         await mockRouter.callRoute(mockRequest);
 
-        expect(mockRouter.response.notFound).toHaveBeenCalledWith({
+        expect(mockRouter.response.customError).toHaveBeenCalledWith({
+          statusCode: 502,
           body: 'cannot-connect',
         });
         expect(mockLogger.error).toHaveBeenCalledWith(
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.ts
index d1e2f4f5f180d..9e5d94ac1b4fe 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.ts
@@ -39,7 +39,7 @@ export function registerWSOverviewRoute({ router, config, log }: IRouteDependenc
         log.error(`Cannot connect to Workplace Search: ${e.toString()}`);
         if (e instanceof Error) log.debug(e.stack as string);
 
-        return response.notFound({ body: 'cannot-connect' });
+        return response.customError({ statusCode: 502, body: 'cannot-connect' });
       }
     }
   );

From eddd39a1c19fbde4370e137f468f5489cca205b4 Mon Sep 17 00:00:00 2001
From: Rashmi Kulkarni <rashmi.kulkarni@elastic.co>
Date: Mon, 24 Aug 2020 15:28:36 -0700
Subject: [PATCH 018/148] Adding sorting test to scripted fields in discover
 (#75520)

...sorting functional UI tests added.
---
 .../apps/management/_scripted_fields.js       | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js
index 116d1eac90cea..6da9ebed0538a 100644
--- a/test/functional/apps/management/_scripted_fields.js
+++ b/test/functional/apps/management/_scripted_fields.js
@@ -165,6 +165,27 @@ export default function ({ getService, getPageObjects }) {
         });
       });
 
+      //add a test to sort numeric scripted field
+      it('should sort scripted field value in Discover', async function () {
+        await testSubjects.click(`docTableHeaderFieldSort_${scriptedPainlessFieldName}`);
+        // after the first click on the scripted field, it becomes secondary sort after time.
+        // click on the timestamp twice to make it be the secondary sort key.
+        await testSubjects.click('docTableHeaderFieldSort_@timestamp');
+        await testSubjects.click('docTableHeaderFieldSort_@timestamp');
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await retry.try(async function () {
+          const rowData = await PageObjects.discover.getDocTableIndex(1);
+          expect(rowData).to.be('Sep 17, 2015 @ 10:53:14.181\n-1');
+        });
+
+        await testSubjects.click(`docTableHeaderFieldSort_${scriptedPainlessFieldName}`);
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await retry.try(async function () {
+          const rowData = await PageObjects.discover.getDocTableIndex(1);
+          expect(rowData).to.be('Sep 17, 2015 @ 06:32:29.479\n20');
+        });
+      });
+
       it('should filter by scripted field value in Discover', async function () {
         await PageObjects.discover.clickFieldListItem(scriptedPainlessFieldName);
         await log.debug('filter by the first value (14) in the expanded scripted field list');
@@ -252,6 +273,27 @@ export default function ({ getService, getPageObjects }) {
         });
       });
 
+      //add a test to sort string scripted field
+      it('should sort scripted field value in Discover', async function () {
+        await testSubjects.click(`docTableHeaderFieldSort_${scriptedPainlessFieldName2}`);
+        // after the first click on the scripted field, it becomes secondary sort after time.
+        // click on the timestamp twice to make it be the secondary sort key.
+        await testSubjects.click('docTableHeaderFieldSort_@timestamp');
+        await testSubjects.click('docTableHeaderFieldSort_@timestamp');
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await retry.try(async function () {
+          const rowData = await PageObjects.discover.getDocTableIndex(1);
+          expect(rowData).to.be('Sep 17, 2015 @ 09:48:40.594\nbad');
+        });
+
+        await testSubjects.click(`docTableHeaderFieldSort_${scriptedPainlessFieldName2}`);
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await retry.try(async function () {
+          const rowData = await PageObjects.discover.getDocTableIndex(1);
+          expect(rowData).to.be('Sep 17, 2015 @ 06:32:29.479\ngood');
+        });
+      });
+
       it('should filter by scripted field value in Discover', async function () {
         await PageObjects.discover.clickFieldListItem(scriptedPainlessFieldName2);
         await log.debug('filter by "bad" in the expanded scripted field list');
@@ -330,6 +372,28 @@ export default function ({ getService, getPageObjects }) {
         await filterBar.removeAllFilters();
       });
 
+      //add a test to sort boolean
+      //existing bug: https://github.com/elastic/kibana/issues/75519 hence the issue is skipped.
+      it.skip('should sort scripted field value in Discover', async function () {
+        await testSubjects.click(`docTableHeaderFieldSort_${scriptedPainlessFieldName2}`);
+        // after the first click on the scripted field, it becomes secondary sort after time.
+        // click on the timestamp twice to make it be the secondary sort key.
+        await testSubjects.click('docTableHeaderFieldSort_@timestamp');
+        await testSubjects.click('docTableHeaderFieldSort_@timestamp');
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await retry.try(async function () {
+          const rowData = await PageObjects.discover.getDocTableIndex(1);
+          expect(rowData).to.be('updateExpectedResultHere\ntrue');
+        });
+
+        await testSubjects.click(`docTableHeaderFieldSort_${scriptedPainlessFieldName2}`);
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await retry.try(async function () {
+          const rowData = await PageObjects.discover.getDocTableIndex(1);
+          expect(rowData).to.be('updateExpectedResultHere\nfalse');
+        });
+      });
+
       it('should visualize scripted field in vertical bar chart', async function () {
         await PageObjects.discover.clickFieldListItemVisualize(scriptedPainlessFieldName2);
         await PageObjects.header.waitUntilLoadingHasFinished();
@@ -384,6 +448,28 @@ export default function ({ getService, getPageObjects }) {
         });
       });
 
+      //add a test to sort date scripted field
+      //https://github.com/elastic/kibana/issues/75711
+      it.skip('should sort scripted field value in Discover', async function () {
+        await testSubjects.click(`docTableHeaderFieldSort_${scriptedPainlessFieldName2}`);
+        // after the first click on the scripted field, it becomes secondary sort after time.
+        // click on the timestamp twice to make it be the secondary sort key.
+        await testSubjects.click('docTableHeaderFieldSort_@timestamp');
+        await testSubjects.click('docTableHeaderFieldSort_@timestamp');
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await retry.try(async function () {
+          const rowData = await PageObjects.discover.getDocTableIndex(1);
+          expect(rowData).to.be('updateExpectedResultHere\n2015-09-18 07:00');
+        });
+
+        await testSubjects.click(`docTableHeaderFieldSort_${scriptedPainlessFieldName2}`);
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await retry.try(async function () {
+          const rowData = await PageObjects.discover.getDocTableIndex(1);
+          expect(rowData).to.be('updateExpectedResultHere\n2015-09-18 07:00');
+        });
+      });
+
       it('should filter by scripted field value in Discover', async function () {
         await PageObjects.discover.clickFieldListItem(scriptedPainlessFieldName2);
         await log.debug('filter by "Sep 17, 2015 @ 23:00" in the expanded scripted field list');

From 7c2eb85a7d23265554ee989e86712429510eccd6 Mon Sep 17 00:00:00 2001
From: Catherine Liu <catherine.liu@elastic.co>
Date: Mon, 24 Aug 2020 15:55:53 -0700
Subject: [PATCH 019/148] [Canvas][Docs] Adds `var` and `var_set` to expression
 function reference (#74291)

---
 .../canvas/canvas-function-reference.asciidoc | 55 ++++++++++++++++++-
 .../common/expression_functions/specs/var.ts  |  4 +-
 .../expression_functions/specs/var_set.ts     |  6 +-
 3 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/docs/canvas/canvas-function-reference.asciidoc b/docs/canvas/canvas-function-reference.asciidoc
index 3ae513708f189..6a6c840074f02 100644
--- a/docs/canvas/canvas-function-reference.asciidoc
+++ b/docs/canvas/canvas-function-reference.asciidoc
@@ -13,7 +13,7 @@ A *** denotes a required argument.
 
 A † denotes an argument can be passed multiple times.
 
-<<a_fns>> | B | <<c_fns>> | <<d_fns>> | <<e_fns>> | <<f_fns>> | <<g_fns>> | <<h_fns>> | <<i_fns>> | <<j_fns>> | K | <<l_fns>> | <<m_fns>> | <<n_fns>> | O | <<p_fns>> | Q | <<r_fns>> | <<s_fns>> | <<t_fns>> | <<u_fns>> | V | W | X | Y | Z
+<<a_fns>> | B | <<c_fns>> | <<d_fns>> | <<e_fns>> | <<f_fns>> | <<g_fns>> | <<h_fns>> | <<i_fns>> | <<j_fns>> | K | <<l_fns>> | <<m_fns>> | <<n_fns>> | O | <<p_fns>> | Q | <<r_fns>> | <<s_fns>> | <<t_fns>> | <<u_fns>> | <<v_fns>> | W | X | Y | Z
 
 [float]
 [[a_fns]]
@@ -2871,3 +2871,56 @@ Default: `""`
 |===
 
 *Returns:* `string`
+
+[float]
+[[v_fns]]
+== V
+
+[float]
+[[var_fn]]
+=== `var`
+
+Updates the Kibana global context.
+
+*Accepts:* `any`
+
+[cols="3*^<"]
+|===
+|Argument |Type |Description
+
+|_Unnamed_ ***
+
+Alias: `name`
+|`string`
+|Specify the name of the variable.
+|===
+
+*Returns:* Depends on your input and arguments
+
+
+[float]
+[[var_set_fn]]
+=== `var_set`
+
+Updates the Kibana global context.
+
+*Accepts:* `any`
+
+[cols="3*^<"]
+|===
+|Argument |Type |Description
+
+|_Unnamed_ ***
+
+Alias: `name`
+|`string`
+|Specify the name of the variable.
+
+|`value`
+
+Alias: `val`
+|`any`
+|Specify the value for the variable. When unspecified, the input context is used.
+|===
+
+*Returns:* Depends on your input and arguments
diff --git a/src/plugins/expressions/common/expression_functions/specs/var.ts b/src/plugins/expressions/common/expression_functions/specs/var.ts
index 4bc185a4cadfd..7d95c9816b99c 100644
--- a/src/plugins/expressions/common/expression_functions/specs/var.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/var.ts
@@ -34,7 +34,7 @@ export type ExpressionFunctionVar = ExpressionFunctionDefinition<
 export const variable: ExpressionFunctionVar = {
   name: 'var',
   help: i18n.translate('expressions.functions.var.help', {
-    defaultMessage: 'Updates kibana global context',
+    defaultMessage: 'Updates the Kibana global context.',
   }),
   args: {
     name: {
@@ -42,7 +42,7 @@ export const variable: ExpressionFunctionVar = {
       aliases: ['_'],
       required: true,
       help: i18n.translate('expressions.functions.var.name.help', {
-        defaultMessage: 'Specify name of the variable',
+        defaultMessage: 'Specify the name of the variable.',
       }),
     },
   },
diff --git a/src/plugins/expressions/common/expression_functions/specs/var_set.ts b/src/plugins/expressions/common/expression_functions/specs/var_set.ts
index 8f15bc8b90042..c45ca593f020c 100644
--- a/src/plugins/expressions/common/expression_functions/specs/var_set.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/var_set.ts
@@ -35,7 +35,7 @@ export type ExpressionFunctionVarSet = ExpressionFunctionDefinition<
 export const variableSet: ExpressionFunctionVarSet = {
   name: 'var_set',
   help: i18n.translate('expressions.functions.varset.help', {
-    defaultMessage: 'Updates kibana global context',
+    defaultMessage: 'Updates the Kibana global context.',
   }),
   args: {
     name: {
@@ -43,14 +43,14 @@ export const variableSet: ExpressionFunctionVarSet = {
       aliases: ['_'],
       required: true,
       help: i18n.translate('expressions.functions.varset.name.help', {
-        defaultMessage: 'Specify name of the variable',
+        defaultMessage: 'Specify the name of the variable.',
       }),
     },
     value: {
       aliases: ['val'],
       help: i18n.translate('expressions.functions.varset.val.help', {
         defaultMessage:
-          'Specify value for the variable. If not provided input context will be used',
+          'Specify the value for the variable. When unspecified, the input context is used.',
       }),
     },
   },

From 6b9092609ad0b54809ca4def0cde7c6986c513bf Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Mon, 24 Aug 2020 16:11:45 -0700
Subject: [PATCH 020/148] [build] Produce Docker target consistent with stack
 (#75621)

The release manager is currently expecting a Docker asset image with
the format of `kibana-8.0.0-SNAPSHOT-docker-image.tar.gz`. If this
target is not found, it will re-export the image. Making this change to
produce the expected filename will remove that duplicated effort.
Additionally, the release manager plans to remove this fallback in the
future anyways.

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/dev/build/tasks/os_packages/docker_generator/run.ts     | 6 +++---
 .../tasks/os_packages/docker_generator/template_context.ts  | 2 +-
 .../docker_generator/templates/build_docker_sh.template.ts  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
index 6cf4a7af70840..362c34d416743 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/run.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -58,8 +58,8 @@ export async function runDockerGenerator(
     'kibana-docker',
     build.isOss() ? `oss` : `default${ubiImageFlavor}`
   );
-  const dockerOutputDir = config.resolveFromTarget(
-    `kibana${imageFlavor}${ubiImageFlavor}-${version}-docker.tar.gz`
+  const dockerTargetFilename = config.resolveFromTarget(
+    `kibana${imageFlavor}${ubiImageFlavor}-${version}-docker-image.tar.gz`
   );
   const scope: TemplateContext = {
     artifactTarball,
@@ -69,7 +69,7 @@ export async function runDockerGenerator(
     artifactsDir,
     imageTag,
     dockerBuildDir,
-    dockerOutputDir,
+    dockerTargetFilename,
     baseOSImage,
     ubiImageFlavor,
     dockerBuildDate,
diff --git a/src/dev/build/tasks/os_packages/docker_generator/template_context.ts b/src/dev/build/tasks/os_packages/docker_generator/template_context.ts
index a7c40db44b87e..49fb173c5a896 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/template_context.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/template_context.ts
@@ -25,7 +25,7 @@ export interface TemplateContext {
   artifactsDir: string;
   imageTag: string;
   dockerBuildDir: string;
-  dockerOutputDir: string;
+  dockerTargetFilename: string;
   baseOSImage: string;
   ubiImageFlavor: string;
   dockerBuildDate: string;
diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts b/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
index 699bba758e1c9..86a02d74dea15 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/build_docker_sh.template.ts
@@ -25,7 +25,7 @@ function generator({
   imageTag,
   imageFlavor,
   version,
-  dockerOutputDir,
+  dockerTargetFilename,
   baseOSImage,
   ubiImageFlavor,
 }: TemplateContext) {
@@ -41,7 +41,7 @@ function generator({
   echo "Building: kibana${imageFlavor}${ubiImageFlavor}-docker"; \\
   docker build -t ${imageTag}${imageFlavor}${ubiImageFlavor}:${version} -f Dockerfile . || exit 1;
 
-  docker save ${imageTag}${imageFlavor}${ubiImageFlavor}:${version} | gzip -c > ${dockerOutputDir}
+  docker save ${imageTag}${imageFlavor}${ubiImageFlavor}:${version} | gzip -c > ${dockerTargetFilename}
 
   exit 0
   `);

From f28a9e6e2d100c3c692323adff647808283cbd84 Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Mon, 24 Aug 2020 16:25:05 -0700
Subject: [PATCH 021/148] Rename Whitelist to AllowList in Actions and Alerting
 (#75099)

* Rename Whitelist to AllowList in Actions and Alerting

* revert not related change

* Fixed due to comments and tests failing

* Fixed failing tests

* Fixed due to comments
---
 x-pack/plugins/actions/README.md              |  20 ++--
 .../actions/server/actions_client.test.ts     |   2 +-
 .../actions/server/actions_config.mock.ts     |   8 +-
 .../actions/server/actions_config.test.ts     | 104 ++++++++----------
 .../plugins/actions/server/actions_config.ts  |  50 ++++-----
 .../builtin_action_types/case/validators.ts   |   6 +-
 .../server/builtin_action_types/email.test.ts |  34 +++---
 .../server/builtin_action_types/email.ts      |   8 +-
 .../builtin_action_types/pagerduty.test.ts    |  12 +-
 .../server/builtin_action_types/pagerduty.ts  |   6 +-
 .../servicenow/validators.ts                  |   6 +-
 .../server/builtin_action_types/slack.test.ts |  12 +-
 .../server/builtin_action_types/slack.ts      |   6 +-
 .../builtin_action_types/webhook.test.ts      |  10 +-
 .../server/builtin_action_types/webhook.ts    |   6 +-
 x-pack/plugins/actions/server/config.test.ts  |  12 +-
 x-pack/plugins/actions/server/config.ts       |  10 +-
 x-pack/plugins/actions/server/plugin.test.ts  |   4 +-
 x-pack/plugins/actions/server/types.ts        |   6 +-
 .../translations/translations/ja-JP.json      |   2 +-
 .../translations/translations/zh-CN.json      |   2 +-
 .../alerting_api_integration/common/config.ts |   5 +-
 .../actions/builtin_action_types/email.ts     |  14 +--
 .../actions/builtin_action_types/jira.ts      |   4 +-
 .../actions/builtin_action_types/pagerduty.ts |   4 +-
 .../actions/builtin_action_types/resilient.ts |   4 +-
 .../builtin_action_types/servicenow.ts        |   4 +-
 .../actions/builtin_action_types/slack.ts     |   4 +-
 .../actions/builtin_action_types/webhook.ts   |   6 +-
 .../tests/actions/execute.ts                  |   2 +-
 .../case_api_integration/common/config.ts     |   5 +-
 .../common/config.ts                          |   5 +-
 32 files changed, 181 insertions(+), 202 deletions(-)

diff --git a/x-pack/plugins/actions/README.md b/x-pack/plugins/actions/README.md
index 3470ede0f15c7..868f6f180cc91 100644
--- a/x-pack/plugins/actions/README.md
+++ b/x-pack/plugins/actions/README.md
@@ -19,7 +19,7 @@ Table of Contents
   - [Usage](#usage)
   - [Kibana Actions Configuration](#kibana-actions-configuration)
     - [Configuration Options](#configuration-options)
-      - [Whitelisting Built-in Action Types](#whitelisting-built-in-action-types)
+      - [Adding Built-in Action Types to allowedHosts](#adding-built-in-action-types-to-hosts-allow-list)
     - [Configuration Utilities](#configuration-utilities)
   - [Action types](#action-types)
     - [Methods](#methods)
@@ -106,15 +106,15 @@ Built-In-Actions are configured using the _xpack.actions_ namespoace under _kiba
 | Namespaced Key                         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                   | Type          |
 | -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- |
 | _xpack.actions._**enabled**            | Feature toggle which enabled Actions in Kibana.                                                                                                                                                                                                                                                                                                                                                                                                                               | boolean       |
-| _xpack.actions._**whitelistedHosts**   | Which _hostnames_ are whitelisted for the Built-In-Action? This list should contain hostnames of every external service you wish to interact with using Webhooks, Email or any other built in Action. Note that you may use the string "\*" in place of a specific hostname to enable Kibana to target any URL, but keep in mind the potential use of such a feature to execute [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery) attacks from your server. | Array<String> |
+| _xpack.actions._**allowedHosts**   | Which _hostnames_ are allowed for the Built-In-Action? This list should contain hostnames of every external service you wish to interact with using Webhooks, Email or any other built in Action. Note that you may use the string "\*" in place of a specific hostname to enable Kibana to target any URL, but keep in mind the potential use of such a feature to execute [SSRF](https://www.owasp.org/index.php/Server_Side_Request_Forgery) attacks from your server. | Array<String> |
 | _xpack.actions._**enabledActionTypes** | A list of _actionTypes_ id's that are enabled. A "\*" may be used as an element to indicate all registered actionTypes should be enabled. The actionTypes registered for Kibana are `.server-log`, `.slack`, `.email`, `.index`, `.pagerduty`, `.webhook`. Default: `["*"]`                                                                                                                                                                                                   | Array<String> |
 | _xpack.actions._**preconfigured**      | A object of action id / preconfigured actions. Default: `{}`                                                                                                                                                                                                                                                                                                                                                                                                                  | Array<Object> |
 
-#### Whitelisting Built-in Action Types
+#### Adding Built-in Action Types to allowedHosts
 
-It is worth noting that the **whitelistedHosts** configuation applies to built-in action types (such as Slack, or PagerDuty) as well.
+It is worth noting that the **allowedHosts** configuation applies to built-in action types (such as Slack, or PagerDuty) as well.
 
-Uniquely, the _PagerDuty Action Type_ has been configured to support the service's Events API (at _https://events.pagerduty.com/v2/enqueue_, which you can read about [here](https://v2.developer.pagerduty.com/docs/events-api-v2)) as a default, but this too, must be included in the whitelist before the PagerDuty action can be used.
+Uniquely, the _PagerDuty Action Type_ has been configured to support the service's Events API (at _https://events.pagerduty.com/v2/enqueue_, which you can read about [here](https://v2.developer.pagerduty.com/docs/events-api-v2)) as a default, but this too, must be included in the allowedHosts before the PagerDuty action can be used.
 
 ### Configuration Utilities
 
@@ -122,11 +122,11 @@ This module provides a Utilities for interacting with the configuration.
 
 | Method                    | Arguments                                                    | Description                                                                                                                                                                                                                                                                                                 | Return Type                                           |
 | ------------------------- | ------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------- |
-| isWhitelistedUri          | _uri_: The URI you wish to validate is whitelisted           | Validates whether the URI is whitelisted. This checks the configuration and validates that the hostname of the URI is in the list of whitelisted Hosts and returns `true` if it is whitelisted. If the configuration says that all URI's are whitelisted (using an "\*") then it will always return `true`. | Boolean                                               |
-| isWhitelistedHostname     | _hostname_: The Hostname you wish to validate is whitelisted | Validates whether the Hostname is whitelisted. This checks the configuration and validates that the hostname is in the list of whitelisted Hosts and returns `true` if it is whitelisted. If the configuration says that all Hostnames are whitelisted (using an "\*") then it will always return `true`.   | Boolean                                               |
+| isUriAllowed          | _uri_: The URI you wish to validate is allowed               | Validates whether the URI is allowed. This checks the configuration and validates that the hostname of the URI is in the list of allowed Hosts and returns `true` if it is allowed. If the configuration says that all URI's are allowed (using an "\*") then it will always return `true`. | Boolean                                               |
+| isHostnameAllowed     | _hostname_: The Hostname you wish to validate is allowed     | Validates whether the Hostname is allowed. This checks the configuration and validates that the hostname is in the list of allowed Hosts and returns `true` if it is allowed. If the configuration says that all Hostnames are allowed (using an "\*") then it will always return `true`.   | Boolean                                               |
 | isActionTypeEnabled       | _actionType_: The actionType to check to see if it's enabled | Returns true if the actionType is enabled, otherwise false.                                                                                                                                                                                                                                                 | Boolean                                               |
-| ensureWhitelistedUri      | _uri_: The URI you wish to validate is whitelisted           | Validates whether the URI is whitelisted. This checks the configuration and validates that the hostname of the URI is in the list of whitelisted Hosts and throws an error if it is not whitelisted. If the configuration says that all URI's are whitelisted (using an "\*") then it will never throw.     | No return value, throws if URI isn't whitelisted      |
-| ensureWhitelistedHostname | _hostname_: The Hostname you wish to validate is whitelisted | Validates whether the Hostname is whitelisted. This checks the configuration and validates that the hostname is in the list of whitelisted Hosts and throws an error if it is not whitelisted. If the configuration says that all Hostnames are whitelisted (using an "\*") then it will never throw        | No return value, throws if Hostname isn't whitelisted |
+| ensureUriAllowed      | _uri_: The URI you wish to validate is allowed               | Validates whether the URI is allowed. This checks the configuration and validates that the hostname of the URI is in the list of allowed Hosts and throws an error if it is not allowed. If the configuration says that all URI's are allowed (using an "\*") then it will never throw.         | No return value, throws if URI isn't allowed      |
+| ensureHostnameAllowed | _hostname_: The Hostname you wish to validate is allowed     | Validates whether the Hostname is allowed. This checks the configuration and validates that the hostname is in the list of allowed Hosts and throws an error if it is not allowed. If the configuration says that all Hostnames are allowed (using an "\*") then it will never throw        | No return value, throws if Hostname isn't allowed .   |
 | ensureActionTypeEnabled   | _actionType_: The actionType to check to see if it's enabled | Throws an error if the actionType is not enabled                                                                                                                                                                                                                                                            | No return value, throws if actionType isn't enabled   |
 
 ## Action types
@@ -666,7 +666,7 @@ Currently actions are licensed as "basic" if the action only interacts with the
 
 Currently actions that are licensed as "basic" **MUST** be implemented in the actions plugin, other actions can be implemented in any other plugin that pre-reqs the actions plugin.  If the new action is generic across the stack, it probably belongs in the actions plugin, but if your action is very specific to a plugin/solution, it might be easiest to implement it in the plugin/solution.  Keep in mind that if Kibana is run without the plugin being enabled, any actions defined in that plugin will not run, nor will those actions be available via APIs or UI.
 
-Actions that take URLs or hostnames should check that those values are whitelisted.  The whitelisting utilities are currently internal to the actions plugin, and so such actions will need to be implemented in the actions plugin.  Longer-term, we will expose these utilities so they can be used by alerts implemented in other plugins; see [issue #64659](https://github.com/elastic/kibana/issues/64659).
+Actions that take URLs or hostnames should check that those values are allowed.  The allowed host list utilities are currently internal to the actions plugin, and so such actions will need to be implemented in the actions plugin.  Longer-term, we will expose these utilities so they can be used by alerts implemented in other plugins; see [issue #64659](https://github.com/elastic/kibana/issues/64659).
 
 ## documentation
 
diff --git a/x-pack/plugins/actions/server/actions_client.test.ts b/x-pack/plugins/actions/server/actions_client.test.ts
index 16a5a59882dd6..573fb0e1be580 100644
--- a/x-pack/plugins/actions/server/actions_client.test.ts
+++ b/x-pack/plugins/actions/server/actions_client.test.ts
@@ -295,7 +295,7 @@ describe('create()', () => {
     const localConfigUtils = getActionsConfigurationUtilities({
       enabled: true,
       enabledActionTypes: ['some-not-ignored-action-type'],
-      whitelistedHosts: ['*'],
+      allowedHosts: ['*'],
     });
 
     const localActionTypeRegistryParams = {
diff --git a/x-pack/plugins/actions/server/actions_config.mock.ts b/x-pack/plugins/actions/server/actions_config.mock.ts
index addd35ae4f5f3..67ab495fc9678 100644
--- a/x-pack/plugins/actions/server/actions_config.mock.ts
+++ b/x-pack/plugins/actions/server/actions_config.mock.ts
@@ -8,11 +8,11 @@ import { ActionsConfigurationUtilities } from './actions_config';
 
 const createActionsConfigMock = () => {
   const mocked: jest.Mocked<ActionsConfigurationUtilities> = {
-    isWhitelistedHostname: jest.fn().mockReturnValue(true),
-    isWhitelistedUri: jest.fn().mockReturnValue(true),
+    isHostnameAllowed: jest.fn().mockReturnValue(true),
+    isUriAllowed: jest.fn().mockReturnValue(true),
     isActionTypeEnabled: jest.fn().mockReturnValue(true),
-    ensureWhitelistedHostname: jest.fn().mockReturnValue({}),
-    ensureWhitelistedUri: jest.fn().mockReturnValue({}),
+    ensureHostnameAllowed: jest.fn().mockReturnValue({}),
+    ensureUriAllowed: jest.fn().mockReturnValue({}),
     ensureActionTypeEnabled: jest.fn().mockReturnValue({}),
   };
   return mocked;
diff --git a/x-pack/plugins/actions/server/actions_config.test.ts b/x-pack/plugins/actions/server/actions_config.test.ts
index 7d9d431d1c1be..56c58054ca799 100644
--- a/x-pack/plugins/actions/server/actions_config.test.ts
+++ b/x-pack/plugins/actions/server/actions_config.test.ts
@@ -7,163 +7,151 @@
 import { ActionsConfigType } from './types';
 import {
   getActionsConfigurationUtilities,
-  WhitelistedHosts,
+  AllowedHosts,
   EnabledActionTypes,
 } from './actions_config';
 
 const DefaultActionsConfig: ActionsConfigType = {
   enabled: false,
-  whitelistedHosts: [],
+  allowedHosts: [],
   enabledActionTypes: [],
 };
 
-describe('ensureWhitelistedUri', () => {
+describe('ensureUriAllowed', () => {
   test('returns true when "any" hostnames are allowed', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [WhitelistedHosts.Any],
+      allowedHosts: [AllowedHosts.Any],
       enabledActionTypes: [],
     };
     expect(
-      getActionsConfigurationUtilities(config).ensureWhitelistedUri(
-        'https://github.com/elastic/kibana'
-      )
+      getActionsConfigurationUtilities(config).ensureUriAllowed('https://github.com/elastic/kibana')
     ).toBeUndefined();
   });
 
-  test('throws when the hostname in the requested uri is not in the whitelist', () => {
+  test('throws when the hostname in the requested uri is not in the allowedHosts', () => {
     const config: ActionsConfigType = DefaultActionsConfig;
     expect(() =>
-      getActionsConfigurationUtilities(config).ensureWhitelistedUri(
-        'https://github.com/elastic/kibana'
-      )
+      getActionsConfigurationUtilities(config).ensureUriAllowed('https://github.com/elastic/kibana')
     ).toThrowErrorMatchingInlineSnapshot(
-      `"target url \\"https://github.com/elastic/kibana\\" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts"`
+      `"target url \\"https://github.com/elastic/kibana\\" is not added to the Kibana config xpack.actions.allowedHosts"`
     );
   });
 
   test('throws when the uri cannot be parsed as a valid URI', () => {
     const config: ActionsConfigType = DefaultActionsConfig;
     expect(() =>
-      getActionsConfigurationUtilities(config).ensureWhitelistedUri('github.com/elastic')
+      getActionsConfigurationUtilities(config).ensureUriAllowed('github.com/elastic')
     ).toThrowErrorMatchingInlineSnapshot(
-      `"target url \\"github.com/elastic\\" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts"`
+      `"target url \\"github.com/elastic\\" is not added to the Kibana config xpack.actions.allowedHosts"`
     );
   });
 
-  test('returns true when the hostname in the requested uri is in the whitelist', () => {
+  test('returns true when the hostname in the requested uri is in the allowedHosts', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: ['github.com'],
+      allowedHosts: ['github.com'],
       enabledActionTypes: [],
     };
     expect(
-      getActionsConfigurationUtilities(config).ensureWhitelistedUri(
-        'https://github.com/elastic/kibana'
-      )
+      getActionsConfigurationUtilities(config).ensureUriAllowed('https://github.com/elastic/kibana')
     ).toBeUndefined();
   });
 });
 
-describe('ensureWhitelistedHostname', () => {
+describe('ensureHostnameAllowed', () => {
   test('returns true when "any" hostnames are allowed', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [WhitelistedHosts.Any],
+      allowedHosts: [AllowedHosts.Any],
       enabledActionTypes: [],
     };
     expect(
-      getActionsConfigurationUtilities(config).ensureWhitelistedHostname('github.com')
+      getActionsConfigurationUtilities(config).ensureHostnameAllowed('github.com')
     ).toBeUndefined();
   });
 
-  test('throws when the hostname in the requested uri is not in the whitelist', () => {
+  test('throws when the hostname in the requested uri is not in the allowedHosts', () => {
     const config: ActionsConfigType = DefaultActionsConfig;
     expect(() =>
-      getActionsConfigurationUtilities(config).ensureWhitelistedHostname('github.com')
+      getActionsConfigurationUtilities(config).ensureHostnameAllowed('github.com')
     ).toThrowErrorMatchingInlineSnapshot(
-      `"target hostname \\"github.com\\" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts"`
+      `"target hostname \\"github.com\\" is not added to the Kibana config xpack.actions.allowedHosts"`
     );
   });
 
-  test('returns true when the hostname in the requested uri is in the whitelist', () => {
+  test('returns true when the hostname in the requested uri is in the allowedHosts', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: ['github.com'],
+      allowedHosts: ['github.com'],
       enabledActionTypes: [],
     };
     expect(
-      getActionsConfigurationUtilities(config).ensureWhitelistedHostname('github.com')
+      getActionsConfigurationUtilities(config).ensureHostnameAllowed('github.com')
     ).toBeUndefined();
   });
 });
 
-describe('isWhitelistedUri', () => {
+describe('isUriAllowed', () => {
   test('returns true when "any" hostnames are allowed', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [WhitelistedHosts.Any],
+      allowedHosts: [AllowedHosts.Any],
       enabledActionTypes: [],
     };
     expect(
-      getActionsConfigurationUtilities(config).isWhitelistedUri('https://github.com/elastic/kibana')
+      getActionsConfigurationUtilities(config).isUriAllowed('https://github.com/elastic/kibana')
     ).toEqual(true);
   });
 
-  test('throws when the hostname in the requested uri is not in the whitelist', () => {
+  test('throws when the hostname in the requested uri is not in the allowedHosts', () => {
     const config: ActionsConfigType = DefaultActionsConfig;
     expect(
-      getActionsConfigurationUtilities(config).isWhitelistedUri('https://github.com/elastic/kibana')
+      getActionsConfigurationUtilities(config).isUriAllowed('https://github.com/elastic/kibana')
     ).toEqual(false);
   });
 
   test('throws when the uri cannot be parsed as a valid URI', () => {
     const config: ActionsConfigType = DefaultActionsConfig;
-    expect(getActionsConfigurationUtilities(config).isWhitelistedUri('github.com/elastic')).toEqual(
+    expect(getActionsConfigurationUtilities(config).isUriAllowed('github.com/elastic')).toEqual(
       false
     );
   });
 
-  test('returns true when the hostname in the requested uri is in the whitelist', () => {
+  test('returns true when the hostname in the requested uri is in the allowedHosts', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: ['github.com'],
+      allowedHosts: ['github.com'],
       enabledActionTypes: [],
     };
     expect(
-      getActionsConfigurationUtilities(config).isWhitelistedUri('https://github.com/elastic/kibana')
+      getActionsConfigurationUtilities(config).isUriAllowed('https://github.com/elastic/kibana')
     ).toEqual(true);
   });
 });
 
-describe('isWhitelistedHostname', () => {
+describe('isHostnameAllowed', () => {
   test('returns true when "any" hostnames are allowed', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [WhitelistedHosts.Any],
+      allowedHosts: [AllowedHosts.Any],
       enabledActionTypes: [],
     };
-    expect(getActionsConfigurationUtilities(config).isWhitelistedHostname('github.com')).toEqual(
-      true
-    );
+    expect(getActionsConfigurationUtilities(config).isHostnameAllowed('github.com')).toEqual(true);
   });
 
-  test('throws when the hostname in the requested uri is not in the whitelist', () => {
+  test('throws when the hostname in the requested uri is not in the allowedHosts', () => {
     const config: ActionsConfigType = DefaultActionsConfig;
-    expect(getActionsConfigurationUtilities(config).isWhitelistedHostname('github.com')).toEqual(
-      false
-    );
+    expect(getActionsConfigurationUtilities(config).isHostnameAllowed('github.com')).toEqual(false);
   });
 
-  test('returns true when the hostname in the requested uri is in the whitelist', () => {
+  test('returns true when the hostname in the requested uri is in the allowedHosts', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: ['github.com'],
+      allowedHosts: ['github.com'],
       enabledActionTypes: [],
     };
-    expect(getActionsConfigurationUtilities(config).isWhitelistedHostname('github.com')).toEqual(
-      true
-    );
+    expect(getActionsConfigurationUtilities(config).isHostnameAllowed('github.com')).toEqual(true);
   });
 });
 
@@ -171,7 +159,7 @@ describe('isActionTypeEnabled', () => {
   test('returns true when "any" actionTypes are allowed', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [],
+      allowedHosts: [],
       enabledActionTypes: ['ignore', EnabledActionTypes.Any],
     };
     expect(getActionsConfigurationUtilities(config).isActionTypeEnabled('foo')).toEqual(true);
@@ -180,7 +168,7 @@ describe('isActionTypeEnabled', () => {
   test('returns false when no actionType is allowed', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [],
+      allowedHosts: [],
       enabledActionTypes: [],
     };
     expect(getActionsConfigurationUtilities(config).isActionTypeEnabled('foo')).toEqual(false);
@@ -189,7 +177,7 @@ describe('isActionTypeEnabled', () => {
   test('returns false when the actionType is not in the enabled list', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [],
+      allowedHosts: [],
       enabledActionTypes: ['foo'],
     };
     expect(getActionsConfigurationUtilities(config).isActionTypeEnabled('bar')).toEqual(false);
@@ -198,7 +186,7 @@ describe('isActionTypeEnabled', () => {
   test('returns true when the actionType is in the enabled list', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [],
+      allowedHosts: [],
       enabledActionTypes: ['ignore', 'foo'],
     };
     expect(getActionsConfigurationUtilities(config).isActionTypeEnabled('foo')).toEqual(true);
@@ -209,7 +197,7 @@ describe('ensureActionTypeEnabled', () => {
   test('does not throw when any actionType is allowed', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [],
+      allowedHosts: [],
       enabledActionTypes: ['ignore', EnabledActionTypes.Any],
     };
     expect(getActionsConfigurationUtilities(config).ensureActionTypeEnabled('foo')).toBeUndefined();
@@ -227,7 +215,7 @@ describe('ensureActionTypeEnabled', () => {
   test('throws when actionType is not enabled', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [],
+      allowedHosts: [],
       enabledActionTypes: ['ignore'],
     };
     expect(() =>
@@ -240,7 +228,7 @@ describe('ensureActionTypeEnabled', () => {
   test('does not throw when actionType is enabled', () => {
     const config: ActionsConfigType = {
       enabled: false,
-      whitelistedHosts: [],
+      allowedHosts: [],
       enabledActionTypes: ['ignore', 'foo'],
     };
     expect(getActionsConfigurationUtilities(config).ensureActionTypeEnabled('foo')).toBeUndefined();
diff --git a/x-pack/plugins/actions/server/actions_config.ts b/x-pack/plugins/actions/server/actions_config.ts
index b15fe5b4007c5..609e4969222f9 100644
--- a/x-pack/plugins/actions/server/actions_config.ts
+++ b/x-pack/plugins/actions/server/actions_config.ts
@@ -13,7 +13,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { ActionsConfigType } from './types';
 import { ActionTypeDisabledError } from './lib';
 
-export enum WhitelistedHosts {
+export enum AllowedHosts {
   Any = '*',
 }
 
@@ -21,24 +21,24 @@ export enum EnabledActionTypes {
   Any = '*',
 }
 
-enum WhitelistingField {
+enum AllowListingField {
   url = 'url',
   hostname = 'hostname',
 }
 
 export interface ActionsConfigurationUtilities {
-  isWhitelistedHostname: (hostname: string) => boolean;
-  isWhitelistedUri: (uri: string) => boolean;
+  isHostnameAllowed: (hostname: string) => boolean;
+  isUriAllowed: (uri: string) => boolean;
   isActionTypeEnabled: (actionType: string) => boolean;
-  ensureWhitelistedHostname: (hostname: string) => void;
-  ensureWhitelistedUri: (uri: string) => void;
+  ensureHostnameAllowed: (hostname: string) => void;
+  ensureUriAllowed: (uri: string) => void;
   ensureActionTypeEnabled: (actionType: string) => void;
 }
 
-function whitelistingErrorMessage(field: WhitelistingField, value: string) {
-  return i18n.translate('xpack.actions.urlWhitelistConfigurationError', {
+function allowListErrorMessage(field: AllowListingField, value: string) {
+  return i18n.translate('xpack.actions.urlAllowedHostsConfigurationError', {
     defaultMessage:
-      'target {field} "{value}" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+      'target {field} "{value}" is not added to the Kibana config xpack.actions.allowedHosts',
     values: {
       value,
       field,
@@ -56,18 +56,18 @@ function disabledActionTypeErrorMessage(actionType: string) {
   });
 }
 
-function isWhitelisted({ whitelistedHosts }: ActionsConfigType, hostname: string): boolean {
-  const whitelisted = new Set(whitelistedHosts);
-  if (whitelisted.has(WhitelistedHosts.Any)) return true;
-  if (whitelisted.has(hostname)) return true;
+function isAllowed({ allowedHosts }: ActionsConfigType, hostname: string): boolean {
+  const allowed = new Set(allowedHosts);
+  if (allowed.has(AllowedHosts.Any)) return true;
+  if (allowed.has(hostname)) return true;
   return false;
 }
 
-function isWhitelistedHostnameInUri(config: ActionsConfigType, uri: string): boolean {
+function isHostnameAllowedInUri(config: ActionsConfigType, uri: string): boolean {
   return pipe(
     tryCatch(() => new URL(uri)),
     map((url) => url.hostname),
-    mapNullable((hostname) => isWhitelisted(config, hostname)),
+    mapNullable((hostname) => isAllowed(config, hostname)),
     getOrElse<boolean>(() => false)
   );
 }
@@ -85,21 +85,21 @@ function isActionTypeEnabledInConfig(
 export function getActionsConfigurationUtilities(
   config: ActionsConfigType
 ): ActionsConfigurationUtilities {
-  const isWhitelistedHostname = curry(isWhitelisted)(config);
-  const isWhitelistedUri = curry(isWhitelistedHostnameInUri)(config);
+  const isHostnameAllowed = curry(isAllowed)(config);
+  const isUriAllowed = curry(isHostnameAllowedInUri)(config);
   const isActionTypeEnabled = curry(isActionTypeEnabledInConfig)(config);
   return {
-    isWhitelistedHostname,
-    isWhitelistedUri,
+    isHostnameAllowed,
+    isUriAllowed,
     isActionTypeEnabled,
-    ensureWhitelistedUri(uri: string) {
-      if (!isWhitelistedUri(uri)) {
-        throw new Error(whitelistingErrorMessage(WhitelistingField.url, uri));
+    ensureUriAllowed(uri: string) {
+      if (!isUriAllowed(uri)) {
+        throw new Error(allowListErrorMessage(AllowListingField.url, uri));
       }
     },
-    ensureWhitelistedHostname(hostname: string) {
-      if (!isWhitelistedHostname(hostname)) {
-        throw new Error(whitelistingErrorMessage(WhitelistingField.hostname, hostname));
+    ensureHostnameAllowed(hostname: string) {
+      if (!isHostnameAllowed(hostname)) {
+        throw new Error(allowListErrorMessage(AllowListingField.hostname, hostname));
       }
     },
     ensureActionTypeEnabled(actionType: string) {
diff --git a/x-pack/plugins/actions/server/builtin_action_types/case/validators.ts b/x-pack/plugins/actions/server/builtin_action_types/case/validators.ts
index 80e301e5be082..08e8a8be6a3e6 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/case/validators.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/case/validators.ts
@@ -23,9 +23,9 @@ export const validateCommonConfig = (
       return i18n.MAPPING_EMPTY;
     }
 
-    configurationUtilities.ensureWhitelistedUri(configObject.apiUrl);
-  } catch (whitelistError) {
-    return i18n.WHITE_LISTED_ERROR(whitelistError.message);
+    configurationUtilities.ensureUriAllowed(configObject.apiUrl);
+  } catch (allowListError) {
+    return i18n.WHITE_LISTED_ERROR(allowListError.message);
   }
 };
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
index 62f369816d714..7147483998d98 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.test.ts
@@ -121,56 +121,56 @@ describe('config validation', () => {
   const NODEMAILER_AOL_SERVICE = 'AOL';
   const NODEMAILER_AOL_SERVICE_HOST = 'smtp.aol.com';
 
-  test('config validation handles email host whitelisting', () => {
+  test('config validation handles email host in allowedHosts', () => {
     actionType = getActionType({
       logger: mockedLogger,
       configurationUtilities: {
         ...actionsConfigMock.create(),
-        isWhitelistedHostname: (hostname) => hostname === NODEMAILER_AOL_SERVICE_HOST,
+        isHostnameAllowed: (hostname) => hostname === NODEMAILER_AOL_SERVICE_HOST,
       },
     });
     const baseConfig = {
       from: 'bob@example.com',
     };
-    const whitelistedConfig1 = {
+    const allowedHosts1 = {
       ...baseConfig,
       service: NODEMAILER_AOL_SERVICE,
     };
-    const whitelistedConfig2 = {
+    const allowedHosts2 = {
       ...baseConfig,
       host: NODEMAILER_AOL_SERVICE_HOST,
       port: 42,
     };
-    const notWhitelistedConfig1 = {
+    const notAllowedHosts1 = {
       ...baseConfig,
       service: 'gmail',
     };
 
-    const notWhitelistedConfig2 = {
+    const notAllowedHosts2 = {
       ...baseConfig,
       host: 'smtp.gmail.com',
       port: 42,
     };
 
-    const validatedConfig1 = validateConfig(actionType, whitelistedConfig1);
-    expect(validatedConfig1.service).toEqual(whitelistedConfig1.service);
-    expect(validatedConfig1.from).toEqual(whitelistedConfig1.from);
+    const validatedConfig1 = validateConfig(actionType, allowedHosts1);
+    expect(validatedConfig1.service).toEqual(allowedHosts1.service);
+    expect(validatedConfig1.from).toEqual(allowedHosts1.from);
 
-    const validatedConfig2 = validateConfig(actionType, whitelistedConfig2);
-    expect(validatedConfig2.host).toEqual(whitelistedConfig2.host);
-    expect(validatedConfig2.port).toEqual(whitelistedConfig2.port);
-    expect(validatedConfig2.from).toEqual(whitelistedConfig2.from);
+    const validatedConfig2 = validateConfig(actionType, allowedHosts2);
+    expect(validatedConfig2.host).toEqual(allowedHosts2.host);
+    expect(validatedConfig2.port).toEqual(allowedHosts2.port);
+    expect(validatedConfig2.from).toEqual(allowedHosts2.from);
 
     expect(() => {
-      validateConfig(actionType, notWhitelistedConfig1);
+      validateConfig(actionType, notAllowedHosts1);
     }).toThrowErrorMatchingInlineSnapshot(
-      `"error validating action type config: [service] value 'gmail' resolves to host 'smtp.gmail.com' which is not in the whitelistedHosts configuration"`
+      `"error validating action type config: [service] value 'gmail' resolves to host 'smtp.gmail.com' which is not in the allowedHosts configuration"`
     );
 
     expect(() => {
-      validateConfig(actionType, notWhitelistedConfig2);
+      validateConfig(actionType, notAllowedHosts2);
     }).toThrowErrorMatchingInlineSnapshot(
-      `"error validating action type config: [host] value 'smtp.gmail.com' is not in the whitelistedHosts configuration"`
+      `"error validating action type config: [host] value 'smtp.gmail.com' is not in the allowedHosts configuration"`
     );
   });
 });
diff --git a/x-pack/plugins/actions/server/builtin_action_types/email.ts b/x-pack/plugins/actions/server/builtin_action_types/email.ts
index e9dc4eea5dcfc..6fd2d694b06f7 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/email.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/email.ts
@@ -66,16 +66,16 @@ function validateConfig(
       return '[port] is required if [service] is not provided';
     }
 
-    if (!configurationUtilities.isWhitelistedHostname(config.host)) {
-      return `[host] value '${config.host}' is not in the whitelistedHosts configuration`;
+    if (!configurationUtilities.isHostnameAllowed(config.host)) {
+      return `[host] value '${config.host}' is not in the allowedHosts configuration`;
     }
   } else {
     const host = getServiceNameHost(config.service);
     if (host == null) {
       return `[service] value '${config.service}' is not valid`;
     }
-    if (!configurationUtilities.isWhitelistedHostname(host)) {
-      return `[service] value '${config.service}' resolves to host '${host}' which is not in the whitelistedHosts configuration`;
+    if (!configurationUtilities.isHostnameAllowed(host)) {
+      return `[service] value '${config.service}' resolves to host '${host}' which is not in the allowedHosts configuration`;
     }
   }
 }
diff --git a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
index c379c05ee88e3..772e7df416979 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.test.ts
@@ -64,12 +64,12 @@ describe('validateConfig()', () => {
     );
   });
 
-  test('should validate and pass when the pagerduty url is whitelisted', () => {
+  test('should validate and pass when the pagerduty url is added to allowedHosts', () => {
     actionType = getActionType({
       logger: mockedLogger,
       configurationUtilities: {
         ...actionsConfigMock.create(),
-        ensureWhitelistedUri: (url) => {
+        ensureUriAllowed: (url) => {
           expect(url).toEqual('https://events.pagerduty.com/v2/enqueue');
         },
       },
@@ -80,13 +80,13 @@ describe('validateConfig()', () => {
     ).toEqual({ apiUrl: 'https://events.pagerduty.com/v2/enqueue' });
   });
 
-  test('config validation returns an error if the specified URL isnt whitelisted', () => {
+  test('config validation returns an error if the specified URL isnt added to allowedHosts', () => {
     actionType = getActionType({
       logger: mockedLogger,
       configurationUtilities: {
         ...actionsConfigMock.create(),
-        ensureWhitelistedUri: (_) => {
-          throw new Error(`target url is not whitelisted`);
+        ensureUriAllowed: (_) => {
+          throw new Error(`target url is not added to allowedHosts`);
         },
       },
     });
@@ -94,7 +94,7 @@ describe('validateConfig()', () => {
     expect(() => {
       validateConfig(actionType, { apiUrl: 'https://events.pagerduty.com/v2/enqueue' });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"error validating action type config: error configuring pagerduty action: target url is not whitelisted"`
+      `"error validating action type config: error configuring pagerduty action: target url is not added to allowedHosts"`
     );
   });
 });
diff --git a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
index c0edfc530e738..640a38d77b6c2 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
@@ -135,12 +135,12 @@ function valdiateActionTypeConfig(
   configObject: ActionTypeConfigType
 ) {
   try {
-    configurationUtilities.ensureWhitelistedUri(getPagerDutyApiUrl(configObject));
-  } catch (whitelistError) {
+    configurationUtilities.ensureUriAllowed(getPagerDutyApiUrl(configObject));
+  } catch (allowListError) {
     return i18n.translate('xpack.actions.builtin.pagerduty.pagerdutyConfigurationError', {
       defaultMessage: 'error configuring pagerduty action: {message}',
       values: {
-        message: whitelistError.message,
+        message: allowListError.message,
       },
     });
   }
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/validators.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/validators.ts
index 65bbe9aea8119..6eec3b8d63b86 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/validators.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/validators.ts
@@ -26,9 +26,9 @@ export const validateCommonConfig = (
   }
 
   try {
-    configurationUtilities.ensureWhitelistedUri(configObject.apiUrl);
-  } catch (whitelistError) {
-    return i18n.WHITE_LISTED_ERROR(whitelistError.message);
+    configurationUtilities.ensureUriAllowed(configObject.apiUrl);
+  } catch (allowListError) {
+    return i18n.WHITE_LISTED_ERROR(allowListError.message);
   }
 };
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
index 812657138152c..81fa5553b331e 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
@@ -96,12 +96,12 @@ describe('validateActionTypeSecrets()', () => {
     );
   });
 
-  test('should validate and pass when the slack webhookUrl is whitelisted', () => {
+  test('should validate and pass when the slack webhookUrl is added to allowedHosts', () => {
     actionType = getActionType({
       logger: mockedLogger,
       configurationUtilities: {
         ...actionsConfigMock.create(),
-        ensureWhitelistedUri: (url) => {
+        ensureUriAllowed: (url) => {
           expect(url).toEqual('https://api.slack.com/');
         },
       },
@@ -112,13 +112,13 @@ describe('validateActionTypeSecrets()', () => {
     });
   });
 
-  test('config validation returns an error if the specified URL isnt whitelisted', () => {
+  test('config validation returns an error if the specified URL isnt added to allowedHosts', () => {
     actionType = getActionType({
       logger: mockedLogger,
       configurationUtilities: {
         ...actionsConfigMock.create(),
-        ensureWhitelistedHostname: () => {
-          throw new Error(`target hostname is not whitelisted`);
+        ensureHostnameAllowed: () => {
+          throw new Error(`target hostname is not added to allowedHosts`);
         },
       },
     });
@@ -126,7 +126,7 @@ describe('validateActionTypeSecrets()', () => {
     expect(() => {
       validateSecrets(actionType, { webhookUrl: 'https://api.slack.com/' });
     }).toThrowErrorMatchingInlineSnapshot(
-      `"error validating action type secrets: error configuring slack action: target hostname is not whitelisted"`
+      `"error validating action type secrets: error configuring slack action: target hostname is not added to allowedHosts"`
     );
   });
 });
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
index 293328c809435..639b4448b5a89 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
@@ -91,12 +91,12 @@ function valdiateActionTypeConfig(
   }
 
   try {
-    configurationUtilities.ensureWhitelistedHostname(url.hostname);
-  } catch (whitelistError) {
+    configurationUtilities.ensureHostnameAllowed(url.hostname);
+  } catch (allowListError) {
     return i18n.translate('xpack.actions.builtin.slack.slackConfigurationError', {
       defaultMessage: 'error configuring slack action: {message}',
       values: {
-        message: whitelistError.message,
+        message: allowListError.message,
       },
     });
   }
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
index ea9f30452918c..23ce527d4ae0d 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/webhook.test.ts
@@ -176,7 +176,7 @@ describe('config validation', () => {
 `);
   });
 
-  test('config validation passes when kibana config whitelists the url', () => {
+  test('config validation passes when kibana config url does not present in allowedHosts', () => {
     // any for testing
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const config: Record<string, any> = {
@@ -192,13 +192,13 @@ describe('config validation', () => {
     });
   });
 
-  test('config validation returns an error if the specified URL isnt whitelisted', () => {
+  test('config validation returns an error if the specified URL isnt added to allowedHosts', () => {
     actionType = getActionType({
       logger: mockedLogger,
       configurationUtilities: {
         ...actionsConfigMock.create(),
-        ensureWhitelistedUri: (_) => {
-          throw new Error(`target url is not whitelisted`);
+        ensureUriAllowed: (_) => {
+          throw new Error(`target url is not present in allowedHosts`);
         },
       },
     });
@@ -215,7 +215,7 @@ describe('config validation', () => {
     expect(() => {
       validateConfig(actionType, config);
     }).toThrowErrorMatchingInlineSnapshot(
-      `"error validating action type config: error configuring webhook action: target url is not whitelisted"`
+      `"error validating action type config: error configuring webhook action: target url is not present in allowedHosts"`
     );
   });
 });
diff --git a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
index d9a005565498d..d0ec31721685e 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/webhook.ts
@@ -111,12 +111,12 @@ function validateActionTypeConfig(
   }
 
   try {
-    configurationUtilities.ensureWhitelistedUri(url.toString());
-  } catch (whitelistError) {
+    configurationUtilities.ensureUriAllowed(url.toString());
+  } catch (allowListError) {
     return i18n.translate('xpack.actions.builtin.webhook.webhookConfigurationError', {
       defaultMessage: 'error configuring webhook action: {message}',
       values: {
-        message: whitelistError.message,
+        message: allowListError.message,
       },
     });
   }
diff --git a/x-pack/plugins/actions/server/config.test.ts b/x-pack/plugins/actions/server/config.test.ts
index 795fbbf84145b..ac815a425a2b7 100644
--- a/x-pack/plugins/actions/server/config.test.ts
+++ b/x-pack/plugins/actions/server/config.test.ts
@@ -10,15 +10,15 @@ describe('config validation', () => {
     const config: Record<string, unknown> = {};
     expect(configSchema.validate(config)).toMatchInlineSnapshot(`
       Object {
+        "allowedHosts": Array [
+          "*",
+        ],
         "enabled": true,
         "enabledActionTypes": Array [
           "*",
         ],
         "preconfigured": Object {},
         "rejectUnauthorizedCertificates": true,
-        "whitelistedHosts": Array [
-          "*",
-        ],
       }
     `);
   });
@@ -38,6 +38,9 @@ describe('config validation', () => {
     };
     expect(configSchema.validate(config)).toMatchInlineSnapshot(`
       Object {
+        "allowedHosts": Array [
+          "*",
+        ],
         "enabled": true,
         "enabledActionTypes": Array [
           "*",
@@ -53,9 +56,6 @@ describe('config validation', () => {
           },
         },
         "rejectUnauthorizedCertificates": false,
-        "whitelistedHosts": Array [
-          "*",
-        ],
       }
     `);
   });
diff --git a/x-pack/plugins/actions/server/config.ts b/x-pack/plugins/actions/server/config.ts
index ba80915ebe243..087a08f572c65 100644
--- a/x-pack/plugins/actions/server/config.ts
+++ b/x-pack/plugins/actions/server/config.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { WhitelistedHosts, EnabledActionTypes } from './actions_config';
+import { AllowedHosts, EnabledActionTypes } from './actions_config';
 
 const preconfiguredActionSchema = schema.object({
   name: schema.string({ minLength: 1 }),
@@ -16,16 +16,16 @@ const preconfiguredActionSchema = schema.object({
 
 export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
-  whitelistedHosts: schema.arrayOf(
-    schema.oneOf([schema.string({ hostname: true }), schema.literal(WhitelistedHosts.Any)]),
+  allowedHosts: schema.arrayOf(
+    schema.oneOf([schema.string({ hostname: true }), schema.literal(AllowedHosts.Any)]),
     {
-      defaultValue: [WhitelistedHosts.Any],
+      defaultValue: [AllowedHosts.Any],
     }
   ),
   enabledActionTypes: schema.arrayOf(
     schema.oneOf([schema.string(), schema.literal(EnabledActionTypes.Any)]),
     {
-      defaultValue: [WhitelistedHosts.Any],
+      defaultValue: [AllowedHosts.Any],
     }
   ),
   preconfigured: schema.recordOf(schema.string(), preconfiguredActionSchema, {
diff --git a/x-pack/plugins/actions/server/plugin.test.ts b/x-pack/plugins/actions/server/plugin.test.ts
index 341a17889923f..4fdf9f2523568 100644
--- a/x-pack/plugins/actions/server/plugin.test.ts
+++ b/x-pack/plugins/actions/server/plugin.test.ts
@@ -32,7 +32,7 @@ describe('Actions Plugin', () => {
       context = coreMock.createPluginInitializerContext<ActionsConfig>({
         enabled: true,
         enabledActionTypes: ['*'],
-        whitelistedHosts: ['*'],
+        allowedHosts: ['*'],
         preconfigured: {},
         rejectUnauthorizedCertificates: true,
       });
@@ -186,7 +186,7 @@ describe('Actions Plugin', () => {
       const context = coreMock.createPluginInitializerContext<ActionsConfig>({
         enabled: true,
         enabledActionTypes: ['*'],
-        whitelistedHosts: ['*'],
+        allowedHosts: ['*'],
         preconfigured: {
           preconfiguredServerLog: {
             actionTypeId: '.server-log',
diff --git a/x-pack/plugins/actions/server/types.ts b/x-pack/plugins/actions/server/types.ts
index bf7bd709a4a88..0a7d6bf01b7ec 100644
--- a/x-pack/plugins/actions/server/types.ts
+++ b/x-pack/plugins/actions/server/types.ts
@@ -47,7 +47,7 @@ export interface ActionsPlugin {
 
 export interface ActionsConfigType {
   enabled: boolean;
-  whitelistedHosts: string[];
+  allowedHosts: string[];
   enabledActionTypes: string[];
 }
 
@@ -100,8 +100,8 @@ interface ValidatorType<Type> {
 }
 
 export interface ActionValidationService {
-  isWhitelistedHostname(hostname: string): boolean;
-  isWhitelistedUri(uri: string): boolean;
+  isHostnameAllowed(hostname: string): boolean;
+  isUriAllowed(uri: string): boolean;
 }
 
 export interface ActionType<
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index b51ccbb64767a..411aa3424c855 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -4599,7 +4599,7 @@
     "xpack.actions.serverSideErrors.predefinedActionUpdateDisabled": "あらかじめ構成されたアクション{id}は更新できません。",
     "xpack.actions.serverSideErrors.unavailableLicenseErrorMessage": "現時点でライセンス情報を入手できないため、アクションタイプ {actionTypeId} は無効です。",
     "xpack.actions.serverSideErrors.unavailableLicenseInformationErrorMessage": "グラフを利用できません。現在ライセンス情報が利用できません。",
-    "xpack.actions.urlWhitelistConfigurationError": "target {field} \"{value}\" は Kibana 構成 xpack.actions.whitelistedHosts にはホワイトリスト化されていません。",
+    "xpack.actions.urlAllowedHostsConfigurationError": "target {field} \"{value}\" は Kibana 構成 xpack.actions.allowedHosts にはホワイトリスト化されていません。",
     "xpack.alertingBuiltins.indexThreshold.actionGroupThresholdMetTitle": "しきい値一致",
     "xpack.alertingBuiltins.indexThreshold.actionVariableContextDateLabel": "アラートがしきい値を超えた日付。",
     "xpack.alertingBuiltins.indexThreshold.actionVariableContextGroupLabel": "しきい値を超えたグループ。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index a2b612cd6dad1..c46135633a3c8 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -4600,7 +4600,7 @@
     "xpack.actions.serverSideErrors.predefinedActionUpdateDisabled": "不允许更新预配置的操作 {id}。",
     "xpack.actions.serverSideErrors.unavailableLicenseErrorMessage": "操作类型 {actionTypeId} 已禁用，因为许可证信息当前不可用。",
     "xpack.actions.serverSideErrors.unavailableLicenseInformationErrorMessage": "操作不可用 - 许可信息当前不可用。",
-    "xpack.actions.urlWhitelistConfigurationError": "目标 {field}“{value}”在 Kibana 配置 xpack.actions.whitelistedHosts 中未列入白名单",
+    "xpack.actions.urlAllowedHostsConfigurationError": "目标 {field}“{value}”在 Kibana 配置 xpack.actions.allowedHosts 中未列入白名单",
     "xpack.alertingBuiltins.indexThreshold.actionGroupThresholdMetTitle": "阈值已达到",
     "xpack.alertingBuiltins.indexThreshold.actionVariableContextDateLabel": "告警超过阈值的日期。",
     "xpack.alertingBuiltins.indexThreshold.actionVariableContextGroupLabel": "超过阈值的组。",
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 34e23a2dba0b2..117a59a304368 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -85,10 +85,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         ...xPackApiIntegrationTestsConfig.get('kbnTestServer'),
         serverArgs: [
           ...xPackApiIntegrationTestsConfig.get('kbnTestServer.serverArgs'),
-          `--xpack.actions.whitelistedHosts=${JSON.stringify([
-            'localhost',
-            'some.non.existent.com',
-          ])}`,
+          `--xpack.actions.allowedHosts=${JSON.stringify(['localhost', 'some.non.existent.com'])}`,
           '--xpack.encryptedSavedObjects.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"',
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           ...actionsProxyUrl,
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts
index 1c3d3e3d713e2..329bd3433d388 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/email.ts
@@ -153,7 +153,7 @@ export default function emailTest({ getService }: FtrProviderContext) {
         });
     });
 
-    it('should respond with a 400 Bad Request when creating an email action with non-whitelisted server', async () => {
+    it('should respond with a 400 Bad Request when creating an email action with a server not added to allowedHosts', async () => {
       await supertest
         .post('/api/actions/action')
         .set('kbn-xsrf', 'foo')
@@ -161,7 +161,7 @@ export default function emailTest({ getService }: FtrProviderContext) {
           name: 'An email action',
           actionTypeId: '.email',
           config: {
-            service: 'gmail', // not whitelisted in the config for this test
+            service: 'gmail', // not added to allowedHosts in the config for this test
             from: 'bob@example.com',
           },
           secrets: {
@@ -175,7 +175,7 @@ export default function emailTest({ getService }: FtrProviderContext) {
             statusCode: 400,
             error: 'Bad Request',
             message:
-              "error validating action type config: [service] value 'gmail' resolves to host 'smtp.gmail.com' which is not in the whitelistedHosts configuration",
+              "error validating action type config: [service] value 'gmail' resolves to host 'smtp.gmail.com' which is not in the allowedHosts configuration",
           });
         });
 
@@ -186,7 +186,7 @@ export default function emailTest({ getService }: FtrProviderContext) {
           name: 'An email action',
           actionTypeId: '.email',
           config: {
-            host: 'stmp.gmail.com', // not whitelisted in the config for this test
+            host: 'stmp.gmail.com', // not added to allowedHosts in the config for this test
             port: 666,
             from: 'bob@example.com',
           },
@@ -201,12 +201,12 @@ export default function emailTest({ getService }: FtrProviderContext) {
             statusCode: 400,
             error: 'Bad Request',
             message:
-              "error validating action type config: [host] value 'stmp.gmail.com' is not in the whitelistedHosts configuration",
+              "error validating action type config: [host] value 'stmp.gmail.com' is not in the allowedHosts configuration",
           });
         });
     });
 
-    it('should handle creating an email action with a whitelisted server', async () => {
+    it('should handle creating an email action with a server added to allowedHosts', async () => {
       const { body: createdAction } = await supertest
         .post('/api/actions/action')
         .set('kbn-xsrf', 'foo')
@@ -214,7 +214,7 @@ export default function emailTest({ getService }: FtrProviderContext) {
           name: 'An email action',
           actionTypeId: '.email',
           config: {
-            host: 'some.non.existent.com', // whitelisted in the config for this test
+            host: 'some.non.existent.com', // added to allowedHosts in the config for this test
             port: 666,
             from: 'bob@example.com',
           },
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts
index 78831fe8ff061..932d2658d2893 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts
@@ -176,7 +176,7 @@ export default function jiraTest({ getService }: FtrProviderContext) {
           });
       });
 
-      it('should respond with a 400 Bad Request when creating a jira action with a non whitelisted apiUrl', async () => {
+      it('should respond with a 400 Bad Request when creating a jira action with a not present in allowedHosts apiUrl', async () => {
         await supertest
           .post('/api/actions/action')
           .set('kbn-xsrf', 'foo')
@@ -196,7 +196,7 @@ export default function jiraTest({ getService }: FtrProviderContext) {
               statusCode: 400,
               error: 'Bad Request',
               message:
-                'error validating action type config: error configuring connector action: target url "http://jira.mynonexistent.com" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+                'error validating action type config: error configuring connector action: target url "http://jira.mynonexistent.com" is not added to the Kibana config xpack.actions.allowedHosts',
             });
           });
       });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
index e81219152c248..33df85b469b58 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
@@ -106,7 +106,7 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
         });
     });
 
-    it('should return unsuccessfully when default pagerduty url is not whitelisted', async () => {
+    it('should return unsuccessfully when default pagerduty url is not present in allowedHosts', async () => {
       await supertest
         .post('/api/actions/action')
         .set('kbn-xsrf', 'foo')
@@ -121,7 +121,7 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'error validating action type config: error configuring pagerduty action: target url "https://events.pagerduty.com/v2/enqueue" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+              'error validating action type config: error configuring pagerduty action: target url "https://events.pagerduty.com/v2/enqueue" is not added to the Kibana config xpack.actions.allowedHosts',
           });
         });
     });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
index 5085c87550d01..6a674d769dc16 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
@@ -175,7 +175,7 @@ export default function resilientTest({ getService }: FtrProviderContext) {
           });
       });
 
-      it('should respond with a 400 Bad Request when creating a ibm resilient action with a non whitelisted apiUrl', async () => {
+      it('should respond with a 400 Bad Request when creating a ibm resilient action with a not present in allowedHosts apiUrl', async () => {
         await supertest
           .post('/api/actions/action')
           .set('kbn-xsrf', 'foo')
@@ -195,7 +195,7 @@ export default function resilientTest({ getService }: FtrProviderContext) {
               statusCode: 400,
               error: 'Bad Request',
               message:
-                'error validating action type config: error configuring connector action: target url "http://resilient.mynonexistent.com" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+                'error validating action type config: error configuring connector action: target url "http://resilient.mynonexistent.com" is not added to the Kibana config xpack.actions.allowedHosts',
             });
           });
       });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
index 3c8fc78b7f872..07826acf34a78 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
@@ -157,7 +157,7 @@ export default function servicenowTest({ getService }: FtrProviderContext) {
           });
       });
 
-      it('should respond with a 400 Bad Request when creating a servicenow action with a non whitelisted apiUrl', async () => {
+      it('should respond with a 400 Bad Request when creating a servicenow action with a not present in allowedHosts apiUrl', async () => {
         await supertest
           .post('/api/actions/action')
           .set('kbn-xsrf', 'foo')
@@ -177,7 +177,7 @@ export default function servicenowTest({ getService }: FtrProviderContext) {
               statusCode: 400,
               error: 'Bad Request',
               message:
-                'error validating action type config: error configuring connector action: target url "http://servicenow.mynonexistent.com" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+                'error validating action type config: error configuring connector action: target url "http://servicenow.mynonexistent.com" is not added to the Kibana config xpack.actions.allowedHosts',
             });
           });
       });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
index 45f9ba369dc23..f7ac281f40343 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
@@ -94,7 +94,7 @@ export default function slackTest({ getService }: FtrProviderContext) {
         });
     });
 
-    it('should respond with a 400 Bad Request when creating a slack action with a non whitelisted webhookUrl', async () => {
+    it('should respond with a 400 Bad Request when creating a slack action with not present in allowedHosts webhookUrl', async () => {
       await supertest
         .post('/api/actions/action')
         .set('kbn-xsrf', 'foo')
@@ -111,7 +111,7 @@ export default function slackTest({ getService }: FtrProviderContext) {
             statusCode: 400,
             error: 'Bad Request',
             message:
-              'error validating action type secrets: error configuring slack action: target hostname "slack.mynonexistent.com" is not whitelisted in the Kibana config xpack.actions.whitelistedHosts',
+              'error validating action type secrets: error configuring slack action: target hostname "slack.mynonexistent.com" is not added to the Kibana config xpack.actions.allowedHosts',
           });
         });
     });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
index 896026611043f..5dff07de8077c 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
@@ -191,7 +191,7 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       expect(result.status).to.eql('ok');
     });
 
-    it('should handle target webhooks that are not whitelisted', async () => {
+    it('should handle target webhooks that are not added to allowedHosts', async () => {
       const { body: result } = await supertest
         .post('/api/actions/action')
         .set('kbn-xsrf', 'test')
@@ -203,13 +203,13 @@ export default function webhookTest({ getService }: FtrProviderContext) {
             password: 'mypassphrase',
           },
           config: {
-            url: 'http://a.none.whitelisted.webhook/endpoint',
+            url: 'http://a.none.allowedHosts.webhook/endpoint',
           },
         })
         .expect(400);
 
       expect(result.error).to.eql('Bad Request');
-      expect(result.message).to.match(/is not whitelisted in the Kibana config/);
+      expect(result.message).to.match(/is not added to the Kibana config/);
     });
 
     it('should handle unreachable webhook targets', async () => {
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
index a45eee400b445..5c4eb5f5d4c54 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/execute.ts
@@ -344,7 +344,7 @@ export default function ({ getService }: FtrProviderContext) {
               actionTypeId: '.email',
               config: {
                 from: 'email-from-1@example.com',
-                // this host is specifically whitelisted in:
+                // this host is specifically added to allowedHosts in:
                 //    x-pack/test/alerting_api_integration/common/config.ts
                 host: 'some.non.existent.com',
                 port: 666,
diff --git a/x-pack/test/case_api_integration/common/config.ts b/x-pack/test/case_api_integration/common/config.ts
index 9b048813b479a..5d34f8b04981a 100644
--- a/x-pack/test/case_api_integration/common/config.ts
+++ b/x-pack/test/case_api_integration/common/config.ts
@@ -74,10 +74,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         ...xPackApiIntegrationTestsConfig.get('kbnTestServer'),
         serverArgs: [
           ...xPackApiIntegrationTestsConfig.get('kbnTestServer.serverArgs'),
-          `--xpack.actions.whitelistedHosts=${JSON.stringify([
-            'localhost',
-            'some.non.existent.com',
-          ])}`,
+          `--xpack.actions.allowedHosts=${JSON.stringify(['localhost', 'some.non.existent.com'])}`,
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           '--xpack.eventLog.logEntries=true',
           ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
diff --git a/x-pack/test/detection_engine_api_integration/common/config.ts b/x-pack/test/detection_engine_api_integration/common/config.ts
index 46fb877e94f23..c21e6d0fdecf0 100644
--- a/x-pack/test/detection_engine_api_integration/common/config.ts
+++ b/x-pack/test/detection_engine_api_integration/common/config.ts
@@ -67,10 +67,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         ...xPackApiIntegrationTestsConfig.get('kbnTestServer'),
         serverArgs: [
           ...xPackApiIntegrationTestsConfig.get('kbnTestServer.serverArgs'),
-          `--xpack.actions.whitelistedHosts=${JSON.stringify([
-            'localhost',
-            'some.non.existent.com',
-          ])}`,
+          `--xpack.actions.allowedHosts=${JSON.stringify(['localhost', 'some.non.existent.com'])}`,
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           '--xpack.eventLog.logEntries=true',
           ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),

From e31a0c27e66535acc0eb74026f118ffa0e8f4d6a Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Mon, 24 Aug 2020 16:43:44 -0700
Subject: [PATCH 022/148] Fixed alerting_api_integration/security_and_spaces
 tests failing if actions proxy set on for parallel process running using
 commands 'scripts/functional_tests_server' and
 'scripts/functional_test_runner' (#75232)

* Fixed alerting_api_integration/security_and_spaces tests failing if actions proxy set on for parallel process running using commands 'scripts/functional_tests_server' and 'scripts/functional_test_runner'

* -

* Fixed get port from range for Slack and webhook simulators, removed some test warnings

* Added check for listening proxy server

* changed logger to debug removed not useful error

* -

* changed proxy to dynamic target in a single place

* test retry

* -

* -

* -

* -

* test with no cleanup

* -

* -

* -

* -

* Added environment variable ALERTING_PROXY_PORT

* fixed type checks

* fixed clean up proxy server port
---
 vars/kibanaPipeline.groovy                    |  2 +
 x-pack/package.json                           |  2 +-
 .../servicenow/service.ts                     |  2 -
 .../server/builtin_action_types/slack.test.ts |  2 +-
 .../server/builtin_action_types/slack.ts      |  4 +-
 .../alerting_api_integration/common/config.ts |  8 +++-
 .../server/slack_simulation.ts                |  3 ++
 .../common/lib/get_proxy_server.ts            | 41 +++++++++++++------
 .../actions/builtin_action_types/jira.ts      | 18 +-------
 .../actions/builtin_action_types/pagerduty.ts | 18 +-------
 .../actions/builtin_action_types/resilient.ts | 15 -------
 .../builtin_action_types/servicenow.ts        | 18 +-------
 .../actions/builtin_action_types/slack.ts     | 20 +++------
 .../actions/builtin_action_types/webhook.ts   | 17 ++------
 .../tests/actions/index.ts                    | 21 +++++++++-
 yarn.lock                                     |  8 ++--
 16 files changed, 77 insertions(+), 122 deletions(-)

diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 00668f2ccdaa7..e5b39584a519b 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -86,6 +86,7 @@ def withFunctionalTestEnv(List additionalEnvs = [], Closure closure) {
   def esPort = "61${parallelId}2"
   def esTransportPort = "61${parallelId}3"
   def ingestManagementPackageRegistryPort = "61${parallelId}4"
+  def alertingProxyPort = "61${parallelId}5"
 
   withEnv([
     "CI_GROUP=${parallelId}",
@@ -98,6 +99,7 @@ def withFunctionalTestEnv(List additionalEnvs = [], Closure closure) {
     "TEST_ES_TRANSPORT_PORT=${esTransportPort}",
     "KBN_NP_PLUGINS_BUILT=true",
     "INGEST_MANAGEMENT_PACKAGE_REGISTRY_PORT=${ingestManagementPackageRegistryPort}",
+    "ALERTING_PROXY_PORT=${alertingProxyPort}"
   ] + additionalEnvs) {
     closure()
   }
diff --git a/x-pack/package.json b/x-pack/package.json
index a9ffb85924562..992a186d41d78 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -269,7 +269,7 @@
     "font-awesome": "4.7.0",
     "formsy-react": "^1.1.5",
     "fp-ts": "^2.3.1",
-    "get-port": "^4.2.0",
+    "get-port": "^5.0.0",
     "getos": "^3.1.0",
     "git-url-parse": "11.1.2",
     "github-markdown-css": "^2.10.0",
diff --git a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
index cf1c26e6462a2..9b1da4b4007c6 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/servicenow/service.ts
@@ -78,8 +78,6 @@ export const createExternalService = (
 
   const createIncident = async ({ incident }: ExternalServiceParams) => {
     try {
-      logger.warn(`incident error : ${JSON.stringify(proxySettings)}`);
-      logger.warn(`incident error : ${url}`);
       const res = await request({
         axios: axiosInstance,
         url: `${incidentUrl}`,
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
index 81fa5553b331e..b15d92cecba62 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.test.ts
@@ -209,7 +209,7 @@ describe('execute()', () => {
         rejectUnauthorizedCertificates: false,
       },
     });
-    expect(mockedLogger.info).toHaveBeenCalledWith(
+    expect(mockedLogger.debug).toHaveBeenCalledWith(
       'IncomingWebhook was called with proxyUrl https://someproxyhost'
     );
   });
diff --git a/x-pack/plugins/actions/server/builtin_action_types/slack.ts b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
index 639b4448b5a89..1605cd4b69f5e 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/slack.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/slack.ts
@@ -119,7 +119,7 @@ async function slackExecutor(
   let proxyAgent: HttpsProxyAgent | HttpProxyAgent | undefined;
   if (execOptions.proxySettings) {
     proxyAgent = getProxyAgent(execOptions.proxySettings, logger);
-    logger.info(`IncomingWebhook was called with proxyUrl ${execOptions.proxySettings.proxyUrl}`);
+    logger.debug(`IncomingWebhook was called with proxyUrl ${execOptions.proxySettings.proxyUrl}`);
   }
 
   try {
@@ -130,8 +130,6 @@ async function slackExecutor(
     });
     result = await webhook.send(message);
   } catch (err) {
-    logger.error(`error on ${actionId} slack event: ${err.message}`);
-
     if (err.original == null || err.original.response == null) {
       return serviceErrorResult(actionId, err.message);
     }
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 117a59a304368..67dd8c877e378 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -58,8 +58,13 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
       fs.statSync(path.resolve(__dirname, 'fixtures', 'plugins', file)).isDirectory()
     );
 
+    const proxyPort =
+      process.env.ALERTING_PROXY_PORT ?? (await getPort({ port: getPort.makeRange(6200, 6300) }));
     const actionsProxyUrl = options.enableActionsProxy
-      ? [`--xpack.actions.proxyUrl=http://localhost:${await getPort()}`]
+      ? [
+          `--xpack.actions.proxyUrl=http://localhost:${proxyPort}`,
+          '--xpack.actions.rejectUnauthorizedCertificates=false',
+        ]
       : [];
 
     return {
@@ -89,7 +94,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           '--xpack.encryptedSavedObjects.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"',
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           ...actionsProxyUrl,
-          '--xpack.actions.rejectUnauthorizedCertificates=false',
 
           '--xpack.eventLog.logEntries=true',
           `--xpack.actions.preconfigured=${JSON.stringify({
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/slack_simulation.ts b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/slack_simulation.ts
index 5032112e702e2..8f5b1ea75d188 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/slack_simulation.ts
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/server/slack_simulation.ts
@@ -64,6 +64,9 @@ export async function initPlugin() {
         response.statusCode = 400;
         response.end('unknown request to slack simulator');
       });
+    } else {
+      response.writeHead(400, { 'Content-Type': 'text/plain' });
+      response.end('Not supported http method to request slack simulator');
     }
   });
 }
diff --git a/x-pack/test/alerting_api_integration/common/lib/get_proxy_server.ts b/x-pack/test/alerting_api_integration/common/lib/get_proxy_server.ts
index 4540556e73c5f..7528b00f926d0 100644
--- a/x-pack/test/alerting_api_integration/common/lib/get_proxy_server.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/get_proxy_server.ts
@@ -4,27 +4,42 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import http from 'http';
 import httpProxy from 'http-proxy';
+import { ToolingLog } from '@kbn/dev-utils';
 
-export const getHttpProxyServer = (
-  targetUrl: string,
-  onProxyResHandler: (proxyRes?: unknown, req?: unknown, res?: unknown) => void
-): httpProxy => {
-  const proxyServer = httpProxy.createProxyServer({
-    target: targetUrl,
-    secure: false,
-    selfHandleResponse: false,
-  });
-  proxyServer.on('proxyRes', (proxyRes: unknown, req: unknown, res: unknown) => {
-    onProxyResHandler(proxyRes, req, res);
+export const getHttpProxyServer = async (
+  defaultKibanaTargetUrl: string,
+  kbnTestServerConfig: any,
+  log: ToolingLog
+): Promise<http.Server> => {
+  const proxy = httpProxy.createProxyServer({ secure: false, selfHandleResponse: false });
+
+  const proxyPort = getProxyPort(kbnTestServerConfig);
+  const proxyServer = http.createServer((req: http.IncomingMessage, res: http.ServerResponse) => {
+    const targetUrl = new URL(req.url ?? defaultKibanaTargetUrl);
+
+    if (targetUrl.hostname !== 'some.non.existent.com') {
+      proxy.web(req, res, {
+        target: `${targetUrl.protocol}//${targetUrl.hostname}:${targetUrl.port}`,
+      });
+    } else {
+      res.writeHead(500, { 'Content-Type': 'text/plain' });
+      res.write('error on call some.non.existent.com');
+      res.end();
+    }
   });
+
+  proxyServer.listen(proxyPort);
+
   return proxyServer;
 };
 
-export const getProxyUrl = (kbnTestServerConfig: any) => {
+export const getProxyPort = (kbnTestServerConfig: any): number => {
   const proxyUrl = kbnTestServerConfig
     .find((val: string) => val.startsWith('--xpack.actions.proxyUrl='))
     .replace('--xpack.actions.proxyUrl=', '');
 
-  return new URL(proxyUrl);
+  const urlObject = new URL(proxyUrl);
+  return Number(urlObject.port);
 };
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts
index 932d2658d2893..78a1df0b9c1c7 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts
@@ -6,7 +6,6 @@
 
 import expect from '@kbn/expect';
 
-import { getHttpProxyServer, getProxyUrl } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -36,7 +35,6 @@ const mapping = [
 export default function jiraTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
-  const config = getService('config');
 
   const mockJira = {
     config: {
@@ -75,20 +73,12 @@ export default function jiraTest({ getService }: FtrProviderContext) {
   };
 
   let jiraSimulatorURL: string = '<could not determine kibana url>';
-  let proxyServer: any;
-  let proxyHaveBeenCalled = false;
 
-  // FLAKY: https://github.com/elastic/kibana/issues/75722
-  describe.skip('Jira', () => {
+  describe('Jira', () => {
     before(() => {
       jiraSimulatorURL = kibanaServer.resolveUrl(
         getExternalServiceSimulatorPath(ExternalServiceSimulator.JIRA)
       );
-      proxyServer = getHttpProxyServer(kibanaServer.resolveUrl('/'), () => {
-        proxyHaveBeenCalled = true;
-      });
-      const proxyUrl = getProxyUrl(config.get('kbnTestServer.serverArgs'));
-      proxyServer.listen(Number(proxyUrl.port));
     });
 
     describe('Jira - Action Creation', () => {
@@ -539,8 +529,6 @@ export default function jiraTest({ getService }: FtrProviderContext) {
             })
             .expect(200);
 
-          expect(proxyHaveBeenCalled).to.equal(true);
-
           expect(body).to.eql({
             status: 'ok',
             actionId: simulatedActionId,
@@ -554,9 +542,5 @@ export default function jiraTest({ getService }: FtrProviderContext) {
         });
       });
     });
-
-    after(() => {
-      proxyServer.close();
-    });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
index 33df85b469b58..76b3e8e39791a 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
@@ -6,7 +6,6 @@
 
 import expect from '@kbn/expect';
 
-import { getHttpProxyServer, getProxyUrl } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -18,26 +17,16 @@ import {
 export default function pagerdutyTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
-  const config = getService('config');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/75386
-  describe.skip('pagerduty action', () => {
+  describe('pagerduty action', () => {
     let simulatedActionId = '';
     let pagerdutySimulatorURL: string = '<could not determine kibana url>';
-    let proxyServer: any;
-    let proxyHaveBeenCalled = false;
 
     // need to wait for kibanaServer to settle ...
     before(() => {
       pagerdutySimulatorURL = kibanaServer.resolveUrl(
         getExternalServiceSimulatorPath(ExternalServiceSimulator.PAGERDUTY)
       );
-
-      proxyServer = getHttpProxyServer(kibanaServer.resolveUrl('/'), () => {
-        proxyHaveBeenCalled = true;
-      });
-      const proxyUrl = getProxyUrl(config.get('kbnTestServer.serverArgs'));
-      proxyServer.listen(Number(proxyUrl.port));
     });
 
     it('should return successfully when passed valid create parameters', async () => {
@@ -155,7 +144,6 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
           },
         })
         .expect(200);
-      expect(proxyHaveBeenCalled).to.equal(true);
 
       expect(result).to.eql({
         status: 'ok',
@@ -215,9 +203,5 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
       expect(result.message).to.match(/error posting pagerduty event: http status 502/);
       expect(result.retry).to.equal(true);
     });
-
-    after(() => {
-      proxyServer.close();
-    });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
index 6a674d769dc16..8adaf9f121931 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
@@ -6,7 +6,6 @@
 
 import expect from '@kbn/expect';
 
-import { getHttpProxyServer, getProxyUrl } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -36,7 +35,6 @@ const mapping = [
 export default function resilientTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
-  const config = getService('config');
 
   const mockResilient = {
     config: {
@@ -75,19 +73,12 @@ export default function resilientTest({ getService }: FtrProviderContext) {
   };
 
   let resilientSimulatorURL: string = '<could not determine kibana url>';
-  let proxyServer: any;
-  let proxyHaveBeenCalled = false;
 
   describe('IBM Resilient', () => {
     before(() => {
       resilientSimulatorURL = kibanaServer.resolveUrl(
         getExternalServiceSimulatorPath(ExternalServiceSimulator.RESILIENT)
       );
-      proxyServer = getHttpProxyServer(kibanaServer.resolveUrl('/'), () => {
-        proxyHaveBeenCalled = true;
-      });
-      const proxyUrl = getProxyUrl(config.get('kbnTestServer.serverArgs'));
-      proxyServer.listen(Number(proxyUrl.port));
     });
 
     describe('IBM Resilient - Action Creation', () => {
@@ -538,8 +529,6 @@ export default function resilientTest({ getService }: FtrProviderContext) {
             })
             .expect(200);
 
-          expect(proxyHaveBeenCalled).to.equal(true);
-
           expect(body).to.eql({
             status: 'ok',
             actionId: simulatedActionId,
@@ -553,9 +542,5 @@ export default function resilientTest({ getService }: FtrProviderContext) {
         });
       });
     });
-
-    after(() => {
-      proxyServer.close();
-    });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
index 07826acf34a78..2dad6f2c425e5 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
@@ -6,7 +6,6 @@
 
 import expect from '@kbn/expect';
 
-import { getHttpProxyServer, getProxyUrl } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -36,7 +35,6 @@ const mapping = [
 export default function servicenowTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
-  const config = getService('config');
 
   const mockServiceNow = {
     config: {
@@ -74,21 +72,12 @@ export default function servicenowTest({ getService }: FtrProviderContext) {
   };
 
   let servicenowSimulatorURL: string = '<could not determine kibana url>';
-  let proxyServer: any;
-  let proxyHaveBeenCalled = false;
 
-  // FLAKY: https://github.com/elastic/kibana/issues/75522
-  describe.skip('ServiceNow', () => {
+  describe('ServiceNow', () => {
     before(() => {
       servicenowSimulatorURL = kibanaServer.resolveUrl(
         getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
       );
-
-      proxyServer = getHttpProxyServer(kibanaServer.resolveUrl('/'), () => {
-        proxyHaveBeenCalled = true;
-      });
-      const proxyUrl = getProxyUrl(config.get('kbnTestServer.serverArgs'));
-      proxyServer.listen(Number(proxyUrl.port));
     });
 
     describe('ServiceNow - Action Creation', () => {
@@ -459,7 +448,6 @@ export default function servicenowTest({ getService }: FtrProviderContext) {
               },
             })
             .expect(200);
-          expect(proxyHaveBeenCalled).to.equal(true);
 
           expect(result).to.eql({
             status: 'ok',
@@ -474,9 +462,5 @@ export default function servicenowTest({ getService }: FtrProviderContext) {
         });
       });
     });
-
-    after(() => {
-      proxyServer.close();
-    });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
index f7ac281f40343..1712c31187b02 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
@@ -7,7 +7,6 @@
 import expect from '@kbn/expect';
 import http from 'http';
 import getPort from 'get-port';
-import { getHttpProxyServer, getProxyUrl } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import { getSlackServer } from '../../../../common/fixtures/plugins/actions_simulators/server/plugin';
@@ -15,27 +14,20 @@ import { getSlackServer } from '../../../../common/fixtures/plugins/actions_simu
 // eslint-disable-next-line import/no-default-export
 export default function slackTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const config = getService('config');
 
   describe('slack action', () => {
     let simulatedActionId = '';
-
     let slackSimulatorURL: string = '';
     let slackServer: http.Server;
-    let proxyServer: any;
-    let proxyHaveBeenCalled = false;
+
     // need to wait for kibanaServer to settle ...
     before(async () => {
       slackServer = await getSlackServer();
-      const availablePort = await getPort({ port: 9000 });
-      slackServer.listen(availablePort);
+      const availablePort = await getPort({ port: getPort.makeRange(9000, 9100) });
+      if (!slackServer.listening) {
+        slackServer.listen(availablePort);
+      }
       slackSimulatorURL = `http://localhost:${availablePort}`;
-
-      proxyServer = getHttpProxyServer(slackSimulatorURL, () => {
-        proxyHaveBeenCalled = true;
-      });
-      const proxyUrl = getProxyUrl(config.get('kbnTestServer.serverArgs'));
-      proxyServer.listen(Number(proxyUrl.port));
     });
 
     it('should return 200 when creating a slack action successfully', async () => {
@@ -165,7 +157,6 @@ export default function slackTest({ getService }: FtrProviderContext) {
         })
         .expect(200);
       expect(result.status).to.eql('ok');
-      expect(proxyHaveBeenCalled).to.equal(true);
     });
 
     it('should handle an empty message error', async () => {
@@ -233,7 +224,6 @@ export default function slackTest({ getService }: FtrProviderContext) {
 
     after(() => {
       slackServer.close();
-      proxyServer.close();
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
index 5dff07de8077c..abebb2650ad08 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
@@ -5,10 +5,9 @@
  */
 
 import http from 'http';
-import getPort from 'get-port';
 import expect from '@kbn/expect';
 import { URL, format as formatUrl } from 'url';
-import { getHttpProxyServer, getProxyUrl } from '../../../../common/lib/get_proxy_server';
+import getPort from 'get-port';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   getExternalServiceSimulatorPath,
@@ -32,7 +31,6 @@ function parsePort(url: Record<string, string>): Record<string, string | null |
 export default function webhookTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
-  const configService = getService('config');
 
   async function createWebhookAction(
     webhookSimulatorURL: string,
@@ -71,21 +69,14 @@ export default function webhookTest({ getService }: FtrProviderContext) {
     let webhookSimulatorURL: string = '';
     let webhookServer: http.Server;
     let kibanaURL: string = '<could not determine kibana url>';
-    let proxyServer: any;
-    let proxyHaveBeenCalled = false;
+
     // need to wait for kibanaServer to settle ...
     before(async () => {
       webhookServer = await getWebhookServer();
-      const availablePort = await getPort({ port: 9000 });
+      const availablePort = await getPort({ port: getPort.makeRange(9000, 9100) });
       webhookServer.listen(availablePort);
       webhookSimulatorURL = `http://localhost:${availablePort}`;
 
-      proxyServer = getHttpProxyServer(webhookSimulatorURL, () => {
-        proxyHaveBeenCalled = true;
-      });
-      const proxyUrl = getProxyUrl(configService.get('kbnTestServer.serverArgs'));
-      proxyServer.listen(Number(proxyUrl.port));
-
       kibanaURL = kibanaServer.resolveUrl(
         getExternalServiceSimulatorPath(ExternalServiceSimulator.WEBHOOK)
       );
@@ -150,7 +141,6 @@ export default function webhookTest({ getService }: FtrProviderContext) {
         .expect(200);
 
       expect(result.status).to.eql('ok');
-      expect(proxyHaveBeenCalled).to.equal(true);
     });
 
     it('should support the POST method against webhook target', async () => {
@@ -251,7 +241,6 @@ export default function webhookTest({ getService }: FtrProviderContext) {
 
     after(() => {
       webhookServer.close();
-      proxyServer.close();
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
index 9cdc0c9fa663e..54484ba34636f 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
@@ -4,11 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import http from 'http';
+import { getHttpProxyServer } from '../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
-export default function actionsTests({ loadTestFile }: FtrProviderContext) {
+export default function actionsTests({ loadTestFile, getService }: FtrProviderContext) {
+  const configService = getService('config');
+  const kibanaServer = getService('kibanaServer');
+  const log = getService('log');
   describe('Actions', () => {
+    let proxyServer: http.Server | undefined;
+    before(async () => {
+      proxyServer = await getHttpProxyServer(
+        kibanaServer.resolveUrl('/'),
+        configService.get('kbnTestServer.serverArgs'),
+        log
+      );
+    });
     loadTestFile(require.resolve('./builtin_action_types/email'));
     loadTestFile(require.resolve('./builtin_action_types/es_index'));
     loadTestFile(require.resolve('./builtin_action_types/es_index_preconfigured'));
@@ -26,5 +39,11 @@ export default function actionsTests({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./get'));
     loadTestFile(require.resolve('./list_action_types'));
     loadTestFile(require.resolve('./update'));
+
+    after(() => {
+      if (proxyServer) {
+        proxyServer.close();
+      }
+    });
   });
 }
diff --git a/yarn.lock b/yarn.lock
index f00bee1d13dc2..845685ff36f7d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13694,10 +13694,10 @@ get-own-enumerable-property-symbols@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.0.tgz#b877b49a5c16aefac3655f2ed2ea5b684df8d203"
   integrity sha512-CIJYJC4GGF06TakLg8z4GQKvDsx9EMspVxOYih7LerEL/WosUnFIww45CGfxfeKHqlg3twgUrYRT1O3WQqjGCg==
 
-get-port@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-4.2.0.tgz#e37368b1e863b7629c43c5a323625f95cf24b119"
-  integrity sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==
+get-port@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
+  integrity sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==
 
 get-stdin@^4.0.1:
   version "4.0.1"

From b82e4d8a845f8571c6409663ed52139113540efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Tue, 25 Aug 2020 08:03:22 +0100
Subject: [PATCH 023/148] [APM] User can't navigate back home using browser nav
 when clicking link  (#75755)

* replaces the route when parmeter is missing

* fixing unit test
---
 .../shared/DatePicker/__test__/DatePicker.test.tsx | 14 ++++++++------
 .../public/components/shared/DatePicker/index.tsx  |  9 ++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx b/x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
index 2434d898389d8..7a63b9e767fe7 100644
--- a/x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
@@ -20,6 +20,7 @@ import { wait } from '@testing-library/react';
 import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 
 const mockHistoryPush = jest.spyOn(history, 'push');
+const mockHistoryReplace = jest.spyOn(history, 'replace');
 const mockRefreshTimeRange = jest.fn();
 function MockUrlParamsProvider({
   params = {},
@@ -69,8 +70,8 @@ describe('DatePicker', () => {
 
   it('sets default query params in the URL', () => {
     mountDatePicker();
-    expect(mockHistoryPush).toHaveBeenCalledTimes(1);
-    expect(mockHistoryPush).toHaveBeenCalledWith(
+    expect(mockHistoryReplace).toHaveBeenCalledTimes(1);
+    expect(mockHistoryReplace).toHaveBeenCalledWith(
       expect.objectContaining({
         search: 'rangeFrom=now-15m&rangeTo=now',
       })
@@ -82,8 +83,8 @@ describe('DatePicker', () => {
       rangeTo: 'now',
       refreshInterval: 5000,
     });
-    expect(mockHistoryPush).toHaveBeenCalledTimes(1);
-    expect(mockHistoryPush).toHaveBeenCalledWith(
+    expect(mockHistoryReplace).toHaveBeenCalledTimes(1);
+    expect(mockHistoryReplace).toHaveBeenCalledWith(
       expect.objectContaining({
         search: 'rangeFrom=now-15m&rangeTo=now&refreshInterval=5000',
       })
@@ -97,18 +98,19 @@ describe('DatePicker', () => {
       refreshPaused: false,
       refreshInterval: 5000,
     });
-    expect(mockHistoryPush).toHaveBeenCalledTimes(0);
+    expect(mockHistoryReplace).toHaveBeenCalledTimes(0);
   });
 
   it('updates the URL when the date range changes', () => {
     const datePicker = mountDatePicker();
+    expect(mockHistoryReplace).toHaveBeenCalledTimes(1);
     datePicker.find(EuiSuperDatePicker).props().onTimeChange({
       start: 'updated-start',
       end: 'updated-end',
       isInvalid: false,
       isQuickSelection: true,
     });
-    expect(mockHistoryPush).toHaveBeenCalledTimes(2);
+    expect(mockHistoryPush).toHaveBeenCalledTimes(1);
     expect(mockHistoryPush).toHaveBeenLastCalledWith(
       expect.objectContaining({
         search: 'rangeFrom=updated-start&rangeTo=updated-end',
diff --git a/x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx b/x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx
index 403a8cad854cd..35b9525733e99 100644
--- a/x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx
@@ -89,7 +89,14 @@ export function DatePicker() {
     ...timePickerURLParams,
   };
   if (!isEqual(nextParams, timePickerURLParams)) {
-    updateUrl(nextParams);
+    // When the default parameters are not availbale in the url, replace it adding the necessary parameters.
+    history.replace({
+      ...location,
+      search: fromQuery({
+        ...toQuery(location.search),
+        ...nextParams,
+      }),
+    });
   }
 
   return (

From 40d8edc2a07ee782bd9521d815f69638ef5be7da Mon Sep 17 00:00:00 2001
From: Peter Pisljar <peter.pisljar@gmail.com>
Date: Tue, 25 Aug 2020 09:31:03 +0200
Subject: [PATCH 024/148] cleaning up embeddable types (#75560)

---
 .../public/book/edit_book_action.tsx          |  4 ++--
 .../public/list_container_example.tsx         | 21 +++++++++----------
 .../actions/add_to_library_action.test.tsx    |  9 ++++++--
 .../actions/clone_panel_action.tsx            |  8 +++++--
 .../unlink_from_library_action.test.tsx       |  8 +++++--
 .../application/dashboard_app_controller.tsx  |  3 ++-
 ...embeddable_saved_object_converters.test.ts |  5 +++--
 .../public/lib/containers/i_container.ts      |  4 ++--
 .../public/lib/embeddables/i_embeddable.ts    |  2 --
 .../embeddable/public/tests/container.test.ts | 12 ++++++++---
 .../public/embeddable/visualize_embeddable.ts |  3 ++-
 .../drilldown.tsx                             |  3 ++-
 .../explore_data/explore_data_chart_action.ts |  7 +++++--
 13 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/examples/embeddable_examples/public/book/edit_book_action.tsx b/examples/embeddable_examples/public/book/edit_book_action.tsx
index b31d69696598e..5b14dc85b1fc7 100644
--- a/examples/embeddable_examples/public/book/edit_book_action.tsx
+++ b/examples/embeddable_examples/public/book/edit_book_action.tsx
@@ -65,8 +65,8 @@ export const createEditBookAction = (getStartServices: () => Promise<StartServic
       const onSave = async (attributes: BookSavedObjectAttributes, useRefType: boolean) => {
         const newInput = await attributeService.wrapAttributes(attributes, useRefType, embeddable);
         if (!useRefType && (embeddable.getInput() as SavedObjectEmbeddableInput).savedObjectId) {
-          // Remove the savedObejctId when un-linking
-          newInput.savedObjectId = null;
+          // Set the saved object ID to null so that update input will remove the existing savedObjectId...
+          (newInput as BookByValueInput & { savedObjectId: unknown }).savedObjectId = null;
         }
         embeddable.updateInput(newInput);
         if (useRefType) {
diff --git a/examples/embeddable_explorer/public/list_container_example.tsx b/examples/embeddable_explorer/public/list_container_example.tsx
index b9bd825ed0240..d9d9c49249ab3 100644
--- a/examples/embeddable_explorer/public/list_container_example.tsx
+++ b/examples/embeddable_explorer/public/list_container_example.tsx
@@ -29,11 +29,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import {
-  EmbeddableInput,
-  EmbeddableRenderer,
-  ViewMode,
-} from '../../../src/plugins/embeddable/public';
+import { EmbeddableRenderer, ViewMode } from '../../../src/plugins/embeddable/public';
 import {
   HELLO_WORLD_EMBEDDABLE,
   MULTI_TASK_TODO_EMBEDDABLE,
@@ -41,6 +37,9 @@ import {
   ListContainerFactory,
   SearchableListContainerFactory,
 } from '../../embeddable_examples/public';
+import { SearchableContainerInput } from '../../embeddable_examples/public/searchable_list_container/searchable_list_container';
+import { TodoInput } from '../../embeddable_examples/public/todo';
+import { MultiTaskTodoInput } from '../../embeddable_examples/public/multi_task_todo';
 
 interface Props {
   listContainerEmbeddableFactory: ListContainerFactory;
@@ -51,7 +50,7 @@ export function ListContainerExample({
   listContainerEmbeddableFactory,
   searchableListContainerEmbeddableFactory,
 }: Props) {
-  const listInput: EmbeddableInput = {
+  const listInput: SearchableContainerInput = {
     id: 'hello',
     title: 'My todo list',
     viewMode: ViewMode.VIEW,
@@ -69,7 +68,7 @@ export function ListContainerExample({
           task: 'Goes out on Wednesdays!',
           icon: 'broom',
           title: 'Take out the trash',
-        },
+        } as TodoInput,
       },
       '3': {
         type: TODO_EMBEDDABLE,
@@ -77,12 +76,12 @@ export function ListContainerExample({
           id: '3',
           icon: 'broom',
           title: 'Vaccum the floor',
-        },
+        } as TodoInput,
       },
     },
   };
 
-  const searchableInput: EmbeddableInput = {
+  const searchableInput: SearchableContainerInput = {
     id: '1',
     title: 'My searchable todo list',
     viewMode: ViewMode.VIEW,
@@ -101,7 +100,7 @@ export function ListContainerExample({
           task: 'Goes out on Wednesdays!',
           icon: 'broom',
           title: 'Take out the trash',
-        },
+        } as TodoInput,
       },
       '3': {
         type: MULTI_TASK_TODO_EMBEDDABLE,
@@ -110,7 +109,7 @@ export function ListContainerExample({
           icon: 'searchProfilerApp',
           title: 'Learn more',
           tasks: ['Go to school', 'Watch planet earth', 'Read the encyclopedia'],
-        },
+        } as MultiTaskTodoInput,
       },
     },
   };
diff --git a/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx b/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx
index 9fa7fff9ad087..755269d1a31be 100644
--- a/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/add_to_library_action.test.tsx
@@ -16,7 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { isErrorEmbeddable, IContainer, ReferenceOrValueEmbeddable } from '../../embeddable_plugin';
+import {
+  isErrorEmbeddable,
+  IContainer,
+  ReferenceOrValueEmbeddable,
+  EmbeddableInput,
+} from '../../embeddable_plugin';
 import { DashboardContainer } from '../embeddable';
 import { getSampleDashboardInput } from '../test_helpers';
 import {
@@ -145,7 +150,7 @@ test('Add to library returns reference type input', async () => {
 
   embeddable = embeddablePluginMock.mockRefOrValEmbeddable<ContactCardEmbeddable>(embeddable, {
     mockedByReferenceInput: { savedObjectId: 'testSavedObjectId', id: embeddable.id },
-    mockedByValueInput: { attributes: complicatedAttributes, id: embeddable.id },
+    mockedByValueInput: { attributes: complicatedAttributes, id: embeddable.id } as EmbeddableInput,
   });
   const dashboard = embeddable.getRoot() as IContainer;
   const originalPanelKeySet = new Set(Object.keys(dashboard.getInput().panels));
diff --git a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
index 26af13b4410fe..dc5887ee0e644 100644
--- a/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx
@@ -24,7 +24,11 @@ import _ from 'lodash';
 import { ActionByType, IncompatibleActionError } from '../../ui_actions_plugin';
 import { ViewMode, PanelState, IEmbeddable } from '../../embeddable_plugin';
 import { SavedObject } from '../../../../saved_objects/public';
-import { PanelNotFoundError, EmbeddableInput } from '../../../../embeddable/public';
+import {
+  PanelNotFoundError,
+  EmbeddableInput,
+  SavedObjectEmbeddableInput,
+} from '../../../../embeddable/public';
 import {
   placePanelBeside,
   IPanelPlacementBesideArgs,
@@ -143,7 +147,7 @@ export class ClonePanelAction implements ActionByType<typeof ACTION_CLONE_PANEL>
         },
         { references: _.cloneDeep(savedObjectToClone.references) }
       );
-      panelState.explicitInput.savedObjectId = clonedSavedObject.id;
+      (panelState.explicitInput as SavedObjectEmbeddableInput).savedObjectId = clonedSavedObject.id;
     }
     this.core.notifications.toasts.addSuccess({
       title: i18n.translate('dashboard.panel.clonedToast', {
diff --git a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx
index 681a6a734a532..b4178fd40c768 100644
--- a/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx
+++ b/src/plugins/dashboard/public/application/actions/unlink_from_library_action.test.tsx
@@ -30,7 +30,7 @@ import { coreMock } from '../../../../../core/public/mocks';
 import { CoreStart } from 'kibana/public';
 import { UnlinkFromLibraryAction } from '.';
 import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
-import { ViewMode } from '../../../../embeddable/public';
+import { ViewMode, SavedObjectEmbeddableInput } from '../../../../embeddable/public';
 
 const { setup, doStart } = embeddablePluginMock.createInstance();
 setup.registerEmbeddableFactory(
@@ -142,7 +142,11 @@ test('Unlink unwraps all attributes from savedObject', async () => {
     attribute4: { nestedattribute: 'hello from the nest' },
   };
 
-  embeddable = embeddablePluginMock.mockRefOrValEmbeddable<ContactCardEmbeddable>(embeddable, {
+  embeddable = embeddablePluginMock.mockRefOrValEmbeddable<
+    ContactCardEmbeddable,
+    { attributes: unknown; id: string },
+    SavedObjectEmbeddableInput
+  >(embeddable, {
     mockedByReferenceInput: { savedObjectId: 'testSavedObjectId', id: embeddable.id },
     mockedByValueInput: { attributes: complicatedAttributes, id: embeddable.id },
   });
diff --git a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
index 7a19514eebe17..e10265376f2de 100644
--- a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
+++ b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
@@ -474,7 +474,8 @@ export class DashboardAppController {
                     : undefined;
                 container.addOrUpdateEmbeddable<EmbeddableInput>(
                   incomingEmbeddable.type,
-                  explicitInput,
+                  // This ugly solution is temporary - https://github.com/elastic/kibana/pull/70272 fixes this whole section
+                  (explicitInput as unknown) as EmbeddableInput,
                   embeddableId
                 );
               }
diff --git a/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.test.ts b/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.test.ts
index 25ce203332422..926d5f405b384 100644
--- a/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.test.ts
+++ b/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.test.ts
@@ -23,6 +23,7 @@ import {
 } from './embeddable_saved_object_converters';
 import { SavedDashboardPanel } from '../../types';
 import { DashboardPanelState } from '../embeddable';
+import { EmbeddableInput } from '../../../../embeddable/public';
 
 test('convertSavedDashboardPanelToPanelState', () => {
   const savedDashboardPanel: SavedDashboardPanel = {
@@ -93,7 +94,7 @@ test('convertPanelStateToSavedDashboardPanel', () => {
       something: 'hi!',
       id: '123',
       savedObjectId: 'savedObjectId',
-    },
+    } as EmbeddableInput,
     type: 'search',
   };
 
@@ -127,7 +128,7 @@ test('convertPanelStateToSavedDashboardPanel will not add an undefined id when n
     explicitInput: {
       id: '123',
       something: 'hi!',
-    },
+    } as EmbeddableInput,
     type: 'search',
   };
 
diff --git a/src/plugins/embeddable/public/lib/containers/i_container.ts b/src/plugins/embeddable/public/lib/containers/i_container.ts
index 31a7cd4f2e559..db219fa8b7314 100644
--- a/src/plugins/embeddable/public/lib/containers/i_container.ts
+++ b/src/plugins/embeddable/public/lib/containers/i_container.ts
@@ -25,7 +25,7 @@ import {
   IEmbeddable,
 } from '../embeddables';
 
-export interface PanelState<E extends { id: string; [key: string]: unknown } = { id: string }> {
+export interface PanelState<E extends EmbeddableInput & { id: string } = { id: string }> {
   // The type of embeddable in this panel. Will be used to find the factory in which to
   // load the embeddable.
   type: string;
@@ -43,7 +43,7 @@ export interface ContainerOutput extends EmbeddableOutput {
 export interface ContainerInput<PanelExplicitInput = {}> extends EmbeddableInput {
   hidePanelTitles?: boolean;
   panels: {
-    [key: string]: PanelState<PanelExplicitInput & { [id: string]: unknown } & { id: string }>;
+    [key: string]: PanelState<PanelExplicitInput & EmbeddableInput & { id: string }>;
   };
 }
 
diff --git a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
index 9c4a1b5602c49..e8aecdba0abc4 100644
--- a/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
+++ b/src/plugins/embeddable/public/lib/embeddables/i_embeddable.ts
@@ -70,8 +70,6 @@ export interface EmbeddableInput {
    * Visualization filters used to narrow down results.
    */
   filters?: Filter[];
-
-  [key: string]: unknown;
 }
 
 export interface EmbeddableOutput {
diff --git a/src/plugins/embeddable/public/tests/container.test.ts b/src/plugins/embeddable/public/tests/container.test.ts
index 621ffe4c9dad6..69c21fdf3f072 100644
--- a/src/plugins/embeddable/public/tests/container.test.ts
+++ b/src/plugins/embeddable/public/tests/container.test.ts
@@ -19,7 +19,13 @@
 
 import * as Rx from 'rxjs';
 import { skip } from 'rxjs/operators';
-import { isErrorEmbeddable, EmbeddableOutput, ContainerInput, ViewMode } from '../lib';
+import {
+  isErrorEmbeddable,
+  EmbeddableOutput,
+  ContainerInput,
+  ViewMode,
+  SavedObjectEmbeddableInput,
+} from '../lib';
 import {
   FilterableEmbeddableInput,
   FilterableEmbeddable,
@@ -648,7 +654,7 @@ test('container stores ErrorEmbeddables when a saved object cannot be found', as
     panels: {
       '123': {
         type: 'vis',
-        explicitInput: { id: '123', savedObjectId: '456' },
+        explicitInput: { id: '123', savedObjectId: '456' } as SavedObjectEmbeddableInput,
       },
     },
     viewMode: ViewMode.EDIT,
@@ -669,7 +675,7 @@ test('ErrorEmbeddables get updated when parent does', async (done) => {
     panels: {
       '123': {
         type: 'vis',
-        explicitInput: { id: '123', savedObjectId: '456' },
+        explicitInput: { id: '123', savedObjectId: '456' } as SavedObjectEmbeddableInput,
       },
     },
     viewMode: ViewMode.EDIT,
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
index 4efdfd2911cbc..cc278a6ee9b3d 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable.ts
@@ -42,7 +42,7 @@ import {
   ExpressionRenderError,
 } from '../../../../plugins/expressions/public';
 import { buildPipeline } from '../legacy/build_pipeline';
-import { Vis } from '../vis';
+import { Vis, SerializedVis } from '../vis';
 import { getExpressions, getUiActions } from '../services';
 import { VIS_EVENT_TO_TRIGGER } from './events';
 import { VisualizeEmbeddableFactoryDeps } from './visualize_embeddable_factory';
@@ -63,6 +63,7 @@ export interface VisualizeInput extends EmbeddableInput {
   vis?: {
     colors?: { [key: string]: string };
   };
+  savedVis?: SerializedVis;
   table?: unknown;
 }
 
diff --git a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx
index a17d95c37c5ce..056feeb2b2167 100644
--- a/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx
+++ b/x-pack/plugins/dashboard_enhanced/public/services/drilldowns/dashboard_to_dashboard_drilldown/drilldown.tsx
@@ -25,6 +25,7 @@ import {
 import { StartServicesGetter } from '../../../../../../../src/plugins/kibana_utils/public';
 import { StartDependencies } from '../../../plugin';
 import { Config, FactoryContext } from './types';
+import { SearchInput } from '../../../../../../../src/plugins/discover/public';
 
 export interface Params {
   start: StartServicesGetter<Pick<StartDependencies, 'data' | 'uiActionsEnhanced'>>;
@@ -89,7 +90,7 @@ export class DashboardToDashboardDrilldown
     };
 
     if (context.embeddable) {
-      const input = context.embeddable.getInput();
+      const input = context.embeddable.getInput() as Readonly<SearchInput>;
       if (isQuery(input.query) && config.useCurrentFilters) state.query = input.query;
 
       // if useCurrentDashboardDataRange is enabled, then preserve current time range
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
index 660739f26c70d..44ad3c57f7e24 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
@@ -5,7 +5,10 @@
  */
 
 import { Action } from '../../../../../../src/plugins/ui_actions/public';
-import { DiscoverUrlGeneratorState } from '../../../../../../src/plugins/discover/public';
+import {
+  DiscoverUrlGeneratorState,
+  SearchInput,
+} from '../../../../../../src/plugins/discover/public';
 import {
   ApplyGlobalFilterActionContext,
   esFilters,
@@ -59,7 +62,7 @@ export class ExploreDataChartAction extends AbstractExploreDataAction<ExploreDat
     if (embeddable) {
       state.indexPatternId = shared.getIndexPatterns(embeddable)[0] || undefined;
 
-      const input = embeddable.getInput();
+      const input = embeddable.getInput() as Readonly<SearchInput>;
 
       if (input.timeRange && !state.timeRange) state.timeRange = input.timeRange;
       if (input.query) state.query = input.query;

From 6718f5494d8952f78706f9b402668145731572f2 Mon Sep 17 00:00:00 2001
From: Liza Katz <lizka.k@gmail.com>
Date: Tue, 25 Aug 2020 12:36:30 +0300
Subject: [PATCH 025/148] Don't overwrite sync strategy in xpack (#75556)

* Don't override sync strategy in XPACK

* search name

* docs

* mock

* Use enhancement pattern

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...plugin-plugins-data-server.plugin.setup.md |  2 ++
 src/plugins/data/common/search/index.ts       |  3 ---
 src/plugins/data/server/plugin.ts             | 23 +++++++++++++++----
 src/plugins/data/server/search/index.ts       |  8 ++++++-
 src/plugins/data/server/search/mocks.ts       |  1 +
 .../data/server/search/search_service.ts      | 16 ++++++++-----
 src/plugins/data/server/search/types.ts       |  9 ++++++++
 src/plugins/data/server/server.api.md         |  8 +++++++
 x-pack/plugins/data_enhanced/common/index.ts  |  7 +++++-
 .../data_enhanced/common/search/index.ts      |  7 +++++-
 .../data_enhanced/common/search/types.ts      |  2 ++
 .../public/search/search_interceptor.ts       |  7 +++---
 x-pack/plugins/data_enhanced/server/plugin.ts | 10 ++++++--
 13 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md
index 18fca3d2c8a66..139c5794f0146 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.plugin.setup.md
@@ -8,6 +8,7 @@
 
 ```typescript
 setup(core: CoreSetup<DataPluginStartDependencies, DataPluginStart>, { expressions, usageCollection }: DataPluginSetupDependencies): {
+        __enhance: (enhancements: DataEnhancements) => void;
         search: ISearchSetup;
         fieldFormats: {
             register: (customFieldFormat: import("../public").FieldFormatInstanceType) => number;
@@ -25,6 +26,7 @@ setup(core: CoreSetup<DataPluginStartDependencies, DataPluginStart>, { expressio
 <b>Returns:</b>
 
 `{
+        __enhance: (enhancements: DataEnhancements) => void;
         search: ISearchSetup;
         fieldFormats: {
             register: (customFieldFormat: import("../public").FieldFormatInstanceType) => number;
diff --git a/src/plugins/data/common/search/index.ts b/src/plugins/data/common/search/index.ts
index 557ab64079d16..d8184551b7f3d 100644
--- a/src/plugins/data/common/search/index.ts
+++ b/src/plugins/data/common/search/index.ts
@@ -23,9 +23,6 @@ export * from './expressions';
 export * from './tabify';
 export * from './types';
 
-import { ES_SEARCH_STRATEGY } from './es_search';
-export const DEFAULT_SEARCH_STRATEGY = ES_SEARCH_STRATEGY;
-
 export {
   IEsSearchRequest,
   IEsSearchResponse,
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index 5163bfcb17d40..588885391262e 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -21,7 +21,7 @@ import { PluginInitializerContext, CoreSetup, CoreStart, Plugin, Logger } from '
 import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
 import { ConfigSchema } from '../config';
 import { IndexPatternsService, IndexPatternsServiceStart } from './index_patterns';
-import { ISearchSetup, ISearchStart } from './search';
+import { ISearchSetup, ISearchStart, SearchEnhancements } from './search';
 import { SearchService } from './search/search_service';
 import { QueryService } from './query/query_service';
 import { ScriptsService } from './scripts';
@@ -31,9 +31,17 @@ import { AutocompleteService } from './autocomplete';
 import { FieldFormatsService, FieldFormatsSetup, FieldFormatsStart } from './field_formats';
 import { getUiSettings } from './ui_settings';
 
+export interface DataEnhancements {
+  search: SearchEnhancements;
+}
+
 export interface DataPluginSetup {
   search: ISearchSetup;
   fieldFormats: FieldFormatsSetup;
+  /**
+   * @internal
+   */
+  __enhance: (enhancements: DataEnhancements) => void;
 }
 
 export interface DataPluginStart {
@@ -87,11 +95,16 @@ export class DataServerPlugin
 
     core.uiSettings.register(getUiSettings());
 
+    const searchSetup = this.searchService.setup(core, {
+      registerFunction: expressions.registerFunction,
+      usageCollection,
+    });
+
     return {
-      search: this.searchService.setup(core, {
-        registerFunction: expressions.registerFunction,
-        usageCollection,
-      }),
+      __enhance: (enhancements: DataEnhancements) => {
+        searchSetup.__enhance(enhancements.search);
+      },
+      search: searchSetup,
       fieldFormats: this.fieldFormats.setup(),
     };
   }
diff --git a/src/plugins/data/server/search/index.ts b/src/plugins/data/server/search/index.ts
index 4a3990621ca39..02c21c3254645 100644
--- a/src/plugins/data/server/search/index.ts
+++ b/src/plugins/data/server/search/index.ts
@@ -17,7 +17,13 @@
  * under the License.
  */
 
-export { ISearchStrategy, ISearchOptions, ISearchSetup, ISearchStart } from './types';
+export {
+  ISearchStrategy,
+  ISearchOptions,
+  ISearchSetup,
+  ISearchStart,
+  SearchEnhancements,
+} from './types';
 
 export { getDefaultSearchParams, getTotalLoaded } from './es_search';
 
diff --git a/src/plugins/data/server/search/mocks.ts b/src/plugins/data/server/search/mocks.ts
index 578a170f468bf..0c74ecb4b2c9d 100644
--- a/src/plugins/data/server/search/mocks.ts
+++ b/src/plugins/data/server/search/mocks.ts
@@ -24,6 +24,7 @@ export function createSearchSetupMock(): jest.Mocked<ISearchSetup> {
   return {
     aggs: searchAggsSetupMock(),
     registerSearchStrategy: jest.fn(),
+    __enhance: jest.fn(),
   };
 }
 
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index cc23c455bed26..edc94961c79d8 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -25,7 +25,7 @@ import {
   PluginInitializerContext,
   RequestHandlerContext,
 } from '../../../../core/server';
-import { ISearchSetup, ISearchStart, ISearchStrategy } from './types';
+import { ISearchSetup, ISearchStart, ISearchStrategy, SearchEnhancements } from './types';
 
 import { AggsService, AggsSetupDependencies } from './aggs';
 
@@ -57,6 +57,7 @@ export interface SearchServiceStartDependencies {
 
 export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
   private readonly aggsService = new AggsService();
+  private defaultSearchStrategyName: string = ES_SEARCH_STRATEGY;
   private searchStrategies: StrategyMap<any, any> = {};
 
   constructor(
@@ -87,6 +88,11 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
     registerSearchRoute(core);
 
     return {
+      __enhance: (enhancements: SearchEnhancements) => {
+        if (this.searchStrategies.hasOwnProperty(enhancements.defaultStrategy)) {
+          this.defaultSearchStrategyName = enhancements.defaultStrategy;
+        }
+      },
       aggs: this.aggsService.setup({ registerFunction }),
       registerSearchStrategy: this.registerSearchStrategy,
       usage,
@@ -98,11 +104,9 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
     searchRequest: IEsSearchRequest,
     options: Record<string, any>
   ) {
-    return this.getSearchStrategy(options.strategy || ES_SEARCH_STRATEGY).search(
-      context,
-      searchRequest,
-      { signal: options.signal }
-    );
+    return this.getSearchStrategy(
+      options.strategy || this.defaultSearchStrategyName
+    ).search(context, searchRequest, { signal: options.signal });
   }
 
   public start(
diff --git a/src/plugins/data/server/search/types.ts b/src/plugins/data/server/search/types.ts
index 56f803512aa19..5ce1bb3e6b9f8 100644
--- a/src/plugins/data/server/search/types.ts
+++ b/src/plugins/data/server/search/types.ts
@@ -23,6 +23,10 @@ import { AggsSetup, AggsStart } from './aggs';
 import { SearchUsage } from './collectors/usage';
 import { IEsSearchRequest, IEsSearchResponse } from './es_search';
 
+export interface SearchEnhancements {
+  defaultStrategy: string;
+}
+
 export interface ISearchOptions {
   /**
    * An `AbortSignal` that allows the caller of `search` to abort a search request.
@@ -49,6 +53,11 @@ export interface ISearchSetup {
    * Used internally for telemetry
    */
   usage?: SearchUsage;
+
+  /**
+   * @internal
+   */
+  __enhance: (enhancements: SearchEnhancements) => void;
 }
 
 export interface ISearchStart<
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index f870030ae9562..9f114f2132009 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -685,6 +685,10 @@ export interface ISearchOptions {
 //
 // @public (undocumented)
 export interface ISearchSetup {
+    // Warning: (ae-forgotten-export) The symbol "SearchEnhancements" needs to be exported by the entry point index.d.ts
+    //
+    // @internal (undocumented)
+    __enhance: (enhancements: SearchEnhancements) => void;
     // Warning: (ae-forgotten-export) The symbol "AggsSetup" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
@@ -855,6 +859,7 @@ export class Plugin implements Plugin_2<PluginSetup, PluginStart, DataPluginSetu
     constructor(initializerContext: PluginInitializerContext_2<ConfigSchema>);
     // (undocumented)
     setup(core: CoreSetup<DataPluginStartDependencies, PluginStart>, { expressions, usageCollection }: DataPluginSetupDependencies): {
+        __enhance: (enhancements: DataEnhancements) => void;
         search: ISearchSetup;
         fieldFormats: {
             register: (customFieldFormat: import("../public").FieldFormatInstanceType) => number;
@@ -883,6 +888,8 @@ export function plugin(initializerContext: PluginInitializerContext<ConfigSchema
 //
 // @public (undocumented)
 export interface PluginSetup {
+    // @internal (undocumented)
+    __enhance: (enhancements: DataEnhancements) => void;
     // Warning: (ae-forgotten-export) The symbol "FieldFormatsSetup" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
@@ -1090,6 +1097,7 @@ export function usageProvider(core: CoreSetup_2): SearchUsage;
 // src/plugins/data/server/index.ts:240:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:244:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:247:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/plugin.ts:88:66 - (ae-forgotten-export) The symbol "DataEnhancements" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 
diff --git a/x-pack/plugins/data_enhanced/common/index.ts b/x-pack/plugins/data_enhanced/common/index.ts
index 1f1cd938c97d1..d6a3c73aaf363 100644
--- a/x-pack/plugins/data_enhanced/common/index.ts
+++ b/x-pack/plugins/data_enhanced/common/index.ts
@@ -4,4 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { EnhancedSearchParams, IEnhancedEsSearchRequest, IAsyncSearchRequest } from './search';
+export {
+  EnhancedSearchParams,
+  IEnhancedEsSearchRequest,
+  IAsyncSearchRequest,
+  ENHANCED_ES_SEARCH_STRATEGY,
+} from './search';
diff --git a/x-pack/plugins/data_enhanced/common/search/index.ts b/x-pack/plugins/data_enhanced/common/search/index.ts
index 129e412a47ccf..2ae422bd6b7d7 100644
--- a/x-pack/plugins/data_enhanced/common/search/index.ts
+++ b/x-pack/plugins/data_enhanced/common/search/index.ts
@@ -4,4 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { EnhancedSearchParams, IEnhancedEsSearchRequest, IAsyncSearchRequest } from './types';
+export {
+  EnhancedSearchParams,
+  IEnhancedEsSearchRequest,
+  IAsyncSearchRequest,
+  ENHANCED_ES_SEARCH_STRATEGY,
+} from './types';
diff --git a/x-pack/plugins/data_enhanced/common/search/types.ts b/x-pack/plugins/data_enhanced/common/search/types.ts
index a5d7d326cecd5..0d3d3a69e1e57 100644
--- a/x-pack/plugins/data_enhanced/common/search/types.ts
+++ b/x-pack/plugins/data_enhanced/common/search/types.ts
@@ -6,6 +6,8 @@
 
 import { IEsSearchRequest, ISearchRequestParams } from '../../../../../src/plugins/data/common';
 
+export const ENHANCED_ES_SEARCH_STRATEGY = 'ese';
+
 export interface EnhancedSearchParams extends ISearchRequestParams {
   ignoreThrottled: boolean;
 }
diff --git a/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts b/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts
index 47099e32fcc72..6f7899d1188b4 100644
--- a/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts
+++ b/x-pack/plugins/data_enhanced/public/search/search_interceptor.ts
@@ -14,7 +14,7 @@ import {
 } from '../../../../../src/plugins/data/public';
 import { AbortError, toPromise } from '../../../../../src/plugins/data/common';
 import { IAsyncSearchOptions } from '.';
-import { IAsyncSearchRequest } from '../../common';
+import { IAsyncSearchRequest, ENHANCED_ES_SEARCH_STRATEGY } from '../../common';
 
 export class EnhancedSearchInterceptor extends SearchInterceptor {
   /**
@@ -76,10 +76,11 @@ export class EnhancedSearchInterceptor extends SearchInterceptor {
 
     const { combinedSignal, cleanup } = this.setupTimers(options);
     const aborted$ = from(toPromise(combinedSignal));
+    const strategy = options?.strategy || ENHANCED_ES_SEARCH_STRATEGY;
 
     this.pendingCount$.next(this.pendingCount$.getValue() + 1);
 
-    return this.runSearch(request, combinedSignal, options?.strategy).pipe(
+    return this.runSearch(request, combinedSignal, strategy).pipe(
       expand((response) => {
         // If the response indicates of an error, stop polling and complete the observable
         if (!response || (!response.isRunning && response.isPartial)) {
@@ -96,7 +97,7 @@ export class EnhancedSearchInterceptor extends SearchInterceptor {
         return timer(pollInterval).pipe(
           // Send future requests using just the ID from the response
           mergeMap(() => {
-            return this.runSearch({ ...request, id }, combinedSignal, options?.strategy);
+            return this.runSearch({ ...request, id }, combinedSignal, strategy);
           })
         );
       }),
diff --git a/x-pack/plugins/data_enhanced/server/plugin.ts b/x-pack/plugins/data_enhanced/server/plugin.ts
index 0e9731a414119..f9b6fd4e9ad64 100644
--- a/x-pack/plugins/data_enhanced/server/plugin.ts
+++ b/x-pack/plugins/data_enhanced/server/plugin.ts
@@ -11,7 +11,6 @@ import {
   Plugin,
   Logger,
 } from '../../../../src/core/server';
-import { ES_SEARCH_STRATEGY } from '../../../../src/plugins/data/common';
 import {
   PluginSetup as DataPluginSetup,
   PluginStart as DataPluginStart,
@@ -19,6 +18,7 @@ import {
 } from '../../../../src/plugins/data/server';
 import { enhancedEsSearchStrategyProvider } from './search';
 import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
+import { ENHANCED_ES_SEARCH_STRATEGY } from '../common';
 
 interface SetupDependencies {
   data: DataPluginSetup;
@@ -36,13 +36,19 @@ export class EnhancedDataServerPlugin implements Plugin<void, void, SetupDepende
     const usage = deps.usageCollection ? usageProvider(core) : undefined;
 
     deps.data.search.registerSearchStrategy(
-      ES_SEARCH_STRATEGY,
+      ENHANCED_ES_SEARCH_STRATEGY,
       enhancedEsSearchStrategyProvider(
         this.initializerContext.config.legacy.globalConfig$,
         this.logger,
         usage
       )
     );
+
+    deps.data.__enhance({
+      search: {
+        defaultStrategy: ENHANCED_ES_SEARCH_STRATEGY,
+      },
+    });
   }
 
   public start(core: CoreStart) {}

From 43cac5af45ce20e8c88c142ed83e9f66042390d1 Mon Sep 17 00:00:00 2001
From: Kerry Gallagher <k.gallagher.05@gmail.com>
Date: Tue, 25 Aug 2020 11:23:57 +0100
Subject: [PATCH 026/148] [Logs UI] Log alerts chart previews (#75296)

* Add chart previews for log threshold alerts
---
 .../infra/common/alerting/logs/types.ts       |  58 +++-
 .../infra/common/color_palette.test.ts        |  30 +-
 x-pack/plugins/infra/common/color_palette.ts  |  49 +--
 x-pack/plugins/infra/common/http_api/index.ts |   1 +
 .../http_api/log_alerts/chart_preview_data.ts |  63 ++++
 .../infra/common/http_api/log_alerts/index.ts |   7 +
 .../components/expression_chart.tsx           |  16 +-
 .../logs/expression_editor/criteria.tsx       |  35 +-
 .../criterion_preview_chart.tsx               | 326 ++++++++++++++++++
 .../logs/expression_editor/editor.tsx         |  13 +-
 .../hooks/use_chart_preview_data.tsx          |  80 +++++
 .../criterion_preview_chart.tsx               | 136 ++++++++
 .../helpers/calculate_domian.test.ts          |   6 +-
 .../components/helpers/create_tsvb_link.ts    |   6 +-
 .../metrics_explorer/components/metrics.tsx   |   6 +-
 .../components/series_chart.tsx               |  10 +-
 .../hooks/use_metrics_explorer_options.ts     |  15 +-
 x-pack/plugins/infra/server/infra_server.ts   |   2 +
 .../log_threshold_chart_preview.ts            | 186 ++++++++++
 .../log_threshold/log_threshold_executor.ts   |  13 +-
 .../routes/log_alerts/chart_preview_data.ts   |  64 ++++
 .../infra/server/routes/log_alerts/index.ts   |   7 +
 22 files changed, 1017 insertions(+), 112 deletions(-)
 create mode 100644 x-pack/plugins/infra/common/http_api/log_alerts/chart_preview_data.ts
 create mode 100644 x-pack/plugins/infra/common/http_api/log_alerts/index.ts
 create mode 100644 x-pack/plugins/infra/public/components/alerting/logs/expression_editor/criterion_preview_chart.tsx
 create mode 100644 x-pack/plugins/infra/public/components/alerting/logs/expression_editor/hooks/use_chart_preview_data.tsx
 create mode 100644 x-pack/plugins/infra/public/components/alerting/shared/criterion_preview_chart/criterion_preview_chart.tsx
 create mode 100644 x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_chart_preview.ts
 create mode 100644 x-pack/plugins/infra/server/routes/log_alerts/chart_preview_data.ts
 create mode 100644 x-pack/plugins/infra/server/routes/log_alerts/index.ts

diff --git a/x-pack/plugins/infra/common/alerting/logs/types.ts b/x-pack/plugins/infra/common/alerting/logs/types.ts
index 884a813d74c86..1b736f52aa7e2 100644
--- a/x-pack/plugins/infra/common/alerting/logs/types.ts
+++ b/x-pack/plugins/infra/common/alerting/logs/types.ts
@@ -96,40 +96,64 @@ const DocumentCountRT = rt.type({
 
 export type DocumentCount = rt.TypeOf<typeof DocumentCountRT>;
 
-const CriterionRT = rt.type({
+export const CriterionRT = rt.type({
   field: rt.string,
   comparator: ComparatorRT,
   value: rt.union([rt.string, rt.number]),
 });
 
 export type Criterion = rt.TypeOf<typeof CriterionRT>;
+export const criteriaRT = rt.array(CriterionRT);
 
-const TimeUnitRT = rt.union([rt.literal('s'), rt.literal('m'), rt.literal('h'), rt.literal('d')]);
+export const TimeUnitRT = rt.union([
+  rt.literal('s'),
+  rt.literal('m'),
+  rt.literal('h'),
+  rt.literal('d'),
+]);
 export type TimeUnit = rt.TypeOf<typeof TimeUnitRT>;
 
+export const timeSizeRT = rt.number;
+export const groupByRT = rt.array(rt.string);
+
 export const LogDocumentCountAlertParamsRT = rt.intersection([
   rt.type({
     count: DocumentCountRT,
-    criteria: rt.array(CriterionRT),
+    criteria: criteriaRT,
     timeUnit: TimeUnitRT,
-    timeSize: rt.number,
+    timeSize: timeSizeRT,
   }),
   rt.partial({
-    groupBy: rt.array(rt.string),
+    groupBy: groupByRT,
   }),
 ]);
 
 export type LogDocumentCountAlertParams = rt.TypeOf<typeof LogDocumentCountAlertParamsRT>;
 
+const chartPreviewHistogramBucket = rt.type({
+  key: rt.number,
+  doc_count: rt.number,
+});
+
 export const UngroupedSearchQueryResponseRT = rt.intersection([
   commonSearchSuccessResponseFieldsRT,
-  rt.type({
-    hits: rt.type({
-      total: rt.type({
-        value: rt.number,
+  rt.intersection([
+    rt.type({
+      hits: rt.type({
+        total: rt.type({
+          value: rt.number,
+        }),
       }),
     }),
-  }),
+    // Chart preview buckets
+    rt.partial({
+      aggregations: rt.type({
+        histogramBuckets: rt.type({
+          buckets: rt.array(chartPreviewHistogramBucket),
+        }),
+      }),
+    }),
+  ]),
 ]);
 
 export type UngroupedSearchQueryResponse = rt.TypeOf<typeof UngroupedSearchQueryResponseRT>;
@@ -144,9 +168,17 @@ export const GroupedSearchQueryResponseRT = rt.intersection([
             rt.type({
               key: rt.record(rt.string, rt.string),
               doc_count: rt.number,
-              filtered_results: rt.type({
-                doc_count: rt.number,
-              }),
+              filtered_results: rt.intersection([
+                rt.type({
+                  doc_count: rt.number,
+                }),
+                // Chart preview buckets
+                rt.partial({
+                  histogramBuckets: rt.type({
+                    buckets: rt.array(chartPreviewHistogramBucket),
+                  }),
+                }),
+              ]),
             })
           ),
         }),
diff --git a/x-pack/plugins/infra/common/color_palette.test.ts b/x-pack/plugins/infra/common/color_palette.test.ts
index ced45c39c710c..1e814d6f67fec 100644
--- a/x-pack/plugins/infra/common/color_palette.test.ts
+++ b/x-pack/plugins/infra/common/color_palette.test.ts
@@ -4,35 +4,35 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { sampleColor, MetricsExplorerColor, colorTransformer } from './color_palette';
+import { sampleColor, Color, colorTransformer } from './color_palette';
 describe('Color Palette', () => {
   describe('sampleColor()', () => {
     it('should just work', () => {
-      const usedColors = [MetricsExplorerColor.color0];
+      const usedColors = [Color.color0];
       const color = sampleColor(usedColors);
-      expect(color).toBe(MetricsExplorerColor.color1);
+      expect(color).toBe(Color.color1);
     });
 
     it('should return color0 when nothing is available', () => {
       const usedColors = [
-        MetricsExplorerColor.color0,
-        MetricsExplorerColor.color1,
-        MetricsExplorerColor.color2,
-        MetricsExplorerColor.color3,
-        MetricsExplorerColor.color4,
-        MetricsExplorerColor.color5,
-        MetricsExplorerColor.color6,
-        MetricsExplorerColor.color7,
-        MetricsExplorerColor.color8,
-        MetricsExplorerColor.color9,
+        Color.color0,
+        Color.color1,
+        Color.color2,
+        Color.color3,
+        Color.color4,
+        Color.color5,
+        Color.color6,
+        Color.color7,
+        Color.color8,
+        Color.color9,
       ];
       const color = sampleColor(usedColors);
-      expect(color).toBe(MetricsExplorerColor.color0);
+      expect(color).toBe(Color.color0);
     });
   });
   describe('colorTransformer()', () => {
     it('should just work', () => {
-      expect(colorTransformer(MetricsExplorerColor.color0)).toBe('#6092C0');
+      expect(colorTransformer(Color.color0)).toBe('#6092C0');
     });
   });
 });
diff --git a/x-pack/plugins/infra/common/color_palette.ts b/x-pack/plugins/infra/common/color_palette.ts
index 51962150d8424..2b72b3f0c1dfa 100644
--- a/x-pack/plugins/infra/common/color_palette.ts
+++ b/x-pack/plugins/infra/common/color_palette.ts
@@ -6,7 +6,7 @@
 import { difference, first, values } from 'lodash';
 import { euiPaletteColorBlind } from '@elastic/eui';
 
-export enum MetricsExplorerColor {
+export enum Color {
   color0 = 'color0',
   color1 = 'color1',
   color2 = 'color2',
@@ -19,41 +19,30 @@ export enum MetricsExplorerColor {
   color9 = 'color9',
 }
 
-export interface MetricsExplorerPalette {
-  [MetricsExplorerColor.color0]: string;
-  [MetricsExplorerColor.color1]: string;
-  [MetricsExplorerColor.color2]: string;
-  [MetricsExplorerColor.color3]: string;
-  [MetricsExplorerColor.color4]: string;
-  [MetricsExplorerColor.color5]: string;
-  [MetricsExplorerColor.color6]: string;
-  [MetricsExplorerColor.color7]: string;
-  [MetricsExplorerColor.color8]: string;
-  [MetricsExplorerColor.color9]: string;
-}
+export type Palette = {
+  [K in keyof typeof Color]: string;
+};
 
 const euiPalette = euiPaletteColorBlind();
 
-export const defaultPalette: MetricsExplorerPalette = {
-  [MetricsExplorerColor.color0]: euiPalette[1], // (blue)
-  [MetricsExplorerColor.color1]: euiPalette[2], // (pink)
-  [MetricsExplorerColor.color2]: euiPalette[0], // (green-ish)
-  [MetricsExplorerColor.color3]: euiPalette[3], // (purple)
-  [MetricsExplorerColor.color4]: euiPalette[4], // (light pink)
-  [MetricsExplorerColor.color5]: euiPalette[5], // (yellow)
-  [MetricsExplorerColor.color6]: euiPalette[6], // (tan)
-  [MetricsExplorerColor.color7]: euiPalette[7], // (orange)
-  [MetricsExplorerColor.color8]: euiPalette[8], // (brown)
-  [MetricsExplorerColor.color9]: euiPalette[9], // (red)
+export const defaultPalette: Palette = {
+  [Color.color0]: euiPalette[1], // (blue)
+  [Color.color1]: euiPalette[2], // (pink)
+  [Color.color2]: euiPalette[0], // (green-ish)
+  [Color.color3]: euiPalette[3], // (purple)
+  [Color.color4]: euiPalette[4], // (light pink)
+  [Color.color5]: euiPalette[5], // (yellow)
+  [Color.color6]: euiPalette[6], // (tan)
+  [Color.color7]: euiPalette[7], // (orange)
+  [Color.color8]: euiPalette[8], // (brown)
+  [Color.color9]: euiPalette[9], // (red)
 };
 
-export const createPaletteTransformer = (palette: MetricsExplorerPalette) => (
-  color: MetricsExplorerColor
-) => palette[color];
+export const createPaletteTransformer = (palette: Palette) => (color: Color) => palette[color];
 
 export const colorTransformer = createPaletteTransformer(defaultPalette);
 
-export const sampleColor = (usedColors: MetricsExplorerColor[] = []): MetricsExplorerColor => {
-  const available = difference(values(MetricsExplorerColor) as MetricsExplorerColor[], usedColors);
-  return first(available) || MetricsExplorerColor.color0;
+export const sampleColor = (usedColors: Color[] = []): Color => {
+  const available = difference(values(Color) as Color[], usedColors);
+  return first(available) || Color.color0;
 };
diff --git a/x-pack/plugins/infra/common/http_api/index.ts b/x-pack/plugins/infra/common/http_api/index.ts
index 9ec8bf5231066..818009417fb1c 100644
--- a/x-pack/plugins/infra/common/http_api/index.ts
+++ b/x-pack/plugins/infra/common/http_api/index.ts
@@ -9,3 +9,4 @@ export * from './metadata_api';
 export * from './log_entries';
 export * from './metrics_explorer';
 export * from './metrics_api';
+export * from './log_alerts';
diff --git a/x-pack/plugins/infra/common/http_api/log_alerts/chart_preview_data.ts b/x-pack/plugins/infra/common/http_api/log_alerts/chart_preview_data.ts
new file mode 100644
index 0000000000000..15914bd1b2209
--- /dev/null
+++ b/x-pack/plugins/infra/common/http_api/log_alerts/chart_preview_data.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import { criteriaRT, TimeUnitRT, timeSizeRT, groupByRT } from '../../alerting/logs/types';
+
+export const LOG_ALERTS_CHART_PREVIEW_DATA_PATH = '/api/infra/log_alerts/chart_preview_data';
+
+const pointRT = rt.type({
+  timestamp: rt.number,
+  value: rt.number,
+});
+
+export type Point = rt.TypeOf<typeof pointRT>;
+
+const serieRT = rt.type({
+  id: rt.string,
+  points: rt.array(pointRT),
+});
+
+const seriesRT = rt.array(serieRT);
+
+export type Series = rt.TypeOf<typeof seriesRT>;
+
+export const getLogAlertsChartPreviewDataSuccessResponsePayloadRT = rt.type({
+  data: rt.type({
+    series: seriesRT,
+  }),
+});
+
+export type GetLogAlertsChartPreviewDataSuccessResponsePayload = rt.TypeOf<
+  typeof getLogAlertsChartPreviewDataSuccessResponsePayloadRT
+>;
+
+export const getLogAlertsChartPreviewDataAlertParamsSubsetRT = rt.intersection([
+  rt.type({
+    criteria: criteriaRT,
+    timeUnit: TimeUnitRT,
+    timeSize: timeSizeRT,
+  }),
+  rt.partial({
+    groupBy: groupByRT,
+  }),
+]);
+
+export type GetLogAlertsChartPreviewDataAlertParamsSubset = rt.TypeOf<
+  typeof getLogAlertsChartPreviewDataAlertParamsSubsetRT
+>;
+
+export const getLogAlertsChartPreviewDataRequestPayloadRT = rt.type({
+  data: rt.type({
+    sourceId: rt.string,
+    alertParams: getLogAlertsChartPreviewDataAlertParamsSubsetRT,
+    buckets: rt.number,
+  }),
+});
+
+export type GetLogAlertsChartPreviewDataRequestPayload = rt.TypeOf<
+  typeof getLogAlertsChartPreviewDataRequestPayloadRT
+>;
diff --git a/x-pack/plugins/infra/common/http_api/log_alerts/index.ts b/x-pack/plugins/infra/common/http_api/log_alerts/index.ts
new file mode 100644
index 0000000000000..5634fda043a52
--- /dev/null
+++ b/x-pack/plugins/infra/common/http_api/log_alerts/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './chart_preview_data';
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx
index c90c534193fdc..94ad074b72e9c 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx
@@ -28,7 +28,7 @@ import {
   Comparator,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../server/lib/alerting/metric_threshold/types';
-import { MetricsExplorerColor, colorTransformer } from '../../../../common/color_palette';
+import { Color, colorTransformer } from '../../../../common/color_palette';
 import { MetricsExplorerRow, MetricsExplorerAggregation } from '../../../../common/http_api';
 import { MetricExplorerSeriesChart } from '../../../pages/metrics/metrics_explorer/components/series_chart';
 import { MetricExpression, AlertContextMeta } from '../types';
@@ -80,7 +80,7 @@ export const ExpressionChart: React.FC<Props> = ({
   const metric = {
     field: expression.metric,
     aggregation: expression.aggType as MetricsExplorerAggregation,
-    color: MetricsExplorerColor.color0,
+    color: Color.color0,
   };
   const isDarkMode = context.uiSettings?.get('theme:darkMode') || false;
   const dateFormatter = useMemo(() => {
@@ -176,7 +176,7 @@ export const ExpressionChart: React.FC<Props> = ({
             style={{
               line: {
                 strokeWidth: 2,
-                stroke: colorTransformer(MetricsExplorerColor.color1),
+                stroke: colorTransformer(Color.color1),
                 opacity: 1,
               },
             }}
@@ -186,7 +186,7 @@ export const ExpressionChart: React.FC<Props> = ({
               <RectAnnotation
                 id="lower-threshold"
                 style={{
-                  fill: colorTransformer(MetricsExplorerColor.color1),
+                  fill: colorTransformer(Color.color1),
                   opacity,
                 }}
                 dataValues={[
@@ -207,7 +207,7 @@ export const ExpressionChart: React.FC<Props> = ({
               <RectAnnotation
                 id="lower-threshold"
                 style={{
-                  fill: colorTransformer(MetricsExplorerColor.color1),
+                  fill: colorTransformer(Color.color1),
                   opacity,
                 }}
                 dataValues={[
@@ -224,7 +224,7 @@ export const ExpressionChart: React.FC<Props> = ({
               <RectAnnotation
                 id="upper-threshold"
                 style={{
-                  fill: colorTransformer(MetricsExplorerColor.color1),
+                  fill: colorTransformer(Color.color1),
                   opacity,
                 }}
                 dataValues={[
@@ -244,7 +244,7 @@ export const ExpressionChart: React.FC<Props> = ({
             <RectAnnotation
               id="upper-threshold"
               style={{
-                fill: colorTransformer(MetricsExplorerColor.color1),
+                fill: colorTransformer(Color.color1),
                 opacity,
               }}
               dataValues={[
@@ -263,7 +263,7 @@ export const ExpressionChart: React.FC<Props> = ({
             <RectAnnotation
               id="upper-threshold"
               style={{
-                fill: colorTransformer(MetricsExplorerColor.color1),
+                fill: colorTransformer(Color.color1),
                 opacity,
               }}
               dataValues={[
diff --git a/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/criteria.tsx b/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/criteria.tsx
index a9b45a117c281..7a4b2ecaa5e43 100644
--- a/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/criteria.tsx
+++ b/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/criteria.tsx
@@ -14,6 +14,8 @@ import {
   LogDocumentCountAlertParams,
   Criterion as CriterionType,
 } from '../../../../../common/alerting/logs/types';
+import { AlertsContext } from './editor';
+import { CriterionPreview } from './criterion_preview_chart';
 
 interface Props {
   fields: IFieldType[];
@@ -21,6 +23,9 @@ interface Props {
   updateCriterion: (idx: number, params: Partial<CriterionType>) => void;
   removeCriterion: (idx: number) => void;
   errors: IErrorObject;
+  alertParams: Partial<LogDocumentCountAlertParams>;
+  context: AlertsContext;
+  sourceId: string;
 }
 
 export const Criteria: React.FC<Props> = ({
@@ -29,6 +34,9 @@ export const Criteria: React.FC<Props> = ({
   updateCriterion,
   removeCriterion,
   errors,
+  alertParams,
+  context,
+  sourceId,
 }) => {
   if (!criteria) return null;
   return (
@@ -36,16 +44,23 @@ export const Criteria: React.FC<Props> = ({
       <EuiFlexItem grow>
         {criteria.map((criterion, idx) => {
           return (
-            <Criterion
-              key={idx}
-              idx={idx}
-              fields={fields}
-              criterion={criterion}
-              updateCriterion={updateCriterion}
-              removeCriterion={removeCriterion}
-              canDelete={criteria.length > 1}
-              errors={errors[idx.toString()] as IErrorObject}
-            />
+            <React.Fragment key={idx}>
+              <Criterion
+                idx={idx}
+                fields={fields}
+                criterion={criterion}
+                updateCriterion={updateCriterion}
+                removeCriterion={removeCriterion}
+                canDelete={criteria.length > 1}
+                errors={errors[idx.toString()] as IErrorObject}
+              />
+              <CriterionPreview
+                alertParams={alertParams}
+                context={context}
+                chartCriterion={criterion}
+                sourceId={sourceId}
+              />
+            </React.Fragment>
           );
         })}
       </EuiFlexItem>
diff --git a/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/criterion_preview_chart.tsx b/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/criterion_preview_chart.tsx
new file mode 100644
index 0000000000000..31f9a64015c07
--- /dev/null
+++ b/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/criterion_preview_chart.tsx
@@ -0,0 +1,326 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useMemo } from 'react';
+import { useDebounce } from 'react-use';
+import {
+  ScaleType,
+  AnnotationDomainTypes,
+  Position,
+  Axis,
+  BarSeries,
+  Chart,
+  Settings,
+  RectAnnotation,
+  LineAnnotation,
+} from '@elastic/charts';
+import { EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  ChartContainer,
+  LoadingState,
+  NoDataState,
+  ErrorState,
+  TIME_LABELS,
+  getDomain,
+  tooltipProps,
+  useDateFormatter,
+  getChartTheme,
+  yAxisFormatter,
+  NUM_BUCKETS,
+} from '../../shared/criterion_preview_chart/criterion_preview_chart';
+import {
+  LogDocumentCountAlertParams,
+  Criterion,
+  Comparator,
+} from '../../../../../common/alerting/logs/types';
+import { Color, colorTransformer } from '../../../../../common/color_palette';
+import {
+  GetLogAlertsChartPreviewDataAlertParamsSubset,
+  getLogAlertsChartPreviewDataAlertParamsSubsetRT,
+} from '../../../../../common/http_api/log_alerts/';
+import { AlertsContext } from './editor';
+import { useChartPreviewData } from './hooks/use_chart_preview_data';
+import { decodeOrThrow } from '../../../../../common/runtime_types';
+
+const GROUP_LIMIT = 5;
+
+interface Props {
+  alertParams: Partial<LogDocumentCountAlertParams>;
+  context: AlertsContext;
+  chartCriterion: Partial<Criterion>;
+  sourceId: string;
+}
+
+export const CriterionPreview: React.FC<Props> = ({
+  alertParams,
+  context,
+  chartCriterion,
+  sourceId,
+}) => {
+  const chartAlertParams: GetLogAlertsChartPreviewDataAlertParamsSubset | null = useMemo(() => {
+    const { field, comparator, value } = chartCriterion;
+    const criteria = field && comparator && value ? [{ field, comparator, value }] : [];
+    const params = {
+      criteria,
+      timeSize: alertParams.timeSize,
+      timeUnit: alertParams.timeUnit,
+      groupBy: alertParams.groupBy,
+    };
+
+    try {
+      return decodeOrThrow(getLogAlertsChartPreviewDataAlertParamsSubsetRT)(params);
+    } catch (error) {
+      return null;
+    }
+  }, [alertParams.timeSize, alertParams.timeUnit, alertParams.groupBy, chartCriterion]);
+
+  // Check for the existence of properties that are necessary for a meaningful chart.
+  if (chartAlertParams === null || chartAlertParams.criteria.length === 0) return null;
+
+  return (
+    <CriterionPreviewChart
+      buckets={
+        !chartAlertParams.groupBy || chartAlertParams.groupBy.length === 0
+          ? NUM_BUCKETS
+          : NUM_BUCKETS / 4
+      } // Display less data for groups due to space limitations
+      context={context}
+      sourceId={sourceId}
+      threshold={alertParams.count}
+      chartAlertParams={chartAlertParams}
+    />
+  );
+};
+
+interface ChartProps {
+  buckets: number;
+  context: AlertsContext;
+  sourceId: string;
+  threshold?: LogDocumentCountAlertParams['count'];
+  chartAlertParams: GetLogAlertsChartPreviewDataAlertParamsSubset;
+}
+
+const CriterionPreviewChart: React.FC<ChartProps> = ({
+  buckets,
+  context,
+  sourceId,
+  threshold,
+  chartAlertParams,
+}) => {
+  const isDarkMode = context.uiSettings?.get('theme:darkMode') || false;
+
+  const {
+    getChartPreviewData,
+    isLoading,
+    hasError,
+    chartPreviewData: series,
+  } = useChartPreviewData({
+    context,
+    sourceId,
+    alertParams: chartAlertParams,
+    buckets,
+  });
+
+  useDebounce(
+    () => {
+      getChartPreviewData();
+    },
+    500,
+    [getChartPreviewData]
+  );
+
+  const isStacked = false;
+
+  const { timeSize, timeUnit, groupBy } = chartAlertParams;
+
+  const isGrouped = groupBy && groupBy.length > 0 ? true : false;
+
+  const isAbove =
+    threshold && threshold.comparator
+      ? [Comparator.GT, Comparator.GT_OR_EQ].includes(threshold.comparator)
+      : false;
+
+  const isBelow =
+    threshold && threshold.comparator
+      ? [Comparator.LT, Comparator.LT_OR_EQ].includes(threshold.comparator)
+      : false;
+
+  // For grouped scenarios we want to limit the groups displayed, for "isAbove" thresholds we'll show
+  // groups with the highest doc counts. And for "isBelow" thresholds we'll show groups with the lowest doc counts.
+  const filteredSeries = useMemo(() => {
+    if (!isGrouped) {
+      return series;
+    }
+
+    const sortedByMax = series.sort((a, b) => {
+      const aMax = Math.max(...a.points.map((point) => point.value));
+      const bMax = Math.max(...b.points.map((point) => point.value));
+      return bMax - aMax;
+    });
+    const sortedSeries = (!isAbove && !isBelow) || isAbove ? sortedByMax : sortedByMax.reverse();
+    return sortedSeries.slice(0, GROUP_LIMIT);
+  }, [series, isGrouped, isAbove, isBelow]);
+
+  const barSeries = useMemo(() => {
+    return filteredSeries.reduce<Array<{ timestamp: number; value: number; groupBy: string }>>(
+      (acc, serie) => {
+        const barPoints = serie.points.reduce<
+          Array<{ timestamp: number; value: number; groupBy: string }>
+        >((pointAcc, point) => {
+          return [...pointAcc, { ...point, groupBy: serie.id }];
+        }, []);
+        return [...acc, ...barPoints];
+      },
+      []
+    );
+  }, [filteredSeries]);
+
+  const lookback = timeSize * buckets;
+  const hasData = series.length > 0;
+  const { yMin, yMax, xMin, xMax } = getDomain(filteredSeries, isStacked);
+  const chartDomain = {
+    max: threshold && threshold.value ? Math.max(yMax, threshold.value) * 1.1 : yMax * 1.1, // Add 10% headroom.
+    min: threshold && threshold.value ? Math.min(yMin, threshold.value) : yMin,
+  };
+
+  if (threshold && threshold.value && chartDomain.min === threshold.value) {
+    chartDomain.min = chartDomain.min * 0.9; // Allow some padding so the threshold annotation has better visibility
+  }
+
+  const THRESHOLD_OPACITY = 0.3;
+  const groupByLabel = groupBy && groupBy.length > 0 ? groupBy.join(', ') : null;
+  const dateFormatter = useDateFormatter(xMin, xMax);
+  const timeLabel = TIME_LABELS[timeUnit as keyof typeof TIME_LABELS];
+
+  if (isLoading) {
+    return <LoadingState />;
+  } else if (hasError) {
+    return <ErrorState />;
+  } else if (!hasData) {
+    return <NoDataState />;
+  }
+
+  return (
+    <>
+      <ChartContainer>
+        <Chart>
+          <BarSeries
+            id="criterion-preview"
+            xScaleType={ScaleType.Linear}
+            yScaleType={ScaleType.Linear}
+            xAccessor="timestamp"
+            yAccessors={['value']}
+            splitSeriesAccessors={['groupBy']}
+            stackAccessors={isStacked ? ['timestamp'] : undefined}
+            data={barSeries}
+            barSeriesStyle={{
+              rectBorder: {
+                stroke: !isGrouped ? colorTransformer(Color.color0) : undefined,
+                strokeWidth: 1,
+                visible: true,
+              },
+              rect: {
+                opacity: 1,
+              },
+            }}
+            color={!isGrouped ? colorTransformer(Color.color0) : undefined}
+          />
+          {threshold && threshold.value ? (
+            <LineAnnotation
+              id={`threshold-line`}
+              domainType={AnnotationDomainTypes.YDomain}
+              dataValues={[{ dataValue: threshold.value }]}
+              style={{
+                line: {
+                  strokeWidth: 2,
+                  stroke: colorTransformer(Color.color1),
+                  opacity: 1,
+                },
+              }}
+            />
+          ) : null}
+          {threshold && threshold.value && isBelow ? (
+            <RectAnnotation
+              id="below-threshold"
+              style={{
+                fill: colorTransformer(Color.color1),
+                opacity: THRESHOLD_OPACITY,
+              }}
+              dataValues={[
+                {
+                  coordinates: {
+                    x0: xMin,
+                    x1: xMax,
+                    y0: chartDomain.min,
+                    y1: threshold.value,
+                  },
+                },
+              ]}
+            />
+          ) : null}
+          {threshold && threshold.value && isAbove ? (
+            <RectAnnotation
+              id="above-threshold"
+              style={{
+                fill: colorTransformer(Color.color1),
+                opacity: THRESHOLD_OPACITY,
+              }}
+              dataValues={[
+                {
+                  coordinates: {
+                    x0: xMin,
+                    x1: xMax,
+                    y0: threshold.value,
+                    y1: chartDomain.max,
+                  },
+                },
+              ]}
+            />
+          ) : null}
+          <Axis
+            id={'timestamp'}
+            position={Position.Bottom}
+            showOverlappingTicks={true}
+            tickFormat={dateFormatter}
+          />
+          <Axis
+            id={'values'}
+            position={Position.Left}
+            tickFormat={yAxisFormatter}
+            domain={chartDomain}
+          />
+          <Settings tooltip={tooltipProps} theme={getChartTheme(isDarkMode)} />
+        </Chart>
+      </ChartContainer>
+      <div style={{ textAlign: 'center' }}>
+        {groupByLabel != null ? (
+          <EuiText size="xs" color="subdued">
+            <FormattedMessage
+              id="xpack.infra.logs.alerts.dataTimeRangeLabelWithGrouping"
+              defaultMessage="Last {lookback} {timeLabel} of data, grouped by {groupByLabel} (showing {displayedGroups}/{totalGroups} groups)"
+              values={{
+                groupByLabel,
+                timeLabel,
+                lookback,
+                displayedGroups: filteredSeries.length,
+                totalGroups: series.length,
+              }}
+            />
+          </EuiText>
+        ) : (
+          <EuiText size="xs" color="subdued">
+            <FormattedMessage
+              id="xpack.infra.logs.alerts.dataTimeRangeLabel"
+              defaultMessage="Last {lookback} {timeLabel} of data"
+              values={{ timeLabel, lookback }}
+            />
+          </EuiText>
+        )}
+      </div>
+    </>
+  );
+};
diff --git a/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/editor.tsx b/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/editor.tsx
index 295e60552cce5..e063b880ab843 100644
--- a/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/editor.tsx
+++ b/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/editor.tsx
@@ -34,12 +34,14 @@ interface LogsContextMeta {
   isInternal?: boolean;
 }
 
+export type AlertsContext = AlertsContextValue<LogsContextMeta>;
 interface Props {
   errors: IErrorObject;
   alertParams: Partial<LogDocumentCountAlertParams>;
   setAlertParams(key: string, value: any): void;
   setAlertProperty(key: string, value: any): void;
-  alertsContext: AlertsContextValue<LogsContextMeta>;
+  alertsContext: AlertsContext;
+  sourceId: string;
 }
 
 const DEFAULT_CRITERIA = { field: 'log.level', comparator: Comparator.EQ, value: 'error' };
@@ -62,12 +64,12 @@ export const ExpressionEditor: React.FC<Props> = (props) => {
     <>
       {isInternal ? (
         <SourceStatusWrapper {...props}>
-          <Editor {...props} />
+          <Editor {...props} sourceId={sourceId} />
         </SourceStatusWrapper>
       ) : (
         <LogSourceProvider sourceId={sourceId} fetch={props.alertsContext.http.fetch}>
           <SourceStatusWrapper {...props}>
-            <Editor {...props} />
+            <Editor {...props} sourceId={sourceId} />
           </SourceStatusWrapper>
         </LogSourceProvider>
       )}
@@ -119,7 +121,7 @@ export const SourceStatusWrapper: React.FC<Props> = (props) => {
 };
 
 export const Editor: React.FC<Props> = (props) => {
-  const { setAlertParams, alertParams, errors } = props;
+  const { setAlertParams, alertParams, errors, alertsContext, sourceId } = props;
   const [hasSetDefaults, setHasSetDefaults] = useState<boolean>(false);
   const { sourceStatus } = useLogSourceContext();
   useMount(() => {
@@ -227,6 +229,9 @@ export const Editor: React.FC<Props> = (props) => {
         updateCriterion={updateCriterion}
         removeCriterion={removeCriterion}
         errors={errors.criteria as IErrorObject}
+        alertParams={alertParams}
+        context={alertsContext}
+        sourceId={sourceId}
       />
 
       <ForLastExpression
diff --git a/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/hooks/use_chart_preview_data.tsx b/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/hooks/use_chart_preview_data.tsx
new file mode 100644
index 0000000000000..d5ba730026b12
--- /dev/null
+++ b/x-pack/plugins/infra/public/components/alerting/logs/expression_editor/hooks/use_chart_preview_data.tsx
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { useState, useMemo } from 'react';
+import { AlertsContext } from '../editor';
+import { useTrackedPromise } from '../../../../../utils/use_tracked_promise';
+import {
+  GetLogAlertsChartPreviewDataSuccessResponsePayload,
+  getLogAlertsChartPreviewDataSuccessResponsePayloadRT,
+  getLogAlertsChartPreviewDataRequestPayloadRT,
+  LOG_ALERTS_CHART_PREVIEW_DATA_PATH,
+} from '../../../../../../common/http_api';
+import { decodeOrThrow } from '../../../../../../common/runtime_types';
+import { GetLogAlertsChartPreviewDataAlertParamsSubset } from '../../../../../../common/http_api/log_alerts/';
+
+interface Options {
+  sourceId: string;
+  context: AlertsContext;
+  alertParams: GetLogAlertsChartPreviewDataAlertParamsSubset;
+  buckets: number;
+}
+
+export const useChartPreviewData = ({ context, sourceId, alertParams, buckets }: Options) => {
+  const [chartPreviewData, setChartPreviewData] = useState<
+    GetLogAlertsChartPreviewDataSuccessResponsePayload['data']['series']
+  >([]);
+  const [hasError, setHasError] = useState<boolean>(false);
+  const [getChartPreviewDataRequest, getChartPreviewData] = useTrackedPromise(
+    {
+      cancelPreviousOn: 'creation',
+      createPromise: async () => {
+        setHasError(false);
+        return await callGetChartPreviewDataAPI(sourceId, context.http.fetch, alertParams, buckets);
+      },
+      onResolve: ({ data: { series } }) => {
+        setHasError(false);
+        setChartPreviewData(series);
+      },
+      onReject: (error) => {
+        setHasError(true);
+      },
+    },
+    [sourceId, context.http.fetch, alertParams, buckets]
+  );
+
+  const isLoading = useMemo(() => getChartPreviewDataRequest.state === 'pending', [
+    getChartPreviewDataRequest.state,
+  ]);
+
+  return {
+    chartPreviewData,
+    hasError,
+    isLoading,
+    getChartPreviewData,
+  };
+};
+
+export const callGetChartPreviewDataAPI = async (
+  sourceId: string,
+  fetch: AlertsContext['http']['fetch'],
+  alertParams: GetLogAlertsChartPreviewDataAlertParamsSubset,
+  buckets: number
+) => {
+  const response = await fetch(LOG_ALERTS_CHART_PREVIEW_DATA_PATH, {
+    method: 'POST',
+    body: JSON.stringify(
+      getLogAlertsChartPreviewDataRequestPayloadRT.encode({
+        data: {
+          sourceId,
+          alertParams,
+          buckets,
+        },
+      })
+    ),
+  });
+
+  return decodeOrThrow(getLogAlertsChartPreviewDataSuccessResponsePayloadRT)(response);
+};
diff --git a/x-pack/plugins/infra/public/components/alerting/shared/criterion_preview_chart/criterion_preview_chart.tsx b/x-pack/plugins/infra/public/components/alerting/shared/criterion_preview_chart/criterion_preview_chart.tsx
new file mode 100644
index 0000000000000..239afd93a7a1f
--- /dev/null
+++ b/x-pack/plugins/infra/public/components/alerting/shared/criterion_preview_chart/criterion_preview_chart.tsx
@@ -0,0 +1,136 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { useMemo } from 'react';
+import { niceTimeFormatter, TooltipValue } from '@elastic/charts';
+import { Theme, LIGHT_THEME, DARK_THEME } from '@elastic/charts';
+import { sum, min as getMin, max as getMax } from 'lodash';
+import moment from 'moment';
+import { i18n } from '@kbn/i18n';
+import { EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { formatNumber } from '../../../../../common/formatters/number';
+import { GetLogAlertsChartPreviewDataSuccessResponsePayload } from '../../../../../common/http_api';
+
+type Series = GetLogAlertsChartPreviewDataSuccessResponsePayload['data']['series'];
+
+export const tooltipProps = {
+  headerFormatter: (tooltipValue: TooltipValue) =>
+    moment(tooltipValue.value).format('Y-MM-DD HH:mm:ss'),
+};
+
+export const NUM_BUCKETS = 20;
+
+export const TIME_LABELS = {
+  s: i18n.translate('xpack.infra.alerts.timeLabels.seconds', { defaultMessage: 'seconds' }),
+  m: i18n.translate('xpack.infra.alerts.timeLabels.minutes', { defaultMessage: 'minutes' }),
+  h: i18n.translate('xpack.infra.alerts.timeLabels.hours', { defaultMessage: 'hours' }),
+  d: i18n.translate('xpack.infra.alerts.timeLabels.days', { defaultMessage: 'days' }),
+};
+
+export const useDateFormatter = (xMin?: number, xMax?: number) => {
+  const dateFormatter = useMemo(() => {
+    if (typeof xMin === 'number' && typeof xMax === 'number') {
+      return niceTimeFormatter([xMin, xMax]);
+    } else {
+      return (value: number) => `${value}`;
+    }
+  }, [xMin, xMax]);
+  return dateFormatter;
+};
+
+export const yAxisFormatter = formatNumber;
+
+export const getDomain = (series: Series, stacked: boolean = false) => {
+  let min: number | null = null;
+  let max: number | null = null;
+  const valuesByTimestamp = series.reduce<{ [timestamp: number]: number[] }>((acc, serie) => {
+    serie.points.forEach((point) => {
+      const valuesForTimestamp = acc[point.timestamp] || [];
+      acc[point.timestamp] = [...valuesForTimestamp, point.value];
+    });
+    return acc;
+  }, {});
+  const pointValues = Object.values(valuesByTimestamp);
+  pointValues.forEach((results) => {
+    const maxResult = stacked ? sum(results) : getMax(results);
+    const minResult = getMin(results);
+    if (maxResult && (!max || maxResult > max)) {
+      max = maxResult;
+    }
+    if (minResult && (!min || minResult < min)) {
+      min = minResult;
+    }
+  });
+  const timestampValues = Object.keys(valuesByTimestamp).map(Number);
+  const minTimestamp = getMin(timestampValues) || 0;
+  const maxTimestamp = getMax(timestampValues) || 0;
+  return { yMin: min || 0, yMax: max || 0, xMin: minTimestamp, xMax: maxTimestamp };
+};
+
+export const getChartTheme = (isDarkMode: boolean): Theme => {
+  return isDarkMode ? DARK_THEME : LIGHT_THEME;
+};
+
+export const EmptyContainer: React.FC = ({ children }) => (
+  <div
+    style={{
+      width: '100%',
+      height: 150,
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center',
+    }}
+  >
+    {children}
+  </div>
+);
+
+export const ChartContainer: React.FC = ({ children }) => (
+  <div
+    style={{
+      width: '100%',
+      height: 150,
+    }}
+  >
+    {children}
+  </div>
+);
+
+export const NoDataState = () => {
+  return (
+    <EmptyContainer>
+      <EuiText color="subdued" data-test-subj="noChartData">
+        <FormattedMessage
+          id="xpack.infra.alerts.charts.noDataMessage"
+          defaultMessage="No chart data available"
+        />
+      </EuiText>
+    </EmptyContainer>
+  );
+};
+
+export const LoadingState = () => {
+  return (
+    <EmptyContainer>
+      <EuiText color="subdued" data-test-subj="loadingData">
+        <FormattedMessage id="xpack.infra.alerts.charts.loadingMessage" defaultMessage="Loading" />
+      </EuiText>
+    </EmptyContainer>
+  );
+};
+
+export const ErrorState = () => {
+  return (
+    <EmptyContainer>
+      <EuiText color="subdued" data-test-subj="chartErrorState">
+        <FormattedMessage
+          id="xpack.infra.alerts.charts.errorMessage"
+          defaultMessage="Uh oh, something went wrong"
+        />
+      </EuiText>
+    </EmptyContainer>
+  );
+};
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/calculate_domian.test.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/calculate_domian.test.ts
index f94c6b6156ae4..d706d598058bd 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/calculate_domian.test.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/calculate_domian.test.ts
@@ -7,7 +7,7 @@
 import { calculateDomain } from './calculate_domain';
 import { MetricsExplorerSeries } from '../../../../../../common/http_api/metrics_explorer';
 import { MetricsExplorerOptionsMetric } from '../../hooks/use_metrics_explorer_options';
-import { MetricsExplorerColor } from '../../../../../../common/color_palette';
+import { Color } from '../../../../../../common/color_palette';
 describe('calculateDomain()', () => {
   const series: MetricsExplorerSeries = {
     id: 'test-01',
@@ -29,12 +29,12 @@ describe('calculateDomain()', () => {
     {
       aggregation: 'avg',
       field: 'system.memory.free',
-      color: MetricsExplorerColor.color0,
+      color: Color.color0,
     },
     {
       aggregation: 'avg',
       field: 'system.memory.used.bytes',
-      color: MetricsExplorerColor.color1,
+      color: Color.color1,
     },
   ];
   it('should return the min and max across 2 metrics', () => {
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
index afddaf6621f10..15ed28c095199 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
@@ -7,7 +7,7 @@
 import { encode } from 'rison-node';
 import uuid from 'uuid';
 import { set } from '@elastic/safer-lodash-set';
-import { colorTransformer, MetricsExplorerColor } from '../../../../../../common/color_palette';
+import { colorTransformer, Color } from '../../../../../../common/color_palette';
 import { MetricsExplorerSeries } from '../../../../../../common/http_api/metrics_explorer';
 import {
   MetricsExplorerOptions,
@@ -91,9 +91,7 @@ const mapMetricToSeries = (chartOptions: MetricsExplorerChartOptions) => (
     label: createMetricLabel(metric),
     axis_position: 'right',
     chart_type: 'line',
-    color:
-      (metric.color && colorTransformer(metric.color)) ||
-      colorTransformer(MetricsExplorerColor.color0),
+    color: (metric.color && colorTransformer(metric.color)) || colorTransformer(Color.color0),
     fill: chartOptions.type === MetricsExplorerChartType.area ? 0.5 : 0,
     formatter: format === InfraFormatterType.bits ? InfraFormatterType.bytes : format,
     value_template: 'rate' === metric.aggregation ? '{{value}}/s' : '{{value}}',
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/metrics.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/metrics.tsx
index 8be03a7096f08..b81a905b4aa87 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/metrics.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/metrics.tsx
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 
 import React, { useCallback, useState } from 'react';
 import { IFieldType } from 'src/plugins/data/public';
-import { colorTransformer, MetricsExplorerColor } from '../../../../../common/color_palette';
+import { colorTransformer, Color } from '../../../../../common/color_palette';
 import { MetricsExplorerMetric } from '../../../../../common/http_api/metrics_explorer';
 import { MetricsExplorerOptions } from '../hooks/use_metrics_explorer_options';
 
@@ -26,7 +26,7 @@ interface SelectedOption {
 }
 
 export const MetricsExplorerMetrics = ({ options, onChange, fields, autoFocus = false }: Props) => {
-  const colors = Object.keys(MetricsExplorerColor) as MetricsExplorerColor[];
+  const colors = Object.keys(Color) as Array<keyof typeof Color>;
   const [shouldFocus, setShouldFocus] = useState(autoFocus);
 
   // the EuiCombobox forwards the ref to an input element
@@ -59,7 +59,7 @@ export const MetricsExplorerMetrics = ({ options, onChange, fields, autoFocus =
     .map((metric) => ({
       label: metric.field || '',
       value: metric.field || '',
-      color: colorTransformer(metric.color || MetricsExplorerColor.color0),
+      color: colorTransformer(metric.color || Color.color0),
     }));
 
   const placeholderText = i18n.translate('xpack.infra.metricsExplorer.metricComboBoxPlaceholder', {
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/series_chart.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/series_chart.tsx
index 9b594ef5e630f..a621dca1e0c51 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/series_chart.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/series_chart.tsx
@@ -14,7 +14,7 @@ import {
   BarSeriesStyle,
 } from '@elastic/charts';
 import { MetricsExplorerSeries } from '../../../../../common/http_api/metrics_explorer';
-import { colorTransformer, MetricsExplorerColor } from '../../../../../common/color_palette';
+import { colorTransformer, Color } from '../../../../../common/color_palette';
 import { createMetricLabel } from './helpers/create_metric_label';
 import {
   MetricsExplorerOptionsMetric,
@@ -41,9 +41,7 @@ export const MetricExplorerSeriesChart = (props: Props) => {
 };
 
 export const MetricsExplorerAreaChart = ({ metric, id, series, type, stack, opacity }: Props) => {
-  const color =
-    (metric.color && colorTransformer(metric.color)) ||
-    colorTransformer(MetricsExplorerColor.color0);
+  const color = (metric.color && colorTransformer(metric.color)) || colorTransformer(Color.color0);
 
   const yAccessors = Array.isArray(id)
     ? id.map((i) => getMetricId(metric, i)).slice(id.length - 1, id.length)
@@ -84,9 +82,7 @@ export const MetricsExplorerAreaChart = ({ metric, id, series, type, stack, opac
 };
 
 export const MetricsExplorerBarChart = ({ metric, id, series, stack }: Props) => {
-  const color =
-    (metric.color && colorTransformer(metric.color)) ||
-    colorTransformer(MetricsExplorerColor.color0);
+  const color = (metric.color && colorTransformer(metric.color)) || colorTransformer(Color.color0);
 
   const yAccessors = Array.isArray(id)
     ? id.map((i) => getMetricId(metric, i)).slice(id.length - 1, id.length)
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts
index 299231f1821f0..d54cb758188c6 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options.ts
@@ -9,19 +9,14 @@ import { values } from 'lodash';
 import createContainer from 'constate';
 import { useState, useEffect, useMemo, Dispatch, SetStateAction } from 'react';
 import { useAlertPrefillContext } from '../../../../alerting/use_alert_prefill';
-import { MetricsExplorerColor } from '../../../../../common/color_palette';
+import { Color } from '../../../../../common/color_palette';
 import { metricsExplorerMetricRT } from '../../../../../common/http_api/metrics_explorer';
 
 const metricsExplorerOptionsMetricRT = t.intersection([
   metricsExplorerMetricRT,
   t.partial({
     rate: t.boolean,
-    color: t.keyof(
-      Object.fromEntries(values(MetricsExplorerColor).map((c) => [c, null])) as Record<
-        MetricsExplorerColor,
-        null
-      >
-    ),
+    color: t.keyof(Object.fromEntries(values(Color).map((c) => [c, null])) as Record<Color, null>),
     label: t.string,
   }),
 ]);
@@ -100,17 +95,17 @@ export const DEFAULT_METRICS: MetricsExplorerOptionsMetric[] = [
   {
     aggregation: 'avg',
     field: 'system.cpu.user.pct',
-    color: MetricsExplorerColor.color0,
+    color: Color.color0,
   },
   {
     aggregation: 'avg',
     field: 'kubernetes.pod.cpu.usage.node.pct',
-    color: MetricsExplorerColor.color1,
+    color: Color.color1,
   },
   {
     aggregation: 'avg',
     field: 'docker.cpu.total.pct',
-    color: MetricsExplorerColor.color2,
+    color: Color.color2,
   },
 ];
 
diff --git a/x-pack/plugins/infra/server/infra_server.ts b/x-pack/plugins/infra/server/infra_server.ts
index c080618f2a563..a72e40e25b479 100644
--- a/x-pack/plugins/infra/server/infra_server.ts
+++ b/x-pack/plugins/infra/server/infra_server.ts
@@ -36,6 +36,7 @@ import { initInventoryMetaRoute } from './routes/inventory_metadata';
 import { initLogSourceConfigurationRoutes, initLogSourceStatusRoutes } from './routes/log_sources';
 import { initSourceRoute } from './routes/source';
 import { initAlertPreviewRoute } from './routes/alerting';
+import { initGetLogAlertsChartPreviewDataRoute } from './routes/log_alerts';
 
 export const initInfraServer = (libs: InfraBackendLibs) => {
   const schema = makeExecutableSchema({
@@ -72,4 +73,5 @@ export const initInfraServer = (libs: InfraBackendLibs) => {
   initLogSourceConfigurationRoutes(libs);
   initLogSourceStatusRoutes(libs);
   initAlertPreviewRoute(libs);
+  initGetLogAlertsChartPreviewDataRoute(libs);
 };
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_chart_preview.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_chart_preview.ts
new file mode 100644
index 0000000000000..026f003463ef2
--- /dev/null
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_chart_preview.ts
@@ -0,0 +1,186 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { RequestHandlerContext } from 'src/core/server';
+import { InfraSource } from '../../sources';
+import { KibanaFramework } from '../../adapters/framework/kibana_framework_adapter';
+import {
+  GetLogAlertsChartPreviewDataAlertParamsSubset,
+  Series,
+  Point,
+} from '../../../../common/http_api/log_alerts';
+import {
+  getGroupedESQuery,
+  getUngroupedESQuery,
+  buildFiltersFromCriteria,
+} from './log_threshold_executor';
+import {
+  UngroupedSearchQueryResponseRT,
+  UngroupedSearchQueryResponse,
+  GroupedSearchQueryResponse,
+  GroupedSearchQueryResponseRT,
+} from '../../../../common/alerting/logs/types';
+import { decodeOrThrow } from '../../../../common/runtime_types';
+
+const COMPOSITE_GROUP_SIZE = 40;
+
+export async function getChartPreviewData(
+  requestContext: RequestHandlerContext,
+  sourceConfiguration: InfraSource,
+  callWithRequest: KibanaFramework['callWithRequest'],
+  alertParams: GetLogAlertsChartPreviewDataAlertParamsSubset,
+  buckets: number
+) {
+  const indexPattern = sourceConfiguration.configuration.logAlias;
+  const timestampField = sourceConfiguration.configuration.fields.timestamp;
+
+  const { groupBy, timeSize, timeUnit } = alertParams;
+  const isGrouped = groupBy && groupBy.length > 0 ? true : false;
+
+  // Charts will use an expanded time range
+  const expandedAlertParams = {
+    ...alertParams,
+    timeSize: timeSize * buckets,
+  };
+
+  const { rangeFilter } = buildFiltersFromCriteria(expandedAlertParams, timestampField);
+
+  const query = isGrouped
+    ? getGroupedESQuery(expandedAlertParams, sourceConfiguration.configuration, indexPattern)
+    : getUngroupedESQuery(expandedAlertParams, sourceConfiguration.configuration, indexPattern);
+
+  if (!query) {
+    throw new Error('ES query could not be built from the provided alert params');
+  }
+
+  const expandedQuery = addHistogramAggregationToQuery(
+    query,
+    rangeFilter,
+    `${timeSize}${timeUnit}`,
+    timestampField,
+    isGrouped
+  );
+
+  const series = isGrouped
+    ? processGroupedResults(await getGroupedResults(expandedQuery, requestContext, callWithRequest))
+    : processUngroupedResults(
+        await getUngroupedResults(expandedQuery, requestContext, callWithRequest)
+      );
+
+  return { series };
+}
+
+// Expand the same query that powers the executor with a date histogram aggregation
+const addHistogramAggregationToQuery = (
+  query: any,
+  rangeFilter: any,
+  interval: string,
+  timestampField: string,
+  isGrouped: boolean
+) => {
+  const histogramAggregation = {
+    histogramBuckets: {
+      date_histogram: {
+        field: timestampField,
+        fixed_interval: interval,
+        // Utilise extended bounds to make sure we get a full set of buckets even if there are empty buckets
+        // at the start and / or end of the range.
+        extended_bounds: {
+          min: rangeFilter.range[timestampField].gte,
+          max: rangeFilter.range[timestampField].lte,
+        },
+      },
+    },
+  };
+
+  if (isGrouped) {
+    query.body.aggregations.groups.aggregations.filtered_results = {
+      ...query.body.aggregations.groups.aggregations.filtered_results,
+      aggregations: histogramAggregation,
+    };
+  } else {
+    query.body = {
+      ...query.body,
+      aggregations: histogramAggregation,
+    };
+  }
+
+  return query;
+};
+
+const getUngroupedResults = async (
+  query: object,
+  requestContext: RequestHandlerContext,
+  callWithRequest: KibanaFramework['callWithRequest']
+) => {
+  return decodeOrThrow(UngroupedSearchQueryResponseRT)(
+    await callWithRequest(requestContext, 'search', query)
+  );
+};
+
+const getGroupedResults = async (
+  query: object,
+  requestContext: RequestHandlerContext,
+  callWithRequest: KibanaFramework['callWithRequest']
+) => {
+  let compositeGroupBuckets: GroupedSearchQueryResponse['aggregations']['groups']['buckets'] = [];
+  let lastAfterKey: GroupedSearchQueryResponse['aggregations']['groups']['after_key'] | undefined;
+
+  while (true) {
+    const queryWithAfterKey: any = { ...query };
+    queryWithAfterKey.body.aggregations.groups.composite.after = lastAfterKey;
+    const groupResponse: GroupedSearchQueryResponse = decodeOrThrow(GroupedSearchQueryResponseRT)(
+      await callWithRequest(requestContext, 'search', queryWithAfterKey)
+    );
+    compositeGroupBuckets = [
+      ...compositeGroupBuckets,
+      ...groupResponse.aggregations.groups.buckets,
+    ];
+    lastAfterKey = groupResponse.aggregations.groups.after_key;
+    if (groupResponse.aggregations.groups.buckets.length < COMPOSITE_GROUP_SIZE) {
+      break;
+    }
+  }
+
+  return compositeGroupBuckets;
+};
+
+const processGroupedResults = (
+  results: GroupedSearchQueryResponse['aggregations']['groups']['buckets']
+): Series => {
+  return results.reduce<Series>((series, group) => {
+    if (!group.filtered_results.histogramBuckets) return series;
+    const groupName = Object.values(group.key).join(', ');
+    const points = group.filtered_results.histogramBuckets.buckets.reduce<Point[]>(
+      (pointsAcc, bucket) => {
+        const { key, doc_count: count } = bucket;
+        return [...pointsAcc, { timestamp: key, value: count }];
+      },
+      []
+    );
+    return [...series, { id: groupName, points }];
+  }, []);
+};
+
+const processUngroupedResults = (results: UngroupedSearchQueryResponse): Series => {
+  if (!results.aggregations?.histogramBuckets) return [];
+  const points = results.aggregations.histogramBuckets.buckets.reduce<Point[]>(
+    (pointsAcc, bucket) => {
+      const { key, doc_count: count } = bucket;
+      return [...pointsAcc, { timestamp: key, value: count }];
+    },
+    []
+  );
+  return [{ id: everythingSeriesName, points }];
+};
+
+const everythingSeriesName = i18n.translate(
+  'xpack.infra.logs.alerting.threshold.everythingSeriesName',
+  {
+    defaultMessage: 'Log entries',
+  }
+);
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
index 85bb18e199192..db76e955f0073 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.ts
@@ -145,7 +145,10 @@ const processGroupByResults = (
   });
 };
 
-const buildFiltersFromCriteria = (params: LogDocumentCountAlertParams, timestampField: string) => {
+export const buildFiltersFromCriteria = (
+  params: Omit<LogDocumentCountAlertParams, 'count'>,
+  timestampField: string
+) => {
   const { timeSize, timeUnit, criteria } = params;
   const interval = `${timeSize}${timeUnit}`;
   const intervalAsSeconds = getIntervalInSeconds(interval);
@@ -193,8 +196,8 @@ const buildFiltersFromCriteria = (params: LogDocumentCountAlertParams, timestamp
   return { rangeFilter, groupedRangeFilter, mustFilters, mustNotFilters };
 };
 
-const getGroupedESQuery = (
-  params: LogDocumentCountAlertParams,
+export const getGroupedESQuery = (
+  params: Omit<LogDocumentCountAlertParams, 'count'>,
   sourceConfiguration: InfraSource['configuration'],
   index: string
 ): object | undefined => {
@@ -253,8 +256,8 @@ const getGroupedESQuery = (
   };
 };
 
-const getUngroupedESQuery = (
-  params: LogDocumentCountAlertParams,
+export const getUngroupedESQuery = (
+  params: Omit<LogDocumentCountAlertParams, 'count'>,
   sourceConfiguration: InfraSource['configuration'],
   index: string
 ): object => {
diff --git a/x-pack/plugins/infra/server/routes/log_alerts/chart_preview_data.ts b/x-pack/plugins/infra/server/routes/log_alerts/chart_preview_data.ts
new file mode 100644
index 0000000000000..95389e14acdb8
--- /dev/null
+++ b/x-pack/plugins/infra/server/routes/log_alerts/chart_preview_data.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Boom from 'boom';
+import { InfraBackendLibs } from '../../lib/infra_types';
+import {
+  LOG_ALERTS_CHART_PREVIEW_DATA_PATH,
+  getLogAlertsChartPreviewDataSuccessResponsePayloadRT,
+  getLogAlertsChartPreviewDataRequestPayloadRT,
+} from '../../../common/http_api/log_alerts/chart_preview_data';
+import { createValidationFunction } from '../../../common/runtime_types';
+import { getChartPreviewData } from '../../lib/alerting/log_threshold/log_threshold_chart_preview';
+
+export const initGetLogAlertsChartPreviewDataRoute = ({ framework, sources }: InfraBackendLibs) => {
+  framework.registerRoute(
+    {
+      method: 'post',
+      path: LOG_ALERTS_CHART_PREVIEW_DATA_PATH,
+      validate: {
+        body: createValidationFunction(getLogAlertsChartPreviewDataRequestPayloadRT),
+      },
+    },
+    framework.router.handleLegacyErrors(async (requestContext, request, response) => {
+      const {
+        data: { sourceId, buckets, alertParams },
+      } = request.body;
+
+      const sourceConfiguration = await sources.getSourceConfiguration(
+        requestContext.core.savedObjects.client,
+        sourceId
+      );
+
+      try {
+        const { series } = await getChartPreviewData(
+          requestContext,
+          sourceConfiguration,
+          framework.callWithRequest,
+          alertParams,
+          buckets
+        );
+
+        return response.ok({
+          body: getLogAlertsChartPreviewDataSuccessResponsePayloadRT.encode({
+            data: { series },
+          }),
+        });
+      } catch (error) {
+        if (Boom.isBoom(error)) {
+          throw error;
+        }
+
+        return response.customError({
+          statusCode: error.statusCode ?? 500,
+          body: {
+            message: error.message ?? 'An unexpected error occurred',
+          },
+        });
+      }
+    })
+  );
+};
diff --git a/x-pack/plugins/infra/server/routes/log_alerts/index.ts b/x-pack/plugins/infra/server/routes/log_alerts/index.ts
new file mode 100644
index 0000000000000..5634fda043a52
--- /dev/null
+++ b/x-pack/plugins/infra/server/routes/log_alerts/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './chart_preview_data';

From 1257aad5b20d8778da9a0bd18f4179c4d6d9d041 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Tue, 25 Aug 2020 12:35:29 +0200
Subject: [PATCH 027/148] [Uptime]fix wrapping issue in certificate list column
 (#74749)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../fingerprint_col.test.tsx.snap             | 26 +++++++------------
 .../certificates/fingerprint_col.tsx          | 10 +++----
 .../__snapshots__/monitor_list.test.tsx.snap  |  8 +++---
 .../__snapshots__/status_filter.test.tsx.snap |  8 +++---
 .../monitor_list/filter_status_button.tsx     |  3 ---
 .../overview/monitor_list/status_filter.tsx   | 13 +++-------
 6 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
index b1da4aa929207..78c21e515c21e 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
@@ -1,8 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`FingerprintCol renders expected elements for valid props 1`] = `
-Array [
-  .c1 .euiButtonEmpty__content {
+.c1 .euiButtonEmpty__content {
   padding-right: 0px;
 }
 
@@ -10,8 +9,9 @@ Array [
   margin-right: 8px;
 }
 
-<span
-    class="c0"
+<span>
+  <span
+    class="c0 eui-textNoWrap"
     data-test-subj="CA06F56B258B7A0D4F2B05470939478651151984"
   >
     <span
@@ -48,17 +48,9 @@ Array [
         />
       </button>
     </span>
-  </span>,
-  .c1 .euiButtonEmpty__content {
-  padding-right: 0px;
-}
-
-.c0 {
-  margin-right: 8px;
-}
-
-<span
-    class="c0"
+  </span>
+  <span
+    class="c0 eui-textNoWrap"
     data-test-subj="3111500C4A66012CDAE333EC3FCA1C9DDE45C954440E7EE413716BFF3663C074"
   >
     <span
@@ -95,8 +87,8 @@ Array [
         />
       </button>
     </span>
-  </span>,
-]
+  </span>
+</span>
 `;
 
 exports[`FingerprintCol shallow renders expected elements for valid props 1`] = `
diff --git a/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.tsx b/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.tsx
index 3bab0a183a0b5..049e206a3fc3c 100644
--- a/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.tsx
+++ b/x-pack/plugins/uptime/public/components/certificates/fingerprint_col.tsx
@@ -16,7 +16,7 @@ const EmptyButton = styled(EuiButtonEmpty)`
   }
 `;
 
-const Span = styled.span`
+const StyledSpan = styled.span`
   margin-right: 8px;
 `;
 
@@ -27,7 +27,7 @@ interface Props {
 export const FingerprintCol: React.FC<Props> = ({ cert }) => {
   const ShaComponent = ({ text, val }: { text: string; val: string }) => {
     return (
-      <Span data-test-subj={val}>
+      <StyledSpan data-test-subj={val} className="eui-textNoWrap">
         <EuiToolTip content={val}>
           <EmptyButton>{text} </EmptyButton>
         </EuiToolTip>
@@ -41,13 +41,13 @@ export const FingerprintCol: React.FC<Props> = ({ cert }) => {
             />
           )}
         </EuiCopy>
-      </Span>
+      </StyledSpan>
     );
   };
   return (
-    <>
+    <span>
       <ShaComponent text="SHA 1" val={cert?.sha1?.toUpperCase() ?? ''} />
       <ShaComponent text="SHA 256" val={cert?.sha256?.toUpperCase() ?? ''} />
-    </>
+    </span>
   );
 };
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
index bfe32acf29e39..4898ec00b38e2 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
@@ -904,12 +904,10 @@ exports[`MonitorList component renders the monitor list 1`] = `
             >
               <span
                 class="euiFilterButton__textShift"
+                data-text="Up"
+                title="Up"
               >
-                <span
-                  class="euiTextColor euiTextColor--default"
-                >
-                  Up
-                </span>
+                Up
               </span>
             </span>
           </span>
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/status_filter.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/status_filter.test.tsx.snap
index 2aa6e0ea8b312..ed344510c1cd7 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/status_filter.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/status_filter.test.tsx.snap
@@ -38,12 +38,10 @@ exports[`StatusFilterComponent renders without errors for valid props 1`] = `
       >
         <span
           class="euiFilterButton__textShift"
+          data-text="Up"
+          title="Up"
         >
-          <span
-            class="euiTextColor euiTextColor--default"
-          >
-            Up
-          </span>
+          Up
         </span>
       </span>
     </span>
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.tsx
index 6e63c21d08ca9..19b09d50ced15 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/filter_status_button.tsx
@@ -15,7 +15,6 @@ export interface FilterStatusButtonProps {
   isActive: boolean;
   value: 'up' | 'down' | '';
   withNext: boolean;
-  color?: string;
 }
 
 export const FilterStatusButton = ({
@@ -24,14 +23,12 @@ export const FilterStatusButton = ({
   isDisabled,
   isActive,
   value,
-  color,
   withNext,
 }: FilterStatusButtonProps) => {
   const [getUrlParams, setUrlParams] = useUrlParams();
   const { statusFilter: urlValue } = getUrlParams();
   return (
     <EuiFilterButton
-      color={(isActive ? color : undefined) as any}
       data-test-subj={dataTestSubj}
       hasActiveFilters={isActive}
       isDisabled={isDisabled}
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.tsx
index 43a7ffcea0867..266735be77498 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/status_filter.tsx
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiFilterGroup, EuiTextColor } from '@elastic/eui';
+import { EuiFilterGroup } from '@elastic/eui';
 import { FilterStatusButton } from './filter_status_button';
 import { useGetUrlParams } from '../../../hooks';
 
@@ -28,13 +28,9 @@ export const StatusFilter: React.FC = () => {
         isActive={statusFilter === ''}
       />
       <FilterStatusButton
-        content={
-          <EuiTextColor color={statusFilter === 'up' ? 'secondary' : undefined}>
-            {i18n.translate('xpack.uptime.filterBar.filterUpLabel', {
-              defaultMessage: 'Up',
-            })}
-          </EuiTextColor>
-        }
+        content={i18n.translate('xpack.uptime.filterBar.filterUpLabel', {
+          defaultMessage: 'Up',
+        })}
         dataTestSubj="xpack.uptime.filterBar.filterStatusUp"
         value="up"
         withNext={true}
@@ -47,7 +43,6 @@ export const StatusFilter: React.FC = () => {
         dataTestSubj="xpack.uptime.filterBar.filterStatusDown"
         value="down"
         withNext={false}
-        color={'danger'}
         isActive={statusFilter === 'down'}
       />
     </EuiFilterGroup>

From fec0d515b3fe9fcaa185ccb77191afd0baaaead6 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Tue, 25 Aug 2020 12:39:52 +0200
Subject: [PATCH 028/148] [RUM Dashboard] Rum design improvement (#74946)

* craete new path for client side monitoring

* update

* update app

* fix i18n

* remove space

* added feature on server

* use lazy load

* update test

* update

* remove csm serve file

* update test

* added design improvements

* imrpove design

* fix types

* rervet conflict screw up

* revert

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../app/RumDashboard/Charts/PageViewsChart.tsx | 18 +++++++++++++++---
 .../app/RumDashboard/ClientMetrics/index.tsx   |  6 ++++--
 .../PageLoadDistribution/index.tsx             |  2 +-
 .../app/RumDashboard/RumDashboard.tsx          |  1 +
 .../app/RumDashboard/translations.ts           |  3 ---
 .../translations/translations/ja-JP.json       |  1 -
 .../translations/translations/zh-CN.json       |  1 -
 7 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx
index 934a985dd735a..9211504a2dffe 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx
@@ -30,6 +30,7 @@ import { history } from '../../../../utils/history';
 import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
 import { ChartWrapper } from '../ChartWrapper';
 import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
+import { useUrlParams } from '../../../../hooks/useUrlParams';
 
 interface Props {
   data?: Array<Record<string, number | null>>;
@@ -37,7 +38,15 @@ interface Props {
 }
 
 export function PageViewsChart({ data, loading }: Props) {
-  const formatter = timeFormatter(niceTimeFormatByDay(2));
+  const { urlParams } = useUrlParams();
+
+  const { start, end } = urlParams;
+  const diffInDays = moment(new Date(end as string)).diff(
+    moment(new Date(start as string)),
+    'day'
+  );
+
+  const formatter = timeFormatter(niceTimeFormatByDay(diffInDays > 1 ? 2 : 1));
 
   const onBrushEnd: BrushEndListener = ({ x }) => {
     if (!x) {
@@ -91,18 +100,21 @@ export function PageViewsChart({ data, loading }: Props) {
             }
             showLegend
             onBrushEnd={onBrushEnd}
+            xDomain={{
+              min: new Date(start as string).valueOf(),
+              max: new Date(end as string).valueOf(),
+            }}
           />
           <Axis
             id="date_time"
             position={Position.Bottom}
-            title={I18LABELS.dateTime}
             tickFormat={formatter}
           />
           <Axis
             id="page_views"
             title={I18LABELS.pageViews}
             position={Position.Left}
-            tickFormat={(d) => numeral(d).format('0.0 a')}
+            tickFormat={(d) => numeral(d).format('0a')}
           />
           <BarSeries
             id={I18LABELS.pageViews}
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx
index 5fee2f4195f91..67404ece3d2c7 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/ClientMetrics/index.tsx
@@ -46,7 +46,9 @@ export function ClientMetrics() {
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="s"
-          title={(data?.backEnd?.value?.toFixed(2) ?? '-') + ' sec'}
+          title={
+            (((data?.backEnd?.value ?? 0) * 1000).toFixed(0) ?? '-') + ' ms'
+          }
           description={I18LABELS.backEnd}
           isLoading={status !== 'success'}
         />
@@ -54,7 +56,7 @@ export function ClientMetrics() {
       <EuiFlexItem grow={false} style={STAT_STYLE}>
         <EuiStat
           titleSize="s"
-          title={(data?.frontEnd?.value?.toFixed(2) ?? '-') + ' sec'}
+          title={(data?.frontEnd?.value?.toFixed(2) ?? '-') + ' s'}
           description={I18LABELS.frontEnd}
           isLoading={status !== 'success'}
         />
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/index.tsx
index c7545ff9a2764..53f2d5ae238c5 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/index.tsx
@@ -102,7 +102,7 @@ export function PageLoadDistribution() {
           />
         </EuiFlexItem>
       </EuiFlexGroup>
-      <EuiSpacer size="s" />
+      <EuiSpacer size="m" />
       <PageLoadDistChart
         data={data}
         onPercentileChange={onPercentileChange}
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx
index 8c8164972328f..24d4470736de0 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/RumDashboard.tsx
@@ -39,6 +39,7 @@ export function RumDashboard() {
           <EuiFlexGroup justifyContent="spaceBetween">
             <EuiFlexItem grow={3}>
               <PageLoadDistribution />
+              <EuiSpacer size="m" />
               <PageViewsTrend />
             </EuiFlexItem>
           </EuiFlexGroup>
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/translations.ts b/x-pack/plugins/apm/public/components/app/RumDashboard/translations.ts
index 96d1b529c52f9..66eeaf433d2a1 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/translations.ts
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/translations.ts
@@ -16,9 +16,6 @@ export const I18LABELS = {
   pageViews: i18n.translate('xpack.apm.rum.dashboard.pageViews', {
     defaultMessage: 'Page views',
   }),
-  dateTime: i18n.translate('xpack.apm.rum.dashboard.dateTime.label', {
-    defaultMessage: 'Date / Time',
-  }),
   percPageLoaded: i18n.translate('xpack.apm.rum.dashboard.pagesLoaded.label', {
     defaultMessage: 'Pages loaded',
   }),
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 411aa3424c855..118362f494b47 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -4909,7 +4909,6 @@
     "xpack.apm.registerTransactionDurationAlertType.variables.serviceName": "サービス名",
     "xpack.apm.registerTransactionDurationAlertType.variables.transactionType": "トランザクションタイプ",
     "xpack.apm.rum.dashboard.backend": "バックエンド",
-    "xpack.apm.rum.dashboard.dateTime.label": "日付/時刻",
     "xpack.apm.rum.dashboard.frontend": "フロントエンド",
     "xpack.apm.rum.dashboard.overall.label": "全体",
     "xpack.apm.rum.dashboard.pageLoadDistribution.label": "ページ読み込み分布",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index c46135633a3c8..de1f206118447 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -4911,7 +4911,6 @@
     "xpack.apm.registerTransactionDurationAlertType.variables.serviceName": "服务名称",
     "xpack.apm.registerTransactionDurationAlertType.variables.transactionType": "事务类型",
     "xpack.apm.rum.dashboard.backend": "后端",
-    "xpack.apm.rum.dashboard.dateTime.label": "日期 / 时间",
     "xpack.apm.rum.dashboard.frontend": "前端",
     "xpack.apm.rum.dashboard.overall.label": "总体",
     "xpack.apm.rum.dashboard.pageLoadDistribution.label": "页面加载分布",

From 446c5237d59b7e324b39b87412880205f3b43db9 Mon Sep 17 00:00:00 2001
From: Marta Bondyra <marta.bondyra@gmail.com>
Date: Tue, 25 Aug 2020 13:47:04 +0200
Subject: [PATCH 029/148] [Visualize] fix performance degradation after
 lodash@4 upgrade

---
 src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js b/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js
index 6490dfe252b29..dda9d85ec43c5 100644
--- a/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js
@@ -41,7 +41,7 @@ export class VisConfig {
 
     const visType = visTypes[visConfigArgs.type];
     const typeDefaults = visType(visConfigArgs, this.data);
-    this._values = _.defaultsDeep({}, typeDefaults, DEFAULT_VIS_CONFIG);
+    this._values = _.defaultsDeep({ ...typeDefaults }, DEFAULT_VIS_CONFIG);
     this._values.el = el;
   }
 

From 7fa23a4ec1f917164fef3fc84f64a5d2f23aa287 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Tue, 25 Aug 2020 08:20:17 -0500
Subject: [PATCH 030/148] IndexPattern class - no longer use `getConfig` or
 `uiSettingsValues` (#75717)

* remove getConfig and uiSettingsValues from IndexPattern class
---
 ...-data-public.indexpattern._constructor_.md |  4 +-
 ...plugin-plugins-data-public.indexpattern.md |  2 +-
 .../data/common/field_formats/errors.ts       | 27 ++++++++
 .../field_formats/field_formats_registry.ts   |  3 +-
 .../data/common/field_formats/index.ts        |  2 +
 .../index_patterns/_fields_fetcher.ts         |  2 +-
 .../index_patterns/index_pattern.test.ts      | 18 ++---
 .../index_patterns/index_pattern.ts           | 67 +++++++------------
 .../index_patterns/index_patterns.ts          | 10 ++-
 .../data/common/index_patterns/types.ts       |  2 +-
 src/plugins/data/public/plugin.ts             |  2 +-
 src/plugins/data/public/public.api.md         |  2 +-
 12 files changed, 75 insertions(+), 66 deletions(-)
 create mode 100644 src/plugins/data/common/field_formats/errors.ts

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
index 0268846772f2c..2e078e3404fe6 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern._constructor_.md
@@ -9,7 +9,7 @@ Constructs a new instance of the `IndexPattern` class
 <b>Signature:</b>
 
 ```typescript
-constructor(id: string | undefined, { getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, uiSettingsValues, }: IndexPatternDeps);
+constructor(id: string | undefined, { savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
 ```
 
 ## Parameters
@@ -17,5 +17,5 @@ constructor(id: string | undefined, { getConfig, savedObjectsClient, apiClient,
 |  Parameter | Type | Description |
 |  --- | --- | --- |
 |  id | <code>string &#124; undefined</code> |  |
-|  { getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, uiSettingsValues, } | <code>IndexPatternDeps</code> |  |
+|  { savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, } | <code>IndexPatternDeps</code> |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index d340aaeeef25e..649f8ef077e3f 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -14,7 +14,7 @@ export declare class IndexPattern implements IIndexPattern
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(id, { getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, uiSettingsValues, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
+|  [(constructor)(id, { savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, })](./kibana-plugin-plugins-data-public.indexpattern._constructor_.md) |  | Constructs a new instance of the <code>IndexPattern</code> class |
 
 ## Properties
 
diff --git a/src/plugins/data/common/field_formats/errors.ts b/src/plugins/data/common/field_formats/errors.ts
new file mode 100644
index 0000000000000..d72eef080923d
--- /dev/null
+++ b/src/plugins/data/common/field_formats/errors.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export class FieldFormatNotFoundError extends Error {
+  public readonly formatId: string;
+  constructor(message: string, formatId: string) {
+    super(message);
+    this.name = 'FieldFormatNotFoundError';
+    this.formatId = formatId;
+  }
+}
diff --git a/src/plugins/data/common/field_formats/field_formats_registry.ts b/src/plugins/data/common/field_formats/field_formats_registry.ts
index 32f9f37b9ba53..4b46adf399363 100644
--- a/src/plugins/data/common/field_formats/field_formats_registry.ts
+++ b/src/plugins/data/common/field_formats/field_formats_registry.ts
@@ -34,6 +34,7 @@ import { FieldFormat } from './field_format';
 import { SerializedFieldFormat } from '../../../expressions/common/types';
 import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../kbn_field_types/types';
 import { UI_SETTINGS } from '../constants';
+import { FieldFormatNotFoundError } from '../field_formats';
 
 export class FieldFormatsRegistry {
   protected fieldFormats: Map<FieldFormatId, FieldFormatInstanceType> = new Map();
@@ -161,7 +162,7 @@ export class FieldFormatsRegistry {
       const ConcreteFieldFormat = this.getType(formatId);
 
       if (!ConcreteFieldFormat) {
-        throw new Error(`Field Format '${formatId}' not found!`);
+        throw new FieldFormatNotFoundError(`Field Format '${formatId}' not found!`, formatId);
       }
 
       return new ConcreteFieldFormat(params, this.getConfig);
diff --git a/src/plugins/data/common/field_formats/index.ts b/src/plugins/data/common/field_formats/index.ts
index d622af2f663a1..c1b1619abd247 100644
--- a/src/plugins/data/common/field_formats/index.ts
+++ b/src/plugins/data/common/field_formats/index.ts
@@ -55,3 +55,5 @@ export {
   IFieldFormat,
   FieldFormatsStartCommon,
 } from './types';
+
+export * from './errors';
diff --git a/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts b/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts
index baeb1587d57a9..4eba0576ff235 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/_fields_fetcher.ts
@@ -24,7 +24,7 @@ import { GetFieldsOptions, IIndexPatternsApiClient } from '../types';
 export const createFieldsFetcher = (
   indexPattern: IndexPattern,
   apiClient: IIndexPatternsApiClient,
-  metaFields: string
+  metaFields: string[] = []
 ) => {
   const fieldFetcher = {
     fetch: (options: GetFieldsOptions) => {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
index e4f297b29c372..09b79cae4aac2 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
@@ -32,7 +32,7 @@ import { fieldFormatsMock } from '../../field_formats/mocks';
 
 class MockFieldFormatter {}
 
-fieldFormatsMock.getType = jest.fn().mockImplementation(() => MockFieldFormatter);
+fieldFormatsMock.getInstance = jest.fn().mockImplementation(() => new MockFieldFormatter()) as any;
 
 jest.mock('../../field_mapping', () => {
   const originalModule = jest.requireActual('../../field_mapping');
@@ -89,10 +89,6 @@ const patternCache = {
   clearAll: jest.fn(),
 };
 
-const config = {
-  get: jest.fn(),
-};
-
 const apiClient = {
   _getUrl: jest.fn(),
   getFieldsForTimePattern: jest.fn(),
@@ -102,14 +98,14 @@ const apiClient = {
 // helper function to create index patterns
 function create(id: string, payload?: any): Promise<IndexPattern> {
   const indexPattern = new IndexPattern(id, {
-    getConfig: (cfg: any) => config.get(cfg),
     savedObjectsClient: savedObjectsClient as any,
     apiClient,
     patternCache,
     fieldFormats: fieldFormatsMock,
     onNotification: () => {},
     onError: () => {},
-    uiSettingsValues: { shortDotsEnable: false, metaFields: [] },
+    shortDotsEnable: false,
+    metaFields: [],
   });
 
   setDocsourcePayload(id, payload);
@@ -391,14 +387,14 @@ describe('IndexPattern', () => {
     });
     // Create a normal index pattern
     const pattern = new IndexPattern('foo', {
-      getConfig: (cfg: any) => config.get(cfg),
       savedObjectsClient: savedObjectsClient as any,
       apiClient,
       patternCache,
       fieldFormats: fieldFormatsMock,
       onNotification: () => {},
       onError: () => {},
-      uiSettingsValues: { shortDotsEnable: false, metaFields: [] },
+      shortDotsEnable: false,
+      metaFields: [],
     });
     await pattern.init();
 
@@ -406,14 +402,14 @@ describe('IndexPattern', () => {
 
     // Create the same one - we're going to handle concurrency
     const samePattern = new IndexPattern('foo', {
-      getConfig: (cfg: any) => config.get(cfg),
       savedObjectsClient: savedObjectsClient as any,
       apiClient,
       patternCache,
       fieldFormats: fieldFormatsMock,
       onNotification: () => {},
       onError: () => {},
-      uiSettingsValues: { shortDotsEnable: false, metaFields: [] },
+      shortDotsEnable: false,
+      metaFields: [],
     });
     await samePattern.init();
 
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 4e484dce7826f..e81ef1d6b2482 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -22,20 +22,19 @@ import { i18n } from '@kbn/i18n';
 import { SavedObjectsClientCommon } from '../..';
 import { DuplicateField, SavedObjectNotFound } from '../../../../kibana_utils/common';
 
-import { ES_FIELD_TYPES, KBN_FIELD_TYPES, IIndexPattern } from '../../../common';
+import {
+  ES_FIELD_TYPES,
+  KBN_FIELD_TYPES,
+  IIndexPattern,
+  FieldFormatNotFoundError,
+} from '../../../common';
 import { findByTitle } from '../utils';
 import { IndexPatternMissingIndices } from '../lib';
 import { IndexPatternField, IIndexPatternFieldList, FieldList } from '../fields';
 import { createFieldsFetcher } from './_fields_fetcher';
 import { formatHitProvider } from './format_hit';
 import { flattenHitWrapper } from './flatten_hit';
-import {
-  OnNotification,
-  OnError,
-  UiSettingsCommon,
-  IIndexPatternsApiClient,
-  IndexPatternAttributes,
-} from '../types';
+import { OnNotification, OnError, IIndexPatternsApiClient, IndexPatternAttributes } from '../types';
 import { FieldFormatsStartCommon, FieldFormat } from '../../field_formats';
 import { PatternCache } from './_pattern_cache';
 import { expandShorthand, FieldMappingSpec, MappingObject } from '../../field_mapping';
@@ -44,21 +43,16 @@ import { SerializedFieldFormat } from '../../../../expressions/common';
 
 const MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS = 3;
 const savedObjectType = 'index-pattern';
-interface IUiSettingsValues {
-  [key: string]: any;
-  shortDotsEnable: any;
-  metaFields: any;
-}
 
 interface IndexPatternDeps {
-  getConfig: UiSettingsCommon['get'];
   savedObjectsClient: SavedObjectsClientCommon;
   apiClient: IIndexPatternsApiClient;
   patternCache: PatternCache;
   fieldFormats: FieldFormatsStartCommon;
   onNotification: OnNotification;
   onError: OnError;
-  uiSettingsValues: IUiSettingsValues;
+  shortDotsEnable: boolean;
+  metaFields: string[];
 }
 
 export class IndexPattern implements IIndexPattern {
@@ -78,7 +72,6 @@ export class IndexPattern implements IIndexPattern {
   private version: string | undefined;
   private savedObjectsClient: SavedObjectsClientCommon;
   private patternCache: PatternCache;
-  private getConfig: UiSettingsCommon['get'];
   private sourceFilters?: SourceFilter[];
   private originalBody: { [key: string]: any } = {};
   public fieldsFetcher: any; // probably want to factor out any direct usage and change to private
@@ -87,7 +80,6 @@ export class IndexPattern implements IIndexPattern {
   private onNotification: OnNotification;
   private onError: OnError;
   private apiClient: IIndexPatternsApiClient;
-  private uiSettingsValues: IUiSettingsValues;
 
   private mapping: MappingObject = expandShorthand({
     title: ES_FIELD_TYPES.TEXT,
@@ -114,35 +106,31 @@ export class IndexPattern implements IIndexPattern {
   constructor(
     id: string | undefined,
     {
-      getConfig,
       savedObjectsClient,
       apiClient,
       patternCache,
       fieldFormats,
       onNotification,
       onError,
-      uiSettingsValues,
+      shortDotsEnable = false,
+      metaFields = [],
     }: IndexPatternDeps
   ) {
     this.id = id;
     this.savedObjectsClient = savedObjectsClient;
     this.patternCache = patternCache;
-    // instead of storing config we rather store the getter only as np uiSettingsClient has circular references
-    // which cause problems when being consumed from angular
-    this.getConfig = getConfig;
     this.fieldFormats = fieldFormats;
     this.onNotification = onNotification;
     this.onError = onError;
-    this.uiSettingsValues = uiSettingsValues;
 
-    this.shortDotsEnable = uiSettingsValues.shortDotsEnable;
-    this.metaFields = uiSettingsValues.metaFields;
+    this.shortDotsEnable = shortDotsEnable;
+    this.metaFields = metaFields;
 
     this.fields = new FieldList(this, [], this.shortDotsEnable, this.onUnknownType);
 
     this.apiClient = apiClient;
-    this.fieldsFetcher = createFieldsFetcher(this, apiClient, uiSettingsValues.metaFields);
-    this.flattenHit = flattenHitWrapper(this, uiSettingsValues.metaFields);
+    this.fieldsFetcher = createFieldsFetcher(this, apiClient, metaFields);
+    this.flattenHit = flattenHitWrapper(this, metaFields);
     this.formatHit = formatHitProvider(
       this,
       fieldFormats.getDefaultInstance(KBN_FIELD_TYPES.STRING)
@@ -157,15 +145,15 @@ export class IndexPattern implements IIndexPattern {
   }
 
   private deserializeFieldFormatMap(mapping: any) {
-    const FieldFormatter = this.fieldFormats.getType(mapping.id);
-
-    return (
-      FieldFormatter &&
-      new FieldFormatter(
-        mapping.params,
-        (key: string) => this.uiSettingsValues[key]?.userValue || this.uiSettingsValues[key]?.value
-      )
-    );
+    try {
+      return this.fieldFormats.getInstance(mapping.id, mapping.params);
+    } catch (err) {
+      if (err instanceof FieldFormatNotFoundError) {
+        return undefined;
+      } else {
+        throw err;
+      }
+    }
   }
 
   private isFieldRefreshRequired(specs?: FieldSpec[]): boolean {
@@ -513,17 +501,14 @@ export class IndexPattern implements IIndexPattern {
           saveAttempts++ < MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS
         ) {
           const samePattern = new IndexPattern(this.id, {
-            getConfig: this.getConfig,
             savedObjectsClient: this.savedObjectsClient,
             apiClient: this.apiClient,
             patternCache: this.patternCache,
             fieldFormats: this.fieldFormats,
             onNotification: this.onNotification,
             onError: this.onError,
-            uiSettingsValues: {
-              shortDotsEnable: this.shortDotsEnable,
-              metaFields: this.metaFields,
-            },
+            shortDotsEnable: this.shortDotsEnable,
+            metaFields: this.metaFields,
           });
 
           return samePattern.init().then(() => {
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 8874ce5f04b7c..0ad9ae8f2014f 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -185,17 +185,16 @@ export class IndexPatternsService {
   async specToIndexPattern(spec: IndexPatternSpec) {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
-    const uiSettingsValues = await this.config.getAll();
 
     const indexPattern = new IndexPattern(spec.id, {
-      getConfig: (cfg: any) => this.config.get(cfg),
       savedObjectsClient: this.savedObjectsClient,
       apiClient: this.apiClient,
       patternCache: indexPatternCache,
       fieldFormats: this.fieldFormats,
       onNotification: this.onNotification,
       onError: this.onError,
-      uiSettingsValues: { ...uiSettingsValues, shortDotsEnable, metaFields },
+      shortDotsEnable,
+      metaFields,
     });
 
     indexPattern.initFromSpec(spec);
@@ -205,17 +204,16 @@ export class IndexPatternsService {
   async make(id?: string): Promise<IndexPattern> {
     const shortDotsEnable = await this.config.get(UI_SETTINGS.SHORT_DOTS_ENABLE);
     const metaFields = await this.config.get(UI_SETTINGS.META_FIELDS);
-    const uiSettingsValues = await this.config.getAll();
 
     const indexPattern = new IndexPattern(id, {
-      getConfig: (cfg: any) => this.config.get(cfg),
       savedObjectsClient: this.savedObjectsClient,
       apiClient: this.apiClient,
       patternCache: indexPatternCache,
       fieldFormats: this.fieldFormats,
       onNotification: this.onNotification,
       onError: this.onError,
-      uiSettingsValues: { ...uiSettingsValues, shortDotsEnable, metaFields },
+      shortDotsEnable,
+      metaFields,
     });
 
     return indexPattern.init();
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index a771113acd231..7a230c20f6cd0 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/types.ts
@@ -96,7 +96,7 @@ export interface GetFieldsOptions {
   type?: string;
   params?: any;
   lookBack?: boolean;
-  metaFields?: string;
+  metaFields?: string[];
 }
 
 export interface IIndexPatternsApiClient {
diff --git a/src/plugins/data/public/plugin.ts b/src/plugins/data/public/plugin.ts
index ee0b0714febc0..3bc19a578a417 100644
--- a/src/plugins/data/public/plugin.ts
+++ b/src/plugins/data/public/plugin.ts
@@ -177,7 +177,7 @@ export class DataPublicPlugin
       onNotification: (toastInputFields) => {
         notifications.toasts.add(toastInputFields);
       },
-      onError: notifications.toasts.addError,
+      onError: notifications.toasts.addError.bind(notifications.toasts),
       onRedirectNoIndexPattern: onRedirectNoIndexPattern(
         application.capabilities,
         application.navigateToApp,
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index f8a108a5a4c58..261f16229460a 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -944,7 +944,7 @@ export type IMetricAggType = MetricAggType;
 // @public (undocumented)
 export class IndexPattern implements IIndexPattern {
     // Warning: (ae-forgotten-export) The symbol "IndexPatternDeps" needs to be exported by the entry point index.d.ts
-    constructor(id: string | undefined, { getConfig, savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, uiSettingsValues, }: IndexPatternDeps);
+    constructor(id: string | undefined, { savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
     // (undocumented)
     [key: string]: any;
     // (undocumented)

From 90f0a294afa921baead26cb37d4d91ca338d2f23 Mon Sep 17 00:00:00 2001
From: Patrick Mueller <pmuellr@gmail.com>
Date: Tue, 25 Aug 2020 09:29:55 -0400
Subject: [PATCH 031/148] [Actions] change routing key refereence in Pager Duty
 action message to include integration key (#75516)

resolves https://github.com/elastic/kibana/issues/68209

Since routing key figures fairly prominently throughout PagerDuty APIs,
and ours, it seems like it make sense to include it in the single validation
message we have for it, as well as using the term we use for it in the product:
"integration key".

See the referenced issue for more background.
---
 .../builtin_action_types/pagerduty/pagerduty.test.tsx           | 2 +-
 .../components/builtin_action_types/pagerduty/pagerduty.tsx     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx
index ba7eb598c120d..0674e5b35c61f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.test.tsx
@@ -69,7 +69,7 @@ describe('pagerduty connector validation', () => {
 
     expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
       errors: {
-        routingKey: ['A routing key is required.'],
+        routingKey: ['An integration key / routing key is required.'],
       },
     });
   });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
index 5e29fca397180..90d8da346c71d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/pagerduty.tsx
@@ -38,7 +38,7 @@ export function getActionType(): ActionTypeModel {
           i18n.translate(
             'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.error.requiredRoutingKeyText',
             {
-              defaultMessage: 'A routing key is required.',
+              defaultMessage: 'An integration key / routing key is required.',
             }
           )
         );

From 59c4cd4a6983db6954f28e89b5a8d1267c1d632a Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Tue, 25 Aug 2020 06:33:04 -0700
Subject: [PATCH 032/148] Reduced the number of targets for a proxy server,
 only actions executions should be affected (#75839)

* Reduced the number of targets for a proxy server, only actions executions should be affected

* fixed typecheck
---
 .../common/lib/get_proxy_server.ts            | 30 +++++++------------
 .../actions/builtin_action_types/jira.ts      | 22 +++++++++++++-
 .../actions/builtin_action_types/pagerduty.ts | 22 +++++++++++++-
 .../actions/builtin_action_types/resilient.ts | 20 +++++++++++++
 .../builtin_action_types/servicenow.ts        | 21 ++++++++++++-
 .../actions/builtin_action_types/slack.ts     | 16 ++++++++++
 .../actions/builtin_action_types/webhook.ts   | 17 +++++++++++
 .../tests/actions/index.ts                    | 19 ------------
 8 files changed, 126 insertions(+), 41 deletions(-)

diff --git a/x-pack/test/alerting_api_integration/common/lib/get_proxy_server.ts b/x-pack/test/alerting_api_integration/common/lib/get_proxy_server.ts
index 7528b00f926d0..2b4908c156e51 100644
--- a/x-pack/test/alerting_api_integration/common/lib/get_proxy_server.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/get_proxy_server.ts
@@ -4,32 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import http from 'http';
 import httpProxy from 'http-proxy';
-import { ToolingLog } from '@kbn/dev-utils';
 
 export const getHttpProxyServer = async (
-  defaultKibanaTargetUrl: string,
+  targetUrl: string,
   kbnTestServerConfig: any,
-  log: ToolingLog
-): Promise<http.Server> => {
-  const proxy = httpProxy.createProxyServer({ secure: false, selfHandleResponse: false });
-
-  const proxyPort = getProxyPort(kbnTestServerConfig);
-  const proxyServer = http.createServer((req: http.IncomingMessage, res: http.ServerResponse) => {
-    const targetUrl = new URL(req.url ?? defaultKibanaTargetUrl);
+  onProxyResHandler: (proxyRes?: unknown, req?: unknown, res?: unknown) => void
+): Promise<httpProxy> => {
+  const proxyServer = httpProxy.createProxyServer({
+    target: targetUrl,
+    secure: false,
+    selfHandleResponse: false,
+  });
 
-    if (targetUrl.hostname !== 'some.non.existent.com') {
-      proxy.web(req, res, {
-        target: `${targetUrl.protocol}//${targetUrl.hostname}:${targetUrl.port}`,
-      });
-    } else {
-      res.writeHead(500, { 'Content-Type': 'text/plain' });
-      res.write('error on call some.non.existent.com');
-      res.end();
-    }
+  proxyServer.on('proxyRes', (proxyRes: unknown, req: unknown, res: unknown) => {
+    onProxyResHandler(proxyRes, req, res);
   });
 
+  const proxyPort = getProxyPort(kbnTestServerConfig);
   proxyServer.listen(proxyPort);
 
   return proxyServer;
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts
index 78a1df0b9c1c7..3ffd58b945ddb 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/jira.ts
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import httpProxy from 'http-proxy';
 import expect from '@kbn/expect';
 
+import { getHttpProxyServer } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -35,6 +37,7 @@ const mapping = [
 export default function jiraTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
+  const configService = getService('config');
 
   const mockJira = {
     config: {
@@ -80,7 +83,6 @@ export default function jiraTest({ getService }: FtrProviderContext) {
         getExternalServiceSimulatorPath(ExternalServiceSimulator.JIRA)
       );
     });
-
     describe('Jira - Action Creation', () => {
       it('should return 200 when creating a jira action successfully', async () => {
         const { body: createdAction } = await supertest
@@ -292,6 +294,9 @@ export default function jiraTest({ getService }: FtrProviderContext) {
 
     describe('Jira - Executor', () => {
       let simulatedActionId: string;
+      let proxyServer: httpProxy | undefined;
+      let proxyHaveBeenCalled = false;
+
       before(async () => {
         const { body } = await supertest
           .post('/api/actions/action')
@@ -307,6 +312,14 @@ export default function jiraTest({ getService }: FtrProviderContext) {
             secrets: mockJira.secrets,
           });
         simulatedActionId = body.id;
+
+        proxyServer = await getHttpProxyServer(
+          kibanaServer.resolveUrl('/'),
+          configService.get('kbnTestServer.serverArgs'),
+          () => {
+            proxyHaveBeenCalled = true;
+          }
+        );
       });
 
       describe('Validation', () => {
@@ -529,6 +542,7 @@ export default function jiraTest({ getService }: FtrProviderContext) {
             })
             .expect(200);
 
+          expect(proxyHaveBeenCalled).to.equal(true);
           expect(body).to.eql({
             status: 'ok',
             actionId: simulatedActionId,
@@ -541,6 +555,12 @@ export default function jiraTest({ getService }: FtrProviderContext) {
           });
         });
       });
+
+      after(() => {
+        if (proxyServer) {
+          proxyServer.close();
+        }
+      });
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
index 76b3e8e39791a..0c4d9096aa31a 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/pagerduty.ts
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import httpProxy from 'http-proxy';
 import expect from '@kbn/expect';
 
+import { getHttpProxyServer } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -17,16 +19,27 @@ import {
 export default function pagerdutyTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
+  const configService = getService('config');
 
   describe('pagerduty action', () => {
     let simulatedActionId = '';
     let pagerdutySimulatorURL: string = '<could not determine kibana url>';
+    let proxyServer: httpProxy | undefined;
+    let proxyHaveBeenCalled = false;
 
     // need to wait for kibanaServer to settle ...
-    before(() => {
+    before(async () => {
       pagerdutySimulatorURL = kibanaServer.resolveUrl(
         getExternalServiceSimulatorPath(ExternalServiceSimulator.PAGERDUTY)
       );
+
+      proxyServer = await getHttpProxyServer(
+        kibanaServer.resolveUrl('/'),
+        configService.get('kbnTestServer.serverArgs'),
+        () => {
+          proxyHaveBeenCalled = true;
+        }
+      );
     });
 
     it('should return successfully when passed valid create parameters', async () => {
@@ -145,6 +158,7 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
         })
         .expect(200);
 
+      expect(proxyHaveBeenCalled).to.equal(true);
       expect(result).to.eql({
         status: 'ok',
         actionId: simulatedActionId,
@@ -203,5 +217,11 @@ export default function pagerdutyTest({ getService }: FtrProviderContext) {
       expect(result.message).to.match(/error posting pagerduty event: http status 502/);
       expect(result.retry).to.equal(true);
     });
+
+    after(() => {
+      if (proxyServer) {
+        proxyServer.close();
+      }
+    });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
index 8adaf9f121931..9cbc2373ef943 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/resilient.ts
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import httpProxy from 'http-proxy';
 import expect from '@kbn/expect';
 
+import { getHttpProxyServer } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -35,6 +37,7 @@ const mapping = [
 export default function resilientTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
+  const configService = getService('config');
 
   const mockResilient = {
     config: {
@@ -292,6 +295,8 @@ export default function resilientTest({ getService }: FtrProviderContext) {
 
     describe('IBM Resilient - Executor', () => {
       let simulatedActionId: string;
+      let proxyServer: httpProxy | undefined;
+      let proxyHaveBeenCalled = false;
       before(async () => {
         const { body } = await supertest
           .post('/api/actions/action')
@@ -307,6 +312,14 @@ export default function resilientTest({ getService }: FtrProviderContext) {
             secrets: mockResilient.secrets,
           });
         simulatedActionId = body.id;
+
+        proxyServer = await getHttpProxyServer(
+          kibanaServer.resolveUrl('/'),
+          configService.get('kbnTestServer.serverArgs'),
+          () => {
+            proxyHaveBeenCalled = true;
+          }
+        );
       });
 
       describe('Validation', () => {
@@ -529,6 +542,7 @@ export default function resilientTest({ getService }: FtrProviderContext) {
             })
             .expect(200);
 
+          expect(proxyHaveBeenCalled).to.equal(true);
           expect(body).to.eql({
             status: 'ok',
             actionId: simulatedActionId,
@@ -541,6 +555,12 @@ export default function resilientTest({ getService }: FtrProviderContext) {
           });
         });
       });
+
+      after(() => {
+        if (proxyServer) {
+          proxyServer.close();
+        }
+      });
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
index 2dad6f2c425e5..3f8341df3d295 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/servicenow.ts
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import httpProxy from 'http-proxy';
 import expect from '@kbn/expect';
 
+import { getHttpProxyServer } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -35,6 +37,7 @@ const mapping = [
 export default function servicenowTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
+  const configService = getService('config');
 
   const mockServiceNow = {
     config: {
@@ -264,6 +267,8 @@ export default function servicenowTest({ getService }: FtrProviderContext) {
 
     describe('ServiceNow - Executor', () => {
       let simulatedActionId: string;
+      let proxyServer: httpProxy | undefined;
+      let proxyHaveBeenCalled = false;
       before(async () => {
         const { body } = await supertest
           .post('/api/actions/action')
@@ -279,6 +284,14 @@ export default function servicenowTest({ getService }: FtrProviderContext) {
             secrets: mockServiceNow.secrets,
           });
         simulatedActionId = body.id;
+
+        proxyServer = await getHttpProxyServer(
+          kibanaServer.resolveUrl('/'),
+          configService.get('kbnTestServer.serverArgs'),
+          () => {
+            proxyHaveBeenCalled = true;
+          }
+        );
       });
 
       describe('Validation', () => {
@@ -448,7 +461,7 @@ export default function servicenowTest({ getService }: FtrProviderContext) {
               },
             })
             .expect(200);
-
+          expect(proxyHaveBeenCalled).to.equal(true);
           expect(result).to.eql({
             status: 'ok',
             actionId: simulatedActionId,
@@ -461,6 +474,12 @@ export default function servicenowTest({ getService }: FtrProviderContext) {
           });
         });
       });
+
+      after(() => {
+        if (proxyServer) {
+          proxyServer.close();
+        }
+      });
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
index 1712c31187b02..83ad17757f3a6 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/slack.ts
@@ -4,9 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import httpProxy from 'http-proxy';
 import expect from '@kbn/expect';
 import http from 'http';
 import getPort from 'get-port';
+import { getHttpProxyServer } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import { getSlackServer } from '../../../../common/fixtures/plugins/actions_simulators/server/plugin';
@@ -14,11 +16,14 @@ import { getSlackServer } from '../../../../common/fixtures/plugins/actions_simu
 // eslint-disable-next-line import/no-default-export
 export default function slackTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
+  const configService = getService('config');
 
   describe('slack action', () => {
     let simulatedActionId = '';
     let slackSimulatorURL: string = '';
     let slackServer: http.Server;
+    let proxyServer: httpProxy | undefined;
+    let proxyHaveBeenCalled = false;
 
     // need to wait for kibanaServer to settle ...
     before(async () => {
@@ -28,6 +33,13 @@ export default function slackTest({ getService }: FtrProviderContext) {
         slackServer.listen(availablePort);
       }
       slackSimulatorURL = `http://localhost:${availablePort}`;
+      proxyServer = await getHttpProxyServer(
+        slackSimulatorURL,
+        configService.get('kbnTestServer.serverArgs'),
+        () => {
+          proxyHaveBeenCalled = true;
+        }
+      );
     });
 
     it('should return 200 when creating a slack action successfully', async () => {
@@ -157,6 +169,7 @@ export default function slackTest({ getService }: FtrProviderContext) {
         })
         .expect(200);
       expect(result.status).to.eql('ok');
+      expect(proxyHaveBeenCalled).to.equal(true);
     });
 
     it('should handle an empty message error', async () => {
@@ -224,6 +237,9 @@ export default function slackTest({ getService }: FtrProviderContext) {
 
     after(() => {
       slackServer.close();
+      if (proxyServer) {
+        proxyServer.close();
+      }
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
index abebb2650ad08..d82d116396cd6 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts
@@ -4,10 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import httpProxy from 'http-proxy';
 import http from 'http';
 import expect from '@kbn/expect';
 import { URL, format as formatUrl } from 'url';
 import getPort from 'get-port';
+import { getHttpProxyServer } from '../../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 import {
   getExternalServiceSimulatorPath,
@@ -31,6 +33,7 @@ function parsePort(url: Record<string, string>): Record<string, string | null |
 export default function webhookTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const kibanaServer = getService('kibanaServer');
+  const configService = getService('config');
 
   async function createWebhookAction(
     webhookSimulatorURL: string,
@@ -69,6 +72,8 @@ export default function webhookTest({ getService }: FtrProviderContext) {
     let webhookSimulatorURL: string = '';
     let webhookServer: http.Server;
     let kibanaURL: string = '<could not determine kibana url>';
+    let proxyServer: httpProxy | undefined;
+    let proxyHaveBeenCalled = false;
 
     // need to wait for kibanaServer to settle ...
     before(async () => {
@@ -80,6 +85,14 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       kibanaURL = kibanaServer.resolveUrl(
         getExternalServiceSimulatorPath(ExternalServiceSimulator.WEBHOOK)
       );
+
+      proxyServer = await getHttpProxyServer(
+        webhookSimulatorURL,
+        configService.get('kbnTestServer.serverArgs'),
+        () => {
+          proxyHaveBeenCalled = true;
+        }
+      );
     });
 
     it('should return 200 when creating a webhook action successfully', async () => {
@@ -178,6 +191,7 @@ export default function webhookTest({ getService }: FtrProviderContext) {
         })
         .expect(200);
 
+      expect(proxyHaveBeenCalled).to.equal(true);
       expect(result.status).to.eql('ok');
     });
 
@@ -241,6 +255,9 @@ export default function webhookTest({ getService }: FtrProviderContext) {
 
     after(() => {
       webhookServer.close();
+      if (proxyServer) {
+        proxyServer.close();
+      }
     });
   });
 }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
index 54484ba34636f..7b2e5f14fc4b6 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/index.ts
@@ -4,24 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import http from 'http';
-import { getHttpProxyServer } from '../../../common/lib/get_proxy_server';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function actionsTests({ loadTestFile, getService }: FtrProviderContext) {
-  const configService = getService('config');
-  const kibanaServer = getService('kibanaServer');
-  const log = getService('log');
   describe('Actions', () => {
-    let proxyServer: http.Server | undefined;
-    before(async () => {
-      proxyServer = await getHttpProxyServer(
-        kibanaServer.resolveUrl('/'),
-        configService.get('kbnTestServer.serverArgs'),
-        log
-      );
-    });
     loadTestFile(require.resolve('./builtin_action_types/email'));
     loadTestFile(require.resolve('./builtin_action_types/es_index'));
     loadTestFile(require.resolve('./builtin_action_types/es_index_preconfigured'));
@@ -39,11 +26,5 @@ export default function actionsTests({ loadTestFile, getService }: FtrProviderCo
     loadTestFile(require.resolve('./get'));
     loadTestFile(require.resolve('./list_action_types'));
     loadTestFile(require.resolve('./update'));
-
-    after(() => {
-      if (proxyServer) {
-        proxyServer.close();
-      }
-    });
   });
 }

From 1e8c05f87ad5901abeeffe40a730153c3e1658c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Tue, 25 Aug 2020 15:15:36 +0100
Subject: [PATCH 033/148] [APM] UI filters: Change transaction type selector
 from dropdown to radio buttons (#75625)

* changing transaction type filter to radio group

* fixing unit test

* changing transaction type filter to radio group

* adding onclick to the badge component

* adding onclick to the badge component

* adding i18n to aria

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../TransactionOverview.test.tsx              | 46 ++++++++-----------
 .../app/TransactionOverview/index.tsx         |  2 +-
 .../LocalUIFilters/Filter/FilterBadgeList.tsx | 26 +++++++----
 .../shared/LocalUIFilters/Filter/index.tsx    |  2 +-
 .../TransactionTypeFilter/index.tsx           | 15 +++---
 5 files changed, 47 insertions(+), 44 deletions(-)
 rename x-pack/plugins/apm/public/components/app/TransactionOverview/{__jest__ => }/TransactionOverview.test.tsx (70%)

diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx b/x-pack/plugins/apm/public/components/app/TransactionOverview/TransactionOverview.test.tsx
similarity index 70%
rename from x-pack/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx
rename to x-pack/plugins/apm/public/components/app/TransactionOverview/TransactionOverview.test.tsx
index 9c514e429c374..28030dd509835 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionOverview/__jest__/TransactionOverview.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/TransactionOverview.test.tsx
@@ -4,25 +4,23 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
 import {
+  fireEvent,
+  getByText,
   queryByLabelText,
   render,
-  getByText,
-  getByDisplayValue,
-  queryByDisplayValue,
-  fireEvent,
 } from '@testing-library/react';
 import { omit } from 'lodash';
-import { history } from '../../../../utils/history';
-import { TransactionOverview } from '..';
-import { IUrlParams } from '../../../../context/UrlParamsContext/types';
-import * as useServiceTransactionTypesHook from '../../../../hooks/useServiceTransactionTypes';
-import * as useFetcherHook from '../../../../hooks/useFetcher';
-import { fromQuery } from '../../../shared/Links/url_helpers';
+import React from 'react';
 import { Router } from 'react-router-dom';
-import { UrlParamsProvider } from '../../../../context/UrlParamsContext';
-import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
+import { TransactionOverview } from './';
+import { MockApmPluginContextWrapper } from '../../../context/ApmPluginContext/MockApmPluginContext';
+import { UrlParamsProvider } from '../../../context/UrlParamsContext';
+import { IUrlParams } from '../../../context/UrlParamsContext/types';
+import * as useFetcherHook from '../../../hooks/useFetcher';
+import * as useServiceTransactionTypesHook from '../../../hooks/useServiceTransactionTypes';
+import { history } from '../../../utils/history';
+import { fromQuery } from '../../shared/Links/url_helpers';
 
 jest.spyOn(history, 'push');
 jest.spyOn(history, 'replace');
@@ -85,7 +83,7 @@ describe('TransactionOverview', () => {
   const FILTER_BY_TYPE_LABEL = 'Transaction type';
 
   describe('when transactionType is selected and multiple transaction types are given', () => {
-    it('should render dropdown with transaction types', () => {
+    it('renders a radio group with transaction types', () => {
       const { container } = setup({
         serviceTransactionTypes: ['firstType', 'secondType'],
         urlParams: {
@@ -94,9 +92,8 @@ describe('TransactionOverview', () => {
         },
       });
 
-      // secondType is selected in the dropdown
-      expect(queryByDisplayValue(container, 'secondType')).not.toBeNull();
-      expect(queryByDisplayValue(container, 'firstType')).toBeNull();
+      expect(getByText(container, 'firstType')).toBeInTheDocument();
+      expect(getByText(container, 'secondType')).toBeInTheDocument();
 
       expect(getByText(container, 'firstType')).not.toBeNull();
     });
@@ -110,22 +107,19 @@ describe('TransactionOverview', () => {
         },
       });
 
-      expect(queryByDisplayValue(container, 'firstType')).toBeNull();
+      expect(history.location.search).toEqual('?transactionType=secondType');
+      expect(getByText(container, 'firstType')).toBeInTheDocument();
+      expect(getByText(container, 'secondType')).toBeInTheDocument();
 
-      fireEvent.change(getByDisplayValue(container, 'secondType'), {
-        target: { value: 'firstType' },
-      });
+      fireEvent.click(getByText(container, 'firstType'));
 
       expect(history.push).toHaveBeenCalled();
-
-      getByDisplayValue(container, 'firstType');
-
-      expect(queryByDisplayValue(container, 'firstType')).not.toBeNull();
+      expect(history.location.search).toEqual('?transactionType=firstType');
     });
   });
 
   describe('when a transaction type is selected, and there are no other transaction types', () => {
-    it('should not render a dropdown with transaction types', () => {
+    it('does not render a radio group with transaction types', () => {
       const { container } = setup({
         serviceTransactionTypes: ['firstType'],
         urlParams: {
diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx
index d9bd3e59d281f..f6eb131a8a733 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx
@@ -121,7 +121,7 @@ export function TransactionOverview() {
         <EuiFlexItem grow={1}>
           <LocalUIFilters {...localFiltersConfig}>
             <TransactionTypeFilter transactionTypes={serviceTransactionTypes} />
-            <EuiSpacer size="xl" />
+            <EuiSpacer size="m" />
             <EuiHorizontalRule margin="none" />
           </LocalUIFilters>
         </EuiFlexItem>
diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx
index 2090a92bf0de4..ed8d865d2d288 100644
--- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx
+++ b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/FilterBadgeList.tsx
@@ -5,8 +5,9 @@
  */
 
 import React from 'react';
-import { EuiFlexGrid, EuiFlexItem, EuiBadge, EuiIcon } from '@elastic/eui';
+import { EuiFlexGrid, EuiFlexItem, EuiBadge } from '@elastic/eui';
 import styled from 'styled-components';
+import { i18n } from '@kbn/i18n';
 import { unit, px, truncate } from '../../../../style/variables';
 
 const BadgeText = styled.div`
@@ -20,22 +21,31 @@ interface Props {
   onRemove: (val: string) => void;
 }
 
+const removeFilterLabel = i18n.translate(
+  'xpack.apm.uifilter.badge.removeFilter',
+  { defaultMessage: 'Remove filter' }
+);
+
 function FilterBadgeList({ onRemove, value }: Props) {
   return (
     <EuiFlexGrid gutterSize="s">
       {value.map((val) => (
         <EuiFlexItem key={val} grow={false}>
-          <button
-            type="button"
+          <EuiBadge
+            color="hollow"
             onClick={() => {
               onRemove(val);
             }}
+            onClickAriaLabel={removeFilterLabel}
+            iconOnClick={() => {
+              onRemove(val);
+            }}
+            iconOnClickAriaLabel={removeFilterLabel}
+            iconType="cross"
+            iconSide="right"
           >
-            <EuiBadge color="hollow">
-              <BadgeText>{val}</BadgeText>
-              <EuiIcon type="cross" />
-            </EuiBadge>
-          </button>
+            <BadgeText>{val}</BadgeText>
+          </EuiBadge>
         </EuiFlexItem>
       ))}
     </EuiFlexGrid>
diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx
index c13439a3c5928..48ebc2add0053 100644
--- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/Filter/index.tsx
@@ -164,7 +164,7 @@ function Filter({ name, title, options, onChange, value, showCount }: Props) {
             }}
             value={value}
           />
-          <EuiSpacer size="s" />
+          <EuiSpacer size="m" />
         </>
       ) : null}
     </>
diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx
index afd2d023d16ba..54a08e9d45af5 100644
--- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx
@@ -9,7 +9,7 @@ import {
   EuiTitle,
   EuiHorizontalRule,
   EuiSpacer,
-  EuiSelect,
+  EuiRadioGroup,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { useUrlParams } from '../../../../hooks/useUrlParams';
@@ -26,8 +26,8 @@ function TransactionTypeFilter({ transactionTypes }: Props) {
   } = useUrlParams();
 
   const options = transactionTypes.map((type) => ({
-    text: type,
-    value: type,
+    id: type,
+    label: type,
   }));
 
   return (
@@ -42,16 +42,15 @@ function TransactionTypeFilter({ transactionTypes }: Props) {
       <EuiSpacer size="s" />
       <EuiHorizontalRule margin="none" />
       <EuiSpacer size="s" />
-      <EuiSelect
+      <EuiRadioGroup
         options={options}
-        value={transactionType}
-        compressed={true}
-        onChange={(event) => {
+        idSelected={transactionType}
+        onChange={(selectedTransactionType) => {
           const newLocation = {
             ...history.location,
             search: fromQuery({
               ...toQuery(history.location.search),
-              transactionType: event.target.value,
+              transactionType: selectedTransactionType,
             }),
           };
           history.push(newLocation);

From c3b6745e3db705a9e14f4b951d967e9880bdd116 Mon Sep 17 00:00:00 2001
From: James Rodewig <40268737+jrodewig@users.noreply.github.com>
Date: Tue, 25 Aug 2020 10:29:57 -0400
Subject: [PATCH 034/148] Correct punctuation for ingest processors help text
 (#75695)

---
 .../processors/common_fields/ignore_missing_field.tsx       | 2 +-
 .../manage_processor_form/processors/date_index_name.tsx    | 2 +-
 .../components/manage_processor_form/processors/enrich.tsx  | 6 +++---
 .../components/manage_processor_form/processors/fail.tsx    | 2 +-
 .../components/manage_processor_form/processors/foreach.tsx | 4 ++--
 .../components/manage_processor_form/processors/geoip.tsx   | 4 ++--
 .../components/manage_processor_form/processors/grok.tsx    | 4 ++--
 .../components/manage_processor_form/processors/gsub.tsx    | 6 +++---
 .../manage_processor_form/processors/html_strip.tsx         | 2 +-
 .../manage_processor_form/processors/inference.tsx          | 2 +-
 .../components/manage_processor_form/processors/join.tsx    | 4 ++--
 .../components/manage_processor_form/processors/json.tsx    | 2 +-
 12 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/ignore_missing_field.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/ignore_missing_field.tsx
index 35dd462d88425..63ebb47dfc573 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/ignore_missing_field.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/common_fields/ignore_missing_field.tsx
@@ -32,7 +32,7 @@ export const fieldsConfig: FieldsConfig = {
     helpText: (
       <FormattedMessage
         id="xpack.ingestPipelines.pipelineEditor.commonFields.ignoreMissingFieldHelpText"
-        defaultMessage="Ignore documents with a missing {field}"
+        defaultMessage="Ignore documents with a missing {field}."
         values={{
           field: <EuiCode>{'field'}</EuiCode>,
         }}
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx
index 2a278a251c30f..8cbc064c1c90c 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/date_index_name.tsx
@@ -133,7 +133,7 @@ const fieldsConfig: FieldsConfig = {
     helpText: (
       <FormattedMessage
         id="xpack.ingestPipelines.pipelineEditor.dateIndexForm.localeHelpText"
-        defaultMessage="The locale to use when parsing the date from the document being preprocessed, relevant when parsing month names or week days. Default value is {locale}"
+        defaultMessage="The locale to use when parsing the date from the document being preprocessed, relevant when parsing month names or week days. Default value is {locale}."
         values={{ locale: <EuiCode inline>{'ENGLISH'}</EuiCode> }}
       />
     ),
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/enrich.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/enrich.tsx
index 31eac38222afb..5986374b338cf 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/enrich.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/enrich.tsx
@@ -157,7 +157,7 @@ export const Enrich: FunctionComponent = () => {
           helpText: (
             <FormattedMessage
               id="xpack.ingestPipelines.pipelineEditor.enrichForm.policyNameHelpText"
-              defaultMessage="Name of the {enrichPolicyLink}"
+              defaultMessage="Name of the {enrichPolicyLink}."
               values={{
                 enrichPolicyLink: (
                   <EuiLink external target="_blank" href={esDocUrl + '/ingest-enriching-data.html'}>
@@ -182,7 +182,7 @@ export const Enrich: FunctionComponent = () => {
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.enrichForm.targetFieldHelpText',
           {
-            defaultMessage: 'Field used to contain enrich data',
+            defaultMessage: 'Field used to contain enrich data.',
           }
         )}
         validations={[targetFieldValidator]}
@@ -202,7 +202,7 @@ export const Enrich: FunctionComponent = () => {
           helpText: (
             <FormattedMessage
               id="xpack.ingestPipelines.pipelineEditor.enrichForm.shapeRelationFieldHelpText"
-              defaultMessage="Operator used to match the geo-shape of incoming documents to enrich documents. Only used for {geoMatchPolicyLink}"
+              defaultMessage="Operator used to match the geo-shape of incoming documents to enrich documents. Only used for {geoMatchPolicyLink}."
               values={{
                 geoMatchPolicyLink: (
                   <EuiLink
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/fail.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/fail.tsx
index 3befadc3ca5a3..be97231fdca46 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/fail.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/fail.tsx
@@ -21,7 +21,7 @@ const fieldsConfig: FieldsConfig = {
       defaultMessage: 'Message',
     }),
     helpText: i18n.translate('xpack.ingestPipelines.pipelineEditor.failForm.messageHelpText', {
-      defaultMessage: 'Error message returned by the processor',
+      defaultMessage: 'Error message returned by the processor.',
     }),
     validations: [
       {
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/foreach.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/foreach.tsx
index e471f8322f164..ce606af086893 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/foreach.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/foreach.tsx
@@ -26,7 +26,7 @@ const fieldsConfig: FieldsConfig = {
       defaultMessage: 'Processor',
     }),
     helpText: i18n.translate('xpack.ingestPipelines.pipelineEditor.foreachForm.processorHelpText', {
-      defaultMessage: 'Ingest processor to run on each array value',
+      defaultMessage: 'Ingest processor to run on each array value.',
     }),
     validations: [
       {
@@ -56,7 +56,7 @@ export const Foreach: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.failForm.fieldNameHelpText',
-          { defaultMessage: 'Field containing array values' }
+          { defaultMessage: 'Field containing array values.' }
         )}
       />
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/geoip.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/geoip.tsx
index ef2aa62c4a7de..9bb1d679938ed 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/geoip.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/geoip.tsx
@@ -80,7 +80,7 @@ export const GeoIP: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.geoIPForm.fieldNameHelpText',
-          { defaultMessage: 'Field containing an IP address for the geographical lookup' }
+          { defaultMessage: 'Field containing an IP address for the geographical lookup.' }
         )}
       />
 
@@ -88,7 +88,7 @@ export const GeoIP: FunctionComponent = () => {
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.geoIPForm.targetFieldHelpText',
           {
-            defaultMessage: 'Field used to contain geo data properties',
+            defaultMessage: 'Field used to contain geo data properties.',
           }
         )}
       />
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/grok.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/grok.tsx
index 1ed9898149a67..d021038fda94f 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/grok.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/grok.tsx
@@ -87,7 +87,7 @@ const fieldsConfig: FieldsConfig = {
     helpText: i18n.translate(
       'xpack.ingestPipelines.pipelineEditor.grokForm.traceMatchFieldHelpText',
       {
-        defaultMessage: 'Add metadata about the matching expression to the document',
+        defaultMessage: 'Add metadata about the matching expression to the document.',
       }
     ),
   },
@@ -99,7 +99,7 @@ export const Grok: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.grokForm.fieldNameHelpText',
-          { defaultMessage: 'Field to search for matches' }
+          { defaultMessage: 'Field to search for matches.' }
         )}
       />
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/gsub.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/gsub.tsx
index 4d3445d469da2..a0bda245d667b 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/gsub.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/gsub.tsx
@@ -29,7 +29,7 @@ const fieldsConfig: FieldsConfig = {
     }),
     deserializer: String,
     helpText: i18n.translate('xpack.ingestPipelines.pipelineEditor.gsubForm.patternFieldHelpText', {
-      defaultMessage: 'Regular expression used to match substrings in the field',
+      defaultMessage: 'Regular expression used to match substrings in the field.',
     }),
     validations: [
       {
@@ -49,7 +49,7 @@ const fieldsConfig: FieldsConfig = {
     }),
     helpText: i18n.translate(
       'xpack.ingestPipelines.pipelineEditor.gsubForm.replacementFieldHelpText',
-      { defaultMessage: 'Replacement text for matches' }
+      { defaultMessage: 'Replacement text for matches.' }
     ),
     validations: [
       {
@@ -69,7 +69,7 @@ export const Gsub: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.gsubForm.fieldNameHelpText',
-          { defaultMessage: 'Field to search for matches' }
+          { defaultMessage: 'Field to search for matches.' }
         )}
       />
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/html_strip.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/html_strip.tsx
index c6ca7df4cc3e7..fb1a2d97672b0 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/html_strip.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/html_strip.tsx
@@ -19,7 +19,7 @@ export const HtmlStrip: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.htmlStripForm.fieldNameHelpText',
-          { defaultMessage: 'Field to remove HTML tags from' }
+          { defaultMessage: 'Field to remove HTML tags from.' }
         )}
       />
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/inference.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/inference.tsx
index ee8d7cc55a9f1..68281fc11f340 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/inference.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/inference.tsx
@@ -82,7 +82,7 @@ const fieldsConfig: FieldsConfig = {
     helpText: i18n.translate(
       'xpack.ingestPipelines.pipelineEditor.inferenceForm.modelIDFieldHelpText',
       {
-        defaultMessage: 'ID of the model to infer against',
+        defaultMessage: 'ID of the model to infer against.',
       }
     ),
     validations: [
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/join.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/join.tsx
index 712d0106459b1..c35a5b463f573 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/join.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/join.tsx
@@ -28,7 +28,7 @@ const fieldsConfig: FieldsConfig = {
     helpText: i18n.translate(
       'xpack.ingestPipelines.pipelineEditor.joinForm.separatorFieldHelpText',
       {
-        defaultMessage: 'Separator character',
+        defaultMessage: 'Separator character.',
       }
     ),
     validations: [
@@ -49,7 +49,7 @@ export const Join: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.joinForm.fieldNameHelpText',
-          { defaultMessage: 'Field containing array values to join' }
+          { defaultMessage: 'Field containing array values to join.' }
         )}
       />
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/json.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/json.tsx
index 9d62c67460136..5c4c53b65b6dc 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/json.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/json.tsx
@@ -61,7 +61,7 @@ export const Json: FunctionComponent = () => {
       <FieldNameField
         helpText={i18n.translate(
           'xpack.ingestPipelines.pipelineEditor.jsonForm.fieldNameHelpText',
-          { defaultMessage: 'Field to be parsed' }
+          { defaultMessage: 'Field to parse.' }
         )}
       />
 

From 75232a74f3be93135ac9f1be959b2890301ad662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Tue, 25 Aug 2020 15:39:57 +0100
Subject: [PATCH 035/148] [APM] Implement nest level expand/collapse toggle for
 each span row (#75259)

* returning an waterfallTransaction

* fixing style

* fixing unit test

* fixing style

* addressing PR comment

* addressing PR comment

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../Waterfall/WaterfallItem.tsx               |    6 +-
 .../Waterfall/accordion_waterfall.tsx         |  170 ++
 .../WaterfallContainer/Waterfall/index.tsx    |  121 +-
 .../waterfall_helpers.test.ts.snap            | 1949 +++++++++++++----
 .../waterfall_helpers/waterfall_helpers.ts    |    9 +-
 .../WaterfallContainer/index.tsx              |    2 +-
 .../WaterfallWithSummmary/index.tsx           |    6 +-
 7 files changed, 1759 insertions(+), 504 deletions(-)
 create mode 100644 x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx

diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx
index a4d42bcf51d01..e1b5ffcd0e0f5 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallItem.tsx
@@ -40,7 +40,6 @@ const Container = styled.div<IContainerStyleProps>`
   padding-bottom: ${px(units.plus)};
   margin-right: ${(props) => px(props.timelineMargins.right)};
   margin-left: ${(props) => px(props.timelineMargins.left)};
-  border-top: 1px solid ${({ theme }) => theme.eui.euiColorLightShade};
   background-color: ${({ isSelected, theme }) =>
     isSelected ? theme.eui.euiColorLightestShade : 'initial'};
   cursor: pointer;
@@ -191,7 +190,10 @@ export function WaterfallItem({
       type={item.docType}
       timelineMargins={timelineMargins}
       isSelected={isSelected}
-      onClick={onClick}
+      onClick={(e: React.MouseEvent) => {
+        e.stopPropagation();
+        onClick();
+      }}
     >
       <ItemBar // using inline styles instead of props to avoid generating a css class for each item
         style={{ left: `${left}%`, width: `${width}%` }}
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx
new file mode 100644
index 0000000000000..833937835f870
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx
@@ -0,0 +1,170 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { EuiAccordion, EuiAccordionProps } from '@elastic/eui';
+import { Location } from 'history';
+import { isEmpty } from 'lodash';
+import React, { useState } from 'react';
+import styled from 'styled-components';
+import { Margins } from '../../../../../shared/charts/Timeline';
+import { WaterfallItem } from './WaterfallItem';
+import {
+  IWaterfall,
+  IWaterfallItem,
+} from './waterfall_helpers/waterfall_helpers';
+
+interface AccordionWaterfallProps {
+  isOpen: boolean;
+  item: IWaterfallItem;
+  level: number;
+  serviceColors: IWaterfall['serviceColors'];
+  duration: IWaterfall['duration'];
+  waterfallItemId?: string;
+  location: Location;
+  errorsPerTransaction: IWaterfall['errorsPerTransaction'];
+  childrenByParentId: Record<string, IWaterfallItem[]>;
+  onToggleEntryTransaction?: (
+    nextState: EuiAccordionProps['forceState']
+  ) => void;
+  timelineMargins: Margins;
+  onClickWaterfallItem: (item: IWaterfallItem) => void;
+}
+
+const StyledAccordion = styled(EuiAccordion).withConfig({
+  shouldForwardProp: (prop) =>
+    !['childrenCount', 'marginLeftLevel', 'hasError'].includes(prop),
+})<
+  EuiAccordionProps & {
+    childrenCount: number;
+    marginLeftLevel: number;
+    hasError: boolean;
+  }
+>`
+  .euiAccordion {
+    border-top: 1px solid ${({ theme }) => theme.eui.euiColorLightShade};
+  }
+  .euiIEFlexWrapFix {
+    width: 100%;
+    height: 48px;
+  }
+  .euiAccordion__childWrapper {
+    transition: none;
+  }
+
+  .euiAccordion__padding--l {
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .euiAccordion__iconWrapper {
+    display: flex;
+    position: relative;
+    &:after {
+      content: ${(props) => `'${props.childrenCount}'`};
+      position: absolute;
+      left: 20px;
+      top: -1px;
+      z-index: 1;
+      font-size: ${({ theme }) => theme.eui.euiFontSizeXS};
+    }
+  }
+
+  ${(props) => {
+    const borderLeft = props.hasError
+      ? `2px solid ${props.theme.eui.euiColorDanger};`
+      : `1px solid ${props.theme.eui.euiColorLightShade};`;
+    return `.button_${props.id} {
+      margin-left: ${props.marginLeftLevel}px;
+      border-left: ${borderLeft}
+      &:hover {
+        background-color: ${props.theme.eui.euiColorLightestShade};
+      }
+    }`;
+    //
+  }}
+`;
+
+const WaterfallItemContainer = styled.div`
+  position: absolute;
+  width: 100%;
+  left: 0;
+`;
+
+export function AccordionWaterfall(props: AccordionWaterfallProps) {
+  const [isOpen, setIsOpen] = useState(props.isOpen);
+
+  const {
+    item,
+    level,
+    serviceColors,
+    duration,
+    childrenByParentId,
+    waterfallItemId,
+    location,
+    errorsPerTransaction,
+    timelineMargins,
+    onClickWaterfallItem,
+  } = props;
+
+  const nextLevel = level + 1;
+
+  const errorCount =
+    item.docType === 'transaction'
+      ? errorsPerTransaction[item.doc.transaction.id]
+      : 0;
+
+  const children = childrenByParentId[item.id] || [];
+
+  // To indent the items creating the parent/child tree
+  const marginLeftLevel = 8 * level;
+
+  return (
+    <StyledAccordion
+      buttonClassName={`button_${item.id}`}
+      key={item.id}
+      id={item.id}
+      hasError={errorCount > 0}
+      marginLeftLevel={marginLeftLevel}
+      childrenCount={children.length}
+      buttonContent={
+        <WaterfallItemContainer>
+          <WaterfallItem
+            key={item.id}
+            timelineMargins={timelineMargins}
+            color={serviceColors[item.doc.service.name]}
+            item={item}
+            totalDuration={duration}
+            isSelected={item.id === waterfallItemId}
+            errorCount={errorCount}
+            onClick={() => {
+              onClickWaterfallItem(item);
+            }}
+          />
+        </WaterfallItemContainer>
+      }
+      arrowDisplay={isEmpty(children) ? 'none' : 'left'}
+      initialIsOpen={true}
+      forceState={isOpen ? 'open' : 'closed'}
+      onToggle={() => setIsOpen((isCurrentOpen) => !isCurrentOpen)}
+    >
+      {children.map((child) => (
+        <AccordionWaterfall
+          key={child.id}
+          isOpen={isOpen}
+          item={child}
+          level={nextLevel}
+          serviceColors={serviceColors}
+          waterfallItemId={waterfallItemId}
+          location={location}
+          errorsPerTransaction={errorsPerTransaction}
+          duration={duration}
+          childrenByParentId={childrenByParentId}
+          timelineMargins={timelineMargins}
+          onClickWaterfallItem={onClickWaterfallItem}
+        />
+      ))}
+    </StyledAccordion>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
index 1fd0ec761b1ae..7daf1b798749b 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
@@ -4,21 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiCallOut } from '@elastic/eui';
+import { EuiButtonEmpty, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
-import React from 'react';
+import React, { useState } from 'react';
 // @ts-ignore
 import { StickyContainer } from 'react-sticky';
 import styled from 'styled-components';
 import { px } from '../../../../../../style/variables';
 import { history } from '../../../../../../utils/history';
 import { Timeline } from '../../../../../shared/charts/Timeline';
+import { HeightRetainer } from '../../../../../shared/HeightRetainer';
 import { fromQuery, toQuery } from '../../../../../shared/Links/url_helpers';
 import { getAgentMarks } from '../Marks/get_agent_marks';
 import { getErrorMarks } from '../Marks/get_error_marks';
+import { AccordionWaterfall } from './accordion_waterfall';
 import { WaterfallFlyout } from './WaterfallFlyout';
-import { WaterfallItem } from './WaterfallItem';
 import {
   IWaterfall,
   IWaterfallItem,
@@ -32,7 +33,7 @@ const Container = styled.div`
 
 const TIMELINE_MARGINS = {
   top: 40,
-  left: 50,
+  left: 100,
   right: 50,
   bottom: 0,
 };
@@ -58,6 +59,7 @@ const WaterfallItemsContainer = styled.div<{
   paddingTop: number;
 }>`
   padding-top: ${(props) => px(props.paddingTop)};
+  border-bottom: 1px solid ${({ theme }) => theme.eui.euiColorMediumShade};
 `;
 
 interface Props {
@@ -66,72 +68,91 @@ interface Props {
   location: Location;
   exceedsMax: boolean;
 }
-
 export function Waterfall({
   waterfall,
   exceedsMax,
   waterfallItemId,
   location,
 }: Props) {
+  const [isAccordionOpen, setIsAccordionOpen] = useState(true);
   const itemContainerHeight = 58; // TODO: This is a nasty way to calculate the height of the svg element. A better approach should be found
   const waterfallHeight = itemContainerHeight * waterfall.items.length;
 
   const { serviceColors, duration } = waterfall;
 
-  const agentMarks = getAgentMarks(waterfall.entryTransaction);
+  const agentMarks = getAgentMarks(waterfall.entryWaterfallTransaction?.doc);
   const errorMarks = getErrorMarks(waterfall.errorItems, serviceColors);
 
-  function renderWaterfallItem(item: IWaterfallItem) {
-    const errorCount =
-      item.docType === 'transaction'
-        ? waterfall.errorsPerTransaction[item.doc.transaction.id]
-        : 0;
-
+  function renderItems(
+    childrenByParentId: Record<string | number, IWaterfallItem[]>
+  ) {
+    const { entryWaterfallTransaction } = waterfall;
+    if (!entryWaterfallTransaction) {
+      return null;
+    }
     return (
-      <WaterfallItem
-        key={item.id}
+      <AccordionWaterfall
+        // used to recreate the entire tree when `isAccordionOpen` changes, collapsing or expanding all elements.
+        key={`accordion_state_${isAccordionOpen}`}
+        isOpen={isAccordionOpen}
+        item={entryWaterfallTransaction}
+        level={0}
+        serviceColors={serviceColors}
+        waterfallItemId={waterfallItemId}
+        location={location}
+        errorsPerTransaction={waterfall.errorsPerTransaction}
+        duration={duration}
+        childrenByParentId={childrenByParentId}
         timelineMargins={TIMELINE_MARGINS}
-        color={serviceColors[item.doc.service.name]}
-        item={item}
-        totalDuration={duration}
-        isSelected={item.id === waterfallItemId}
-        errorCount={errorCount}
-        onClick={() => toggleFlyout({ item, location })}
+        onClickWaterfallItem={(item: IWaterfallItem) =>
+          toggleFlyout({ item, location })
+        }
       />
     );
   }
 
   return (
-    <Container>
-      {exceedsMax && (
-        <EuiCallOut
-          color="warning"
-          size="s"
-          iconType="alert"
-          title={i18n.translate('xpack.apm.waterfall.exceedsMax', {
-            defaultMessage:
-              'Number of items in this trace exceed what is displayed',
-          })}
-        />
-      )}
-      <StickyContainer>
-        <Timeline
-          marks={[...agentMarks, ...errorMarks]}
-          xMax={duration}
-          height={waterfallHeight}
-          margins={TIMELINE_MARGINS}
-        />
-        <WaterfallItemsContainer paddingTop={TIMELINE_MARGINS.top}>
-          {waterfall.items.map(renderWaterfallItem)}
-        </WaterfallItemsContainer>
-      </StickyContainer>
+    <HeightRetainer>
+      <Container>
+        {exceedsMax && (
+          <EuiCallOut
+            color="warning"
+            size="s"
+            iconType="alert"
+            title={i18n.translate('xpack.apm.waterfall.exceedsMax', {
+              defaultMessage:
+                'Number of items in this trace exceed what is displayed',
+            })}
+          />
+        )}
+        <StickyContainer>
+          <div style={{ display: 'flex' }}>
+            <EuiButtonEmpty
+              style={{ zIndex: 3, position: 'absolute' }}
+              iconType={isAccordionOpen ? 'arrowDown' : 'arrowRight'}
+              onClick={() => {
+                setIsAccordionOpen((isOpen) => !isOpen);
+              }}
+            />
+            <Timeline
+              marks={[...agentMarks, ...errorMarks]}
+              xMax={duration}
+              height={waterfallHeight}
+              margins={TIMELINE_MARGINS}
+            />
+          </div>
+          <WaterfallItemsContainer paddingTop={TIMELINE_MARGINS.top}>
+            {renderItems(waterfall.childrenByParentId)}
+          </WaterfallItemsContainer>
+        </StickyContainer>
 
-      <WaterfallFlyout
-        waterfallItemId={waterfallItemId}
-        waterfall={waterfall}
-        location={location}
-        toggleFlyout={toggleFlyout}
-      />
-    </Container>
+        <WaterfallFlyout
+          waterfallItemId={waterfallItemId}
+          waterfall={waterfall}
+          location={location}
+          toggleFlyout={toggleFlyout}
+        />
+      </Container>
+    </HeightRetainer>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
index c9b29e8692f44..204c5e9ae6da2 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap
@@ -2,27 +2,734 @@
 
 exports[`waterfall_helpers getWaterfall should return full waterfall 1`] = `
 Object {
+  "childrenByParentId": Object {
+    "mySpanIdA": Array [
+      Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "mySpanIdA",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 481,
+            },
+            "id": "mySpanIdB",
+            "name": "SELECT FROM products",
+          },
+          "timestamp": Object {
+            "us": 1549324795825633,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
+          },
+        },
+        "docType": "span",
+        "duration": 481,
+        "id": "mySpanIdB",
+        "offset": 41627,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "myTransactionId2",
+            },
+            "processor": Object {
+              "event": "span",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "span": Object {
+              "duration": Object {
+                "us": 6161,
+              },
+              "id": "mySpanIdA",
+              "name": "Api::ProductsController#index",
+            },
+            "timestamp": Object {
+              "us": 1549324795824504,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "id": "myTransactionId2",
+            },
+          },
+          "docType": "span",
+          "duration": 6161,
+          "id": "mySpanIdA",
+          "offset": 40498,
+          "parent": Object {
+            "doc": Object {
+              "parent": Object {
+                "id": "mySpanIdD",
+              },
+              "processor": Object {
+                "event": "transaction",
+              },
+              "service": Object {
+                "name": "opbeans-ruby",
+              },
+              "timestamp": Object {
+                "us": 1549324795823304,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "duration": Object {
+                  "us": 8634,
+                },
+                "id": "myTransactionId2",
+                "marks": Object {
+                  "agent": Object {
+                    "domComplete": 383,
+                    "domInteractive": 382,
+                    "timeToFirstByte": 14,
+                  },
+                },
+                "name": "Api::ProductsController#index",
+              },
+            },
+            "docType": "transaction",
+            "duration": 8634,
+            "id": "myTransactionId2",
+            "offset": 39298,
+            "parent": Object {
+              "doc": Object {
+                "parent": Object {
+                  "id": "myTransactionId1",
+                },
+                "processor": Object {
+                  "event": "span",
+                },
+                "service": Object {
+                  "name": "opbeans-node",
+                },
+                "span": Object {
+                  "duration": Object {
+                    "us": 47557,
+                  },
+                  "id": "mySpanIdD",
+                  "name": "GET opbeans-ruby:3000/api/products",
+                },
+                "timestamp": Object {
+                  "us": 1549324795785760,
+                },
+                "trace": Object {
+                  "id": "myTraceId",
+                },
+                "transaction": Object {
+                  "id": "myTransactionId1",
+                },
+              },
+              "docType": "span",
+              "duration": 47557,
+              "id": "mySpanIdD",
+              "offset": 1754,
+              "parent": Object {
+                "doc": Object {
+                  "processor": Object {
+                    "event": "transaction",
+                  },
+                  "service": Object {
+                    "name": "opbeans-node",
+                  },
+                  "timestamp": Object {
+                    "us": 1549324795784006,
+                  },
+                  "trace": Object {
+                    "id": "myTraceId",
+                  },
+                  "transaction": Object {
+                    "duration": Object {
+                      "us": 49660,
+                    },
+                    "id": "myTransactionId1",
+                    "name": "GET /api",
+                  },
+                },
+                "docType": "transaction",
+                "duration": 49660,
+                "id": "myTransactionId1",
+                "offset": 0,
+                "parent": undefined,
+                "parentId": undefined,
+                "skew": 0,
+              },
+              "parentId": "myTransactionId1",
+              "skew": 0,
+            },
+            "parentId": "mySpanIdD",
+            "skew": 0,
+          },
+          "parentId": "myTransactionId2",
+          "skew": 0,
+        },
+        "parentId": "mySpanIdA",
+        "skew": 0,
+      },
+      Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "mySpanIdA",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 532,
+            },
+            "id": "mySpanIdC",
+            "name": "SELECT FROM product",
+          },
+          "timestamp": Object {
+            "us": 1549324795827905,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
+          },
+        },
+        "docType": "span",
+        "duration": 532,
+        "id": "mySpanIdC",
+        "offset": 43899,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "myTransactionId2",
+            },
+            "processor": Object {
+              "event": "span",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "span": Object {
+              "duration": Object {
+                "us": 6161,
+              },
+              "id": "mySpanIdA",
+              "name": "Api::ProductsController#index",
+            },
+            "timestamp": Object {
+              "us": 1549324795824504,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "id": "myTransactionId2",
+            },
+          },
+          "docType": "span",
+          "duration": 6161,
+          "id": "mySpanIdA",
+          "offset": 40498,
+          "parent": Object {
+            "doc": Object {
+              "parent": Object {
+                "id": "mySpanIdD",
+              },
+              "processor": Object {
+                "event": "transaction",
+              },
+              "service": Object {
+                "name": "opbeans-ruby",
+              },
+              "timestamp": Object {
+                "us": 1549324795823304,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "duration": Object {
+                  "us": 8634,
+                },
+                "id": "myTransactionId2",
+                "marks": Object {
+                  "agent": Object {
+                    "domComplete": 383,
+                    "domInteractive": 382,
+                    "timeToFirstByte": 14,
+                  },
+                },
+                "name": "Api::ProductsController#index",
+              },
+            },
+            "docType": "transaction",
+            "duration": 8634,
+            "id": "myTransactionId2",
+            "offset": 39298,
+            "parent": Object {
+              "doc": Object {
+                "parent": Object {
+                  "id": "myTransactionId1",
+                },
+                "processor": Object {
+                  "event": "span",
+                },
+                "service": Object {
+                  "name": "opbeans-node",
+                },
+                "span": Object {
+                  "duration": Object {
+                    "us": 47557,
+                  },
+                  "id": "mySpanIdD",
+                  "name": "GET opbeans-ruby:3000/api/products",
+                },
+                "timestamp": Object {
+                  "us": 1549324795785760,
+                },
+                "trace": Object {
+                  "id": "myTraceId",
+                },
+                "transaction": Object {
+                  "id": "myTransactionId1",
+                },
+              },
+              "docType": "span",
+              "duration": 47557,
+              "id": "mySpanIdD",
+              "offset": 1754,
+              "parent": Object {
+                "doc": Object {
+                  "processor": Object {
+                    "event": "transaction",
+                  },
+                  "service": Object {
+                    "name": "opbeans-node",
+                  },
+                  "timestamp": Object {
+                    "us": 1549324795784006,
+                  },
+                  "trace": Object {
+                    "id": "myTraceId",
+                  },
+                  "transaction": Object {
+                    "duration": Object {
+                      "us": 49660,
+                    },
+                    "id": "myTransactionId1",
+                    "name": "GET /api",
+                  },
+                },
+                "docType": "transaction",
+                "duration": 49660,
+                "id": "myTransactionId1",
+                "offset": 0,
+                "parent": undefined,
+                "parentId": undefined,
+                "skew": 0,
+              },
+              "parentId": "myTransactionId1",
+              "skew": 0,
+            },
+            "parentId": "mySpanIdD",
+            "skew": 0,
+          },
+          "parentId": "myTransactionId2",
+          "skew": 0,
+        },
+        "parentId": "mySpanIdA",
+        "skew": 0,
+      },
+    ],
+    "mySpanIdD": Array [
+      Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "mySpanIdD",
+          },
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "timestamp": Object {
+            "us": 1549324795823304,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 8634,
+            },
+            "id": "myTransactionId2",
+            "marks": Object {
+              "agent": Object {
+                "domComplete": 383,
+                "domInteractive": 382,
+                "timeToFirstByte": 14,
+              },
+            },
+            "name": "Api::ProductsController#index",
+          },
+        },
+        "docType": "transaction",
+        "duration": 8634,
+        "id": "myTransactionId2",
+        "offset": 39298,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "myTransactionId1",
+            },
+            "processor": Object {
+              "event": "span",
+            },
+            "service": Object {
+              "name": "opbeans-node",
+            },
+            "span": Object {
+              "duration": Object {
+                "us": 47557,
+              },
+              "id": "mySpanIdD",
+              "name": "GET opbeans-ruby:3000/api/products",
+            },
+            "timestamp": Object {
+              "us": 1549324795785760,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "id": "myTransactionId1",
+            },
+          },
+          "docType": "span",
+          "duration": 47557,
+          "id": "mySpanIdD",
+          "offset": 1754,
+          "parent": Object {
+            "doc": Object {
+              "processor": Object {
+                "event": "transaction",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "timestamp": Object {
+                "us": 1549324795784006,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "duration": Object {
+                  "us": 49660,
+                },
+                "id": "myTransactionId1",
+                "name": "GET /api",
+              },
+            },
+            "docType": "transaction",
+            "duration": 49660,
+            "id": "myTransactionId1",
+            "offset": 0,
+            "parent": undefined,
+            "parentId": undefined,
+            "skew": 0,
+          },
+          "parentId": "myTransactionId1",
+          "skew": 0,
+        },
+        "parentId": "mySpanIdD",
+        "skew": 0,
+      },
+    ],
+    "myTransactionId1": Array [
+      Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId1",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-node",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 47557,
+            },
+            "id": "mySpanIdD",
+            "name": "GET opbeans-ruby:3000/api/products",
+          },
+          "timestamp": Object {
+            "us": 1549324795785760,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId1",
+          },
+        },
+        "docType": "span",
+        "duration": 47557,
+        "id": "mySpanIdD",
+        "offset": 1754,
+        "parent": Object {
+          "doc": Object {
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-node",
+            },
+            "timestamp": Object {
+              "us": 1549324795784006,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 49660,
+              },
+              "id": "myTransactionId1",
+              "name": "GET /api",
+            },
+          },
+          "docType": "transaction",
+          "duration": 49660,
+          "id": "myTransactionId1",
+          "offset": 0,
+          "parent": undefined,
+          "parentId": undefined,
+          "skew": 0,
+        },
+        "parentId": "myTransactionId1",
+        "skew": 0,
+      },
+    ],
+    "myTransactionId2": Array [
+      Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId2",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 6161,
+            },
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
+          },
+          "timestamp": Object {
+            "us": 1549324795824504,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId2",
+          },
+        },
+        "docType": "span",
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 40498,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
+            },
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "timestamp": Object {
+              "us": 1549324795823304,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
+          "id": "myTransactionId2",
+          "offset": 39298,
+          "parent": Object {
+            "doc": Object {
+              "parent": Object {
+                "id": "myTransactionId1",
+              },
+              "processor": Object {
+                "event": "span",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "span": Object {
+                "duration": Object {
+                  "us": 47557,
+                },
+                "id": "mySpanIdD",
+                "name": "GET opbeans-ruby:3000/api/products",
+              },
+              "timestamp": Object {
+                "us": 1549324795785760,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "id": "myTransactionId1",
+              },
+            },
+            "docType": "span",
+            "duration": 47557,
+            "id": "mySpanIdD",
+            "offset": 1754,
+            "parent": Object {
+              "doc": Object {
+                "processor": Object {
+                  "event": "transaction",
+                },
+                "service": Object {
+                  "name": "opbeans-node",
+                },
+                "timestamp": Object {
+                  "us": 1549324795784006,
+                },
+                "trace": Object {
+                  "id": "myTraceId",
+                },
+                "transaction": Object {
+                  "duration": Object {
+                    "us": 49660,
+                  },
+                  "id": "myTransactionId1",
+                  "name": "GET /api",
+                },
+              },
+              "docType": "transaction",
+              "duration": 49660,
+              "id": "myTransactionId1",
+              "offset": 0,
+              "parent": undefined,
+              "parentId": undefined,
+              "skew": 0,
+            },
+            "parentId": "myTransactionId1",
+            "skew": 0,
+          },
+          "parentId": "mySpanIdD",
+          "skew": 0,
+        },
+        "parentId": "myTransactionId2",
+        "skew": 0,
+      },
+    ],
+    "root": Array [
+      Object {
+        "doc": Object {
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-node",
+          },
+          "timestamp": Object {
+            "us": 1549324795784006,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 49660,
+            },
+            "id": "myTransactionId1",
+            "name": "GET /api",
+          },
+        },
+        "docType": "transaction",
+        "duration": 49660,
+        "id": "myTransactionId1",
+        "offset": 0,
+        "parent": undefined,
+        "parentId": undefined,
+        "skew": 0,
+      },
+    ],
+  },
   "duration": 49660,
-  "entryTransaction": Object {
-    "processor": Object {
-      "event": "transaction",
-    },
-    "service": Object {
-      "name": "opbeans-node",
-    },
-    "timestamp": Object {
-      "us": 1549324795784006,
-    },
-    "trace": Object {
-      "id": "myTraceId",
-    },
-    "transaction": Object {
-      "duration": Object {
-        "us": 49660,
+  "entryWaterfallTransaction": Object {
+    "doc": Object {
+      "processor": Object {
+        "event": "transaction",
+      },
+      "service": Object {
+        "name": "opbeans-node",
+      },
+      "timestamp": Object {
+        "us": 1549324795784006,
+      },
+      "trace": Object {
+        "id": "myTraceId",
+      },
+      "transaction": Object {
+        "duration": Object {
+          "us": 49660,
+        },
+        "id": "myTransactionId1",
+        "name": "GET /api",
       },
-      "id": "myTransactionId1",
-      "name": "GET /api",
     },
+    "docType": "transaction",
+    "duration": 49660,
+    "id": "myTransactionId1",
+    "offset": 0,
+    "parent": undefined,
+    "parentId": undefined,
+    "skew": 0,
   },
   "errorItems": Array [
     Object {
@@ -42,13 +749,115 @@ Object {
           "id": "myTransactionId1",
         },
         "processor": Object {
-          "event": "error",
+          "event": "error",
+        },
+        "service": Object {
+          "name": "opbeans-ruby",
+        },
+        "timestamp": Object {
+          "us": 1549324795810000,
+        },
+        "trace": Object {
+          "id": "myTraceId",
+        },
+        "transaction": Object {
+          "id": "myTransactionId1",
+        },
+      },
+      "docType": "error",
+      "duration": 0,
+      "id": "error1",
+      "offset": 25994,
+      "parent": Object {
+        "doc": Object {
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-node",
+          },
+          "timestamp": Object {
+            "us": 1549324795784006,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 49660,
+            },
+            "id": "myTransactionId1",
+            "name": "GET /api",
+          },
+        },
+        "docType": "transaction",
+        "duration": 49660,
+        "id": "myTransactionId1",
+        "offset": 0,
+        "parent": undefined,
+        "parentId": undefined,
+        "skew": 0,
+      },
+      "parentId": "myTransactionId1",
+      "skew": 0,
+    },
+  ],
+  "errorsCount": 1,
+  "errorsPerTransaction": Object {
+    "myTransactionId1": 2,
+    "myTransactionId2": 3,
+  },
+  "items": Array [
+    Object {
+      "doc": Object {
+        "processor": Object {
+          "event": "transaction",
+        },
+        "service": Object {
+          "name": "opbeans-node",
+        },
+        "timestamp": Object {
+          "us": 1549324795784006,
+        },
+        "trace": Object {
+          "id": "myTraceId",
+        },
+        "transaction": Object {
+          "duration": Object {
+            "us": 49660,
+          },
+          "id": "myTransactionId1",
+          "name": "GET /api",
+        },
+      },
+      "docType": "transaction",
+      "duration": 49660,
+      "id": "myTransactionId1",
+      "offset": 0,
+      "parent": undefined,
+      "parentId": undefined,
+      "skew": 0,
+    },
+    Object {
+      "doc": Object {
+        "parent": Object {
+          "id": "myTransactionId1",
+        },
+        "processor": Object {
+          "event": "span",
         },
         "service": Object {
-          "name": "opbeans-ruby",
+          "name": "opbeans-node",
+        },
+        "span": Object {
+          "duration": Object {
+            "us": 47557,
+          },
+          "id": "mySpanIdD",
+          "name": "GET opbeans-ruby:3000/api/products",
         },
         "timestamp": Object {
-          "us": 1549324795810000,
+          "us": 1549324795785760,
         },
         "trace": Object {
           "id": "myTraceId",
@@ -57,10 +866,10 @@ Object {
           "id": "myTransactionId1",
         },
       },
-      "docType": "error",
-      "duration": 0,
-      "id": "error1",
-      "offset": 25994,
+      "docType": "span",
+      "duration": 47557,
+      "id": "mySpanIdD",
+      "offset": 1754,
       "parent": Object {
         "doc": Object {
           "processor": Object {
@@ -94,387 +903,744 @@ Object {
       "parentId": "myTransactionId1",
       "skew": 0,
     },
-  ],
-  "errorsCount": 1,
-  "errorsPerTransaction": Object {
-    "myTransactionId1": 2,
-    "myTransactionId2": 3,
-  },
-  "items": Array [
     Object {
       "doc": Object {
+        "parent": Object {
+          "id": "mySpanIdD",
+        },
         "processor": Object {
           "event": "transaction",
         },
         "service": Object {
-          "name": "opbeans-node",
+          "name": "opbeans-ruby",
         },
         "timestamp": Object {
-          "us": 1549324795784006,
+          "us": 1549324795823304,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
           "duration": Object {
-            "us": 49660,
+            "us": 8634,
+          },
+          "id": "myTransactionId2",
+          "marks": Object {
+            "agent": Object {
+              "domComplete": 383,
+              "domInteractive": 382,
+              "timeToFirstByte": 14,
+            },
+          },
+          "name": "Api::ProductsController#index",
+        },
+      },
+      "docType": "transaction",
+      "duration": 8634,
+      "id": "myTransactionId2",
+      "offset": 39298,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId1",
+          },
+          "processor": Object {
+            "event": "span",
+          },
+          "service": Object {
+            "name": "opbeans-node",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 47557,
+            },
+            "id": "mySpanIdD",
+            "name": "GET opbeans-ruby:3000/api/products",
+          },
+          "timestamp": Object {
+            "us": 1549324795785760,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "id": "myTransactionId1",
+          },
+        },
+        "docType": "span",
+        "duration": 47557,
+        "id": "mySpanIdD",
+        "offset": 1754,
+        "parent": Object {
+          "doc": Object {
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-node",
+            },
+            "timestamp": Object {
+              "us": 1549324795784006,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 49660,
+              },
+              "id": "myTransactionId1",
+              "name": "GET /api",
+            },
           },
+          "docType": "transaction",
+          "duration": 49660,
           "id": "myTransactionId1",
-          "name": "GET /api",
+          "offset": 0,
+          "parent": undefined,
+          "parentId": undefined,
+          "skew": 0,
+        },
+        "parentId": "myTransactionId1",
+        "skew": 0,
+      },
+      "parentId": "mySpanIdD",
+      "skew": 0,
+    },
+    Object {
+      "doc": Object {
+        "parent": Object {
+          "id": "myTransactionId2",
+        },
+        "processor": Object {
+          "event": "span",
+        },
+        "service": Object {
+          "name": "opbeans-ruby",
+        },
+        "span": Object {
+          "duration": Object {
+            "us": 6161,
+          },
+          "id": "mySpanIdA",
+          "name": "Api::ProductsController#index",
+        },
+        "timestamp": Object {
+          "us": 1549324795824504,
+        },
+        "trace": Object {
+          "id": "myTraceId",
+        },
+        "transaction": Object {
+          "id": "myTransactionId2",
+        },
+      },
+      "docType": "span",
+      "duration": 6161,
+      "id": "mySpanIdA",
+      "offset": 40498,
+      "parent": Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "mySpanIdD",
+          },
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "timestamp": Object {
+            "us": 1549324795823304,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 8634,
+            },
+            "id": "myTransactionId2",
+            "marks": Object {
+              "agent": Object {
+                "domComplete": 383,
+                "domInteractive": 382,
+                "timeToFirstByte": 14,
+              },
+            },
+            "name": "Api::ProductsController#index",
+          },
+        },
+        "docType": "transaction",
+        "duration": 8634,
+        "id": "myTransactionId2",
+        "offset": 39298,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "myTransactionId1",
+            },
+            "processor": Object {
+              "event": "span",
+            },
+            "service": Object {
+              "name": "opbeans-node",
+            },
+            "span": Object {
+              "duration": Object {
+                "us": 47557,
+              },
+              "id": "mySpanIdD",
+              "name": "GET opbeans-ruby:3000/api/products",
+            },
+            "timestamp": Object {
+              "us": 1549324795785760,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "id": "myTransactionId1",
+            },
+          },
+          "docType": "span",
+          "duration": 47557,
+          "id": "mySpanIdD",
+          "offset": 1754,
+          "parent": Object {
+            "doc": Object {
+              "processor": Object {
+                "event": "transaction",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "timestamp": Object {
+                "us": 1549324795784006,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "duration": Object {
+                  "us": 49660,
+                },
+                "id": "myTransactionId1",
+                "name": "GET /api",
+              },
+            },
+            "docType": "transaction",
+            "duration": 49660,
+            "id": "myTransactionId1",
+            "offset": 0,
+            "parent": undefined,
+            "parentId": undefined,
+            "skew": 0,
+          },
+          "parentId": "myTransactionId1",
+          "skew": 0,
         },
+        "parentId": "mySpanIdD",
+        "skew": 0,
       },
-      "docType": "transaction",
-      "duration": 49660,
-      "id": "myTransactionId1",
-      "offset": 0,
-      "parent": undefined,
-      "parentId": undefined,
+      "parentId": "myTransactionId2",
       "skew": 0,
     },
     Object {
       "doc": Object {
         "parent": Object {
-          "id": "myTransactionId1",
+          "id": "mySpanIdA",
         },
         "processor": Object {
           "event": "span",
         },
         "service": Object {
-          "name": "opbeans-node",
+          "name": "opbeans-ruby",
         },
         "span": Object {
           "duration": Object {
-            "us": 47557,
+            "us": 481,
           },
-          "id": "mySpanIdD",
-          "name": "GET opbeans-ruby:3000/api/products",
+          "id": "mySpanIdB",
+          "name": "SELECT FROM products",
         },
         "timestamp": Object {
-          "us": 1549324795785760,
+          "us": 1549324795825633,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
-          "id": "myTransactionId1",
+          "id": "myTransactionId2",
         },
       },
       "docType": "span",
-      "duration": 47557,
-      "id": "mySpanIdD",
-      "offset": 1754,
+      "duration": 481,
+      "id": "mySpanIdB",
+      "offset": 41627,
       "parent": Object {
         "doc": Object {
+          "parent": Object {
+            "id": "myTransactionId2",
+          },
           "processor": Object {
-            "event": "transaction",
+            "event": "span",
           },
           "service": Object {
-            "name": "opbeans-node",
+            "name": "opbeans-ruby",
+          },
+          "span": Object {
+            "duration": Object {
+              "us": 6161,
+            },
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
           },
           "timestamp": Object {
-            "us": 1549324795784006,
+            "us": 1549324795824504,
           },
           "trace": Object {
             "id": "myTraceId",
           },
           "transaction": Object {
-            "duration": Object {
-              "us": 49660,
+            "id": "myTransactionId2",
+          },
+        },
+        "docType": "span",
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 40498,
+        "parent": Object {
+          "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
             },
-            "id": "myTransactionId1",
-            "name": "GET /api",
+            "processor": Object {
+              "event": "transaction",
+            },
+            "service": Object {
+              "name": "opbeans-ruby",
+            },
+            "timestamp": Object {
+              "us": 1549324795823304,
+            },
+            "trace": Object {
+              "id": "myTraceId",
+            },
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
+          "id": "myTransactionId2",
+          "offset": 39298,
+          "parent": Object {
+            "doc": Object {
+              "parent": Object {
+                "id": "myTransactionId1",
+              },
+              "processor": Object {
+                "event": "span",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "span": Object {
+                "duration": Object {
+                  "us": 47557,
+                },
+                "id": "mySpanIdD",
+                "name": "GET opbeans-ruby:3000/api/products",
+              },
+              "timestamp": Object {
+                "us": 1549324795785760,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "id": "myTransactionId1",
+              },
+            },
+            "docType": "span",
+            "duration": 47557,
+            "id": "mySpanIdD",
+            "offset": 1754,
+            "parent": Object {
+              "doc": Object {
+                "processor": Object {
+                  "event": "transaction",
+                },
+                "service": Object {
+                  "name": "opbeans-node",
+                },
+                "timestamp": Object {
+                  "us": 1549324795784006,
+                },
+                "trace": Object {
+                  "id": "myTraceId",
+                },
+                "transaction": Object {
+                  "duration": Object {
+                    "us": 49660,
+                  },
+                  "id": "myTransactionId1",
+                  "name": "GET /api",
+                },
+              },
+              "docType": "transaction",
+              "duration": 49660,
+              "id": "myTransactionId1",
+              "offset": 0,
+              "parent": undefined,
+              "parentId": undefined,
+              "skew": 0,
+            },
+            "parentId": "myTransactionId1",
+            "skew": 0,
           },
+          "parentId": "mySpanIdD",
+          "skew": 0,
         },
-        "docType": "transaction",
-        "duration": 49660,
-        "id": "myTransactionId1",
-        "offset": 0,
-        "parent": undefined,
-        "parentId": undefined,
+        "parentId": "myTransactionId2",
         "skew": 0,
       },
-      "parentId": "myTransactionId1",
+      "parentId": "mySpanIdA",
       "skew": 0,
     },
     Object {
       "doc": Object {
         "parent": Object {
-          "id": "mySpanIdD",
+          "id": "mySpanIdA",
         },
         "processor": Object {
-          "event": "transaction",
+          "event": "span",
         },
         "service": Object {
           "name": "opbeans-ruby",
         },
+        "span": Object {
+          "duration": Object {
+            "us": 532,
+          },
+          "id": "mySpanIdC",
+          "name": "SELECT FROM product",
+        },
         "timestamp": Object {
-          "us": 1549324795823304,
+          "us": 1549324795827905,
         },
         "trace": Object {
           "id": "myTraceId",
         },
         "transaction": Object {
-          "duration": Object {
-            "us": 8634,
-          },
           "id": "myTransactionId2",
-          "marks": Object {
-            "agent": Object {
-              "domComplete": 383,
-              "domInteractive": 382,
-              "timeToFirstByte": 14,
-            },
-          },
-          "name": "Api::ProductsController#index",
         },
       },
-      "docType": "transaction",
-      "duration": 8634,
-      "id": "myTransactionId2",
-      "offset": 39298,
+      "docType": "span",
+      "duration": 532,
+      "id": "mySpanIdC",
+      "offset": 43899,
       "parent": Object {
         "doc": Object {
           "parent": Object {
-            "id": "myTransactionId1",
+            "id": "myTransactionId2",
           },
           "processor": Object {
             "event": "span",
           },
           "service": Object {
-            "name": "opbeans-node",
+            "name": "opbeans-ruby",
           },
           "span": Object {
             "duration": Object {
-              "us": 47557,
+              "us": 6161,
             },
-            "id": "mySpanIdD",
-            "name": "GET opbeans-ruby:3000/api/products",
+            "id": "mySpanIdA",
+            "name": "Api::ProductsController#index",
           },
           "timestamp": Object {
-            "us": 1549324795785760,
+            "us": 1549324795824504,
           },
           "trace": Object {
             "id": "myTraceId",
           },
           "transaction": Object {
-            "id": "myTransactionId1",
+            "id": "myTransactionId2",
           },
         },
         "docType": "span",
-        "duration": 47557,
-        "id": "mySpanIdD",
-        "offset": 1754,
+        "duration": 6161,
+        "id": "mySpanIdA",
+        "offset": 40498,
         "parent": Object {
           "doc": Object {
+            "parent": Object {
+              "id": "mySpanIdD",
+            },
             "processor": Object {
               "event": "transaction",
             },
             "service": Object {
-              "name": "opbeans-node",
+              "name": "opbeans-ruby",
             },
             "timestamp": Object {
-              "us": 1549324795784006,
+              "us": 1549324795823304,
             },
             "trace": Object {
               "id": "myTraceId",
             },
-            "transaction": Object {
-              "duration": Object {
-                "us": 49660,
+            "transaction": Object {
+              "duration": Object {
+                "us": 8634,
+              },
+              "id": "myTransactionId2",
+              "marks": Object {
+                "agent": Object {
+                  "domComplete": 383,
+                  "domInteractive": 382,
+                  "timeToFirstByte": 14,
+                },
+              },
+              "name": "Api::ProductsController#index",
+            },
+          },
+          "docType": "transaction",
+          "duration": 8634,
+          "id": "myTransactionId2",
+          "offset": 39298,
+          "parent": Object {
+            "doc": Object {
+              "parent": Object {
+                "id": "myTransactionId1",
+              },
+              "processor": Object {
+                "event": "span",
+              },
+              "service": Object {
+                "name": "opbeans-node",
+              },
+              "span": Object {
+                "duration": Object {
+                  "us": 47557,
+                },
+                "id": "mySpanIdD",
+                "name": "GET opbeans-ruby:3000/api/products",
+              },
+              "timestamp": Object {
+                "us": 1549324795785760,
+              },
+              "trace": Object {
+                "id": "myTraceId",
+              },
+              "transaction": Object {
+                "id": "myTransactionId1",
+              },
+            },
+            "docType": "span",
+            "duration": 47557,
+            "id": "mySpanIdD",
+            "offset": 1754,
+            "parent": Object {
+              "doc": Object {
+                "processor": Object {
+                  "event": "transaction",
+                },
+                "service": Object {
+                  "name": "opbeans-node",
+                },
+                "timestamp": Object {
+                  "us": 1549324795784006,
+                },
+                "trace": Object {
+                  "id": "myTraceId",
+                },
+                "transaction": Object {
+                  "duration": Object {
+                    "us": 49660,
+                  },
+                  "id": "myTransactionId1",
+                  "name": "GET /api",
+                },
               },
+              "docType": "transaction",
+              "duration": 49660,
               "id": "myTransactionId1",
-              "name": "GET /api",
+              "offset": 0,
+              "parent": undefined,
+              "parentId": undefined,
+              "skew": 0,
             },
+            "parentId": "myTransactionId1",
+            "skew": 0,
           },
-          "docType": "transaction",
-          "duration": 49660,
-          "id": "myTransactionId1",
-          "offset": 0,
-          "parent": undefined,
-          "parentId": undefined,
+          "parentId": "mySpanIdD",
           "skew": 0,
         },
-        "parentId": "myTransactionId1",
+        "parentId": "myTransactionId2",
         "skew": 0,
       },
-      "parentId": "mySpanIdD",
+      "parentId": "mySpanIdA",
       "skew": 0,
     },
-    Object {
-      "doc": Object {
-        "parent": Object {
-          "id": "myTransactionId2",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 6161,
-          },
-          "id": "mySpanIdA",
-          "name": "Api::ProductsController#index",
-        },
-        "timestamp": Object {
-          "us": 1549324795824504,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
-        },
+  ],
+  "rootTransaction": Object {
+    "processor": Object {
+      "event": "transaction",
+    },
+    "service": Object {
+      "name": "opbeans-node",
+    },
+    "timestamp": Object {
+      "us": 1549324795784006,
+    },
+    "trace": Object {
+      "id": "myTraceId",
+    },
+    "transaction": Object {
+      "duration": Object {
+        "us": 49660,
       },
-      "docType": "span",
-      "duration": 6161,
-      "id": "mySpanIdA",
-      "offset": 40498,
-      "parent": Object {
+      "id": "myTransactionId1",
+      "name": "GET /api",
+    },
+  },
+  "serviceColors": Object {
+    "opbeans-node": "#6092c0",
+    "opbeans-ruby": "#54b399",
+  },
+}
+`;
+
+exports[`waterfall_helpers getWaterfall should return partial waterfall 1`] = `
+Object {
+  "childrenByParentId": Object {
+    "mySpanIdA": Array [
+      Object {
         "doc": Object {
           "parent": Object {
-            "id": "mySpanIdD",
+            "id": "mySpanIdA",
           },
           "processor": Object {
-            "event": "transaction",
+            "event": "span",
           },
           "service": Object {
             "name": "opbeans-ruby",
           },
+          "span": Object {
+            "duration": Object {
+              "us": 481,
+            },
+            "id": "mySpanIdB",
+            "name": "SELECT FROM products",
+          },
           "timestamp": Object {
-            "us": 1549324795823304,
+            "us": 1549324795825633,
           },
           "trace": Object {
             "id": "myTraceId",
           },
           "transaction": Object {
-            "duration": Object {
-              "us": 8634,
-            },
             "id": "myTransactionId2",
-            "marks": Object {
-              "agent": Object {
-                "domComplete": 383,
-                "domInteractive": 382,
-                "timeToFirstByte": 14,
-              },
-            },
-            "name": "Api::ProductsController#index",
           },
         },
-        "docType": "transaction",
-        "duration": 8634,
-        "id": "myTransactionId2",
-        "offset": 39298,
+        "docType": "span",
+        "duration": 481,
+        "id": "mySpanIdB",
+        "offset": 2329,
         "parent": Object {
           "doc": Object {
             "parent": Object {
-              "id": "myTransactionId1",
+              "id": "myTransactionId2",
             },
             "processor": Object {
               "event": "span",
             },
             "service": Object {
-              "name": "opbeans-node",
+              "name": "opbeans-ruby",
             },
             "span": Object {
               "duration": Object {
-                "us": 47557,
+                "us": 6161,
               },
-              "id": "mySpanIdD",
-              "name": "GET opbeans-ruby:3000/api/products",
+              "id": "mySpanIdA",
+              "name": "Api::ProductsController#index",
             },
             "timestamp": Object {
-              "us": 1549324795785760,
+              "us": 1549324795824504,
             },
             "trace": Object {
               "id": "myTraceId",
             },
             "transaction": Object {
-              "id": "myTransactionId1",
+              "id": "myTransactionId2",
             },
           },
           "docType": "span",
-          "duration": 47557,
-          "id": "mySpanIdD",
-          "offset": 1754,
+          "duration": 6161,
+          "id": "mySpanIdA",
+          "offset": 1200,
           "parent": Object {
             "doc": Object {
+              "parent": Object {
+                "id": "mySpanIdD",
+              },
               "processor": Object {
                 "event": "transaction",
               },
               "service": Object {
-                "name": "opbeans-node",
+                "name": "opbeans-ruby",
               },
               "timestamp": Object {
-                "us": 1549324795784006,
+                "us": 1549324795823304,
               },
               "trace": Object {
                 "id": "myTraceId",
               },
               "transaction": Object {
                 "duration": Object {
-                  "us": 49660,
+                  "us": 8634,
                 },
-                "id": "myTransactionId1",
-                "name": "GET /api",
+                "id": "myTransactionId2",
+                "marks": Object {
+                  "agent": Object {
+                    "domComplete": 383,
+                    "domInteractive": 382,
+                    "timeToFirstByte": 14,
+                  },
+                },
+                "name": "Api::ProductsController#index",
               },
             },
             "docType": "transaction",
-            "duration": 49660,
-            "id": "myTransactionId1",
+            "duration": 8634,
+            "id": "myTransactionId2",
             "offset": 0,
             "parent": undefined,
-            "parentId": undefined,
+            "parentId": "mySpanIdD",
             "skew": 0,
           },
-          "parentId": "myTransactionId1",
+          "parentId": "myTransactionId2",
           "skew": 0,
         },
-        "parentId": "mySpanIdD",
+        "parentId": "mySpanIdA",
         "skew": 0,
       },
-      "parentId": "myTransactionId2",
-      "skew": 0,
-    },
-    Object {
-      "doc": Object {
-        "parent": Object {
-          "id": "mySpanIdA",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 481,
-          },
-          "id": "mySpanIdB",
-          "name": "SELECT FROM products",
-        },
-        "timestamp": Object {
-          "us": 1549324795825633,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
-        },
-      },
-      "docType": "span",
-      "duration": 481,
-      "id": "mySpanIdB",
-      "offset": 41627,
-      "parent": Object {
+      Object {
         "doc": Object {
           "parent": Object {
-            "id": "myTransactionId2",
+            "id": "mySpanIdA",
           },
           "processor": Object {
             "event": "span",
@@ -484,13 +1650,13 @@ Object {
           },
           "span": Object {
             "duration": Object {
-              "us": 6161,
+              "us": 532,
             },
-            "id": "mySpanIdA",
-            "name": "Api::ProductsController#index",
+            "id": "mySpanIdC",
+            "name": "SELECT FROM product",
           },
           "timestamp": Object {
-            "us": 1549324795824504,
+            "us": 1549324795827905,
           },
           "trace": Object {
             "id": "myTraceId",
@@ -500,152 +1666,132 @@ Object {
           },
         },
         "docType": "span",
-        "duration": 6161,
-        "id": "mySpanIdA",
-        "offset": 40498,
+        "duration": 532,
+        "id": "mySpanIdC",
+        "offset": 4601,
         "parent": Object {
           "doc": Object {
             "parent": Object {
-              "id": "mySpanIdD",
+              "id": "myTransactionId2",
             },
             "processor": Object {
-              "event": "transaction",
+              "event": "span",
             },
             "service": Object {
               "name": "opbeans-ruby",
             },
+            "span": Object {
+              "duration": Object {
+                "us": 6161,
+              },
+              "id": "mySpanIdA",
+              "name": "Api::ProductsController#index",
+            },
             "timestamp": Object {
-              "us": 1549324795823304,
+              "us": 1549324795824504,
             },
             "trace": Object {
               "id": "myTraceId",
             },
             "transaction": Object {
-              "duration": Object {
-                "us": 8634,
-              },
               "id": "myTransactionId2",
-              "marks": Object {
-                "agent": Object {
-                  "domComplete": 383,
-                  "domInteractive": 382,
-                  "timeToFirstByte": 14,
-                },
-              },
-              "name": "Api::ProductsController#index",
             },
           },
-          "docType": "transaction",
-          "duration": 8634,
-          "id": "myTransactionId2",
-          "offset": 39298,
+          "docType": "span",
+          "duration": 6161,
+          "id": "mySpanIdA",
+          "offset": 1200,
           "parent": Object {
             "doc": Object {
               "parent": Object {
-                "id": "myTransactionId1",
+                "id": "mySpanIdD",
               },
               "processor": Object {
-                "event": "span",
+                "event": "transaction",
               },
               "service": Object {
-                "name": "opbeans-node",
-              },
-              "span": Object {
-                "duration": Object {
-                  "us": 47557,
-                },
-                "id": "mySpanIdD",
-                "name": "GET opbeans-ruby:3000/api/products",
+                "name": "opbeans-ruby",
               },
               "timestamp": Object {
-                "us": 1549324795785760,
+                "us": 1549324795823304,
               },
               "trace": Object {
                 "id": "myTraceId",
               },
               "transaction": Object {
-                "id": "myTransactionId1",
-              },
-            },
-            "docType": "span",
-            "duration": 47557,
-            "id": "mySpanIdD",
-            "offset": 1754,
-            "parent": Object {
-              "doc": Object {
-                "processor": Object {
-                  "event": "transaction",
-                },
-                "service": Object {
-                  "name": "opbeans-node",
-                },
-                "timestamp": Object {
-                  "us": 1549324795784006,
-                },
-                "trace": Object {
-                  "id": "myTraceId",
+                "duration": Object {
+                  "us": 8634,
                 },
-                "transaction": Object {
-                  "duration": Object {
-                    "us": 49660,
+                "id": "myTransactionId2",
+                "marks": Object {
+                  "agent": Object {
+                    "domComplete": 383,
+                    "domInteractive": 382,
+                    "timeToFirstByte": 14,
                   },
-                  "id": "myTransactionId1",
-                  "name": "GET /api",
                 },
+                "name": "Api::ProductsController#index",
               },
-              "docType": "transaction",
-              "duration": 49660,
-              "id": "myTransactionId1",
-              "offset": 0,
-              "parent": undefined,
-              "parentId": undefined,
-              "skew": 0,
             },
-            "parentId": "myTransactionId1",
+            "docType": "transaction",
+            "duration": 8634,
+            "id": "myTransactionId2",
+            "offset": 0,
+            "parent": undefined,
+            "parentId": "mySpanIdD",
             "skew": 0,
           },
-          "parentId": "mySpanIdD",
+          "parentId": "myTransactionId2",
           "skew": 0,
         },
-        "parentId": "myTransactionId2",
+        "parentId": "mySpanIdA",
         "skew": 0,
       },
-      "parentId": "mySpanIdA",
-      "skew": 0,
-    },
-    Object {
-      "doc": Object {
-        "parent": Object {
-          "id": "mySpanIdA",
-        },
-        "processor": Object {
-          "event": "span",
-        },
-        "service": Object {
-          "name": "opbeans-ruby",
-        },
-        "span": Object {
-          "duration": Object {
-            "us": 532,
+    ],
+    "mySpanIdD": Array [
+      Object {
+        "doc": Object {
+          "parent": Object {
+            "id": "mySpanIdD",
+          },
+          "processor": Object {
+            "event": "transaction",
+          },
+          "service": Object {
+            "name": "opbeans-ruby",
+          },
+          "timestamp": Object {
+            "us": 1549324795823304,
+          },
+          "trace": Object {
+            "id": "myTraceId",
+          },
+          "transaction": Object {
+            "duration": Object {
+              "us": 8634,
+            },
+            "id": "myTransactionId2",
+            "marks": Object {
+              "agent": Object {
+                "domComplete": 383,
+                "domInteractive": 382,
+                "timeToFirstByte": 14,
+              },
+            },
+            "name": "Api::ProductsController#index",
           },
-          "id": "mySpanIdC",
-          "name": "SELECT FROM product",
-        },
-        "timestamp": Object {
-          "us": 1549324795827905,
-        },
-        "trace": Object {
-          "id": "myTraceId",
-        },
-        "transaction": Object {
-          "id": "myTransactionId2",
         },
+        "docType": "transaction",
+        "duration": 8634,
+        "id": "myTransactionId2",
+        "offset": 0,
+        "parent": undefined,
+        "parentId": "mySpanIdD",
+        "skew": 0,
       },
-      "docType": "span",
-      "duration": 532,
-      "id": "mySpanIdC",
-      "offset": 43899,
-      "parent": Object {
+    ],
+    "myTransactionId2": Array [
+      Object {
         "doc": Object {
           "parent": Object {
             "id": "myTransactionId2",
@@ -676,7 +1822,7 @@ Object {
         "docType": "span",
         "duration": 6161,
         "id": "mySpanIdA",
-        "offset": 40498,
+        "offset": 1200,
         "parent": Object {
           "doc": Object {
             "parent": Object {
@@ -712,143 +1858,56 @@ Object {
           "docType": "transaction",
           "duration": 8634,
           "id": "myTransactionId2",
-          "offset": 39298,
-          "parent": Object {
-            "doc": Object {
-              "parent": Object {
-                "id": "myTransactionId1",
-              },
-              "processor": Object {
-                "event": "span",
-              },
-              "service": Object {
-                "name": "opbeans-node",
-              },
-              "span": Object {
-                "duration": Object {
-                  "us": 47557,
-                },
-                "id": "mySpanIdD",
-                "name": "GET opbeans-ruby:3000/api/products",
-              },
-              "timestamp": Object {
-                "us": 1549324795785760,
-              },
-              "trace": Object {
-                "id": "myTraceId",
-              },
-              "transaction": Object {
-                "id": "myTransactionId1",
-              },
-            },
-            "docType": "span",
-            "duration": 47557,
-            "id": "mySpanIdD",
-            "offset": 1754,
-            "parent": Object {
-              "doc": Object {
-                "processor": Object {
-                  "event": "transaction",
-                },
-                "service": Object {
-                  "name": "opbeans-node",
-                },
-                "timestamp": Object {
-                  "us": 1549324795784006,
-                },
-                "trace": Object {
-                  "id": "myTraceId",
-                },
-                "transaction": Object {
-                  "duration": Object {
-                    "us": 49660,
-                  },
-                  "id": "myTransactionId1",
-                  "name": "GET /api",
-                },
-              },
-              "docType": "transaction",
-              "duration": 49660,
-              "id": "myTransactionId1",
-              "offset": 0,
-              "parent": undefined,
-              "parentId": undefined,
-              "skew": 0,
-            },
-            "parentId": "myTransactionId1",
-            "skew": 0,
-          },
+          "offset": 0,
+          "parent": undefined,
           "parentId": "mySpanIdD",
           "skew": 0,
         },
         "parentId": "myTransactionId2",
         "skew": 0,
       },
-      "parentId": "mySpanIdA",
-      "skew": 0,
-    },
-  ],
-  "rootTransaction": Object {
-    "processor": Object {
-      "event": "transaction",
-    },
-    "service": Object {
-      "name": "opbeans-node",
-    },
-    "timestamp": Object {
-      "us": 1549324795784006,
-    },
-    "trace": Object {
-      "id": "myTraceId",
-    },
-    "transaction": Object {
-      "duration": Object {
-        "us": 49660,
-      },
-      "id": "myTransactionId1",
-      "name": "GET /api",
-    },
-  },
-  "serviceColors": Object {
-    "opbeans-node": "#6092c0",
-    "opbeans-ruby": "#54b399",
+    ],
   },
-}
-`;
-
-exports[`waterfall_helpers getWaterfall should return partial waterfall 1`] = `
-Object {
   "duration": 8634,
-  "entryTransaction": Object {
-    "parent": Object {
-      "id": "mySpanIdD",
-    },
-    "processor": Object {
-      "event": "transaction",
-    },
-    "service": Object {
-      "name": "opbeans-ruby",
-    },
-    "timestamp": Object {
-      "us": 1549324795823304,
-    },
-    "trace": Object {
-      "id": "myTraceId",
-    },
-    "transaction": Object {
-      "duration": Object {
-        "us": 8634,
+  "entryWaterfallTransaction": Object {
+    "doc": Object {
+      "parent": Object {
+        "id": "mySpanIdD",
       },
-      "id": "myTransactionId2",
-      "marks": Object {
-        "agent": Object {
-          "domComplete": 383,
-          "domInteractive": 382,
-          "timeToFirstByte": 14,
+      "processor": Object {
+        "event": "transaction",
+      },
+      "service": Object {
+        "name": "opbeans-ruby",
+      },
+      "timestamp": Object {
+        "us": 1549324795823304,
+      },
+      "trace": Object {
+        "id": "myTraceId",
+      },
+      "transaction": Object {
+        "duration": Object {
+          "us": 8634,
+        },
+        "id": "myTransactionId2",
+        "marks": Object {
+          "agent": Object {
+            "domComplete": 383,
+            "domInteractive": 382,
+            "timeToFirstByte": 14,
+          },
         },
+        "name": "Api::ProductsController#index",
       },
-      "name": "Api::ProductsController#index",
     },
+    "docType": "transaction",
+    "duration": 8634,
+    "id": "myTransactionId2",
+    "offset": 0,
+    "parent": undefined,
+    "parentId": "mySpanIdD",
+    "skew": 0,
   },
   "errorItems": Array [],
   "errorsCount": 0,
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
index 441a51bcba646..44e5e09e506af 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers.ts
@@ -28,7 +28,7 @@ interface IWaterfallGroup {
 const ROOT_ID = 'root';
 
 export interface IWaterfall {
-  entryTransaction?: Transaction;
+  entryWaterfallTransaction?: IWaterfallTransaction;
   rootTransaction?: Transaction;
 
   /**
@@ -36,6 +36,7 @@ export interface IWaterfall {
    */
   duration: number;
   items: IWaterfallItem[];
+  childrenByParentId: Record<string | number, IWaterfallItem[]>;
   errorsPerTransaction: TraceAPIResponse['errorsPerTransaction'];
   errorsCount: number;
   serviceColors: IServiceColors;
@@ -329,6 +330,7 @@ export function getWaterfall(
       errorsCount: sum(Object.values(errorsPerTransaction)),
       serviceColors: {},
       errorItems: [],
+      childrenByParentId: {},
     };
   }
 
@@ -357,10 +359,8 @@ export function getWaterfall(
   const duration = getWaterfallDuration(items);
   const serviceColors = getServiceColors(items);
 
-  const entryTransaction = entryWaterfallTransaction?.doc;
-
   return {
-    entryTransaction,
+    entryWaterfallTransaction,
     rootTransaction,
     duration,
     items,
@@ -368,5 +368,6 @@ export function getWaterfall(
     errorsCount: errorItems.length,
     serviceColors,
     errorItems,
+    childrenByParentId: getChildrenGroupedByParentId(items),
   };
 }
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx
index 6fd139b470ce1..501ca6d33d5af 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/index.tsx
@@ -8,8 +8,8 @@ import { Location } from 'history';
 import React from 'react';
 import { IUrlParams } from '../../../../../context/UrlParamsContext/types';
 import { ServiceLegends } from './ServiceLegends';
-import { Waterfall } from './Waterfall';
 import { IWaterfall } from './Waterfall/waterfall_helpers/waterfall_helpers';
+import { Waterfall } from './Waterfall';
 
 interface Props {
   urlParams: IUrlParams;
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
index 12676b7c15f1c..392bd90ffbabc 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
@@ -64,8 +64,8 @@ export function WaterfallWithSummmary({
     });
   };
 
-  const { entryTransaction } = waterfall;
-  if (!entryTransaction) {
+  const { entryWaterfallTransaction } = waterfall;
+  if (!entryWaterfallTransaction) {
     const content = isLoading ? (
       <LoadingStatePrompt />
     ) : (
@@ -84,6 +84,8 @@ export function WaterfallWithSummmary({
     return <EuiPanel paddingSize="m">{content}</EuiPanel>;
   }
 
+  const entryTransaction = entryWaterfallTransaction.doc;
+
   return (
     <EuiPanel paddingSize="m">
       <EuiFlexGroup>

From 1dc48b3fdd0b32b1bd4aaf9169498aaa328e5a39 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Tue, 25 Aug 2020 08:07:10 -0700
Subject: [PATCH 036/148] [src/dev/build] stop including public source in
 distributable (#75841)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 src/dev/build/tasks/copy_source_task.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dev/build/tasks/copy_source_task.ts b/src/dev/build/tasks/copy_source_task.ts
index 7a5d84da527db..948e2357effb0 100644
--- a/src/dev/build/tasks/copy_source_task.ts
+++ b/src/dev/build/tasks/copy_source_task.ts
@@ -33,11 +33,11 @@ export const CopySource: Task = {
         '!src/**/{target,__tests__,__snapshots__,__mocks__}/**',
         '!src/test_utils/**',
         '!src/fixtures/**',
-        '!src/legacy/core_plugins/console/public/tests/**',
         '!src/cli/cluster/**',
         '!src/cli/repl/**',
         '!src/functional_test_runner/**',
         '!src/dev/**',
+        '!**/public/**',
         'typings/**',
         'config/kibana.yml',
         'config/node.options',

From 8f85593910f49afc48e335618f0ef4aaede5efb5 Mon Sep 17 00:00:00 2001
From: Frank Hassanabad <frank.hassanabad@elastic.co>
Date: Tue, 25 Aug 2020 09:22:13 -0600
Subject: [PATCH 037/148] [Security Solution] Fixes assert unreachable to be
 within the common section and the type to never (#75798)

## Summary

Assert unreachable was created through advice given by both the Typescript community and through the techniques that TyepScript is trying to achieve type safety with switch statements.

This fixes recent bugs by:
* Re-adding the never type
* Reduces the two different types by putting the helper within the common section so there's not duplication
* Fixes on type that looks like it was a regular string rather than a one of the enum types

The reasoning for exhaustive checks within switch statements and techniques can be seen in numerous areas such as here:
https://stackoverflow.com/questions/39419170/how-do-i-check-that-a-switch-block-is-exhaustive-in-typescript

You can do it either way with TypeScript as long as you ensure you have a explicit return type and you do early return statements you can actually avoid having to call into the assertUnreachable.

If introduced and used correctly it is there to help out like this error it is telling us that this string type is not exhaustive:
<img width="921" alt="Screen Shot 2020-08-24 at 10 39 42 AM" src="https://user-images.githubusercontent.com/1151048/91075618-9b1ad380-e5fb-11ea-9200-1c355faf5dca.png">

You can notice that for this pull request I actually remove the assertion like so if someone accidentally removes one of the switch statements:
<img width="1014" alt="Screen Shot 2020-08-24 at 10 42 08 AM" src="https://user-images.githubusercontent.com/1151048/91075662-a968ef80-e5fb-11ea-8d74-a92eedd63892.png">

And since the function has an explicit return type it is not needed. You will see that TypeScript improved its never types behind the scenes where it actually will tell you that it will never reach the `assertUnreachable` and want to remove it as an auto-refactor. That is ok as long as we have explicit return types and what I did with one line of code here.

<img width="536" alt="Screen Shot 2020-08-24 at 11 21 05 AM" src="https://user-images.githubusercontent.com/1151048/91075861-efbe4e80-e5fb-11ea-9991-dda111a04f1d.png">

Without this fix, and having the never type become an unknown it introduces less safety where any code that is utilizing the assertUnknown without explicit return types will be prone to having run time errors being thrown when something new is added to their switch enum types.
---
 .../search_strategy/security_solution/index.ts |  2 +-
 .../security_solution/common/utility_types.ts  | 18 ++++++++++++++++++
 .../public/common/lib/helpers/index.tsx        | 13 -------------
 .../rules/description_step/helpers.tsx         |  2 +-
 .../hosts/components/hosts_table/index.tsx     |  2 +-
 .../network/components/users_table/index.tsx   |  2 +-
 .../body/column_headers/header/helpers.ts      |  2 +-
 .../lib/detection_engine/signals/get_filter.ts |  2 +-
 .../signals/rule_status_service.ts             |  2 +-
 .../lib/events/query.last_event_time.dsl.ts    |  2 +-
 .../server/lib/hosts/query.hosts.dsl.ts        |  3 ++-
 .../server/lib/ip_details/query_users.dsl.ts   |  3 ++-
 .../server/lib/network/query_dns.dsl.ts        |  3 ++-
 .../lib/network/query_top_countries.dsl.ts     |  4 ++--
 .../server/lib/network/query_top_n_flow.dsl.ts |  3 ++-
 .../server/lib/tls/query_tls.dsl.ts            |  3 ++-
 .../factory/hosts/dsl/query.hosts.dsl.ts       |  4 +---
 .../server/utils/build_query/index.ts          |  7 -------
 18 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
index edb5dda2ca6da..a188eb7619e6b 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
@@ -40,7 +40,7 @@ export enum Direction {
 }
 
 export interface SortField {
-  field: string;
+  field: 'lastSeen' | 'hostName';
   direction: Direction;
 }
 
diff --git a/x-pack/plugins/security_solution/common/utility_types.ts b/x-pack/plugins/security_solution/common/utility_types.ts
index 43271dc40ba12..4a7bd02d0442b 100644
--- a/x-pack/plugins/security_solution/common/utility_types.ts
+++ b/x-pack/plugins/security_solution/common/utility_types.ts
@@ -26,3 +26,21 @@ export const stringEnum = <T>(enumObj: T, enumName = 'enum') =>
         : runtimeTypes.failure(u, c),
     (a) => (a as unknown) as string
   );
+
+/**
+ * Unreachable Assertion helper for scenarios like exhaustive switches.
+ * For references see: https://stackoverflow.com/questions/39419170/how-do-i-check-that-a-switch-block-is-exhaustive-in-typescript
+ * This "x" should _always_ be a type of "never" and not change to "unknown" or any other type. See above link or the generic
+ * concept of exhaustive checks in switch blocks.
+ *
+ * Optionally you can avoid the use of this by using early returns and TypeScript will clear your type checking without complaints
+ * but there are situations and times where this function might still be needed.
+ * @param x Unreachable field
+ * @param message Message of error thrown
+ */
+export const assertUnreachable = (
+  x: never, // This should always be a type of "never"
+  message = 'Unknown Field in switch statement'
+): never => {
+  throw new Error(`${message}: ${x}`);
+};
diff --git a/x-pack/plugins/security_solution/public/common/lib/helpers/index.tsx b/x-pack/plugins/security_solution/public/common/lib/helpers/index.tsx
index 96b0343efdf72..35f51b3c65f95 100644
--- a/x-pack/plugins/security_solution/public/common/lib/helpers/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/lib/helpers/index.tsx
@@ -24,19 +24,6 @@ export const asArrayIfExists: WrapArrayIfExitts = (value) =>
  */
 export type ValueOf<T> = T[keyof T];
 
-/**
- * Unreachable Assertion helper for scenarios like exhaustive switches
- *
- * @param x Unreachable field
- * @param message Message of error thrown
- */
-export const assertUnreachable = (
-  x: never,
-  message = 'Unknown Field in switch statement'
-): never => {
-  throw new Error(`${message}: ${x}`);
-};
-
 /**
  * Global variables
  */
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
index 600bc999849d1..3a0a5b04c5874 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.tsx
@@ -21,6 +21,7 @@ import { isEmpty } from 'lodash/fp';
 import React from 'react';
 import styled from 'styled-components';
 
+import { assertUnreachable } from '../../../../../common/utility_types';
 import * as i18nSeverity from '../severity_mapping/translations';
 import * as i18nRiskScore from '../risk_score_mapping/translations';
 import { Threshold } from '../../../../../common/detection_engine/schemas/common/schemas';
@@ -33,7 +34,6 @@ import * as i18n from './translations';
 import { BuildQueryBarDescription, BuildThreatDescription, ListItems } from './types';
 import { SeverityBadge } from '../severity_badge';
 import ListTreeIcon from './assets/list_tree_icon.svg';
-import { assertUnreachable } from '../../../../common/lib/helpers';
 import { AboutStepRiskScore, AboutStepSeverity } from '../../../pages/detection_engine/rules/types';
 import { defaultToEmptyTag } from '../../../../common/components/empty_value';
 
diff --git a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.tsx b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.tsx
index d72891fad8f53..8b795fca41512 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/hosts_table/index.tsx
@@ -8,6 +8,7 @@ import React, { useMemo, useCallback } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { IIndexPattern } from 'src/plugins/data/public';
 
+import { assertUnreachable } from '../../../../common/utility_types';
 import {
   Direction,
   HostFields,
@@ -17,7 +18,6 @@ import {
   HostsSortField,
   OsFields,
 } from '../../../graphql/types';
-import { assertUnreachable } from '../../../common/lib/helpers';
 import { State } from '../../../common/store';
 import {
   Columns,
diff --git a/x-pack/plugins/security_solution/public/network/components/users_table/index.tsx b/x-pack/plugins/security_solution/public/network/components/users_table/index.tsx
index af9d2b0ffefe3..9a971e0087d12 100644
--- a/x-pack/plugins/security_solution/public/network/components/users_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/users_table/index.tsx
@@ -8,6 +8,7 @@ import React, { useCallback, useMemo } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import deepEqual from 'fast-deep-equal';
 
+import { assertUnreachable } from '../../../../common/utility_types';
 import { networkActions, networkModel, networkSelectors } from '../../store';
 import {
   Direction,
@@ -26,7 +27,6 @@ import {
 
 import { getUsersColumns } from './columns';
 import * as i18n from './translations';
-import { assertUnreachable } from '../../../common/lib/helpers';
 const tableType = networkModel.IpDetailsTableType.users;
 
 interface OwnProps {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/helpers.ts
index 6d70795c422d9..609f690903bf2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/header/helpers.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { assertUnreachable } from '../../../../../../../common/utility_types';
 import { Direction } from '../../../../../../graphql/types';
-import { assertUnreachable } from '../../../../../../common/lib/helpers';
 import { ColumnHeaderOptions } from '../../../../../../timelines/store/timeline/model';
 import { Sort, SortDirection } from '../../sort';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts
index 67dc1d50eefcd..f77485f39a98d 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/get_filter.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { assertUnreachable } from '../../../../common/utility_types';
 import { getQueryFilter } from '../../../../common/detection_engine/get_query_filter';
 import {
   LanguageOrUndefined,
@@ -15,7 +16,6 @@ import {
 } from '../../../../common/detection_engine/schemas/common/schemas';
 import { ExceptionListItemSchema } from '../../../../../lists/common/schemas';
 import { AlertServices } from '../../../../../alerts/server';
-import { assertUnreachable } from '../../../utils/build_query';
 import { PartialFilter } from '../types';
 import { BadRequestError } from '../errors/bad_request_error';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/rule_status_service.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/rule_status_service.ts
index 0f4b8d1472b3f..8fdbe282eece5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/rule_status_service.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/rule_status_service.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { assertUnreachable } from '../../../../common/utility_types';
 import { JobStatus } from '../../../../common/detection_engine/schemas/common/schemas';
-import { assertUnreachable } from '../../../utils/build_query';
 import { IRuleStatusAttributes } from '../rules/types';
 import { getOrCreateRuleStatuses } from './get_or_create_rule_statuses';
 import { RuleStatusSavedObjectsClient } from './rule_status_saved_objects_client';
diff --git a/x-pack/plugins/security_solution/server/lib/events/query.last_event_time.dsl.ts b/x-pack/plugins/security_solution/server/lib/events/query.last_event_time.dsl.ts
index 6c443fed3c99d..02badd3ccee8f 100644
--- a/x-pack/plugins/security_solution/server/lib/events/query.last_event_time.dsl.ts
+++ b/x-pack/plugins/security_solution/server/lib/events/query.last_event_time.dsl.ts
@@ -6,9 +6,9 @@
 
 import { isEmpty } from 'lodash/fp';
 
+import { assertUnreachable } from '../../../common/utility_types';
 import { LastEventTimeRequestOptions } from './types';
 import { LastEventIndexKey } from '../../graphql/types';
-import { assertUnreachable } from '../../utils/build_query';
 
 interface EventIndices {
   [key: string]: string[];
diff --git a/x-pack/plugins/security_solution/server/lib/hosts/query.hosts.dsl.ts b/x-pack/plugins/security_solution/server/lib/hosts/query.hosts.dsl.ts
index 013afd5cd58f5..dfe45a00e0513 100644
--- a/x-pack/plugins/security_solution/server/lib/hosts/query.hosts.dsl.ts
+++ b/x-pack/plugins/security_solution/server/lib/hosts/query.hosts.dsl.ts
@@ -6,8 +6,9 @@
 
 import { isEmpty } from 'lodash/fp';
 
+import { assertUnreachable } from '../../../common/utility_types';
 import { Direction, HostsFields, HostsSortField } from '../../graphql/types';
-import { assertUnreachable, createQueryFilterClauses } from '../../utils/build_query';
+import { createQueryFilterClauses } from '../../utils/build_query';
 
 import { HostsRequestOptions } from '.';
 
diff --git a/x-pack/plugins/security_solution/server/lib/ip_details/query_users.dsl.ts b/x-pack/plugins/security_solution/server/lib/ip_details/query_users.dsl.ts
index 10678dc033eb5..293a487777fd2 100644
--- a/x-pack/plugins/security_solution/server/lib/ip_details/query_users.dsl.ts
+++ b/x-pack/plugins/security_solution/server/lib/ip_details/query_users.dsl.ts
@@ -4,8 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { assertUnreachable } from '../../../common/utility_types';
 import { Direction, UsersFields, UsersSortField } from '../../graphql/types';
-import { assertUnreachable, createQueryFilterClauses } from '../../utils/build_query';
+import { createQueryFilterClauses } from '../../utils/build_query';
 
 import { UsersRequestOptions } from './index';
 
diff --git a/x-pack/plugins/security_solution/server/lib/network/query_dns.dsl.ts b/x-pack/plugins/security_solution/server/lib/network/query_dns.dsl.ts
index e7c86e1d3d66b..90781e7b48b4a 100644
--- a/x-pack/plugins/security_solution/server/lib/network/query_dns.dsl.ts
+++ b/x-pack/plugins/security_solution/server/lib/network/query_dns.dsl.ts
@@ -6,8 +6,9 @@
 
 import { isEmpty } from 'lodash/fp';
 
+import { assertUnreachable } from '../../../common/utility_types';
 import { Direction, NetworkDnsFields, NetworkDnsSortField } from '../../graphql/types';
-import { assertUnreachable, createQueryFilterClauses } from '../../utils/build_query';
+import { createQueryFilterClauses } from '../../utils/build_query';
 
 import { NetworkDnsRequestOptions } from './index';
 
diff --git a/x-pack/plugins/security_solution/server/lib/network/query_top_countries.dsl.ts b/x-pack/plugins/security_solution/server/lib/network/query_top_countries.dsl.ts
index 93ffc35161fa9..be0b8fb64c76a 100644
--- a/x-pack/plugins/security_solution/server/lib/network/query_top_countries.dsl.ts
+++ b/x-pack/plugins/security_solution/server/lib/network/query_top_countries.dsl.ts
@@ -10,8 +10,8 @@ import {
   NetworkTopTablesSortField,
   NetworkTopTablesFields,
 } from '../../graphql/types';
-import { assertUnreachable, createQueryFilterClauses } from '../../utils/build_query';
-
+import { createQueryFilterClauses } from '../../utils/build_query';
+import { assertUnreachable } from '../../../common/utility_types';
 import { NetworkTopCountriesRequestOptions } from './index';
 
 const getCountAgg = (flowTarget: FlowTargetSourceDest) => ({
diff --git a/x-pack/plugins/security_solution/server/lib/network/query_top_n_flow.dsl.ts b/x-pack/plugins/security_solution/server/lib/network/query_top_n_flow.dsl.ts
index 7cb8b76e7b524..14a9c5e33aca0 100644
--- a/x-pack/plugins/security_solution/server/lib/network/query_top_n_flow.dsl.ts
+++ b/x-pack/plugins/security_solution/server/lib/network/query_top_n_flow.dsl.ts
@@ -4,13 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { assertUnreachable } from '../../../common/utility_types';
 import {
   Direction,
   FlowTargetSourceDest,
   NetworkTopTablesSortField,
   NetworkTopTablesFields,
 } from '../../graphql/types';
-import { assertUnreachable, createQueryFilterClauses } from '../../utils/build_query';
+import { createQueryFilterClauses } from '../../utils/build_query';
 
 import { NetworkTopNFlowRequestOptions } from './index';
 
diff --git a/x-pack/plugins/security_solution/server/lib/tls/query_tls.dsl.ts b/x-pack/plugins/security_solution/server/lib/tls/query_tls.dsl.ts
index 82f16ff58d135..f6921ddcdf508 100644
--- a/x-pack/plugins/security_solution/server/lib/tls/query_tls.dsl.ts
+++ b/x-pack/plugins/security_solution/server/lib/tls/query_tls.dsl.ts
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { createQueryFilterClauses, assertUnreachable } from '../../utils/build_query';
+import { assertUnreachable } from '../../../common/utility_types';
+import { createQueryFilterClauses } from '../../utils/build_query';
 
 import { TlsRequestOptions } from './index';
 import { TlsSortField, Direction, TlsFields } from '../../graphql/types';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.hosts.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.hosts.dsl.ts
index 3d72f98f35355..a9101f54ada55 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.hosts.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.hosts.dsl.ts
@@ -11,7 +11,7 @@ import {
   HostsRequestOptions,
   SortField,
 } from '../../../../../../common/search_strategy/security_solution';
-import { assertUnreachable, createQueryFilterClauses } from '../../../../../utils/build_query';
+import { createQueryFilterClauses } from '../../../../../utils/build_query';
 
 export const buildHostsQuery = ({
   defaultIndex,
@@ -83,7 +83,5 @@ const getQueryOrder = (sort: SortField): QueryOrder => {
       return { lastSeen: sort.direction };
     case 'hostName':
       return { _key: sort.direction };
-    default:
-      return assertUnreachable(sort.field);
   }
 };
diff --git a/x-pack/plugins/security_solution/server/utils/build_query/index.ts b/x-pack/plugins/security_solution/server/utils/build_query/index.ts
index 233ba70968fa1..f0f4ba07ab2ae 100644
--- a/x-pack/plugins/security_solution/server/utils/build_query/index.ts
+++ b/x-pack/plugins/security_solution/server/utils/build_query/index.ts
@@ -9,13 +9,6 @@ export * from './filters';
 export * from './merge_fields_with_hits';
 export * from './calculate_timeseries_interval';
 
-export const assertUnreachable = (
-  x: unknown,
-  message: string = 'Unknown Field in switch statement'
-): never => {
-  throw new Error(`${message} ${x}`);
-};
-
 export const inspectStringifyObject = (obj: unknown) => {
   try {
     return JSON.stringify(obj, null, 2);

From 9cafade2b9d4a22a364c921e94a30c54e82e2ee0 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Tue, 25 Aug 2020 08:27:15 -0700
Subject: [PATCH 038/148] [remove] production deps which are only used in
 public code (#75838)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 .eslintrc.js                                  |   2 +-
 package.json                                  |  98 ++++++------
 packages/kbn-optimizer/package.json           |  10 +-
 .../plugins/kbn_tp_run_pipeline/package.json  |   8 +-
 .../kbn_sample_panel_action/package.json      |   6 +-
 .../kbn_tp_custom_visualizations/package.json |   6 +-
 x-pack/package.json                           | 142 +++++++++---------
 x-pack/plugins/apm/e2e/package.json           |   6 +-
 x-pack/plugins/apm/scripts/package.json       |   4 +-
 x-pack/plugins/security_solution/package.json |   4 +-
 x-pack/plugins/security_solution/yarn.lock    |   1 -
 11 files changed, 142 insertions(+), 145 deletions(-)
 delete mode 120000 x-pack/plugins/security_solution/yarn.lock

diff --git a/.eslintrc.js b/.eslintrc.js
index 8c2a46f80a3a8..a07d0830907b6 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -517,7 +517,7 @@ module.exports = {
         'packages/kbn-interpreter/tasks/**/*.js',
         'packages/kbn-interpreter/src/plugin/**/*.js',
         'x-pack/{dev-tools,tasks,scripts,test,build_chromium}/**/*.js',
-        'x-pack/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*.js',
+        'x-pack/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__,public}/**/*.js',
         'x-pack/**/*.test.js',
         'x-pack/test_utils/**/*',
         'x-pack/gulpfile.js',
diff --git a/package.json b/package.json
index 46418e52d8548..84f6f30f064f9 100644
--- a/package.json
+++ b/package.json
@@ -123,18 +123,13 @@
   "dependencies": {
     "@babel/core": "^7.11.1",
     "@babel/register": "^7.10.5",
-    "@elastic/apm-rum": "^5.5.0",
-    "@elastic/charts": "19.8.1",
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.9.0-rc.2",
-    "@elastic/ems-client": "7.9.3",
     "@elastic/eui": "27.4.1",
-    "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "^2.5.0",
     "@elastic/request-crypto": "1.1.4",
     "@elastic/safer-lodash-set": "0.0.0",
-    "@elastic/ui-ace": "0.2.3",
     "@hapi/good-squeeze": "5.2.1",
     "@hapi/wreck": "^15.0.2",
     "@kbn/analytics": "1.0.0",
@@ -151,35 +146,24 @@
     "abortcontroller-polyfill": "^1.4.0",
     "accept": "3.0.2",
     "angular": "^1.8.0",
-    "angular-aria": "^1.8.0",
     "angular-elastic": "^2.5.1",
-    "angular-recursion": "^1.0.5",
-    "angular-route": "^1.8.0",
     "angular-sanitize": "^1.8.0",
-    "angular-sortable-view": "^0.0.17",
     "bluebird": "3.5.5",
     "boom": "^7.2.0",
-    "brace": "0.11.1",
     "chalk": "^2.4.2",
     "check-disk-space": "^2.1.0",
     "chokidar": "3.2.1",
     "color": "1.0.3",
     "commander": "3.0.2",
-    "compare-versions": "3.5.1",
     "core-js": "^3.6.4",
-    "d3": "3.5.17",
-    "d3-cloud": "1.2.5",
     "deep-freeze-strict": "^1.1.1",
-    "deepmerge": "^4.2.2",
     "del": "^5.1.0",
     "elastic-apm-node": "^3.7.0",
     "elasticsearch": "^16.7.0",
-    "elasticsearch-browser": "^16.7.0",
     "execa": "^4.0.2",
     "expiry-js": "0.1.7",
     "fast-deep-equal": "^3.1.1",
     "font-awesome": "4.7.0",
-    "fp-ts": "^2.3.1",
     "getos": "^3.1.0",
     "glob": "^7.1.2",
     "glob-all": "^3.2.1",
@@ -188,67 +172,40 @@
     "handlebars": "4.7.6",
     "hapi": "^17.5.3",
     "hapi-auth-cookie": "^9.0.0",
-    "history": "^4.9.0",
-    "hjson": "3.2.1",
     "hoek": "^5.0.4",
     "http-proxy-agent": "^2.1.0",
     "https-proxy-agent": "^5.0.0",
-    "immer": "^1.5.0",
     "inert": "^5.1.0",
     "inline-style": "^2.0.0",
     "joi": "^13.5.2",
-    "jquery": "^3.5.0",
-    "js-levenshtein": "^1.1.6",
     "js-yaml": "3.13.1",
     "json-stable-stringify": "^1.0.1",
-    "json-stringify-pretty-compact": "1.2.0",
     "json-stringify-safe": "5.0.1",
-    "leaflet": "1.5.1",
-    "leaflet-draw": "0.4.14",
-    "leaflet-responsive-popup": "0.6.4",
-    "leaflet-vega": "^0.8.6",
-    "leaflet.heat": "0.2.0",
-    "less": "npm:@elastic/less@2.7.3-kibana",
     "lodash": "^4.17.20",
     "lru-cache": "4.1.5",
-    "markdown-it": "^10.0.0",
     "minimatch": "^3.0.4",
     "moment": "^2.24.0",
     "moment-timezone": "^0.5.27",
-    "monaco-editor": "~0.17.0",
     "mustache": "2.3.2",
-    "ngreact": "0.5.1",
     "node-fetch": "1.7.3",
     "node-forge": "^0.9.1",
     "opn": "^5.5.0",
     "oppsy": "^2.0.0",
     "pegjs": "0.10.0",
-    "prop-types": "15.6.0",
     "proxy-from-env": "1.0.0",
     "query-string": "5.1.1",
     "re2": "^1.15.4",
     "react": "^16.12.0",
     "react-color": "^2.13.8",
     "react-dom": "^16.12.0",
-    "react-grid-layout": "^0.16.2",
     "react-input-range": "^1.3.0",
-    "react-markdown": "^4.3.1",
-    "react-monaco-editor": "~0.27.0",
-    "react-redux": "^7.2.0",
-    "react-resize-detector": "^4.2.0",
     "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0",
-    "react-sizeme": "^2.3.6",
     "react-use": "^13.27.0",
-    "reactcss": "1.2.3",
-    "redux": "^4.0.5",
     "redux-actions": "^2.6.5",
     "redux-thunk": "^2.3.0",
     "regenerator-runtime": "^0.13.3",
     "request": "^2.88.0",
     "require-in-the-middle": "^5.0.2",
-    "reselect": "^4.0.0",
-    "resize-observer-polyfill": "^1.5.0",
     "rison-node": "1.0.2",
     "rxjs": "^6.5.5",
     "seedrandom": "^3.0.5",
@@ -258,15 +215,9 @@
     "tar": "4.4.13",
     "tinygradient": "0.4.3",
     "tinymath": "1.2.1",
-    "topojson-client": "3.0.0",
     "tslib": "^2.0.0",
     "type-detect": "^4.0.8",
-    "ui-select": "0.19.8",
     "uuid": "3.3.2",
-    "vega": "^5.13.0",
-    "vega-lite": "^4.13.1",
-    "vega-schema-url-parser": "^1.1.0",
-    "vega-tooltip": "^0.12.0",
     "vision": "^5.3.3",
     "whatwg-fetch": "^3.0.0",
     "yauzl": "2.10.0"
@@ -274,10 +225,15 @@
   "devDependencies": {
     "@babel/parser": "^7.11.2",
     "@babel/types": "^7.11.0",
+    "@elastic/apm-rum": "^5.5.0",
+    "@elastic/charts": "19.8.1",
+    "@elastic/ems-client": "7.9.3",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
+    "@elastic/filesaver": "1.1.2",
     "@elastic/github-checks-reporter": "0.0.20b3",
     "@elastic/makelogs": "^6.0.0",
+    "@elastic/ui-ace": "0.2.3",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/es": "1.0.0",
     "@kbn/es-archiver": "1.0.0",
@@ -383,20 +339,30 @@
     "@types/zen-observable": "^0.8.0",
     "@typescript-eslint/eslint-plugin": "^3.7.1",
     "@typescript-eslint/parser": "^3.7.1",
+    "angular-aria": "^1.8.0",
     "angular-mocks": "^1.7.9",
+    "angular-recursion": "^1.0.5",
+    "angular-route": "^1.8.0",
+    "angular-sortable-view": "^0.0.17",
     "archiver": "^3.1.1",
     "axe-core": "^3.4.1",
     "babel-eslint": "^10.0.3",
     "babel-jest": "^25.5.1",
     "babel-plugin-istanbul": "^6.0.0",
     "backport": "5.5.1",
+    "brace": "0.11.1",
     "chai": "3.5.0",
     "chance": "1.0.18",
     "cheerio": "0.22.0",
     "chromedriver": "^84.0.0",
     "classnames": "2.2.6",
+    "compare-versions": "3.5.1",
+    "d3": "3.5.17",
+    "d3-cloud": "1.2.5",
     "dedent": "^0.7.0",
+    "deepmerge": "^4.2.2",
     "delete-empty": "^2.0.0",
+    "elasticsearch-browser": "^16.7.0",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "enzyme-adapter-utils": "^1.13.0",
@@ -421,6 +387,7 @@
     "exit-hook": "^2.2.0",
     "faker": "1.1.0",
     "fetch-mock": "^7.3.9",
+    "fp-ts": "^2.3.1",
     "geckodriver": "^1.20.0",
     "getopts": "^2.2.4",
     "grunt": "1.0.4",
@@ -432,7 +399,10 @@
     "gulp-babel": "^8.0.0",
     "gulp-sourcemaps": "2.6.5",
     "has-ansi": "^3.0.0",
+    "history": "^4.9.0",
+    "hjson": "3.2.1",
     "iedriver": "^3.14.2",
+    "immer": "^1.5.0",
     "intl-messageformat-parser": "^1.4.0",
     "jest": "^25.5.4",
     "jest-canvas-mock": "^2.2.0",
@@ -441,18 +411,30 @@
     "jest-environment-jsdom-thirteen": "^1.0.1",
     "jest-raw-loader": "^1.0.1",
     "jimp": "^0.14.0",
+    "jquery": "^3.5.0",
+    "js-levenshtein": "^1.1.6",
+    "json-stringify-pretty-compact": "1.2.0",
     "json5": "^1.0.1",
+    "leaflet": "1.5.1",
+    "leaflet-draw": "0.4.14",
+    "leaflet-responsive-popup": "0.6.4",
+    "leaflet-vega": "^0.8.6",
+    "leaflet.heat": "0.2.0",
+    "less": "npm:@elastic/less@2.7.3-kibana",
     "license-checker": "^16.0.0",
     "listr": "^0.14.1",
     "load-grunt-config": "^3.0.1",
     "load-json-file": "^6.2.0",
+    "markdown-it": "^10.0.0",
     "mocha": "^7.1.1",
     "mock-fs": "^4.12.0",
     "mock-http-server": "1.3.0",
+    "monaco-editor": "~0.17.0",
     "ms-chromium-edge-driver": "^0.2.3",
     "multistream": "^2.1.1",
     "murmurhash3js": "3.0.1",
     "mutation-observer": "^1.0.3",
+    "ngreact": "0.5.1",
     "nock": "12.0.3",
     "normalize-path": "^3.0.0",
     "nyc": "^15.0.1",
@@ -461,9 +443,21 @@
     "pngjs": "^3.4.0",
     "postcss": "^7.0.32",
     "prettier": "^2.0.5",
+    "prop-types": "15.6.0",
     "proxyquire": "1.8.0",
+    "react-grid-layout": "^0.16.2",
+    "react-markdown": "^4.3.1",
+    "react-monaco-editor": "~0.27.0",
     "react-popper-tooltip": "^2.10.1",
+    "react-redux": "^7.2.0",
+    "react-resize-detector": "^4.2.0",
+    "react-router-dom": "^5.2.0",
+    "react-sizeme": "^2.3.6",
+    "reactcss": "1.2.3",
+    "redux": "^4.0.5",
     "regenerate": "^1.4.0",
+    "reselect": "^4.0.0",
+    "resize-observer-polyfill": "^1.5.0",
     "sass-lint": "^1.12.1",
     "selenium-webdriver": "^4.0.0-alpha.7",
     "simple-git": "1.116.0",
@@ -472,9 +466,15 @@
     "supertest": "^3.1.0",
     "supertest-as-promised": "^4.0.2",
     "tape": "^4.13.0",
+    "topojson-client": "3.0.0",
     "tree-kill": "^1.2.2",
     "typescript": "3.9.5",
     "typings-tester": "^0.3.2",
+    "ui-select": "0.19.8",
+    "vega": "^5.13.0",
+    "vega-lite": "^4.13.1",
+    "vega-schema-url-parser": "^1.1.0",
+    "vega-tooltip": "^0.12.0",
     "vinyl-fs": "^3.0.3",
     "xml2js": "^0.4.22",
     "xmlbuilder": "13.0.2",
diff --git a/packages/kbn-optimizer/package.json b/packages/kbn-optimizer/package.json
index 740555fd87897..b80d1365659dd 100644
--- a/packages/kbn-optimizer/package.json
+++ b/packages/kbn-optimizer/package.json
@@ -14,10 +14,6 @@
     "@kbn/babel-preset": "1.0.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/ui-shared-deps": "1.0.0",
-    "@types/compression-webpack-plugin": "^2.0.2",
-    "@types/loader-utils": "^1.1.3",
-    "@types/watchpack": "^1.1.5",
-    "@types/webpack": "^4.41.3",
     "autoprefixer": "^9.7.4",
     "babel-loader": "^8.0.6",
     "clean-webpack-plugin": "^3.0.0",
@@ -46,5 +42,11 @@
     "watchpack": "^1.6.0",
     "webpack": "^4.41.5",
     "webpack-merge": "^4.2.2"
+  },
+  "devDependencies": {
+    "@types/compression-webpack-plugin": "^2.0.2",
+    "@types/loader-utils": "^1.1.3",
+    "@types/watchpack": "^1.1.5",
+    "@types/webpack": "^4.41.3"
   }
 }
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index c5e080e3c8175..e1ee1153a28ac 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -7,17 +7,15 @@
     "templateVersion": "1.0.0"
   },
   "license": "Apache-2.0",
-  "dependencies": {
-    "@elastic/eui": "27.4.1",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0"
-  },
   "scripts": {
     "kbn": "node ../../../../scripts/kbn.js",
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
+    "@elastic/eui": "27.4.1",
     "@kbn/plugin-helpers": "9.0.2",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
     "typescript": "3.9.5"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
index dac901f496304..b3cef400089b0 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
@@ -7,15 +7,13 @@
     "templateVersion": "1.0.0"
   },
   "license": "Apache-2.0",
-  "dependencies": {
-    "@elastic/eui": "27.4.1",
-    "react": "^16.12.0"
-  },
   "scripts": {
     "kbn": "node ../../../../scripts/kbn.js",
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
+    "@elastic/eui": "27.4.1",
+    "react": "^16.12.0",
     "typescript": "3.9.5"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index b7c494807672e..9250a4499662f 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -7,16 +7,14 @@
     "templateVersion": "1.0.0"
   },
   "license": "Apache-2.0",
-  "dependencies": {
-    "@elastic/eui": "27.4.1",
-    "react": "^16.12.0"
-  },
   "scripts": {
     "kbn": "node ../../../../scripts/kbn.js",
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
+    "@elastic/eui": "27.4.1",
     "@kbn/plugin-helpers": "9.0.2",
+    "react": "^16.12.0",
     "typescript": "3.9.5"
   }
 }
diff --git a/x-pack/package.json b/x-pack/package.json
index 992a186d41d78..247130f4895bb 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -30,6 +30,8 @@
   },
   "devDependencies": {
     "@cypress/webpack-preprocessor": "^4.1.0",
+    "@elastic/apm-rum-react": "^1.2.3",
+    "@elastic/maki": "6.3.0",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/es": "1.0.0",
     "@kbn/expect": "1.0.0",
@@ -37,6 +39,10 @@
     "@kbn/storybook": "1.0.0",
     "@kbn/test": "1.0.0",
     "@kbn/utility-types": "1.0.0",
+    "@mapbox/geojson-rewind": "^0.4.1",
+    "@mapbox/mapbox-gl-draw": "^1.2.0",
+    "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
+    "@scant/router": "^0.1.0",
     "@storybook/addon-actions": "^5.3.19",
     "@storybook/addon-console": "^1.2.1",
     "@storybook/addon-info": "^5.3.19",
@@ -47,6 +53,11 @@
     "@testing-library/jest-dom": "^5.8.0",
     "@testing-library/react": "^9.3.2",
     "@testing-library/react-hooks": "^3.2.1",
+    "@turf/bbox": "6.0.1",
+    "@turf/bbox-polygon": "6.0.1",
+    "@turf/boolean-contains": "6.0.1",
+    "@turf/distance": "6.0.1",
+    "@turf/helpers": "6.0.1",
     "@types/angular": "^1.6.56",
     "@types/archiver": "^3.1.0",
     "@types/base64-js": "^1.2.5",
@@ -75,6 +86,7 @@
     "@types/history": "^4.7.3",
     "@types/hoist-non-react-statics": "^3.3.1",
     "@types/http-proxy": "^1.17.4",
+    "@types/http-proxy-agent": "^2.0.2",
     "@types/jest": "^25.2.3",
     "@types/jest-specific-snapshot": "^0.5.4",
     "@types/joi": "^13.4.2",
@@ -124,6 +136,11 @@
     "@types/xml2js": "^0.4.5",
     "@welldone-software/why-did-you-render": "^4.0.0",
     "abab": "^1.0.4",
+    "angular": "^1.8.0",
+    "angular-sanitize": "1.8.0",
+    "apollo-link": "^1.2.3",
+    "apollo-link-error": "^1.1.7",
+    "apollo-link-state": "^0.4.1",
     "autoprefixer": "^9.7.4",
     "axios": "^0.19.0",
     "babel-jest": "^25.5.1",
@@ -131,14 +148,22 @@
     "babel-plugin-require-context-hook": "npm:babel-plugin-require-context-hook-babel7@1.0.0",
     "base64-js": "^1.3.1",
     "base64url": "^3.0.1",
+    "brace": "0.11.1",
+    "broadcast-channel": "^3.0.3",
     "canvas": "^2.6.1",
     "chalk": "^4.1.0",
     "chance": "1.0.18",
     "cheerio": "0.22.0",
     "commander": "3.0.2",
+    "constate": "^1.3.2",
+    "copy-to-clipboard": "^3.0.8",
     "copy-webpack-plugin": "^6.0.2",
+    "cronstrue": "^1.51.0",
     "cypress": "4.11.0",
     "cypress-multi-reporters": "^1.2.3",
+    "d3": "3.5.17",
+    "d3-scale": "1.0.7",
+    "dragselect": "1.13.1",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.2",
     "enzyme-adapter-utils": "^1.13.0",
@@ -146,6 +171,8 @@
     "execa": "^4.0.2",
     "fancy-log": "^1.3.2",
     "fetch-mock": "^7.3.9",
+    "file-saver": "^1.3.8",
+    "formsy-react": "^1.1.5",
     "graphql-code-generator": "^0.18.2",
     "graphql-codegen-add": "^0.18.2",
     "graphql-codegen-introspection": "^0.18.2",
@@ -155,16 +182,27 @@
     "graphql-codegen-typescript-server": "^0.18.2",
     "gulp": "4.0.2",
     "hapi": "^17.5.3",
+    "he": "^1.2.0",
+    "history-extra": "^5.0.1",
     "hoist-non-react-statics": "^3.3.2",
+    "i18n-iso-countries": "^4.3.1",
+    "icalendar": "0.7.1",
     "jest": "^25.5.4",
     "jest-circus": "^25.5.4",
     "jest-cli": "^25.5.4",
     "jest-styled-components": "^7.0.2",
+    "js-search": "^1.4.3",
     "jsdom": "13.1.0",
     "jsondiffpatch": "0.4.1",
+    "jsts": "^1.6.2",
+    "kea": "^2.0.1",
     "loader-utils": "^1.2.3",
+    "lz-string": "^1.4.4",
     "madge": "3.4.4",
+    "mapbox-gl": "^1.10.0",
+    "mapbox-gl-draw-rectangle-mode": "^1.0.4",
     "marge": "^1.0.1",
+    "memoize-one": "^5.0.0",
     "mini-css-extract-plugin": "0.8.0",
     "mocha": "^7.1.1",
     "mocha-junit-reporter": "^1.23.1",
@@ -174,14 +212,39 @@
     "mutation-observer": "^1.0.3",
     "node-fetch": "^2.6.0",
     "null-loader": "^3.0.0",
+    "oboe": "^2.1.4",
     "pixelmatch": "^5.1.0",
+    "pluralize": "3.1.0",
+    "polished": "^1.9.2",
     "postcss": "^7.0.32",
     "postcss-loader": "^3.0.0",
     "postcss-prefix-selector": "^1.7.2",
     "proxyquire": "1.8.0",
+    "re-resizable": "^6.1.1",
+    "react-apollo": "^2.1.4",
+    "react-beautiful-dnd": "^12.2.0",
     "react-docgen-typescript-loader": "^3.1.1",
+    "react-dropzone": "^4.2.9",
+    "react-fast-compare": "^2.0.4",
     "react-is": "^16.8.0",
+    "react-markdown": "^4.3.1",
+    "react-reverse-portal": "^1.0.4",
+    "react-router": "^5.2.0",
+    "react-shortcuts": "^2.0.0",
+    "react-sticky": "^6.0.3",
+    "react-syntax-highlighter": "^5.7.0",
     "react-test-renderer": "^16.12.0",
+    "react-tiny-virtual-list": "^2.2.0",
+    "react-use": "^13.27.0",
+    "react-virtualized": "^9.21.2",
+    "react-vis": "^1.8.1",
+    "react-visibility-sensor": "^5.1.1",
+    "reduce-reducers": "^1.0.4",
+    "redux-actions": "^2.6.5",
+    "redux-saga": "^1.1.3",
+    "redux-thunks": "^1.0.0",
+    "reselect": "^4.0.0",
+    "resize-observer-polyfill": "^1.5.0",
     "rxjs-marbles": "^5.0.6",
     "sass-loader": "^8.0.2",
     "sass-resources-loader": "^2.0.1",
@@ -190,10 +253,18 @@
     "string-replace-loader": "^2.2.0",
     "supertest": "^3.1.0",
     "supertest-as-promised": "^4.0.2",
+    "suricata-sid-db": "^1.0.2",
+    "tinycolor2": "1.4.1",
     "tmp": "0.1.0",
+    "topojson-client": "3.0.0",
     "tree-kill": "^1.2.2",
     "ts-loader": "^6.0.4",
     "typescript": "3.9.5",
+    "typescript-fsa": "^3.0.0",
+    "typescript-fsa-reducers": "^1.2.1",
+    "unstated": "^2.1.1",
+    "use-resize-observer": "^6.0.0",
+    "venn.js": "0.2.20",
     "vinyl-fs": "^3.0.3",
     "whatwg-fetch": "^3.0.0",
     "xml-crypto": "^1.4.0",
@@ -203,12 +274,10 @@
     "@babel/core": "^7.11.1",
     "@babel/register": "^7.10.5",
     "@babel/runtime": "^7.11.2",
-    "@elastic/apm-rum-react": "^1.2.3",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.9.3",
     "@elastic/eui": "27.4.1",
     "@elastic/filesaver": "1.1.2",
-    "@elastic/maki": "6.3.0",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.0",
     "@elastic/safer-lodash-set": "0.0.0",
@@ -217,57 +286,32 @@
     "@kbn/i18n": "1.0.0",
     "@kbn/interpreter": "1.0.0",
     "@kbn/ui-framework": "1.0.0",
-    "@mapbox/geojson-rewind": "^0.4.1",
-    "@mapbox/mapbox-gl-draw": "^1.2.0",
-    "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
-    "@scant/router": "^0.1.0",
     "@slack/webhook": "^5.0.0",
-    "@turf/bbox": "6.0.1",
-    "@turf/bbox-polygon": "6.0.1",
-    "@turf/boolean-contains": "6.0.1",
     "@turf/circle": "6.0.1",
-    "@turf/distance": "6.0.1",
-    "@turf/helpers": "6.0.1",
-    "@types/http-proxy-agent": "^2.0.2",
-    "angular": "^1.8.0",
     "angular-resource": "1.8.0",
-    "angular-sanitize": "1.8.0",
     "angular-ui-ace": "0.2.3",
     "apollo-cache-inmemory": "1.6.2",
     "apollo-client": "^2.3.8",
-    "apollo-link": "^1.2.3",
-    "apollo-link-error": "^1.1.7",
     "apollo-link-http": "^1.5.16",
     "apollo-link-schema": "^1.1.0",
-    "apollo-link-state": "^0.4.1",
     "apollo-server-errors": "^2.0.2",
     "apollo-server-hapi": "^1.3.6",
     "archiver": "3.1.1",
     "axios": "^0.19.0",
     "bluebird": "3.5.5",
     "boom": "^7.2.0",
-    "brace": "0.11.1",
-    "broadcast-channel": "^3.0.3",
     "chroma-js": "^1.4.1",
     "classnames": "2.2.6",
     "concat-stream": "1.6.2",
-    "constate": "^1.3.2",
     "content-disposition": "0.5.3",
-    "copy-to-clipboard": "^3.0.8",
-    "cronstrue": "^1.51.0",
     "cytoscape": "^3.10.0",
-    "d3": "3.5.17",
     "d3-array": "1.2.4",
-    "d3-scale": "1.0.7",
     "dedent": "^0.7.0",
     "del": "^5.1.0",
-    "dragselect": "1.13.1",
     "elasticsearch": "^16.7.0",
     "extract-zip": "^1.7.0",
-    "file-saver": "^1.3.8",
     "file-type": "^10.9.0",
     "font-awesome": "4.7.0",
-    "formsy-react": "^1.1.5",
     "fp-ts": "^2.3.1",
     "get-port": "^5.0.0",
     "getos": "^3.1.0",
@@ -280,11 +324,7 @@
     "graphql-tools": "^3.0.2",
     "h2o2": "^8.1.2",
     "handlebars": "4.7.6",
-    "he": "^1.2.0",
     "history": "4.9.0",
-    "history-extra": "^5.0.1",
-    "i18n-iso-countries": "^4.3.1",
-    "icalendar": "0.7.1",
     "idx": "^2.5.6",
     "immer": "^1.5.0",
     "inline-style": "^2.0.0",
@@ -293,18 +333,11 @@
     "isbinaryfile": "4.0.2",
     "joi": "^13.5.2",
     "jquery": "^3.5.0",
-    "js-search": "^1.4.3",
     "js-yaml": "3.13.1",
     "json-stable-stringify": "^1.0.1",
     "jsonwebtoken": "^8.5.1",
-    "jsts": "^1.6.2",
-    "kea": "^2.0.1",
     "lodash": "^4.17.15",
-    "lz-string": "^1.4.4",
-    "mapbox-gl": "^1.10.0",
-    "mapbox-gl-draw-rectangle-mode": "^1.0.4",
     "markdown-it": "^10.0.0",
-    "memoize-one": "^5.0.0",
     "mime": "^2.4.4",
     "moment": "^2.24.0",
     "moment-duration-format": "^2.3.2",
@@ -315,54 +348,29 @@
     "nodemailer": "^4.7.0",
     "object-hash": "^1.3.1",
     "object-path-immutable": "^3.1.1",
-    "oboe": "^2.1.4",
     "oppsy": "^2.0.0",
     "p-retry": "^4.2.0",
     "papaparse": "^5.2.0",
     "pdfmake": "^0.1.65",
-    "pluralize": "3.1.0",
     "pngjs": "3.4.0",
-    "polished": "^1.9.2",
     "prop-types": "^15.6.0",
     "proper-lockfile": "^3.2.0",
     "puid": "1.0.7",
     "puppeteer-core": "^1.19.0",
     "query-string": "5.1.1",
     "raw-loader": "3.1.0",
-    "re-resizable": "^6.1.1",
     "react": "^16.12.0",
-    "react-apollo": "^2.1.4",
-    "react-beautiful-dnd": "^12.2.0",
     "react-datetime": "^2.14.0",
     "react-dom": "^16.12.0",
-    "react-dropzone": "^4.2.9",
-    "react-fast-compare": "^2.0.4",
-    "react-markdown": "^4.3.1",
     "react-moment-proptypes": "^1.7.0",
     "react-portal": "^3.2.0",
     "react-redux": "^7.2.0",
-    "react-reverse-portal": "^1.0.4",
-    "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "react-shortcuts": "^2.0.0",
-    "react-sticky": "^6.0.3",
-    "react-syntax-highlighter": "^5.7.0",
-    "react-tiny-virtual-list": "^2.2.0",
-    "react-use": "^13.27.0",
-    "react-virtualized": "^9.21.2",
-    "react-vis": "^1.8.1",
-    "react-visibility-sensor": "^5.1.1",
     "recompose": "^0.26.0",
-    "reduce-reducers": "^1.0.4",
     "redux": "^4.0.5",
-    "redux-actions": "^2.6.5",
     "redux-observable": "^1.2.0",
-    "redux-saga": "^1.1.3",
     "redux-thunk": "^2.3.0",
-    "redux-thunks": "^1.0.0",
     "request": "^2.88.0",
-    "reselect": "^4.0.0",
-    "resize-observer-polyfill": "^1.5.0",
     "rison-node": "0.3.1",
     "rxjs": "^6.5.5",
     "semver": "5.7.0",
@@ -371,18 +379,10 @@
     "stats-lite": "^2.2.0",
     "style-it": "^2.1.3",
     "styled-components": "^5.1.0",
-    "suricata-sid-db": "^1.0.2",
-    "tinycolor2": "1.4.1",
     "tinymath": "1.2.1",
-    "topojson-client": "3.0.0",
     "tslib": "^2.0.0",
-    "typescript-fsa": "^3.0.0",
-    "typescript-fsa-reducers": "^1.2.1",
     "ui-select": "0.19.8",
-    "unstated": "^2.1.1",
-    "use-resize-observer": "^6.0.0",
     "uuid": "3.3.2",
-    "venn.js": "0.2.20",
     "vscode-languageserver": "^5.2.1",
     "webpack": "^4.41.5",
     "wellknown": "^0.5.0",
diff --git a/x-pack/plugins/apm/e2e/package.json b/x-pack/plugins/apm/e2e/package.json
index 5101e64235c62..d113b465fdf2f 100644
--- a/x-pack/plugins/apm/e2e/package.json
+++ b/x-pack/plugins/apm/e2e/package.json
@@ -10,8 +10,6 @@
   "dependencies": {
     "@cypress/snapshot": "^2.1.3",
     "@cypress/webpack-preprocessor": "^5.4.1",
-    "@types/cypress-cucumber-preprocessor": "^1.14.1",
-    "@types/node": "^14.0.14",
     "axios": "^0.19.2",
     "cypress": "^4.9.0",
     "cypress-cucumber-preprocessor": "^2.5.2",
@@ -23,5 +21,9 @@
     "wait-on": "^5.0.1",
     "webpack": "^4.43.0",
     "yargs": "^15.4.0"
+  },
+  "devDependencies": {
+    "@types/cypress-cucumber-preprocessor": "^1.14.1",
+    "@types/node": "^14.0.14"
   }
 }
diff --git a/x-pack/plugins/apm/scripts/package.json b/x-pack/plugins/apm/scripts/package.json
index 4d0906514b5e1..d3e2d42f972a9 100644
--- a/x-pack/plugins/apm/scripts/package.json
+++ b/x-pack/plugins/apm/scripts/package.json
@@ -6,8 +6,10 @@
   "dependencies": {
     "@elastic/elasticsearch": "7.9.0-rc.1",
     "@octokit/rest": "^16.35.0",
-    "@types/console-stamp": "^0.2.32",
     "console-stamp": "^0.2.9",
     "hdr-histogram-js": "^1.2.0"
+  },
+  "devDependencies": {
+    "@types/console-stamp": "^0.2.32"
   }
 }
diff --git a/x-pack/plugins/security_solution/package.json b/x-pack/plugins/security_solution/package.json
index 703ef6584f164..687099541b3d2 100644
--- a/x-pack/plugins/security_solution/package.json
+++ b/x-pack/plugins/security_solution/package.json
@@ -13,9 +13,7 @@
     "test:generate": "ts-node --project scripts/endpoint/cli_tsconfig.json scripts/endpoint/resolver_generator.ts"
   },
   "devDependencies": {
-    "@types/md5": "^2.2.0"
-  },
-  "dependencies": {
+    "@types/md5": "^2.2.0",
     "@types/rbush": "^3.0.0",
     "@types/seedrandom": ">=2.0.0 <4.0.0",
     "querystring": "^0.2.0",
diff --git a/x-pack/plugins/security_solution/yarn.lock b/x-pack/plugins/security_solution/yarn.lock
deleted file mode 120000
index 6e09764ec763b..0000000000000
--- a/x-pack/plugins/security_solution/yarn.lock
+++ /dev/null
@@ -1 +0,0 @@
-../../../yarn.lock
\ No newline at end of file

From c634208e4f2426b9762b46d88073121529df23d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yulia=20=C4=8Cech?=
 <6585477+yuliacech@users.noreply.github.com>
Date: Tue, 25 Aug 2020 18:59:47 +0200
Subject: [PATCH 039/148] [ILM] TS conversion of Edit policy page (#75148)

* [ILM] TS conversion of Edit policy page

* [ILM] Deleted some constants

* [ILM] Fixed imports

* [ILM] Fixed imports

* [ILM] Clean up

* [ILM] Clean up

* [ILM] Fixed ui_metric jest test

* [ILM] Fixed ui_metric jest test

* [ILM] Fix review suggestions

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../edit_policy/constants.ts                  |  10 +-
 .../edit_policy/edit_policy.helpers.tsx       |   2 -
 .../edit_policy/edit_policy.test.ts           |   8 +-
 .../__jest__/components/edit_policy.test.js   |  28 +-
 .../public/application/app.tsx                |   2 +-
 .../public/application/constants/index.ts     |  99 +----
 .../public/application/constants/policy.ts    |  60 +++
 .../edit_policy/components/form_errors.tsx    |  12 +-
 .../edit_policy/components/min_age_input.tsx  |  58 ++-
 .../components/node_allocation.tsx            |  41 +-
 .../components/policy_json_flyout.tsx         |  15 +-
 .../components/set_priority_input.tsx         |  31 +-
 .../edit_policy/edit_policy.container.js      |  58 ---
 .../edit_policy/edit_policy.container.tsx     |  83 ++++
 .../sections/edit_policy/edit_policy.js       | 390 ------------------
 .../sections/edit_policy/edit_policy.tsx      | 383 +++++++++++++++++
 .../sections/edit_policy/index.d.ts           |   7 -
 .../edit_policy/{index.js => index.ts}        |   0
 .../edit_policy/phases/cold_phase.tsx         |  67 ++-
 .../edit_policy/phases/delete_phase.tsx       |  34 +-
 .../sections/edit_policy/phases/hot_phase.tsx | 262 ++++++------
 .../edit_policy/phases/warm_phase.tsx         | 138 +++----
 .../components/policy_table/policy_table.js   |   2 +-
 .../public/application/services/api.ts        |  13 +-
 .../application/services/find_errors.js       |  24 --
 .../services/policies/cold_phase.ts           | 159 +++++++
 .../services/policies/delete_phase.ts         |  88 ++++
 .../services/policies/hot_phase.ts            | 155 +++++++
 .../policies/policy_save.ts}                  |  30 +-
 .../services/policies/policy_serialization.ts | 104 +++++
 .../services/policies/policy_validation.ts    | 191 +++++++++
 .../application/services/policies/types.ts    | 140 +++++++
 .../services/policies/warm_phase.ts           | 219 ++++++++++
 .../{ui_metric.test.js => ui_metric.test.ts}  |  19 +-
 .../public/application/services/ui_metric.ts  |  64 +--
 .../application/store/actions/general.js      |  11 -
 .../public/application/store/actions/index.js |   3 -
 .../public/application/store/actions/nodes.js |   8 -
 .../application/store/actions/policies.js     |   7 -
 .../application/store/defaults/cold_phase.js  |  30 --
 .../store/defaults/delete_phase.js            |  23 --
 .../application/store/defaults/hot_phase.js   |  35 --
 .../application/store/defaults/index.d.ts     |  10 -
 .../application/store/defaults/index.js       |  10 -
 .../application/store/defaults/warm_phase.js  |  39 --
 .../application/store/reducers/general.js     |  38 --
 .../application/store/reducers/index.js       |   4 -
 .../application/store/reducers/nodes.js       |  50 ---
 .../application/store/reducers/policies.js    |  97 -----
 .../application/store/selectors/general.js    |   9 -
 .../application/store/selectors/index.js      |   3 -
 .../application/store/selectors/lifecycle.js  | 287 -------------
 .../application/store/selectors/nodes.js      |  12 -
 .../application/store/selectors/policies.js   | 291 +------------
 54 files changed, 1996 insertions(+), 1967 deletions(-)
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.container.js
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.container.tsx
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.js
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.d.ts
 rename x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/{index.js => index.ts} (100%)
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/find_errors.js
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/policies/delete_phase.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/policies/hot_phase.ts
 rename x-pack/plugins/index_lifecycle_management/public/application/{store/actions/lifecycle.js => services/policies/policy_save.ts} (58%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_serialization.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_validation.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/policies/types.ts
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/policies/warm_phase.ts
 rename x-pack/plugins/index_lifecycle_management/public/application/services/{ui_metric.test.js => ui_metric.test.ts} (75%)
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/actions/general.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/actions/nodes.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/defaults/cold_phase.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/defaults/delete_phase.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/defaults/hot_phase.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.d.ts
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/defaults/warm_phase.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/reducers/general.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/reducers/nodes.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/selectors/general.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/selectors/lifecycle.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/selectors/nodes.js

diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts
index e5037a6477aca..acf642f250a7b 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/constants.ts
@@ -4,21 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { PolicyFromES } from '../../../public/application/services/policies/types';
+
 export const POLICY_NAME = 'my_policy';
 export const SNAPSHOT_POLICY_NAME = 'my_snapshot_policy';
 export const NEW_SNAPSHOT_POLICY_NAME = 'my_new_snapshot_policy';
 
-export const DELETE_PHASE_POLICY = {
+export const DELETE_PHASE_POLICY: PolicyFromES = {
   version: 1,
-  modified_date: Date.now(),
+  modified_date: Date.now().toString(),
   policy: {
     phases: {
       hot: {
         min_age: '0ms',
         actions: {
-          set_priority: {
-            priority: null,
-          },
           rollover: {
             max_size: '50gb',
           },
@@ -36,6 +35,7 @@ export const DELETE_PHASE_POLICY = {
         },
       },
     },
+    name: POLICY_NAME,
   },
   name: POLICY_NAME,
 };
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
index ebe1c12e2a079..6365bb8caa963 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
@@ -13,7 +13,6 @@ import { POLICY_NAME } from './constants';
 import { TestSubjects } from '../helpers';
 
 import { EditPolicy } from '../../../public/application/sections/edit_policy';
-import { indexLifecycleManagementStore } from '../../../public/application/store';
 
 jest.mock('@elastic/eui', () => {
   const original = jest.requireActual('@elastic/eui');
@@ -35,7 +34,6 @@ jest.mock('@elastic/eui', () => {
 });
 
 const testBedConfig: TestBedConfig = {
-  store: () => indexLifecycleManagementStore(),
   memoryRouter: {
     initialEntries: [`/policies/edit/${POLICY_NAME}`],
     componentRoutePath: `/policies/edit/:policyName`,
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
index 06829e6ef6f1e..36feb3f6203c8 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
@@ -40,8 +40,8 @@ describe('<EditPolicy />', () => {
     test('wait for snapshot policy field should correctly display snapshot policy name', () => {
       expect(testBed.find('snapshotPolicyCombobox').prop('data-currentvalue')).toEqual([
         {
-          label: DELETE_PHASE_POLICY.policy.phases.delete.actions.wait_for_snapshot.policy,
-          value: DELETE_PHASE_POLICY.policy.phases.delete.actions.wait_for_snapshot.policy,
+          label: DELETE_PHASE_POLICY.policy.phases.delete?.actions.wait_for_snapshot?.policy,
+          value: DELETE_PHASE_POLICY.policy.phases.delete?.actions.wait_for_snapshot?.policy,
         },
       ]);
     });
@@ -59,7 +59,7 @@ describe('<EditPolicy />', () => {
           delete: {
             ...DELETE_PHASE_POLICY.policy.phases.delete,
             actions: {
-              ...DELETE_PHASE_POLICY.policy.phases.delete.actions,
+              ...DELETE_PHASE_POLICY.policy.phases.delete?.actions,
               wait_for_snapshot: {
                 policy: NEW_SNAPSHOT_POLICY_NAME,
               },
@@ -96,7 +96,7 @@ describe('<EditPolicy />', () => {
           delete: {
             ...DELETE_PHASE_POLICY.policy.phases.delete,
             actions: {
-              ...DELETE_PHASE_POLICY.policy.phases.delete.actions,
+              ...DELETE_PHASE_POLICY.policy.phases.delete?.actions,
             },
           },
         },
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js b/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
index 4fe3d5c66696e..81c30579cd4dd 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
@@ -7,7 +7,6 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import moment from 'moment-timezone';
-import { Provider } from 'react-redux';
 // axios has a $http like interface so using it to simulate $http
 import axios from 'axios';
 import axiosXhrAdapter from 'axios/lib/adapters/xhr';
@@ -21,9 +20,7 @@ import {
 import { usageCollectionPluginMock } from '../../../../../src/plugins/usage_collection/public/mocks';
 
 import { mountWithIntl } from '../../../../test_utils/enzyme_helpers';
-import { fetchedPolicies } from '../../public/application/store/actions';
-import { indexLifecycleManagementStore } from '../../public/application/store';
-import { EditPolicy } from '../../public/application/sections/edit_policy';
+import { EditPolicy } from '../../public/application/sections/edit_policy/edit_policy';
 import { init as initHttp } from '../../public/application/services/http';
 import { init as initUiMetric } from '../../public/application/services/ui_metric';
 import { init as initNotification } from '../../public/application/services/notification';
@@ -40,7 +37,7 @@ import {
   policyNameMustBeDifferentErrorMessage,
   policyNameAlreadyUsedErrorMessage,
   maximumDocumentsRequiredMessage,
-} from '../../public/application/store/selectors';
+} from '../../public/application/services/policies/policy_validation';
 
 initHttp(axios.create({ adapter: axiosXhrAdapter }));
 initUiMetric(usageCollectionPluginMock.createSetupContract());
@@ -51,7 +48,6 @@ initNotification(
 
 let server;
 let httpRequestsMockHelpers;
-let store;
 const policy = {
   phases: {
     hot: {
@@ -128,13 +124,14 @@ const save = (rendered) => {
 };
 describe('edit policy', () => {
   beforeEach(() => {
-    store = indexLifecycleManagementStore();
     component = (
-      <Provider store={store}>
-        <EditPolicy history={{ push: () => {} }} getUrlForApp={() => {}} />
-      </Provider>
+      <EditPolicy
+        history={{ push: () => {} }}
+        getUrlForApp={() => {}}
+        policies={policies}
+        policyName={''}
+      />
     );
-    store.dispatch(fetchedPolicies(policies));
     ({ server, httpRequestsMockHelpers } = initHttpRequests());
 
     httpRequestsMockHelpers.setPoliciesResponse(policies);
@@ -162,9 +159,12 @@ describe('edit policy', () => {
     });
     test('should show error when trying to save as new policy but using the same name', () => {
       component = (
-        <Provider store={store}>
-          <EditPolicy match={{ params: { policyName: 'testy0' } }} getUrlForApp={() => {}} />
-        </Provider>
+        <EditPolicy
+          policyName={'testy0'}
+          policies={policies}
+          getUrlForApp={() => {}}
+          history={{ push: () => {} }}
+        />
       );
       const rendered = mountWithIntl(component);
       findTestSubject(rendered, 'saveAsNewSwitch').simulate('click');
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/app.tsx b/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
index 14b0e72317c66..f7f8b30324bca 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/app.tsx
@@ -9,7 +9,7 @@ import { Router, Switch, Route, Redirect } from 'react-router-dom';
 import { ScopedHistory, ApplicationStart } from 'kibana/public';
 import { METRIC_TYPE } from '@kbn/analytics';
 
-import { UIM_APP_LOAD } from './constants';
+import { UIM_APP_LOAD } from './constants/ui_metric';
 import { EditPolicy } from './sections/edit_policy';
 import { PolicyTable } from './sections/policy_table';
 import { trackUiMetric } from './services/ui_metric';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/constants/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/constants/index.ts
index 6319fc0d68543..61c197f2ba149 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/constants/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/constants/index.ts
@@ -4,102 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+export * from './policy';
 export * from './ui_metric';
-
-export const SET_PHASE_DATA: string = 'SET_PHASE_DATA';
-export const SET_SELECTED_NODE_ATTRS: string = 'SET_SELECTED_NODE_ATTRS';
-export const PHASE_HOT: string = 'hot';
-export const PHASE_WARM: string = 'warm';
-export const PHASE_COLD: string = 'cold';
-export const PHASE_DELETE: string = 'delete';
-
-export const PHASE_ENABLED: string = 'phaseEnabled';
-
-export const PHASE_ROLLOVER_ENABLED: string = 'rolloverEnabled';
-export const WARM_PHASE_ON_ROLLOVER: string = 'warmPhaseOnRollover';
-export const PHASE_ROLLOVER_ALIAS: string = 'selectedAlias';
-export const PHASE_ROLLOVER_MAX_AGE: string = 'selectedMaxAge';
-export const PHASE_ROLLOVER_MAX_AGE_UNITS: string = 'selectedMaxAgeUnits';
-export const PHASE_ROLLOVER_MAX_SIZE_STORED: string = 'selectedMaxSizeStored';
-export const PHASE_ROLLOVER_MAX_DOCUMENTS: string = 'selectedMaxDocuments';
-export const PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS: string = 'selectedMaxSizeStoredUnits';
-export const PHASE_ROLLOVER_MINIMUM_AGE: string = 'selectedMinimumAge';
-export const PHASE_ROLLOVER_MINIMUM_AGE_UNITS: string = 'selectedMinimumAgeUnits';
-
-export const PHASE_FORCE_MERGE_SEGMENTS: string = 'selectedForceMergeSegments';
-export const PHASE_FORCE_MERGE_ENABLED: string = 'forceMergeEnabled';
-export const PHASE_FREEZE_ENABLED: string = 'freezeEnabled';
-
-export const PHASE_SHRINK_ENABLED: string = 'shrinkEnabled';
-
-export const PHASE_NODE_ATTRS: string = 'selectedNodeAttrs';
-export const PHASE_PRIMARY_SHARD_COUNT: string = 'selectedPrimaryShardCount';
-export const PHASE_REPLICA_COUNT: string = 'selectedReplicaCount';
-export const PHASE_INDEX_PRIORITY: string = 'phaseIndexPriority';
-
-export const PHASE_WAIT_FOR_SNAPSHOT_POLICY = 'waitForSnapshotPolicy';
-
-export const PHASE_ATTRIBUTES_THAT_ARE_NUMBERS_VALIDATE: string[] = [
-  PHASE_ROLLOVER_MINIMUM_AGE,
-  PHASE_FORCE_MERGE_SEGMENTS,
-  PHASE_PRIMARY_SHARD_COUNT,
-  PHASE_REPLICA_COUNT,
-  PHASE_INDEX_PRIORITY,
-];
-export const PHASE_ATTRIBUTES_THAT_ARE_NUMBERS: string[] = [
-  ...PHASE_ATTRIBUTES_THAT_ARE_NUMBERS_VALIDATE,
-  PHASE_ROLLOVER_MAX_AGE,
-  PHASE_ROLLOVER_MAX_SIZE_STORED,
-  PHASE_ROLLOVER_MAX_DOCUMENTS,
-];
-
-export const STRUCTURE_INDEX_TEMPLATE: string = 'indexTemplate';
-export const STRUCTURE_TEMPLATE_SELECTION: string = 'templateSelection';
-export const STRUCTURE_TEMPLATE_NAME: string = 'templateName';
-export const STRUCTURE_CONFIGURATION: string = 'configuration';
-export const STRUCTURE_NODE_ATTRS: string = 'node_attrs';
-export const STRUCTURE_PRIMARY_NODES: string = 'primary_nodes';
-export const STRUCTURE_REPLICAS: string = 'replicas';
-
-export const STRUCTURE_POLICY_CONFIGURATION: string = 'policyConfiguration';
-
-export const STRUCTURE_REVIEW: string = 'review';
-export const STRUCTURE_POLICY_NAME: string = 'policyName';
-export const STRUCTURE_INDEX_NAME: string = 'indexName';
-export const STRUCTURE_ALIAS_NAME: string = 'aliasName';
-
-export const ERROR_STRUCTURE: any = {
-  [PHASE_HOT]: {
-    [PHASE_ROLLOVER_ALIAS]: [],
-    [PHASE_ROLLOVER_MAX_AGE]: [],
-    [PHASE_ROLLOVER_MAX_AGE_UNITS]: [],
-    [PHASE_ROLLOVER_MAX_SIZE_STORED]: [],
-    [PHASE_ROLLOVER_MAX_DOCUMENTS]: [],
-    [PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS]: [],
-    [PHASE_INDEX_PRIORITY]: [],
-  },
-  [PHASE_WARM]: {
-    [PHASE_ROLLOVER_ALIAS]: [],
-    [PHASE_ROLLOVER_MINIMUM_AGE]: [],
-    [PHASE_ROLLOVER_MINIMUM_AGE_UNITS]: [],
-    [PHASE_NODE_ATTRS]: [],
-    [PHASE_PRIMARY_SHARD_COUNT]: [],
-    [PHASE_REPLICA_COUNT]: [],
-    [PHASE_FORCE_MERGE_SEGMENTS]: [],
-    [PHASE_INDEX_PRIORITY]: [],
-  },
-  [PHASE_COLD]: {
-    [PHASE_ROLLOVER_ALIAS]: [],
-    [PHASE_ROLLOVER_MINIMUM_AGE]: [],
-    [PHASE_ROLLOVER_MINIMUM_AGE_UNITS]: [],
-    [PHASE_NODE_ATTRS]: [],
-    [PHASE_REPLICA_COUNT]: [],
-    [PHASE_INDEX_PRIORITY]: [],
-  },
-  [PHASE_DELETE]: {
-    [PHASE_ROLLOVER_ALIAS]: [],
-    [PHASE_ROLLOVER_MINIMUM_AGE]: [],
-    [PHASE_ROLLOVER_MINIMUM_AGE_UNITS]: [],
-  },
-  [STRUCTURE_POLICY_NAME]: [],
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts b/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
new file mode 100644
index 0000000000000..3a19f03547b5b
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  SerializedPhase,
+  ColdPhase,
+  DeletePhase,
+  HotPhase,
+  WarmPhase,
+} from '../services/policies/types';
+
+export const defaultNewHotPhase: HotPhase = {
+  phaseEnabled: true,
+  rolloverEnabled: true,
+  selectedMaxAge: '30',
+  selectedMaxAgeUnits: 'd',
+  selectedMaxSizeStored: '50',
+  selectedMaxSizeStoredUnits: 'gb',
+  phaseIndexPriority: '100',
+  selectedMaxDocuments: '',
+};
+
+export const defaultNewWarmPhase: WarmPhase = {
+  phaseEnabled: false,
+  forceMergeEnabled: false,
+  selectedForceMergeSegments: '',
+  selectedMinimumAge: '0',
+  selectedMinimumAgeUnits: 'd',
+  selectedNodeAttrs: '',
+  shrinkEnabled: false,
+  selectedPrimaryShardCount: '',
+  selectedReplicaCount: '',
+  warmPhaseOnRollover: true,
+  phaseIndexPriority: '50',
+};
+
+export const defaultNewColdPhase: ColdPhase = {
+  phaseEnabled: false,
+  selectedMinimumAge: '0',
+  selectedMinimumAgeUnits: 'd',
+  selectedNodeAttrs: '',
+  selectedReplicaCount: '',
+  freezeEnabled: false,
+  phaseIndexPriority: '0',
+};
+
+export const defaultNewDeletePhase: DeletePhase = {
+  phaseEnabled: false,
+  selectedMinimumAge: '0',
+  selectedMinimumAgeUnits: 'd',
+  waitForSnapshotPolicy: '',
+};
+
+export const serializedPhaseInitialization: SerializedPhase = {
+  min_age: '0ms',
+  actions: {},
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/form_errors.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/form_errors.tsx
index a3278b6c231b9..9db40ebf5521f 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/form_errors.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/form_errors.tsx
@@ -8,28 +8,22 @@ import React, { cloneElement, Children, Fragment, ReactElement } from 'react';
 import { EuiFormRow, EuiFormRowProps } from '@elastic/eui';
 
 type Props = EuiFormRowProps & {
-  errorKey: string;
   isShowingErrors: boolean;
-  errors: Record<string, string[]>;
+  errors?: string[];
 };
 
 export const ErrableFormRow: React.FunctionComponent<Props> = ({
-  errorKey,
   isShowingErrors,
   errors,
   children,
   ...rest
 }) => {
   return (
-    <EuiFormRow
-      isInvalid={isShowingErrors && errors[errorKey].length > 0}
-      error={errors[errorKey]}
-      {...rest}
-    >
+    <EuiFormRow isInvalid={errors && isShowingErrors && errors.length > 0} error={errors} {...rest}>
       <Fragment>
         {Children.map(children, (child) =>
           cloneElement(child as ReactElement, {
-            isInvalid: isShowingErrors && errors[errorKey].length > 0,
+            isInvalid: errors && isShowingErrors && errors.length > 0,
           })
         )}
       </Fragment>
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx
index c9732f2311758..11b743ecc4bb6 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx
@@ -9,40 +9,35 @@ import { i18n } from '@kbn/i18n';
 
 import { EuiFieldNumber, EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect } from '@elastic/eui';
 
-import {
-  PHASE_ROLLOVER_MINIMUM_AGE,
-  PHASE_ROLLOVER_MINIMUM_AGE_UNITS,
-  PHASE_WARM,
-  PHASE_COLD,
-  PHASE_DELETE,
-} from '../../../constants';
 import { LearnMoreLink } from './learn_more_link';
 import { ErrableFormRow } from './form_errors';
+import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
+import { ColdPhase, DeletePhase, Phase, Phases, WarmPhase } from '../../../services/policies/types';
 
-function getTimingLabelForPhase(phase: string) {
+function getTimingLabelForPhase(phase: keyof Phases) {
   // NOTE: Hot phase isn't necessary, because indices begin in the hot phase.
   switch (phase) {
-    case PHASE_WARM:
+    case 'warm':
       return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseWarm.minimumAgeLabel', {
         defaultMessage: 'Timing for warm phase',
       });
 
-    case PHASE_COLD:
+    case 'cold':
       return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseCold.minimumAgeLabel', {
         defaultMessage: 'Timing for cold phase',
       });
 
-    case PHASE_DELETE:
+    case 'delete':
       return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseDelete.minimumAgeLabel', {
         defaultMessage: 'Timing for delete phase',
       });
   }
 }
 
-function getUnitsAriaLabelForPhase(phase: string) {
+function getUnitsAriaLabelForPhase(phase: keyof Phases) {
   // NOTE: Hot phase isn't necessary, because indices begin in the hot phase.
   switch (phase) {
-    case PHASE_WARM:
+    case 'warm':
       return i18n.translate(
         'xpack.indexLifecycleMgmt.editPolicy.phaseWarm.minimumAgeUnitsAriaLabel',
         {
@@ -50,7 +45,7 @@ function getUnitsAriaLabelForPhase(phase: string) {
         }
       );
 
-    case PHASE_COLD:
+    case 'cold':
       return i18n.translate(
         'xpack.indexLifecycleMgmt.editPolicy.phaseCold.minimumAgeUnitsAriaLabel',
         {
@@ -58,7 +53,7 @@ function getUnitsAriaLabelForPhase(phase: string) {
         }
       );
 
-    case PHASE_DELETE:
+    case 'delete':
       return i18n.translate(
         'xpack.indexLifecycleMgmt.editPolicy.phaseDelete.minimumAgeUnitsAriaLabel',
         {
@@ -68,24 +63,23 @@ function getUnitsAriaLabelForPhase(phase: string) {
   }
 }
 
-interface Props {
+interface Props<T extends Phase> {
   rolloverEnabled: boolean;
-  errors: Record<string, string[]>;
-  phase: string;
-  // TODO add types for phaseData and setPhaseData after policy is typed
-  phaseData: any;
-  setPhaseData: (dataKey: string, value: any) => void;
+  errors?: PhaseValidationErrors<T>;
+  phase: keyof Phases & string;
+  phaseData: T;
+  setPhaseData: (dataKey: keyof T & string, value: string) => void;
   isShowingErrors: boolean;
 }
 
-export const MinAgeInput: React.FunctionComponent<Props> = ({
+export const MinAgeInput = <Phase extends WarmPhase | ColdPhase | DeletePhase>({
   rolloverEnabled,
   errors,
   phaseData,
   phase,
   setPhaseData,
   isShowingErrors,
-}) => {
+}: React.PropsWithChildren<Props<Phase>>): React.ReactElement => {
   let daysOptionLabel;
   let hoursOptionLabel;
   let minutesOptionLabel;
@@ -192,15 +186,17 @@ export const MinAgeInput: React.FunctionComponent<Props> = ({
     );
   }
 
+  // check that these strings are valid properties
+  const selectedMinimumAgeProperty = propertyof<Phase>('selectedMinimumAge');
+  const selectedMinimumAgeUnitsProperty = propertyof<Phase>('selectedMinimumAgeUnits');
   return (
     <EuiFlexGroup>
       <EuiFlexItem style={{ maxWidth: 140 }}>
         <ErrableFormRow
-          id={`${phase}-${PHASE_ROLLOVER_MINIMUM_AGE}`}
+          id={`${phase}-${selectedMinimumAgeProperty}`}
           label={getTimingLabelForPhase(phase)}
-          errorKey={PHASE_ROLLOVER_MINIMUM_AGE}
           isShowingErrors={isShowingErrors}
-          errors={errors}
+          errors={errors?.selectedMinimumAge}
           helpText={
             <LearnMoreLink
               docPath="ilm-index-lifecycle.html#ilm-phase-transitions"
@@ -214,10 +210,10 @@ export const MinAgeInput: React.FunctionComponent<Props> = ({
           }
         >
           <EuiFieldNumber
-            id={`${phase}-${PHASE_ROLLOVER_MINIMUM_AGE}`}
-            value={phaseData[PHASE_ROLLOVER_MINIMUM_AGE]}
+            id={`${phase}-${selectedMinimumAgeProperty}`}
+            value={phaseData.selectedMinimumAge}
             onChange={async (e) => {
-              setPhaseData(PHASE_ROLLOVER_MINIMUM_AGE, e.target.value);
+              setPhaseData(selectedMinimumAgeProperty, e.target.value);
             }}
             min={0}
           />
@@ -227,8 +223,8 @@ export const MinAgeInput: React.FunctionComponent<Props> = ({
         <EuiFormRow hasEmptyLabelSpace>
           <EuiSelect
             aria-label={getUnitsAriaLabelForPhase(phase)}
-            value={phaseData[PHASE_ROLLOVER_MINIMUM_AGE_UNITS]}
-            onChange={(e) => setPhaseData(PHASE_ROLLOVER_MINIMUM_AGE_UNITS, e.target.value)}
+            value={phaseData.selectedMinimumAgeUnits}
+            onChange={(e) => setPhaseData(selectedMinimumAgeUnitsProperty, e.target.value)}
             options={[
               {
                 value: 'd',
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation.tsx
index 576483a5ab9c2..0ce2c0d7ea566 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation.tsx
@@ -16,20 +16,12 @@ import {
   EuiButton,
 } from '@elastic/eui';
 
-import { PHASE_NODE_ATTRS } from '../../../constants';
 import { LearnMoreLink } from './learn_more_link';
 import { ErrableFormRow } from './form_errors';
 import { useLoadNodes } from '../../../services/api';
 import { NodeAttrsDetails } from './node_attrs_details';
-
-interface Props {
-  phase: string;
-  errors: Record<string, string[]>;
-  // TODO add types for phaseData and setPhaseData after policy is typed
-  phaseData: any;
-  setPhaseData: (dataKey: string, value: any) => void;
-  isShowingErrors: boolean;
-}
+import { ColdPhase, Phase, Phases, WarmPhase } from '../../../services/policies/types';
+import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
 
 const learnMoreLink = (
   <Fragment>
@@ -46,13 +38,20 @@ const learnMoreLink = (
   </Fragment>
 );
 
-export const NodeAllocation: React.FunctionComponent<Props> = ({
+interface Props<T extends Phase> {
+  phase: keyof Phases & string;
+  errors?: PhaseValidationErrors<T>;
+  phaseData: T;
+  setPhaseData: (dataKey: keyof T & string, value: string) => void;
+  isShowingErrors: boolean;
+}
+export const NodeAllocation = <T extends WarmPhase | ColdPhase>({
   phase,
   setPhaseData,
   errors,
   phaseData,
   isShowingErrors,
-}) => {
+}: React.PropsWithChildren<Props<T>>) => {
   const { isLoading, data: nodes, error, sendRequest } = useLoadNodes();
 
   const [selectedNodeAttrsForDetails, setSelectedNodeAttrsForDetails] = useState<string | null>(
@@ -140,33 +139,35 @@ export const NodeAllocation: React.FunctionComponent<Props> = ({
     );
   }
 
+  // check that this string is a valid property
+  const nodeAttrsProperty = propertyof<T>('selectedNodeAttrs');
+
   return (
     <Fragment>
       <ErrableFormRow
-        id={`${phase}-${PHASE_NODE_ATTRS}`}
+        id={`${phase}-${nodeAttrsProperty}`}
         label={i18n.translate('xpack.indexLifecycleMgmt.editPolicy.nodeAllocationLabel', {
           defaultMessage: 'Select a node attribute to control shard allocation',
         })}
-        errorKey={PHASE_NODE_ATTRS}
         isShowingErrors={isShowingErrors}
-        errors={errors}
+        errors={errors?.selectedNodeAttrs}
       >
         <EuiSelect
-          id={`${phase}-${PHASE_NODE_ATTRS}`}
-          value={phaseData[PHASE_NODE_ATTRS] || ' '}
+          id={`${phase}-${nodeAttrsProperty}`}
+          value={phaseData.selectedNodeAttrs || ' '}
           options={nodeOptions}
           onChange={(e) => {
-            setPhaseData(PHASE_NODE_ATTRS, e.target.value);
+            setPhaseData(nodeAttrsProperty, e.target.value);
           }}
         />
       </ErrableFormRow>
-      {!!phaseData[PHASE_NODE_ATTRS] ? (
+      {!!phaseData.selectedNodeAttrs ? (
         <EuiButtonEmpty
           style={{ maxWidth: 400 }}
           data-test-subj={`${phase}-viewNodeDetailsFlyoutButton`}
           flush="left"
           iconType="eye"
-          onClick={() => setSelectedNodeAttrsForDetails(phaseData[PHASE_NODE_ATTRS])}
+          onClick={() => setSelectedNodeAttrsForDetails(phaseData.selectedNodeAttrs)}
         >
           <FormattedMessage
             id="xpack.indexLifecycleMgmt.editPolicy.viewNodeDetailsButton"
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/policy_json_flyout.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/policy_json_flyout.tsx
index aaf4aa6e6222d..66cb4ad9fba32 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/policy_json_flyout.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/policy_json_flyout.tsx
@@ -18,21 +18,16 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
+import { Policy } from '../../../services/policies/types';
 
 interface Props {
   close: () => void;
-  // TODO add types for lifecycle after policy is typed
-  lifecycle: any;
+  policy: Policy;
   policyName: string;
 }
 
-export const PolicyJsonFlyout: React.FunctionComponent<Props> = ({
-  close,
-  lifecycle,
-  policyName,
-}) => {
-  // @ts-ignore until store is typed
-  const getEsJson = ({ phases }) => {
+export const PolicyJsonFlyout: React.FunctionComponent<Props> = ({ close, policy, policyName }) => {
+  const getEsJson = ({ phases }: Policy) => {
     return JSON.stringify(
       {
         policy: {
@@ -45,7 +40,7 @@ export const PolicyJsonFlyout: React.FunctionComponent<Props> = ({
   };
 
   const endpoint = `PUT _ilm/policy/${policyName || '<policyName>'}`;
-  const request = `${endpoint}\n${getEsJson(lifecycle)}`;
+  const request = `${endpoint}\n${getEsJson(policy)}`;
 
   return (
     <EuiFlyout maxWidth={480} onClose={close}>
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/set_priority_input.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/set_priority_input.tsx
index 0034de85fce17..1da7508049f24 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/set_priority_input.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/set_priority_input.tsx
@@ -7,27 +7,27 @@ import React, { Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFieldNumber, EuiTextColor, EuiDescribedFormGroup } from '@elastic/eui';
 
-import { PHASE_INDEX_PRIORITY } from '../../../constants';
-
 import { LearnMoreLink } from './';
 import { OptionalLabel } from './';
 import { ErrableFormRow } from './';
+import { ColdPhase, HotPhase, Phase, Phases, WarmPhase } from '../../../services/policies/types';
+import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
 
-interface Props {
-  errors: Record<string, string[]>;
-  // TODO add types for phaseData and setPhaseData after policy is typed
-  phase: string;
-  phaseData: any;
-  setPhaseData: (dataKey: string, value: any) => void;
+interface Props<T extends Phase> {
+  errors?: PhaseValidationErrors<T>;
+  phase: keyof Phases & string;
+  phaseData: T;
+  setPhaseData: (dataKey: keyof T & string, value: any) => void;
   isShowingErrors: boolean;
 }
-export const SetPriorityInput: React.FunctionComponent<Props> = ({
+export const SetPriorityInput = <T extends HotPhase | WarmPhase | ColdPhase>({
   errors,
   phaseData,
   phase,
   setPhaseData,
   isShowingErrors,
-}) => {
+}: React.PropsWithChildren<Props<T>>) => {
+  const phaseIndexPriorityProperty = propertyof<T>('phaseIndexPriority');
   return (
     <EuiDescribedFormGroup
       title={
@@ -52,7 +52,7 @@ export const SetPriorityInput: React.FunctionComponent<Props> = ({
       fullWidth
     >
       <ErrableFormRow
-        id={`${phase}-${PHASE_INDEX_PRIORITY}`}
+        id={`${phase}-${phaseIndexPriorityProperty}`}
         label={
           <Fragment>
             <FormattedMessage
@@ -62,15 +62,14 @@ export const SetPriorityInput: React.FunctionComponent<Props> = ({
             <OptionalLabel />
           </Fragment>
         }
-        errorKey={PHASE_INDEX_PRIORITY}
         isShowingErrors={isShowingErrors}
-        errors={errors}
+        errors={errors?.phaseIndexPriority}
       >
         <EuiFieldNumber
-          id={`${phase}-${PHASE_INDEX_PRIORITY}`}
-          value={phaseData[PHASE_INDEX_PRIORITY]}
+          id={`${phase}-${phaseIndexPriorityProperty}`}
+          value={phaseData.phaseIndexPriority}
           onChange={(e) => {
-            setPhaseData(PHASE_INDEX_PRIORITY, e.target.value);
+            setPhaseData(phaseIndexPriorityProperty, e.target.value);
           }}
           min={0}
         />
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.container.js
deleted file mode 100644
index e7f20a66d09f0..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.container.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { connect } from 'react-redux';
-
-import {
-  getSaveAsNewPolicy,
-  getSelectedPolicy,
-  validateLifecycle,
-  getLifecycle,
-  getPolicies,
-  isPolicyListLoaded,
-  getIsNewPolicy,
-  getSelectedOriginalPolicyName,
-  getPhases,
-} from '../../store/selectors';
-
-import {
-  setSelectedPolicy,
-  setSelectedPolicyName,
-  setSaveAsNewPolicy,
-  saveLifecyclePolicy,
-  fetchPolicies,
-  setPhaseData,
-} from '../../store/actions';
-
-import { findFirstError } from '../../services/find_errors';
-import { EditPolicy as PresentationComponent } from './edit_policy';
-
-export const EditPolicy = connect(
-  (state) => {
-    const errors = validateLifecycle(state);
-    const firstError = findFirstError(errors);
-    return {
-      firstError,
-      errors,
-      selectedPolicy: getSelectedPolicy(state),
-      saveAsNewPolicy: getSaveAsNewPolicy(state),
-      lifecycle: getLifecycle(state),
-      policies: getPolicies(state),
-      isPolicyListLoaded: isPolicyListLoaded(state),
-      isNewPolicy: getIsNewPolicy(state),
-      originalPolicyName: getSelectedOriginalPolicyName(state),
-      phases: getPhases(state),
-    };
-  },
-  {
-    setSelectedPolicy,
-    setSelectedPolicyName,
-    setSaveAsNewPolicy,
-    saveLifecyclePolicy,
-    fetchPolicies,
-    setPhaseData,
-  }
-)(PresentationComponent);
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.container.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.container.tsx
new file mode 100644
index 0000000000000..359134e015f7f
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.container.tsx
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { RouteComponentProps } from 'react-router-dom';
+import { EuiButton, EuiCallOut, EuiEmptyPrompt, EuiLoadingSpinner } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { useLoadPoliciesList } from '../../services/api';
+
+import { EditPolicy as PresentationComponent } from './edit_policy';
+
+interface RouterProps {
+  policyName: string;
+}
+
+interface Props {
+  getUrlForApp: (
+    appId: string,
+    options?: {
+      path?: string;
+      absolute?: boolean;
+    }
+  ) => string;
+}
+
+export const EditPolicy: React.FunctionComponent<Props & RouteComponentProps<RouterProps>> = ({
+  match: {
+    params: { policyName },
+  },
+  getUrlForApp,
+  history,
+}) => {
+  const { error, isLoading, data: policies, sendRequest } = useLoadPoliciesList(false);
+  if (isLoading) {
+    return (
+      <EuiEmptyPrompt
+        title={<EuiLoadingSpinner size="xl" />}
+        body={
+          <FormattedMessage
+            id="xpack.indexLifecycleMgmt.editPolicy.policiesLoading"
+            defaultMessage="Loading policies..."
+          />
+        }
+      />
+    );
+  }
+  if (error || !policies) {
+    const { statusCode, message } = error ? error : { statusCode: '', message: '' };
+    return (
+      <EuiCallOut
+        title={
+          <FormattedMessage
+            id="xpack.indexLifecycleMgmt.editPolicy.lifecyclePoliciesLoadingFailedTitle"
+            defaultMessage="Unable to load existing lifecycle policies"
+          />
+        }
+        color="danger"
+      >
+        <p>
+          {message} ({statusCode})
+        </p>
+        <EuiButton onClick={sendRequest} iconType="refresh" color="danger">
+          <FormattedMessage
+            id="xpack.indexLifecycleMgmt.editPolicy.lifecyclePoliciesReloadButton"
+            defaultMessage="Try again"
+          />
+        </EuiButton>
+      </EuiCallOut>
+    );
+  }
+
+  return (
+    <PresentationComponent
+      policies={policies}
+      history={history}
+      getUrlForApp={getUrlForApp}
+      policyName={policyName}
+    />
+  );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.js
deleted file mode 100644
index a29ecd07c5e45..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.js
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { Component, Fragment } from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-
-import {
-  EuiPage,
-  EuiPageBody,
-  EuiFieldText,
-  EuiPageContent,
-  EuiFormRow,
-  EuiTitle,
-  EuiText,
-  EuiSpacer,
-  EuiSwitch,
-  EuiHorizontalRule,
-  EuiButton,
-  EuiButtonEmpty,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiDescribedFormGroup,
-} from '@elastic/eui';
-
-import {
-  PHASE_HOT,
-  PHASE_COLD,
-  PHASE_DELETE,
-  PHASE_WARM,
-  STRUCTURE_POLICY_NAME,
-  WARM_PHASE_ON_ROLLOVER,
-  PHASE_ROLLOVER_ENABLED,
-} from '../../constants';
-
-import { toasts } from '../../services/notification';
-import { findFirstError } from '../../services/find_errors';
-import { LearnMoreLink, PolicyJsonFlyout, ErrableFormRow } from './components';
-
-import { HotPhase, WarmPhase, ColdPhase, DeletePhase } from './phases';
-
-export class EditPolicy extends Component {
-  static propTypes = {
-    selectedPolicy: PropTypes.object.isRequired,
-    errors: PropTypes.object.isRequired,
-  };
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      isShowingErrors: false,
-      isShowingPolicyJsonFlyout: false,
-    };
-  }
-
-  selectPolicy = (policyName) => {
-    const { setSelectedPolicy, policies } = this.props;
-
-    const selectedPolicy = policies.find((policy) => {
-      return policy.name === policyName;
-    });
-
-    if (selectedPolicy) {
-      setSelectedPolicy(selectedPolicy);
-    }
-  };
-
-  componentDidMount() {
-    window.scrollTo(0, 0);
-
-    const {
-      isPolicyListLoaded,
-      fetchPolicies,
-      match: { params: { policyName } } = { params: {} },
-    } = this.props;
-
-    if (policyName) {
-      const decodedPolicyName = decodeURIComponent(policyName);
-      if (isPolicyListLoaded) {
-        this.selectPolicy(decodedPolicyName);
-      } else {
-        fetchPolicies(true, () => {
-          this.selectPolicy(decodedPolicyName);
-        });
-      }
-    } else {
-      this.props.setSelectedPolicy(null);
-    }
-  }
-
-  backToPolicyList = () => {
-    this.props.setSelectedPolicy(null);
-    this.props.history.push('/policies');
-  };
-
-  submit = async () => {
-    this.setState({ isShowingErrors: true });
-    const { saveLifecyclePolicy, lifecycle, saveAsNewPolicy, firstError } = this.props;
-    if (firstError) {
-      toasts.addDanger(
-        i18n.translate('xpack.indexLifecycleMgmt.editPolicy.formErrorsMessage', {
-          defaultMessage: 'Please fix the errors on this page.',
-        })
-      );
-      const errorRowId = `${firstError.replace('.', '-')}-row`;
-      const element = document.getElementById(errorRowId);
-      if (element) {
-        element.scrollIntoView({ block: 'center', inline: 'nearest' });
-      }
-    } else {
-      const success = await saveLifecyclePolicy(lifecycle, saveAsNewPolicy);
-      if (success) {
-        this.backToPolicyList();
-      }
-    }
-  };
-
-  togglePolicyJsonFlyout = () => {
-    this.setState(({ isShowingPolicyJsonFlyout }) => ({
-      isShowingPolicyJsonFlyout: !isShowingPolicyJsonFlyout,
-    }));
-  };
-
-  render() {
-    const {
-      selectedPolicy,
-      errors,
-      setSaveAsNewPolicy,
-      saveAsNewPolicy,
-      setSelectedPolicyName,
-      isNewPolicy,
-      lifecycle,
-      originalPolicyName,
-      phases,
-      setPhaseData,
-    } = this.props;
-    const selectedPolicyName = selectedPolicy.name;
-    const { isShowingErrors, isShowingPolicyJsonFlyout } = this.state;
-
-    return (
-      <EuiPage>
-        <EuiPageBody>
-          <EuiPageContent
-            className="ilmEditPolicyPageContent"
-            verticalPosition="center"
-            horizontalPosition="center"
-          >
-            <EuiTitle size="l">
-              <h1>
-                {isNewPolicy
-                  ? i18n.translate('xpack.indexLifecycleMgmt.editPolicy.createPolicyMessage', {
-                      defaultMessage: 'Create an index lifecycle policy',
-                    })
-                  : i18n.translate('xpack.indexLifecycleMgmt.editPolicy.editPolicyMessage', {
-                      defaultMessage: 'Edit index lifecycle policy {originalPolicyName}',
-                      values: { originalPolicyName },
-                    })}
-              </h1>
-            </EuiTitle>
-
-            <div className="euiAnimateContentLoad">
-              <EuiSpacer size="xs" />
-              <EuiText color="subdued">
-                <p>
-                  <FormattedMessage
-                    id="xpack.indexLifecycleMgmt.editPolicy.lifecyclePolicyDescriptionText"
-                    defaultMessage="Use an index policy to automate the four phases of the index lifecycle,
-                      from actively writing to the index to deleting it."
-                  />{' '}
-                  <LearnMoreLink
-                    docPath="index-lifecycle-management.html"
-                    text={
-                      <FormattedMessage
-                        id="xpack.indexLifecycleMgmt.editPolicy.learnAboutIndexLifecycleManagementLinkText"
-                        defaultMessage="Learn about the index lifecycle."
-                      />
-                    }
-                  />
-                </p>
-              </EuiText>
-
-              <EuiSpacer />
-
-              <Fragment>
-                {isNewPolicy ? null : (
-                  <Fragment>
-                    <Fragment>
-                      <EuiText>
-                        <p>
-                          <strong>
-                            <FormattedMessage
-                              id="xpack.indexLifecycleMgmt.editPolicy.editingExistingPolicyMessage"
-                              defaultMessage="You are editing an existing policy"
-                            />
-                          </strong>
-                          .{' '}
-                          <FormattedMessage
-                            id="xpack.indexLifecycleMgmt.editPolicy.editingExistingPolicyExplanationMessage"
-                            defaultMessage="Any changes you make will affect the indices that are
-                              attached to this policy. Alternatively, you can save these changes in
-                              a new policy."
-                          />
-                        </p>
-                      </EuiText>
-                      <EuiSpacer />
-                    </Fragment>
-
-                    <EuiFormRow>
-                      <EuiSwitch
-                        data-test-subj="saveAsNewSwitch"
-                        style={{ maxWidth: '100%' }}
-                        checked={saveAsNewPolicy}
-                        onChange={async (e) => {
-                          await setSaveAsNewPolicy(e.target.checked);
-                        }}
-                        label={
-                          <span>
-                            <FormattedMessage
-                              id="xpack.indexLifecycleMgmt.editPolicy.saveAsNewPolicyMessage"
-                              defaultMessage="Save as new policy"
-                            />
-                          </span>
-                        }
-                      />
-                    </EuiFormRow>
-                  </Fragment>
-                )}
-
-                {saveAsNewPolicy || isNewPolicy ? (
-                  <EuiDescribedFormGroup
-                    title={
-                      <div>
-                        <span className="eui-displayInlineBlock eui-alignMiddle">
-                          <FormattedMessage
-                            id="xpack.indexLifecycleMgmt.editPolicy.nameLabel"
-                            defaultMessage="Name"
-                          />
-                        </span>
-                      </div>
-                    }
-                    titleSize="s"
-                    fullWidth
-                  >
-                    <ErrableFormRow
-                      id={STRUCTURE_POLICY_NAME}
-                      label={i18n.translate('xpack.indexLifecycleMgmt.editPolicy.policyNameLabel', {
-                        defaultMessage: 'Policy name',
-                      })}
-                      errorKey={STRUCTURE_POLICY_NAME}
-                      isShowingErrors={isShowingErrors}
-                      errors={errors}
-                      helpText={
-                        <FormattedMessage
-                          id="xpack.indexLifecycleMgmt.editPolicy.validPolicyNameMessage"
-                          defaultMessage="A policy name cannot start with an underscore and cannot contain a question mark or a space."
-                        />
-                      }
-                    >
-                      <EuiFieldText
-                        data-test-subj="policyNameField"
-                        value={selectedPolicyName}
-                        onChange={async (e) => {
-                          await setSelectedPolicyName(e.target.value);
-                        }}
-                      />
-                    </ErrableFormRow>
-                  </EuiDescribedFormGroup>
-                ) : null}
-              </Fragment>
-
-              <EuiSpacer />
-
-              <HotPhase
-                errors={errors[PHASE_HOT]}
-                isShowingErrors={isShowingErrors && !!findFirstError(errors[PHASE_HOT], false)}
-                setPhaseData={(key, value) => setPhaseData(PHASE_HOT, key, value)}
-                phaseData={phases[PHASE_HOT]}
-                setWarmPhaseOnRollover={(value) =>
-                  setPhaseData(PHASE_WARM, WARM_PHASE_ON_ROLLOVER, value)
-                }
-              />
-
-              <EuiHorizontalRule />
-
-              <WarmPhase
-                errors={errors[PHASE_WARM]}
-                isShowingErrors={isShowingErrors && !!findFirstError(errors[PHASE_WARM], false)}
-                setPhaseData={(key, value) => setPhaseData(PHASE_WARM, key, value)}
-                phaseData={phases[PHASE_WARM]}
-                hotPhaseRolloverEnabled={phases[PHASE_HOT][PHASE_ROLLOVER_ENABLED]}
-              />
-
-              <EuiHorizontalRule />
-
-              <ColdPhase
-                errors={errors[PHASE_COLD]}
-                isShowingErrors={isShowingErrors && !!findFirstError(errors[PHASE_COLD], false)}
-                setPhaseData={(key, value) => setPhaseData(PHASE_COLD, key, value)}
-                phaseData={phases[PHASE_COLD]}
-                hotPhaseRolloverEnabled={phases[PHASE_HOT][PHASE_ROLLOVER_ENABLED]}
-              />
-
-              <EuiHorizontalRule />
-
-              <DeletePhase
-                errors={errors[PHASE_DELETE]}
-                isShowingErrors={isShowingErrors && !!findFirstError(errors[PHASE_DELETE], false)}
-                getUrlForApp={this.props.getUrlForApp}
-                setPhaseData={(key, value) => setPhaseData(PHASE_DELETE, key, value)}
-                phaseData={phases[PHASE_DELETE]}
-                hotPhaseRolloverEnabled={phases[PHASE_HOT][PHASE_ROLLOVER_ENABLED]}
-              />
-
-              <EuiHorizontalRule />
-
-              <EuiFlexGroup justifyContent="spaceBetween">
-                <EuiFlexItem grow={false}>
-                  <EuiFlexGroup>
-                    <EuiFlexItem grow={false}>
-                      <EuiButton
-                        data-test-subj="savePolicyButton"
-                        fill
-                        iconType="check"
-                        iconSide="left"
-                        onClick={this.submit}
-                        color="secondary"
-                      >
-                        {saveAsNewPolicy ? (
-                          <FormattedMessage
-                            id="xpack.indexLifecycleMgmt.editPolicy.saveAsNewButton"
-                            defaultMessage="Save as new policy"
-                          />
-                        ) : (
-                          <FormattedMessage
-                            id="xpack.indexLifecycleMgmt.editPolicy.saveButton"
-                            defaultMessage="Save policy"
-                          />
-                        )}
-                      </EuiButton>
-                    </EuiFlexItem>
-
-                    <EuiFlexItem grow={false}>
-                      <EuiButtonEmpty
-                        data-test-subj="cancelTestPolicy"
-                        onClick={this.backToPolicyList}
-                      >
-                        <FormattedMessage
-                          id="xpack.indexLifecycleMgmt.editPolicy.cancelButton"
-                          defaultMessage="Cancel"
-                        />
-                      </EuiButtonEmpty>
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
-                </EuiFlexItem>
-
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty onClick={this.togglePolicyJsonFlyout}>
-                    {isShowingPolicyJsonFlyout ? (
-                      <FormattedMessage
-                        id="xpack.indexLifecycleMgmt.editPolicy.hidePolicyJsonButto"
-                        defaultMessage="Hide request"
-                      />
-                    ) : (
-                      <FormattedMessage
-                        id="xpack.indexLifecycleMgmt.editPolicy.showPolicyJsonButto"
-                        defaultMessage="Show request"
-                      />
-                    )}
-                  </EuiButtonEmpty>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-
-              {this.state.isShowingPolicyJsonFlyout ? (
-                <PolicyJsonFlyout
-                  policyName={selectedPolicyName || ''}
-                  lifecycle={lifecycle}
-                  close={() => this.setState({ isShowingPolicyJsonFlyout: false })}
-                />
-              ) : null}
-            </div>
-          </EuiPageContent>
-        </EuiPageBody>
-      </EuiPage>
-    );
-  }
-}
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
new file mode 100644
index 0000000000000..6cffde577b35e
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
@@ -0,0 +1,383 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Fragment, useEffect, useState } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+
+import {
+  EuiButton,
+  EuiButtonEmpty,
+  EuiDescribedFormGroup,
+  EuiFieldText,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFormRow,
+  EuiHorizontalRule,
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiSpacer,
+  EuiSwitch,
+  EuiText,
+  EuiTitle,
+} from '@elastic/eui';
+
+import { toasts } from '../../services/notification';
+
+import { Policy, PolicyFromES } from '../../services/policies/types';
+import {
+  validatePolicy,
+  ValidationErrors,
+  findFirstError,
+} from '../../services/policies/policy_validation';
+import { savePolicy } from '../../services/policies/policy_save';
+import {
+  deserializePolicy,
+  getPolicyByName,
+  initializeNewPolicy,
+} from '../../services/policies/policy_serialization';
+
+import { ErrableFormRow, LearnMoreLink, PolicyJsonFlyout } from './components';
+import { ColdPhase, DeletePhase, HotPhase, WarmPhase } from './phases';
+
+interface Props {
+  policies: PolicyFromES[];
+  policyName: string;
+  getUrlForApp: (
+    appId: string,
+    options?: {
+      path?: string;
+      absolute?: boolean;
+    }
+  ) => string;
+  history: any;
+}
+export const EditPolicy: React.FunctionComponent<Props> = ({
+  policies,
+  policyName,
+  history,
+  getUrlForApp,
+}) => {
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, []);
+
+  const [isShowingErrors, setIsShowingErrors] = useState(false);
+  const [errors, setErrors] = useState<ValidationErrors>();
+  const [isShowingPolicyJsonFlyout, setIsShowingPolicyJsonFlyout] = useState(false);
+
+  const existingPolicy = getPolicyByName(policies, policyName);
+
+  const [policy, setPolicy] = useState<Policy>(
+    existingPolicy ? deserializePolicy(existingPolicy) : initializeNewPolicy(policyName)
+  );
+
+  const isNewPolicy: boolean = !Boolean(existingPolicy);
+  const [saveAsNew, setSaveAsNew] = useState(isNewPolicy);
+  const originalPolicyName: string = existingPolicy ? existingPolicy.name : '';
+
+  const backToPolicyList = () => {
+    history.push('/policies');
+  };
+
+  const submit = async () => {
+    setIsShowingErrors(true);
+    const [isValid, validationErrors] = validatePolicy(
+      saveAsNew,
+      policy,
+      policies,
+      originalPolicyName
+    );
+    setErrors(validationErrors);
+
+    if (!isValid) {
+      toasts.addDanger(
+        i18n.translate('xpack.indexLifecycleMgmt.editPolicy.formErrorsMessage', {
+          defaultMessage: 'Please fix the errors on this page.',
+        })
+      );
+      const firstError = findFirstError(validationErrors);
+      const errorRowId = `${firstError ? firstError.replace('.', '-') : ''}-row`;
+      const element = document.getElementById(errorRowId);
+      if (element) {
+        element.scrollIntoView({ block: 'center', inline: 'nearest' });
+      }
+    } else {
+      const success = await savePolicy(policy, isNewPolicy || saveAsNew, existingPolicy);
+      if (success) {
+        backToPolicyList();
+      }
+    }
+  };
+
+  const togglePolicyJsonFlyout = () => {
+    setIsShowingPolicyJsonFlyout(!isShowingPolicyJsonFlyout);
+  };
+
+  const setPhaseData = (phase: 'hot' | 'warm' | 'cold' | 'delete', key: string, value: any) => {
+    setPolicy({
+      ...policy,
+      phases: {
+        ...policy.phases,
+        [phase]: { ...policy.phases[phase], [key]: value },
+      },
+    });
+  };
+
+  const setWarmPhaseOnRollover = (value: boolean) => {
+    setPolicy({
+      ...policy,
+      phases: {
+        ...policy.phases,
+        hot: {
+          ...policy.phases.hot,
+          rolloverEnabled: value,
+        },
+        warm: {
+          ...policy.phases.warm,
+          warmPhaseOnRollover: value,
+        },
+      },
+    });
+  };
+
+  return (
+    <EuiPage>
+      <EuiPageBody>
+        <EuiPageContent
+          className="ilmEditPolicyPageContent"
+          verticalPosition="center"
+          horizontalPosition="center"
+        >
+          <EuiTitle size="l">
+            <h1>
+              {isNewPolicy
+                ? i18n.translate('xpack.indexLifecycleMgmt.editPolicy.createPolicyMessage', {
+                    defaultMessage: 'Create an index lifecycle policy',
+                  })
+                : i18n.translate('xpack.indexLifecycleMgmt.editPolicy.editPolicyMessage', {
+                    defaultMessage: 'Edit index lifecycle policy {originalPolicyName}',
+                    values: { originalPolicyName },
+                  })}
+            </h1>
+          </EuiTitle>
+
+          <div className="euiAnimateContentLoad">
+            <EuiSpacer size="xs" />
+            <EuiText color="subdued">
+              <p>
+                <FormattedMessage
+                  id="xpack.indexLifecycleMgmt.editPolicy.lifecyclePolicyDescriptionText"
+                  defaultMessage="Use an index policy to automate the four phases of the index lifecycle,
+                      from actively writing to the index to deleting it."
+                />{' '}
+                <LearnMoreLink
+                  docPath="index-lifecycle-management.html"
+                  text={
+                    <FormattedMessage
+                      id="xpack.indexLifecycleMgmt.editPolicy.learnAboutIndexLifecycleManagementLinkText"
+                      defaultMessage="Learn about the index lifecycle."
+                    />
+                  }
+                />
+              </p>
+            </EuiText>
+
+            <EuiSpacer />
+
+            {isNewPolicy ? null : (
+              <Fragment>
+                <EuiText>
+                  <p>
+                    <strong>
+                      <FormattedMessage
+                        id="xpack.indexLifecycleMgmt.editPolicy.editingExistingPolicyMessage"
+                        defaultMessage="You are editing an existing policy"
+                      />
+                    </strong>
+                    .{' '}
+                    <FormattedMessage
+                      id="xpack.indexLifecycleMgmt.editPolicy.editingExistingPolicyExplanationMessage"
+                      defaultMessage="Any changes you make will affect the indices that are
+                              attached to this policy. Alternatively, you can save these changes in
+                              a new policy."
+                    />
+                  </p>
+                </EuiText>
+                <EuiSpacer />
+
+                <EuiFormRow>
+                  <EuiSwitch
+                    data-test-subj="saveAsNewSwitch"
+                    style={{ maxWidth: '100%' }}
+                    checked={saveAsNew}
+                    onChange={(e) => {
+                      setSaveAsNew(e.target.checked);
+                    }}
+                    label={
+                      <span>
+                        <FormattedMessage
+                          id="xpack.indexLifecycleMgmt.editPolicy.saveAsNewPolicyMessage"
+                          defaultMessage="Save as new policy"
+                        />
+                      </span>
+                    }
+                  />
+                </EuiFormRow>
+              </Fragment>
+            )}
+
+            {saveAsNew || isNewPolicy ? (
+              <EuiDescribedFormGroup
+                title={
+                  <div>
+                    <span className="eui-displayInlineBlock eui-alignMiddle">
+                      <FormattedMessage
+                        id="xpack.indexLifecycleMgmt.editPolicy.nameLabel"
+                        defaultMessage="Name"
+                      />
+                    </span>
+                  </div>
+                }
+                titleSize="s"
+                fullWidth
+              >
+                <ErrableFormRow
+                  id={'policyName'}
+                  label={i18n.translate('xpack.indexLifecycleMgmt.editPolicy.policyNameLabel', {
+                    defaultMessage: 'Policy name',
+                  })}
+                  isShowingErrors={isShowingErrors}
+                  errors={errors?.policyName}
+                  helpText={
+                    <FormattedMessage
+                      id="xpack.indexLifecycleMgmt.editPolicy.validPolicyNameMessage"
+                      defaultMessage="A policy name cannot start with an underscore and cannot contain a question mark or a space."
+                    />
+                  }
+                >
+                  <EuiFieldText
+                    data-test-subj="policyNameField"
+                    value={policy.name}
+                    onChange={(e) => {
+                      setPolicy({ ...policy, name: e.target.value });
+                    }}
+                  />
+                </ErrableFormRow>
+              </EuiDescribedFormGroup>
+            ) : null}
+
+            <EuiSpacer />
+
+            <HotPhase
+              errors={errors?.hot}
+              isShowingErrors={isShowingErrors && !!errors && Object.keys(errors.hot).length > 0}
+              setPhaseData={(key, value) => setPhaseData('hot', key, value)}
+              phaseData={policy.phases.hot}
+              setWarmPhaseOnRollover={setWarmPhaseOnRollover}
+            />
+
+            <EuiHorizontalRule />
+
+            <WarmPhase
+              errors={errors?.warm}
+              isShowingErrors={isShowingErrors && !!errors && Object.keys(errors.warm).length > 0}
+              setPhaseData={(key, value) => setPhaseData('warm', key, value)}
+              phaseData={policy.phases.warm}
+              hotPhaseRolloverEnabled={policy.phases.hot.rolloverEnabled}
+            />
+
+            <EuiHorizontalRule />
+
+            <ColdPhase
+              errors={errors?.cold}
+              isShowingErrors={isShowingErrors && !!errors && Object.keys(errors.cold).length > 0}
+              setPhaseData={(key, value) => setPhaseData('cold', key, value)}
+              phaseData={policy.phases.cold}
+              hotPhaseRolloverEnabled={policy.phases.hot.rolloverEnabled}
+            />
+
+            <EuiHorizontalRule />
+
+            <DeletePhase
+              errors={errors?.delete}
+              isShowingErrors={isShowingErrors && !!errors && Object.keys(errors.delete).length > 0}
+              getUrlForApp={getUrlForApp}
+              setPhaseData={(key, value) => setPhaseData('delete', key, value)}
+              phaseData={policy.phases.delete}
+              hotPhaseRolloverEnabled={policy.phases.hot.rolloverEnabled}
+            />
+
+            <EuiHorizontalRule />
+
+            <EuiFlexGroup justifyContent="spaceBetween">
+              <EuiFlexItem grow={false}>
+                <EuiFlexGroup>
+                  <EuiFlexItem grow={false}>
+                    <EuiButton
+                      data-test-subj="savePolicyButton"
+                      fill
+                      iconType="check"
+                      iconSide="left"
+                      onClick={submit}
+                      color="secondary"
+                    >
+                      {saveAsNew ? (
+                        <FormattedMessage
+                          id="xpack.indexLifecycleMgmt.editPolicy.saveAsNewButton"
+                          defaultMessage="Save as new policy"
+                        />
+                      ) : (
+                        <FormattedMessage
+                          id="xpack.indexLifecycleMgmt.editPolicy.saveButton"
+                          defaultMessage="Save policy"
+                        />
+                      )}
+                    </EuiButton>
+                  </EuiFlexItem>
+
+                  <EuiFlexItem grow={false}>
+                    <EuiButtonEmpty data-test-subj="cancelTestPolicy" onClick={backToPolicyList}>
+                      <FormattedMessage
+                        id="xpack.indexLifecycleMgmt.editPolicy.cancelButton"
+                        defaultMessage="Cancel"
+                      />
+                    </EuiButtonEmpty>
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+              </EuiFlexItem>
+
+              <EuiFlexItem grow={false}>
+                <EuiButtonEmpty onClick={togglePolicyJsonFlyout}>
+                  {isShowingPolicyJsonFlyout ? (
+                    <FormattedMessage
+                      id="xpack.indexLifecycleMgmt.editPolicy.hidePolicyJsonButto"
+                      defaultMessage="Hide request"
+                    />
+                  ) : (
+                    <FormattedMessage
+                      id="xpack.indexLifecycleMgmt.editPolicy.showPolicyJsonButto"
+                      defaultMessage="Show request"
+                    />
+                  )}
+                </EuiButtonEmpty>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+
+            {isShowingPolicyJsonFlyout ? (
+              <PolicyJsonFlyout
+                policyName={policy.name || ''}
+                policy={policy}
+                close={() => setIsShowingPolicyJsonFlyout(false)}
+              />
+            ) : null}
+          </div>
+        </EuiPageContent>
+      </EuiPageBody>
+    </EuiPage>
+  );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.d.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.d.ts
deleted file mode 100644
index 5f15d929a4916..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.d.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export declare const EditPolicy: any;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.ts
similarity index 100%
rename from x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/index.ts
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/cold_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/cold_phase.tsx
index babbbf7638ebe..fb32752fe24ea 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/cold_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/cold_phase.tsx
@@ -18,12 +18,9 @@ import {
   EuiTextColor,
 } from '@elastic/eui';
 
-import {
-  PHASE_COLD,
-  PHASE_ENABLED,
-  PHASE_REPLICA_COUNT,
-  PHASE_FREEZE_ENABLED,
-} from '../../../constants';
+import { ColdPhase as ColdPhaseInterface, Phases } from '../../../services/policies/types';
+import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
+
 import {
   LearnMoreLink,
   ActiveBadge,
@@ -35,14 +32,21 @@ import {
   SetPriorityInput,
 } from '../components';
 
+const freezeLabel = i18n.translate('xpack.indexLifecycleMgmt.coldPhase.freezeIndexLabel', {
+  defaultMessage: 'Freeze index',
+});
+
+const coldProperty = propertyof<Phases>('cold');
+const phaseProperty = (propertyName: keyof ColdPhaseInterface) =>
+  propertyof<ColdPhaseInterface>(propertyName);
+
 interface Props {
-  setPhaseData: (key: string, value: any) => void;
-  phaseData: any;
+  setPhaseData: (key: keyof ColdPhaseInterface & string, value: string | boolean) => void;
+  phaseData: ColdPhaseInterface;
   isShowingErrors: boolean;
-  errors: Record<string, string[]>;
+  errors?: PhaseValidationErrors<ColdPhaseInterface>;
   hotPhaseRolloverEnabled: boolean;
 }
-
 export class ColdPhase extends PureComponent<Props> {
   render() {
     const {
@@ -53,10 +57,6 @@ export class ColdPhase extends PureComponent<Props> {
       hotPhaseRolloverEnabled,
     } = this.props;
 
-    const freezeLabel = i18n.translate('xpack.indexLifecycleMgmt.coldPhase.freezeIndexLabel', {
-      defaultMessage: 'Freeze index',
-    });
-
     return (
       <div id="coldPhaseContent" aria-live="polite" role="region">
         <EuiDescribedFormGroup
@@ -68,7 +68,7 @@ export class ColdPhase extends PureComponent<Props> {
                   defaultMessage="Cold phase"
                 />
               </h2>{' '}
-              {phaseData[PHASE_ENABLED] && !isShowingErrors ? <ActiveBadge /> : null}
+              {phaseData.phaseEnabled && !isShowingErrors ? <ActiveBadge /> : null}
               <PhaseErrorMessage isShowingErrors={isShowingErrors} />
             </div>
           }
@@ -91,10 +91,10 @@ export class ColdPhase extends PureComponent<Props> {
                     defaultMessage="Activate cold phase"
                   />
                 }
-                id={`${PHASE_COLD}-${PHASE_ENABLED}`}
-                checked={phaseData[PHASE_ENABLED]}
+                id={`${coldProperty}-${phaseProperty('phaseEnabled')}`}
+                checked={phaseData.phaseEnabled}
                 onChange={(e) => {
-                  setPhaseData(PHASE_ENABLED, e.target.checked);
+                  setPhaseData(phaseProperty('phaseEnabled'), e.target.checked);
                 }}
                 aria-controls="coldPhaseContent"
               />
@@ -103,20 +103,20 @@ export class ColdPhase extends PureComponent<Props> {
           fullWidth
         >
           <Fragment>
-            {phaseData[PHASE_ENABLED] ? (
+            {phaseData.phaseEnabled ? (
               <Fragment>
-                <MinAgeInput
+                <MinAgeInput<ColdPhaseInterface>
                   errors={errors}
                   phaseData={phaseData}
-                  phase={PHASE_COLD}
+                  phase={coldProperty}
                   isShowingErrors={isShowingErrors}
                   setPhaseData={setPhaseData}
                   rolloverEnabled={hotPhaseRolloverEnabled}
                 />
                 <EuiSpacer />
 
-                <NodeAllocation
-                  phase={PHASE_COLD}
+                <NodeAllocation<ColdPhaseInterface>
+                  phase={coldProperty}
                   setPhaseData={setPhaseData}
                   errors={errors}
                   phaseData={phaseData}
@@ -126,7 +126,7 @@ export class ColdPhase extends PureComponent<Props> {
                 <EuiFlexGroup>
                   <EuiFlexItem grow={false} style={{ maxWidth: 188 }}>
                     <ErrableFormRow
-                      id={`${PHASE_COLD}-${PHASE_REPLICA_COUNT}`}
+                      id={`${coldProperty}-${phaseProperty('freezeEnabled')}`}
                       label={
                         <Fragment>
                           <FormattedMessage
@@ -136,9 +136,8 @@ export class ColdPhase extends PureComponent<Props> {
                           <OptionalLabel />
                         </Fragment>
                       }
-                      errorKey={PHASE_REPLICA_COUNT}
                       isShowingErrors={isShowingErrors}
-                      errors={errors}
+                      errors={errors?.freezeEnabled}
                       helpText={i18n.translate(
                         'xpack.indexLifecycleMgmt.coldPhase.replicaCountHelpText',
                         {
@@ -147,10 +146,10 @@ export class ColdPhase extends PureComponent<Props> {
                       )}
                     >
                       <EuiFieldNumber
-                        id={`${PHASE_COLD}-${PHASE_REPLICA_COUNT}`}
-                        value={phaseData[PHASE_REPLICA_COUNT]}
+                        id={`${coldProperty}-${phaseProperty('selectedReplicaCount')}`}
+                        value={phaseData.selectedReplicaCount}
                         onChange={(e) => {
-                          setPhaseData(PHASE_REPLICA_COUNT, e.target.value);
+                          setPhaseData(phaseProperty('selectedReplicaCount'), e.target.value);
                         }}
                         min={0}
                       />
@@ -163,7 +162,7 @@ export class ColdPhase extends PureComponent<Props> {
             )}
           </Fragment>
         </EuiDescribedFormGroup>
-        {phaseData[PHASE_ENABLED] ? (
+        {phaseData.phaseEnabled ? (
           <Fragment>
             <EuiDescribedFormGroup
               title={
@@ -189,18 +188,18 @@ export class ColdPhase extends PureComponent<Props> {
             >
               <EuiSwitch
                 data-test-subj="freezeSwitch"
-                checked={phaseData[PHASE_FREEZE_ENABLED]}
+                checked={phaseData.freezeEnabled}
                 onChange={(e) => {
-                  setPhaseData(PHASE_FREEZE_ENABLED, e.target.checked);
+                  setPhaseData(phaseProperty('freezeEnabled'), e.target.checked);
                 }}
                 label={freezeLabel}
                 aria-label={freezeLabel}
               />
             </EuiDescribedFormGroup>
-            <SetPriorityInput
+            <SetPriorityInput<ColdPhaseInterface>
               errors={errors}
               phaseData={phaseData}
-              phase={PHASE_COLD}
+              phase={coldProperty}
               isShowingErrors={isShowingErrors}
               setPhaseData={setPhaseData}
             />
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/delete_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/delete_phase.tsx
index 0143cc4af24e3..d3c73090f25f2 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/delete_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/delete_phase.tsx
@@ -8,7 +8,9 @@ import React, { PureComponent, Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiDescribedFormGroup, EuiSwitch, EuiTextColor, EuiFormRow } from '@elastic/eui';
 
-import { PHASE_DELETE, PHASE_ENABLED, PHASE_WAIT_FOR_SNAPSHOT_POLICY } from '../../../constants';
+import { DeletePhase as DeletePhaseInterface, Phases } from '../../../services/policies/types';
+import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
+
 import {
   ActiveBadge,
   LearnMoreLink,
@@ -18,11 +20,15 @@ import {
   SnapshotPolicies,
 } from '../components';
 
+const deleteProperty = propertyof<Phases>('delete');
+const phaseProperty = (propertyName: keyof DeletePhaseInterface) =>
+  propertyof<DeletePhaseInterface>(propertyName);
+
 interface Props {
-  setPhaseData: (key: string, value: any) => void;
-  phaseData: any;
+  setPhaseData: (key: keyof DeletePhaseInterface & string, value: string | boolean) => void;
+  phaseData: DeletePhaseInterface;
   isShowingErrors: boolean;
-  errors: Record<string, string[]>;
+  errors?: PhaseValidationErrors<DeletePhaseInterface>;
   hotPhaseRolloverEnabled: boolean;
   getUrlForApp: (
     appId: string,
@@ -55,7 +61,7 @@ export class DeletePhase extends PureComponent<Props> {
                   defaultMessage="Delete phase"
                 />
               </h2>{' '}
-              {phaseData[PHASE_ENABLED] && !isShowingErrors ? <ActiveBadge /> : null}
+              {phaseData.phaseEnabled && !isShowingErrors ? <ActiveBadge /> : null}
               <PhaseErrorMessage isShowingErrors={isShowingErrors} />
             </div>
           }
@@ -76,10 +82,10 @@ export class DeletePhase extends PureComponent<Props> {
                     defaultMessage="Activate delete phase"
                   />
                 }
-                id={`${PHASE_DELETE}-${PHASE_ENABLED}`}
-                checked={phaseData[PHASE_ENABLED]}
+                id={`${deleteProperty}-${phaseProperty('phaseEnabled')}`}
+                checked={phaseData.phaseEnabled}
                 onChange={(e) => {
-                  setPhaseData(PHASE_ENABLED, e.target.checked);
+                  setPhaseData(phaseProperty('phaseEnabled'), e.target.checked);
                 }}
                 aria-controls="deletePhaseContent"
               />
@@ -87,11 +93,11 @@ export class DeletePhase extends PureComponent<Props> {
           }
           fullWidth
         >
-          {phaseData[PHASE_ENABLED] ? (
-            <MinAgeInput
+          {phaseData.phaseEnabled ? (
+            <MinAgeInput<DeletePhaseInterface>
               errors={errors}
               phaseData={phaseData}
-              phase={PHASE_DELETE}
+              phase={deleteProperty}
               isShowingErrors={isShowingErrors}
               setPhaseData={setPhaseData}
               rolloverEnabled={hotPhaseRolloverEnabled}
@@ -100,7 +106,7 @@ export class DeletePhase extends PureComponent<Props> {
             <div />
           )}
         </EuiDescribedFormGroup>
-        {phaseData[PHASE_ENABLED] ? (
+        {phaseData.phaseEnabled ? (
           <EuiDescribedFormGroup
             title={
               <h3>
@@ -135,8 +141,8 @@ export class DeletePhase extends PureComponent<Props> {
               }
             >
               <SnapshotPolicies
-                value={phaseData[PHASE_WAIT_FOR_SNAPSHOT_POLICY]}
-                onChange={(value) => setPhaseData(PHASE_WAIT_FOR_SNAPSHOT_POLICY, value)}
+                value={phaseData.waitForSnapshotPolicy}
+                onChange={(value) => setPhaseData(phaseProperty('waitForSnapshotPolicy'), value)}
                 getUrlForApp={getUrlForApp}
               />
             </EuiFormRow>
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/hot_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/hot_phase.tsx
index dbd48f3a85634..22f0114d16afe 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/hot_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/hot_phase.tsx
@@ -7,7 +7,6 @@
 import React, { Fragment, PureComponent } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-
 import {
   EuiFlexGroup,
   EuiFlexItem,
@@ -19,15 +18,9 @@ import {
   EuiDescribedFormGroup,
 } from '@elastic/eui';
 
-import {
-  PHASE_HOT,
-  PHASE_ROLLOVER_MAX_AGE,
-  PHASE_ROLLOVER_MAX_AGE_UNITS,
-  PHASE_ROLLOVER_MAX_DOCUMENTS,
-  PHASE_ROLLOVER_MAX_SIZE_STORED,
-  PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS,
-  PHASE_ROLLOVER_ENABLED,
-} from '../../../constants';
+import { HotPhase as HotPhaseInterface, Phases } from '../../../services/policies/types';
+import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
+
 import {
   LearnMoreLink,
   ActiveBadge,
@@ -36,11 +29,98 @@ import {
   SetPriorityInput,
 } from '../components';
 
+const maxSizeStoredUnits = [
+  {
+    value: 'gb',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.gigabytesLabel', {
+      defaultMessage: 'gigabytes',
+    }),
+  },
+  {
+    value: 'mb',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.megabytesLabel', {
+      defaultMessage: 'megabytes',
+    }),
+  },
+  {
+    value: 'b',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.bytesLabel', {
+      defaultMessage: 'bytes',
+    }),
+  },
+  {
+    value: 'kb',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.kilobytesLabel', {
+      defaultMessage: 'kilobytes',
+    }),
+  },
+  {
+    value: 'tb',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.terabytesLabel', {
+      defaultMessage: 'terabytes',
+    }),
+  },
+  {
+    value: 'pb',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.petabytesLabel', {
+      defaultMessage: 'petabytes',
+    }),
+  },
+];
+
+const maxAgeUnits = [
+  {
+    value: 'd',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.daysLabel', {
+      defaultMessage: 'days',
+    }),
+  },
+  {
+    value: 'h',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.hoursLabel', {
+      defaultMessage: 'hours',
+    }),
+  },
+  {
+    value: 'm',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.minutesLabel', {
+      defaultMessage: 'minutes',
+    }),
+  },
+  {
+    value: 's',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.secondsLabel', {
+      defaultMessage: 'seconds',
+    }),
+  },
+  {
+    value: 'ms',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.millisecondsLabel', {
+      defaultMessage: 'milliseconds',
+    }),
+  },
+  {
+    value: 'micros',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.microsecondsLabel', {
+      defaultMessage: 'microseconds',
+    }),
+  },
+  {
+    value: 'nanos',
+    text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.nanosecondsLabel', {
+      defaultMessage: 'nanoseconds',
+    }),
+  },
+];
+const hotProperty = propertyof<Phases>('hot');
+const phaseProperty = (propertyName: keyof HotPhaseInterface) =>
+  propertyof<HotPhaseInterface>(propertyName);
+
 interface Props {
-  errors: Record<string, string[]>;
+  errors?: PhaseValidationErrors<HotPhaseInterface>;
   isShowingErrors: boolean;
-  phaseData: any;
-  setPhaseData: (key: string, value: any) => void;
+  phaseData: HotPhaseInterface;
+  setPhaseData: (key: keyof HotPhaseInterface & string, value: string | boolean) => void;
   setWarmPhaseOnRollover: (value: boolean) => void;
 }
 
@@ -104,39 +184,36 @@ export class HotPhase extends PureComponent<Props> {
           >
             <EuiSwitch
               data-test-subj="rolloverSwitch"
-              checked={phaseData[PHASE_ROLLOVER_ENABLED]}
+              checked={phaseData.rolloverEnabled}
               onChange={async (e) => {
-                const { checked } = e.target;
-                setPhaseData(PHASE_ROLLOVER_ENABLED, checked);
-                setWarmPhaseOnRollover(checked);
+                setWarmPhaseOnRollover(e.target.checked);
               }}
               label={i18n.translate('xpack.indexLifecycleMgmt.hotPhase.enableRolloverLabel', {
                 defaultMessage: 'Enable rollover',
               })}
             />
           </EuiFormRow>
-          {phaseData[PHASE_ROLLOVER_ENABLED] ? (
+          {phaseData.rolloverEnabled ? (
             <Fragment>
               <EuiSpacer size="m" />
               <EuiFlexGroup>
                 <EuiFlexItem style={{ maxWidth: 188 }}>
                   <ErrableFormRow
-                    id={`${PHASE_HOT}-${PHASE_ROLLOVER_MAX_SIZE_STORED}`}
+                    id={`${hotProperty}-${phaseProperty('selectedMaxSizeStored')}`}
                     label={i18n.translate(
                       'xpack.indexLifecycleMgmt.hotPhase.maximumIndexSizeLabel',
                       {
                         defaultMessage: 'Maximum index size',
                       }
                     )}
-                    errorKey={PHASE_ROLLOVER_MAX_SIZE_STORED}
                     isShowingErrors={isShowingErrors}
-                    errors={errors}
+                    errors={errors?.selectedMaxSizeStored}
                   >
                     <EuiFieldNumber
-                      id={`${PHASE_HOT}-${PHASE_ROLLOVER_MAX_SIZE_STORED}`}
-                      value={phaseData[PHASE_ROLLOVER_MAX_SIZE_STORED]}
+                      id={`${hotProperty}-${phaseProperty('selectedMaxSizeStored')}`}
+                      value={phaseData.selectedMaxSizeStored}
                       onChange={(e) => {
-                        setPhaseData(PHASE_ROLLOVER_MAX_SIZE_STORED, e.target.value);
+                        setPhaseData(phaseProperty('selectedMaxSizeStored'), e.target.value);
                       }}
                       min={1}
                     />
@@ -144,11 +221,10 @@ export class HotPhase extends PureComponent<Props> {
                 </EuiFlexItem>
                 <EuiFlexItem style={{ maxWidth: 188 }}>
                   <ErrableFormRow
-                    id={`${PHASE_HOT}-${PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS}`}
+                    id={`${hotProperty}-${phaseProperty('selectedMaxSizeStoredUnits')}`}
                     hasEmptyLabelSpace
-                    errorKey={PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS}
                     isShowingErrors={isShowingErrors}
-                    errors={errors}
+                    errors={errors?.selectedMaxSizeStoredUnits}
                   >
                     <EuiSelect
                       aria-label={i18n.translate(
@@ -157,48 +233,11 @@ export class HotPhase extends PureComponent<Props> {
                           defaultMessage: 'Maximum index size units',
                         }
                       )}
-                      value={phaseData[PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS]}
+                      value={phaseData.selectedMaxSizeStoredUnits}
                       onChange={(e) => {
-                        setPhaseData(PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS, e.target.value);
+                        setPhaseData(phaseProperty('selectedMaxSizeStoredUnits'), e.target.value);
                       }}
-                      options={[
-                        {
-                          value: 'gb',
-                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.gigabytesLabel', {
-                            defaultMessage: 'gigabytes',
-                          }),
-                        },
-                        {
-                          value: 'mb',
-                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.megabytesLabel', {
-                            defaultMessage: 'megabytes',
-                          }),
-                        },
-                        {
-                          value: 'b',
-                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.bytesLabel', {
-                            defaultMessage: 'bytes',
-                          }),
-                        },
-                        {
-                          value: 'kb',
-                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.kilobytesLabel', {
-                            defaultMessage: 'kilobytes',
-                          }),
-                        },
-                        {
-                          value: 'tb',
-                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.terabytesLabel', {
-                            defaultMessage: 'terabytes',
-                          }),
-                        },
-                        {
-                          value: 'pb',
-                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.petabytesLabel', {
-                            defaultMessage: 'petabytes',
-                          }),
-                        },
-                      ]}
+                      options={maxSizeStoredUnits}
                     />
                   </ErrableFormRow>
                 </EuiFlexItem>
@@ -207,22 +246,21 @@ export class HotPhase extends PureComponent<Props> {
               <EuiFlexGroup>
                 <EuiFlexItem style={{ maxWidth: 188 }}>
                   <ErrableFormRow
-                    id={`${PHASE_HOT}-${PHASE_ROLLOVER_MAX_DOCUMENTS}`}
+                    id={`${hotProperty}-${phaseProperty('selectedMaxDocuments')}`}
                     label={i18n.translate(
                       'xpack.indexLifecycleMgmt.hotPhase.maximumDocumentsLabel',
                       {
                         defaultMessage: 'Maximum documents',
                       }
                     )}
-                    errorKey={PHASE_ROLLOVER_MAX_DOCUMENTS}
                     isShowingErrors={isShowingErrors}
-                    errors={errors}
+                    errors={errors?.selectedMaxDocuments}
                   >
                     <EuiFieldNumber
-                      id={`${PHASE_HOT}-${PHASE_ROLLOVER_MAX_DOCUMENTS}`}
-                      value={phaseData[PHASE_ROLLOVER_MAX_DOCUMENTS]}
+                      id={`${hotProperty}-${phaseProperty('selectedMaxDocuments')}`}
+                      value={phaseData.selectedMaxDocuments}
                       onChange={(e) => {
-                        setPhaseData(PHASE_ROLLOVER_MAX_DOCUMENTS, e.target.value);
+                        setPhaseData(phaseProperty('selectedMaxDocuments'), e.target.value);
                       }}
                       min={1}
                     />
@@ -233,19 +271,18 @@ export class HotPhase extends PureComponent<Props> {
               <EuiFlexGroup>
                 <EuiFlexItem style={{ maxWidth: 188 }}>
                   <ErrableFormRow
-                    id={`${PHASE_HOT}-${PHASE_ROLLOVER_MAX_AGE}`}
+                    id={`${hotProperty}-${phaseProperty('selectedMaxAge')}`}
                     label={i18n.translate('xpack.indexLifecycleMgmt.hotPhase.maximumAgeLabel', {
                       defaultMessage: 'Maximum age',
                     })}
-                    errorKey={`${PHASE_ROLLOVER_MAX_AGE}`}
                     isShowingErrors={isShowingErrors}
-                    errors={errors}
+                    errors={errors?.selectedMaxAge}
                   >
                     <EuiFieldNumber
-                      id={`${PHASE_HOT}-${PHASE_ROLLOVER_MAX_AGE}`}
-                      value={phaseData[PHASE_ROLLOVER_MAX_AGE]}
+                      id={`${hotProperty}-${phaseProperty('selectedMaxAge')}`}
+                      value={phaseData.selectedMaxAge}
                       onChange={(e) => {
-                        setPhaseData(PHASE_ROLLOVER_MAX_AGE, e.target.value);
+                        setPhaseData(phaseProperty('selectedMaxAge'), e.target.value);
                       }}
                       min={1}
                     />
@@ -253,11 +290,10 @@ export class HotPhase extends PureComponent<Props> {
                 </EuiFlexItem>
                 <EuiFlexItem style={{ maxWidth: 188 }}>
                   <ErrableFormRow
-                    id={`${PHASE_HOT}-${PHASE_ROLLOVER_MAX_AGE_UNITS}`}
+                    id={`${hotProperty}-${phaseProperty('selectedMaxAgeUnits')}`}
                     hasEmptyLabelSpace
-                    errorKey={PHASE_ROLLOVER_MAX_AGE_UNITS}
                     isShowingErrors={isShowingErrors}
-                    errors={errors}
+                    errors={errors?.selectedMaxAgeUnits}
                   >
                     <EuiSelect
                       aria-label={i18n.translate(
@@ -266,63 +302,11 @@ export class HotPhase extends PureComponent<Props> {
                           defaultMessage: 'Maximum age units',
                         }
                       )}
-                      value={phaseData[PHASE_ROLLOVER_MAX_AGE_UNITS]}
+                      value={phaseData.selectedMaxAgeUnits}
                       onChange={(e) => {
-                        setPhaseData(PHASE_ROLLOVER_MAX_AGE_UNITS, e.target.value);
+                        setPhaseData(phaseProperty('selectedMaxAgeUnits'), e.target.value);
                       }}
-                      options={[
-                        {
-                          value: 'd',
-                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.daysLabel', {
-                            defaultMessage: 'days',
-                          }),
-                        },
-                        {
-                          value: 'h',
-                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.hoursLabel', {
-                            defaultMessage: 'hours',
-                          }),
-                        },
-                        {
-                          value: 'm',
-                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.minutesLabel', {
-                            defaultMessage: 'minutes',
-                          }),
-                        },
-                        {
-                          value: 's',
-                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.secondsLabel', {
-                            defaultMessage: 'seconds',
-                          }),
-                        },
-                        {
-                          value: 'ms',
-                          text: i18n.translate(
-                            'xpack.indexLifecycleMgmt.hotPhase.millisecondsLabel',
-                            {
-                              defaultMessage: 'milliseconds',
-                            }
-                          ),
-                        },
-                        {
-                          value: 'micros',
-                          text: i18n.translate(
-                            'xpack.indexLifecycleMgmt.hotPhase.microsecondsLabel',
-                            {
-                              defaultMessage: 'microseconds',
-                            }
-                          ),
-                        },
-                        {
-                          value: 'nanos',
-                          text: i18n.translate(
-                            'xpack.indexLifecycleMgmt.hotPhase.nanosecondsLabel',
-                            {
-                              defaultMessage: 'nanoseconds',
-                            }
-                          ),
-                        },
-                      ]}
+                      options={maxAgeUnits}
                     />
                   </ErrableFormRow>
                 </EuiFlexItem>
@@ -330,10 +314,10 @@ export class HotPhase extends PureComponent<Props> {
             </Fragment>
           ) : null}
         </EuiDescribedFormGroup>
-        <SetPriorityInput
+        <SetPriorityInput<HotPhaseInterface>
           errors={errors}
           phaseData={phaseData}
-          phase={PHASE_HOT}
+          phase={hotProperty}
           isShowingErrors={isShowingErrors}
           setPhaseData={setPhaseData}
         />
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/warm_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/warm_phase.tsx
index 6ed81bf8f45d5..f7b8c60a5c71f 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/warm_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/warm_phase.tsx
@@ -18,16 +18,6 @@ import {
   EuiDescribedFormGroup,
 } from '@elastic/eui';
 
-import {
-  PHASE_WARM,
-  PHASE_ENABLED,
-  WARM_PHASE_ON_ROLLOVER,
-  PHASE_FORCE_MERGE_ENABLED,
-  PHASE_FORCE_MERGE_SEGMENTS,
-  PHASE_PRIMARY_SHARD_COUNT,
-  PHASE_REPLICA_COUNT,
-  PHASE_SHRINK_ENABLED,
-} from '../../../constants';
 import {
   LearnMoreLink,
   ActiveBadge,
@@ -39,11 +29,33 @@ import {
   MinAgeInput,
 } from '../components';
 
+import { Phases, WarmPhase as WarmPhaseInterface } from '../../../services/policies/types';
+import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
+
+const shrinkLabel = i18n.translate('xpack.indexLifecycleMgmt.warmPhase.shrinkIndexLabel', {
+  defaultMessage: 'Shrink index',
+});
+
+const moveToWarmPhaseOnRolloverLabel = i18n.translate(
+  'xpack.indexLifecycleMgmt.warmPhase.moveToWarmPhaseOnRolloverLabel',
+  {
+    defaultMessage: 'Move to warm phase on rollover',
+  }
+);
+
+const forcemergeLabel = i18n.translate('xpack.indexLifecycleMgmt.warmPhase.forceMergeDataLabel', {
+  defaultMessage: 'Force merge data',
+});
+
+const warmProperty = propertyof<Phases>('warm');
+const phaseProperty = (propertyName: keyof WarmPhaseInterface) =>
+  propertyof<WarmPhaseInterface>(propertyName);
+
 interface Props {
-  setPhaseData: (key: string, value: any) => void;
-  phaseData: any;
+  setPhaseData: (key: keyof WarmPhaseInterface & string, value: boolean | string) => void;
+  phaseData: WarmPhaseInterface;
   isShowingErrors: boolean;
-  errors: Record<string, string[]>;
+  errors?: PhaseValidationErrors<WarmPhaseInterface>;
   hotPhaseRolloverEnabled: boolean;
 }
 export class WarmPhase extends PureComponent<Props> {
@@ -56,24 +68,6 @@ export class WarmPhase extends PureComponent<Props> {
       hotPhaseRolloverEnabled,
     } = this.props;
 
-    const shrinkLabel = i18n.translate('xpack.indexLifecycleMgmt.warmPhase.shrinkIndexLabel', {
-      defaultMessage: 'Shrink index',
-    });
-
-    const moveToWarmPhaseOnRolloverLabel = i18n.translate(
-      'xpack.indexLifecycleMgmt.warmPhase.moveToWarmPhaseOnRolloverLabel',
-      {
-        defaultMessage: 'Move to warm phase on rollover',
-      }
-    );
-
-    const forcemergeLabel = i18n.translate(
-      'xpack.indexLifecycleMgmt.warmPhase.forceMergeDataLabel',
-      {
-        defaultMessage: 'Force merge data',
-      }
-    );
-
     return (
       <div id="warmPhaseContent" aria-live="polite" role="region" aria-relevant="additions">
         <EuiDescribedFormGroup
@@ -85,7 +79,7 @@ export class WarmPhase extends PureComponent<Props> {
                   defaultMessage="Warm phase"
                 />
               </h2>{' '}
-              {phaseData[PHASE_ENABLED] && !isShowingErrors ? <ActiveBadge /> : null}
+              {phaseData.phaseEnabled && !isShowingErrors ? <ActiveBadge /> : null}
               <PhaseErrorMessage isShowingErrors={isShowingErrors} />
             </div>
           }
@@ -108,10 +102,10 @@ export class WarmPhase extends PureComponent<Props> {
                     defaultMessage="Activate warm phase"
                   />
                 }
-                id={`${PHASE_WARM}-${PHASE_ENABLED}`}
-                checked={phaseData[PHASE_ENABLED]}
+                id={`${warmProperty}-${phaseProperty('phaseEnabled')}`}
+                checked={phaseData.phaseEnabled}
                 onChange={(e) => {
-                  setPhaseData(PHASE_ENABLED, e.target.checked);
+                  setPhaseData(phaseProperty('phaseEnabled'), e.target.checked);
                 }}
                 aria-controls="warmPhaseContent"
               />
@@ -120,28 +114,28 @@ export class WarmPhase extends PureComponent<Props> {
           fullWidth
         >
           <Fragment>
-            {phaseData[PHASE_ENABLED] ? (
+            {phaseData.phaseEnabled ? (
               <Fragment>
                 {hotPhaseRolloverEnabled ? (
-                  <EuiFormRow id={`${PHASE_WARM}-${WARM_PHASE_ON_ROLLOVER}`}>
+                  <EuiFormRow id={`${warmProperty}-${phaseProperty('warmPhaseOnRollover')}`}>
                     <EuiSwitch
                       data-test-subj="warmPhaseOnRolloverSwitch"
                       label={moveToWarmPhaseOnRolloverLabel}
-                      id={`${PHASE_WARM}-${WARM_PHASE_ON_ROLLOVER}`}
-                      checked={phaseData[WARM_PHASE_ON_ROLLOVER]}
+                      id={`${warmProperty}-${phaseProperty('warmPhaseOnRollover')}`}
+                      checked={phaseData.warmPhaseOnRollover}
                       onChange={(e) => {
-                        setPhaseData(WARM_PHASE_ON_ROLLOVER, e.target.checked);
+                        setPhaseData(phaseProperty('warmPhaseOnRollover'), e.target.checked);
                       }}
                     />
                   </EuiFormRow>
                 ) : null}
-                {!phaseData[WARM_PHASE_ON_ROLLOVER] ? (
+                {!phaseData.warmPhaseOnRollover ? (
                   <Fragment>
                     <EuiSpacer size="m" />
-                    <MinAgeInput
+                    <MinAgeInput<WarmPhaseInterface>
                       errors={errors}
                       phaseData={phaseData}
-                      phase={PHASE_WARM}
+                      phase={warmProperty}
                       isShowingErrors={isShowingErrors}
                       setPhaseData={setPhaseData}
                       rolloverEnabled={hotPhaseRolloverEnabled}
@@ -151,8 +145,8 @@ export class WarmPhase extends PureComponent<Props> {
 
                 <EuiSpacer />
 
-                <NodeAllocation
-                  phase={PHASE_WARM}
+                <NodeAllocation<WarmPhaseInterface>
+                  phase={warmProperty}
                   setPhaseData={setPhaseData}
                   errors={errors}
                   phaseData={phaseData}
@@ -162,7 +156,7 @@ export class WarmPhase extends PureComponent<Props> {
                 <EuiFlexGroup>
                   <EuiFlexItem grow={false} style={{ maxWidth: 188 }}>
                     <ErrableFormRow
-                      id={`${PHASE_WARM}-${PHASE_REPLICA_COUNT}`}
+                      id={`${warmProperty}-${phaseProperty('selectedReplicaCount')}`}
                       label={
                         <Fragment>
                           <FormattedMessage
@@ -172,9 +166,8 @@ export class WarmPhase extends PureComponent<Props> {
                           <OptionalLabel />
                         </Fragment>
                       }
-                      errorKey={PHASE_REPLICA_COUNT}
                       isShowingErrors={isShowingErrors}
-                      errors={errors}
+                      errors={errors?.selectedReplicaCount}
                       helpText={i18n.translate(
                         'xpack.indexLifecycleMgmt.warmPhase.replicaCountHelpText',
                         {
@@ -183,10 +176,10 @@ export class WarmPhase extends PureComponent<Props> {
                       )}
                     >
                       <EuiFieldNumber
-                        id={`${PHASE_WARM}-${PHASE_REPLICA_COUNT}`}
-                        value={phaseData[PHASE_REPLICA_COUNT]}
+                        id={`${warmProperty}-${phaseProperty('selectedReplicaCount')}`}
+                        value={phaseData.selectedReplicaCount}
                         onChange={(e) => {
-                          setPhaseData(PHASE_REPLICA_COUNT, e.target.value);
+                          setPhaseData('selectedReplicaCount', e.target.value);
                         }}
                         min={0}
                       />
@@ -199,7 +192,7 @@ export class WarmPhase extends PureComponent<Props> {
             ) : null}
           </Fragment>
         </EuiDescribedFormGroup>
-        {phaseData[PHASE_ENABLED] ? (
+        {phaseData.phaseEnabled ? (
           <Fragment>
             <EuiDescribedFormGroup
               title={
@@ -225,9 +218,9 @@ export class WarmPhase extends PureComponent<Props> {
               <Fragment>
                 <EuiSwitch
                   data-test-subj="shrinkSwitch"
-                  checked={phaseData[PHASE_SHRINK_ENABLED]}
+                  checked={phaseData.shrinkEnabled}
                   onChange={(e) => {
-                    setPhaseData(PHASE_SHRINK_ENABLED, e.target.checked);
+                    setPhaseData(phaseProperty('shrinkEnabled'), e.target.checked);
                   }}
                   label={shrinkLabel}
                   aria-label={shrinkLabel}
@@ -235,28 +228,30 @@ export class WarmPhase extends PureComponent<Props> {
                 />
 
                 <div id="shrinkContent" aria-live="polite" role="region">
-                  {phaseData[PHASE_SHRINK_ENABLED] ? (
+                  {phaseData.shrinkEnabled ? (
                     <Fragment>
                       <EuiSpacer />
                       <EuiFlexGroup>
                         <EuiFlexItem grow={false}>
                           <ErrableFormRow
-                            id={`${PHASE_WARM}-${PHASE_PRIMARY_SHARD_COUNT}`}
+                            id={`${warmProperty}-${phaseProperty('selectedPrimaryShardCount')}`}
                             label={i18n.translate(
                               'xpack.indexLifecycleMgmt.warmPhase.numberOfPrimaryShardsLabel',
                               {
                                 defaultMessage: 'Number of primary shards',
                               }
                             )}
-                            errorKey={PHASE_PRIMARY_SHARD_COUNT}
                             isShowingErrors={isShowingErrors}
-                            errors={errors}
+                            errors={errors?.selectedPrimaryShardCount}
                           >
                             <EuiFieldNumber
-                              id={`${PHASE_WARM}-${PHASE_PRIMARY_SHARD_COUNT}`}
-                              value={phaseData[PHASE_PRIMARY_SHARD_COUNT]}
+                              id={`${warmProperty}-${phaseProperty('selectedPrimaryShardCount')}`}
+                              value={phaseData.selectedPrimaryShardCount}
                               onChange={(e) => {
-                                setPhaseData(PHASE_PRIMARY_SHARD_COUNT, e.target.value);
+                                setPhaseData(
+                                  phaseProperty('selectedPrimaryShardCount'),
+                                  e.target.value
+                                );
                               }}
                               min={1}
                             />
@@ -294,33 +289,32 @@ export class WarmPhase extends PureComponent<Props> {
                 data-test-subj="forceMergeSwitch"
                 label={forcemergeLabel}
                 aria-label={forcemergeLabel}
-                checked={phaseData[PHASE_FORCE_MERGE_ENABLED]}
+                checked={phaseData.forceMergeEnabled}
                 onChange={(e) => {
-                  setPhaseData(PHASE_FORCE_MERGE_ENABLED, e.target.checked);
+                  setPhaseData(phaseProperty('forceMergeEnabled'), e.target.checked);
                 }}
                 aria-controls="forcemergeContent"
               />
 
               <EuiSpacer />
               <div id="forcemergeContent" aria-live="polite" role="region">
-                {phaseData[PHASE_FORCE_MERGE_ENABLED] ? (
+                {phaseData.forceMergeEnabled ? (
                   <ErrableFormRow
-                    id={`${PHASE_WARM}-${PHASE_FORCE_MERGE_SEGMENTS}`}
+                    id={`${warmProperty}-${phaseProperty('selectedForceMergeSegments')}`}
                     label={i18n.translate(
                       'xpack.indexLifecycleMgmt.warmPhase.numberOfSegmentsLabel',
                       {
                         defaultMessage: 'Number of segments',
                       }
                     )}
-                    errorKey={PHASE_FORCE_MERGE_SEGMENTS}
                     isShowingErrors={isShowingErrors}
-                    errors={errors}
+                    errors={errors?.selectedForceMergeSegments}
                   >
                     <EuiFieldNumber
-                      id={`${PHASE_WARM}-${PHASE_FORCE_MERGE_SEGMENTS}`}
-                      value={phaseData[PHASE_FORCE_MERGE_SEGMENTS]}
+                      id={`${warmProperty}-${phaseProperty('selectedForceMergeSegments')}`}
+                      value={phaseData.selectedForceMergeSegments}
                       onChange={(e) => {
-                        setPhaseData(PHASE_FORCE_MERGE_SEGMENTS, e.target.value);
+                        setPhaseData(phaseProperty('selectedForceMergeSegments'), e.target.value);
                       }}
                       min={1}
                     />
@@ -328,10 +322,10 @@ export class WarmPhase extends PureComponent<Props> {
                 ) : null}
               </div>
             </EuiDescribedFormGroup>
-            <SetPriorityInput
+            <SetPriorityInput<WarmPhaseInterface>
               errors={errors}
               phaseData={phaseData}
-              phase={PHASE_WARM}
+              phase={warmProperty}
               isShowingErrors={isShowingErrors}
               setPhaseData={setPhaseData}
             />
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.js
index 500ab44d96694..ec1cdb987f4b3 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.js
@@ -38,7 +38,7 @@ import {
 import { RIGHT_ALIGNMENT } from '@elastic/eui/lib/services';
 import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
 import { getIndexListUri } from '../../../../../../../index_management/public';
-import { UIM_EDIT_CLICK } from '../../../../constants';
+import { UIM_EDIT_CLICK } from '../../../../constants/ui_metric';
 import { getPolicyPath } from '../../../../services/navigation';
 import { flattenPanelTree } from '../../../../services/flatten_panel_tree';
 import { trackUiMetric } from '../../../../services/ui_metric';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
index 61de37bbfad11..b80e9e70c54fa 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/api.ts
@@ -12,10 +12,11 @@ import {
   UIM_POLICY_ATTACH_INDEX_TEMPLATE,
   UIM_POLICY_DETACH_INDEX,
   UIM_INDEX_RETRY_STEP,
-} from '../constants';
+} from '../constants/ui_metric';
 
 import { trackUiMetric } from './ui_metric';
 import { sendGet, sendPost, sendDelete, useRequest } from './http';
+import { PolicyFromES, SerializedPolicy } from './policies/types';
 
 interface GenericObject {
   [key: string]: any;
@@ -44,7 +45,15 @@ export async function loadPolicies(withIndices: boolean) {
   return await sendGet('policies', { withIndices });
 }
 
-export async function savePolicy(policy: GenericObject) {
+export const useLoadPoliciesList = (withIndices: boolean) => {
+  return useRequest<PolicyFromES[]>({
+    path: `policies`,
+    method: 'get',
+    query: { withIndices },
+  });
+};
+
+export async function savePolicy(policy: SerializedPolicy) {
   return await sendPost(`policies`, policy);
 }
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/find_errors.js b/x-pack/plugins/index_lifecycle_management/public/application/services/find_errors.js
deleted file mode 100644
index 12b53ad1eaf52..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/find_errors.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const findFirstError = (object, topLevel = true) => {
-  let firstError;
-  const keys = topLevel ? ['policyName', 'hot', 'warm', 'cold', 'delete'] : Object.keys(object);
-  for (const key of keys) {
-    const value = object[key];
-    if (Array.isArray(value) && value.length > 0) {
-      firstError = key;
-      break;
-    } else if (value) {
-      firstError = findFirstError(value, false);
-      if (firstError) {
-        firstError = `${key}.${firstError}`;
-        break;
-      }
-    }
-  }
-  return firstError;
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts
new file mode 100644
index 0000000000000..d9ed7a0bf51eb
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts
@@ -0,0 +1,159 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { isEmpty } from 'lodash';
+import { serializedPhaseInitialization } from '../../constants';
+import { AllocateAction, ColdPhase, SerializedColdPhase } from './types';
+import { isNumber, splitSizeAndUnits } from './policy_serialization';
+import {
+  numberRequiredMessage,
+  PhaseValidationErrors,
+  positiveNumberRequiredMessage,
+} from './policy_validation';
+
+const coldPhaseInitialization: ColdPhase = {
+  phaseEnabled: false,
+  selectedMinimumAge: '0',
+  selectedMinimumAgeUnits: 'd',
+  selectedNodeAttrs: '',
+  selectedReplicaCount: '',
+  freezeEnabled: false,
+  phaseIndexPriority: '',
+};
+
+export const coldPhaseFromES = (phaseSerialized?: SerializedColdPhase): ColdPhase => {
+  const phase = { ...coldPhaseInitialization };
+  if (phaseSerialized === undefined || phaseSerialized === null) {
+    return phase;
+  }
+
+  phase.phaseEnabled = true;
+
+  if (phaseSerialized.min_age) {
+    const { size: minAge, units: minAgeUnits } = splitSizeAndUnits(phaseSerialized.min_age);
+    phase.selectedMinimumAge = minAge;
+    phase.selectedMinimumAgeUnits = minAgeUnits;
+  }
+
+  if (phaseSerialized.actions) {
+    const actions = phaseSerialized.actions;
+    if (actions.allocate) {
+      const allocate = actions.allocate;
+      if (allocate.require) {
+        Object.entries(allocate.require).forEach((entry) => {
+          phase.selectedNodeAttrs = entry.join(':');
+        });
+        if (allocate.number_of_replicas) {
+          phase.selectedReplicaCount = allocate.number_of_replicas.toString();
+        }
+      }
+    }
+
+    if (actions.freeze) {
+      phase.freezeEnabled = true;
+    }
+
+    if (actions.set_priority) {
+      phase.phaseIndexPriority = actions.set_priority.priority
+        ? actions.set_priority.priority.toString()
+        : '';
+    }
+  }
+
+  return phase;
+};
+
+export const coldPhaseToES = (
+  phase: ColdPhase,
+  originalPhase: SerializedColdPhase | undefined
+): SerializedColdPhase => {
+  if (!originalPhase) {
+    originalPhase = { ...serializedPhaseInitialization };
+  }
+
+  const esPhase = { ...originalPhase };
+
+  if (isNumber(phase.selectedMinimumAge)) {
+    esPhase.min_age = `${phase.selectedMinimumAge}${phase.selectedMinimumAgeUnits}`;
+  }
+
+  esPhase.actions = esPhase.actions ? { ...esPhase.actions } : {};
+
+  if (phase.selectedNodeAttrs) {
+    const [name, value] = phase.selectedNodeAttrs.split(':');
+    esPhase.actions.allocate = esPhase.actions.allocate || ({} as AllocateAction);
+    esPhase.actions.allocate.require = {
+      [name]: value,
+    };
+  } else {
+    if (esPhase.actions.allocate) {
+      delete esPhase.actions.allocate.require;
+    }
+  }
+
+  if (isNumber(phase.selectedReplicaCount)) {
+    esPhase.actions.allocate = esPhase.actions.allocate || ({} as AllocateAction);
+    esPhase.actions.allocate.number_of_replicas = parseInt(phase.selectedReplicaCount, 10);
+  } else {
+    if (esPhase.actions.allocate) {
+      delete esPhase.actions.allocate.number_of_replicas;
+    }
+  }
+
+  if (
+    esPhase.actions.allocate &&
+    !esPhase.actions.allocate.require &&
+    !isNumber(esPhase.actions.allocate.number_of_replicas) &&
+    isEmpty(esPhase.actions.allocate.include) &&
+    isEmpty(esPhase.actions.allocate.exclude)
+  ) {
+    // remove allocate action if it does not define require or number of nodes
+    // and both include and exclude are empty objects (ES will fail to parse if we don't)
+    delete esPhase.actions.allocate;
+  }
+
+  if (phase.freezeEnabled) {
+    esPhase.actions.freeze = {};
+  } else {
+    delete esPhase.actions.freeze;
+  }
+
+  if (isNumber(phase.phaseIndexPriority)) {
+    esPhase.actions.set_priority = {
+      priority: parseInt(phase.phaseIndexPriority, 10),
+    };
+  } else {
+    delete esPhase.actions.set_priority;
+  }
+
+  return esPhase;
+};
+
+export const validateColdPhase = (phase: ColdPhase): PhaseValidationErrors<ColdPhase> => {
+  if (!phase.phaseEnabled) {
+    return {};
+  }
+
+  const phaseErrors = {} as PhaseValidationErrors<ColdPhase>;
+
+  // index priority is optional, but if it's set, it needs to be a positive number
+  if (phase.phaseIndexPriority) {
+    if (!isNumber(phase.phaseIndexPriority)) {
+      phaseErrors.phaseIndexPriority = [numberRequiredMessage];
+    } else if (parseInt(phase.phaseIndexPriority, 10) < 0) {
+      phaseErrors.phaseIndexPriority = [positiveNumberRequiredMessage];
+    }
+  }
+
+  // min age needs to be a positive number
+  if (!isNumber(phase.selectedMinimumAge)) {
+    phaseErrors.phaseIndexPriority = [numberRequiredMessage];
+  } else if (parseInt(phase.selectedMinimumAge, 10) < 0) {
+    phaseErrors.phaseIndexPriority = [positiveNumberRequiredMessage];
+  }
+
+  return { ...phaseErrors };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/delete_phase.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/delete_phase.ts
new file mode 100644
index 0000000000000..70e7c21da8cb6
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/delete_phase.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { serializedPhaseInitialization } from '../../constants';
+import { DeletePhase, SerializedDeletePhase } from './types';
+import { isNumber, splitSizeAndUnits } from './policy_serialization';
+import {
+  numberRequiredMessage,
+  PhaseValidationErrors,
+  positiveNumberRequiredMessage,
+} from './policy_validation';
+
+const deletePhaseInitialization: DeletePhase = {
+  phaseEnabled: false,
+  selectedMinimumAge: '0',
+  selectedMinimumAgeUnits: 'd',
+  waitForSnapshotPolicy: '',
+};
+
+export const deletePhaseFromES = (phaseSerialized?: SerializedDeletePhase): DeletePhase => {
+  const phase = { ...deletePhaseInitialization };
+  if (phaseSerialized === undefined || phaseSerialized === null) {
+    return phase;
+  }
+
+  phase.phaseEnabled = true;
+  if (phaseSerialized.min_age) {
+    const { size: minAge, units: minAgeUnits } = splitSizeAndUnits(phaseSerialized.min_age);
+    phase.selectedMinimumAge = minAge;
+    phase.selectedMinimumAgeUnits = minAgeUnits;
+  }
+
+  if (phaseSerialized.actions) {
+    const actions = phaseSerialized.actions;
+
+    if (actions.wait_for_snapshot) {
+      phase.waitForSnapshotPolicy = actions.wait_for_snapshot.policy;
+    }
+  }
+
+  return phase;
+};
+
+export const deletePhaseToES = (
+  phase: DeletePhase,
+  originalEsPhase?: SerializedDeletePhase
+): SerializedDeletePhase => {
+  if (!originalEsPhase) {
+    originalEsPhase = { ...serializedPhaseInitialization };
+  }
+  const esPhase = { ...originalEsPhase };
+
+  if (isNumber(phase.selectedMinimumAge)) {
+    esPhase.min_age = `${phase.selectedMinimumAge}${phase.selectedMinimumAgeUnits}`;
+  }
+
+  esPhase.actions = esPhase.actions ? { ...esPhase.actions } : {};
+
+  if (phase.waitForSnapshotPolicy) {
+    esPhase.actions.wait_for_snapshot = {
+      policy: phase.waitForSnapshotPolicy,
+    };
+  } else {
+    delete esPhase.actions.wait_for_snapshot;
+  }
+
+  return esPhase;
+};
+
+export const validateDeletePhase = (phase: DeletePhase): PhaseValidationErrors<DeletePhase> => {
+  if (!phase.phaseEnabled) {
+    return {};
+  }
+
+  const phaseErrors = {} as PhaseValidationErrors<DeletePhase>;
+
+  // min age needs to be a positive number
+  if (!isNumber(phase.selectedMinimumAge)) {
+    phaseErrors.selectedMinimumAge = [numberRequiredMessage];
+  } else if (parseInt(phase.selectedMinimumAge, 10) < 0) {
+    phaseErrors.selectedMinimumAge = [positiveNumberRequiredMessage];
+  }
+
+  return { ...phaseErrors };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/hot_phase.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/hot_phase.ts
new file mode 100644
index 0000000000000..34ac8f3e270e6
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/hot_phase.ts
@@ -0,0 +1,155 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { serializedPhaseInitialization } from '../../constants';
+import { isNumber, splitSizeAndUnits } from './policy_serialization';
+import { HotPhase, SerializedHotPhase } from './types';
+import {
+  maximumAgeRequiredMessage,
+  maximumDocumentsRequiredMessage,
+  maximumSizeRequiredMessage,
+  numberRequiredMessage,
+  PhaseValidationErrors,
+  positiveNumberRequiredMessage,
+  positiveNumbersAboveZeroErrorMessage,
+} from './policy_validation';
+
+const hotPhaseInitialization: HotPhase = {
+  phaseEnabled: false,
+  rolloverEnabled: false,
+  selectedMaxAge: '',
+  selectedMaxAgeUnits: 'd',
+  selectedMaxSizeStored: '',
+  selectedMaxSizeStoredUnits: 'gb',
+  phaseIndexPriority: '',
+  selectedMaxDocuments: '',
+};
+
+export const hotPhaseFromES = (phaseSerialized?: SerializedHotPhase): HotPhase => {
+  const phase: HotPhase = { ...hotPhaseInitialization };
+
+  if (phaseSerialized === undefined || phaseSerialized === null) {
+    return phase;
+  }
+
+  phase.phaseEnabled = true;
+
+  if (phaseSerialized.actions) {
+    const actions = phaseSerialized.actions;
+
+    if (actions.rollover) {
+      const rollover = actions.rollover;
+      phase.rolloverEnabled = true;
+      if (rollover.max_age) {
+        const { size: maxAge, units: maxAgeUnits } = splitSizeAndUnits(rollover.max_age);
+        phase.selectedMaxAge = maxAge;
+        phase.selectedMaxAgeUnits = maxAgeUnits;
+      }
+      if (rollover.max_size) {
+        const { size: maxSize, units: maxSizeUnits } = splitSizeAndUnits(rollover.max_size);
+        phase.selectedMaxSizeStored = maxSize;
+        phase.selectedMaxSizeStoredUnits = maxSizeUnits;
+      }
+      if (rollover.max_docs) {
+        phase.selectedMaxDocuments = rollover.max_docs.toString();
+      }
+    }
+
+    if (actions.set_priority) {
+      phase.phaseIndexPriority = actions.set_priority.priority
+        ? actions.set_priority.priority.toString()
+        : '';
+    }
+  }
+
+  return phase;
+};
+
+export const hotPhaseToES = (
+  phase: HotPhase,
+  originalPhase?: SerializedHotPhase
+): SerializedHotPhase => {
+  if (!originalPhase) {
+    originalPhase = { ...serializedPhaseInitialization };
+  }
+
+  const esPhase = { ...originalPhase };
+
+  esPhase.actions = esPhase.actions ? { ...esPhase.actions } : {};
+
+  if (phase.rolloverEnabled) {
+    if (!esPhase.actions.rollover) {
+      esPhase.actions.rollover = {};
+    }
+    if (isNumber(phase.selectedMaxAge)) {
+      esPhase.actions.rollover.max_age = `${phase.selectedMaxAge}${phase.selectedMaxAgeUnits}`;
+    }
+    if (isNumber(phase.selectedMaxSizeStored)) {
+      esPhase.actions.rollover.max_size = `${phase.selectedMaxSizeStored}${phase.selectedMaxSizeStoredUnits}`;
+    }
+    if (isNumber(phase.selectedMaxDocuments)) {
+      esPhase.actions.rollover.max_docs = parseInt(phase.selectedMaxDocuments, 10);
+    }
+  } else {
+    delete esPhase.actions.rollover;
+  }
+
+  if (isNumber(phase.phaseIndexPriority)) {
+    esPhase.actions.set_priority = {
+      priority: parseInt(phase.phaseIndexPriority, 10),
+    };
+  } else {
+    delete esPhase.actions.set_priority;
+  }
+
+  return esPhase;
+};
+
+export const validateHotPhase = (phase: HotPhase): PhaseValidationErrors<HotPhase> => {
+  if (!phase.phaseEnabled) {
+    return {};
+  }
+
+  const phaseErrors = {} as PhaseValidationErrors<HotPhase>;
+
+  // index priority is optional, but if it's set, it needs to be a positive number
+  if (phase.phaseIndexPriority) {
+    if (!isNumber(phase.phaseIndexPriority)) {
+      phaseErrors.phaseIndexPriority = [numberRequiredMessage];
+    } else if (parseInt(phase.phaseIndexPriority, 10) < 0) {
+      phaseErrors.phaseIndexPriority = [positiveNumberRequiredMessage];
+    }
+  }
+
+  // if rollover is enabled
+  if (phase.rolloverEnabled) {
+    // either max_age, max_size or max_documents need to be set
+    if (
+      !isNumber(phase.selectedMaxAge) &&
+      !isNumber(phase.selectedMaxSizeStored) &&
+      !isNumber(phase.selectedMaxDocuments)
+    ) {
+      phaseErrors.selectedMaxAge = [maximumAgeRequiredMessage];
+      phaseErrors.selectedMaxSizeStored = [maximumSizeRequiredMessage];
+      phaseErrors.selectedMaxDocuments = [maximumDocumentsRequiredMessage];
+    }
+
+    // max age, max size and max docs need to be above zero if set
+    if (isNumber(phase.selectedMaxAge) && parseInt(phase.selectedMaxAge, 10) < 1) {
+      phaseErrors.selectedMaxAge = [positiveNumbersAboveZeroErrorMessage];
+    }
+    if (isNumber(phase.selectedMaxSizeStored) && parseInt(phase.selectedMaxSizeStored, 10) < 1) {
+      phaseErrors.selectedMaxSizeStored = [positiveNumbersAboveZeroErrorMessage];
+    }
+    if (isNumber(phase.selectedMaxDocuments) && parseInt(phase.selectedMaxDocuments, 10) < 1) {
+      phaseErrors.selectedMaxDocuments = [positiveNumbersAboveZeroErrorMessage];
+    }
+  }
+
+  return {
+    ...phaseErrors,
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/lifecycle.js b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_save.ts
similarity index 58%
rename from x-pack/plugins/index_lifecycle_management/public/application/store/actions/lifecycle.js
rename to x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_save.ts
index 0bb6543482bd6..12df071544952 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/lifecycle.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_save.ts
@@ -5,28 +5,36 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { METRIC_TYPE } from '@kbn/analytics';
 
-import { UIM_POLICY_CREATE, UIM_POLICY_UPDATE } from '../../constants';
-import { showApiError } from '../../services/api_errors';
-import { toasts } from '../../services/notification';
-import { savePolicy as savePolicyApi } from '../../services/api';
-import { trackUiMetric, getUiMetricsForPhases } from '../../services/ui_metric';
+import { savePolicy as savePolicyApi } from '../api';
+import { showApiError } from '../api_errors';
+import { getUiMetricsForPhases, trackUiMetric } from '../ui_metric';
+import { UIM_POLICY_CREATE, UIM_POLICY_UPDATE } from '../../constants/ui_metric';
+import { toasts } from '../notification';
+import { Policy, PolicyFromES } from './types';
+import { serializePolicy } from './policy_serialization';
 
-export const saveLifecyclePolicy = (lifecycle, isNew) => async () => {
+export const savePolicy = async (
+  policy: Policy,
+  isNew: boolean,
+  originalEsPolicy?: PolicyFromES
+): Promise<boolean> => {
+  const serializedPolicy = serializePolicy(policy, originalEsPolicy?.policy);
   try {
-    await savePolicyApi(lifecycle);
+    await savePolicyApi(serializedPolicy);
   } catch (err) {
     const title = i18n.translate('xpack.indexLifecycleMgmt.editPolicy.saveErrorMessage', {
       defaultMessage: 'Error saving lifecycle policy {lifecycleName}',
-      values: { lifecycleName: lifecycle.name },
+      values: { lifecycleName: policy.name },
     });
     showApiError(err, title);
     return false;
   }
 
-  const uiMetrics = getUiMetricsForPhases(lifecycle.phases);
+  const uiMetrics = getUiMetricsForPhases(serializedPolicy.phases);
   uiMetrics.push(isNew ? UIM_POLICY_CREATE : UIM_POLICY_UPDATE);
-  trackUiMetric('count', uiMetrics);
+  trackUiMetric(METRIC_TYPE.COUNT, uiMetrics);
 
   const message = i18n.translate('xpack.indexLifecycleMgmt.editPolicy.successfulSaveMessage', {
     defaultMessage: '{verb} lifecycle policy "{lifecycleName}"',
@@ -38,7 +46,7 @@ export const saveLifecyclePolicy = (lifecycle, isNew) => async () => {
         : i18n.translate('xpack.indexLifecycleMgmt.editPolicy.updatedMessage', {
             defaultMessage: 'Updated',
           }),
-      lifecycleName: lifecycle.name,
+      lifecycleName: policy.name,
     },
   });
   toasts.addSuccess(message);
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_serialization.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_serialization.ts
new file mode 100644
index 0000000000000..3953521df1817
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_serialization.ts
@@ -0,0 +1,104 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  defaultNewColdPhase,
+  defaultNewDeletePhase,
+  defaultNewHotPhase,
+  defaultNewWarmPhase,
+  serializedPhaseInitialization,
+} from '../../constants';
+
+import { Policy, PolicyFromES, SerializedPolicy } from './types';
+
+import { hotPhaseFromES, hotPhaseToES } from './hot_phase';
+import { warmPhaseFromES, warmPhaseToES } from './warm_phase';
+import { coldPhaseFromES, coldPhaseToES } from './cold_phase';
+import { deletePhaseFromES, deletePhaseToES } from './delete_phase';
+
+export const splitSizeAndUnits = (field: string): { size: string; units: string } => {
+  let size = '';
+  let units = '';
+
+  const result = /(\d+)(\w+)/.exec(field);
+  if (result) {
+    size = result[1];
+    units = result[2];
+  }
+
+  return {
+    size,
+    units,
+  };
+};
+
+export const isNumber = (value: any): boolean => value !== '' && value !== null && isFinite(value);
+
+export const getPolicyByName = (
+  policies: PolicyFromES[] | null | undefined,
+  policyName: string = ''
+): PolicyFromES | undefined => {
+  if (policies && policies.length > 0) {
+    return policies.find((policy: PolicyFromES) => policy.name === policyName);
+  }
+};
+
+export const initializeNewPolicy = (newPolicyName: string = ''): Policy => {
+  return {
+    name: newPolicyName,
+    phases: {
+      hot: { ...defaultNewHotPhase },
+      warm: { ...defaultNewWarmPhase },
+      cold: { ...defaultNewColdPhase },
+      delete: { ...defaultNewDeletePhase },
+    },
+  };
+};
+
+export const deserializePolicy = (policy: PolicyFromES): Policy => {
+  const {
+    name,
+    policy: { phases },
+  } = policy;
+
+  return {
+    name,
+    phases: {
+      hot: hotPhaseFromES(phases.hot),
+      warm: warmPhaseFromES(phases.warm),
+      cold: coldPhaseFromES(phases.cold),
+      delete: deletePhaseFromES(phases.delete),
+    },
+  };
+};
+
+export const serializePolicy = (
+  policy: Policy,
+  originalEsPolicy: SerializedPolicy = {
+    name: policy.name,
+    phases: { hot: { ...serializedPhaseInitialization } },
+  }
+): SerializedPolicy => {
+  const serializedPolicy = {
+    name: policy.name,
+    phases: { hot: hotPhaseToES(policy.phases.hot, originalEsPolicy.phases.hot) },
+  } as SerializedPolicy;
+  if (policy.phases.warm.phaseEnabled) {
+    serializedPolicy.phases.warm = warmPhaseToES(policy.phases.warm, originalEsPolicy.phases.warm);
+  }
+
+  if (policy.phases.cold.phaseEnabled) {
+    serializedPolicy.phases.cold = coldPhaseToES(policy.phases.cold, originalEsPolicy.phases.cold);
+  }
+
+  if (policy.phases.delete.phaseEnabled) {
+    serializedPolicy.phases.delete = deletePhaseToES(
+      policy.phases.delete,
+      originalEsPolicy.phases.delete
+    );
+  }
+  return serializedPolicy;
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_validation.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_validation.ts
new file mode 100644
index 0000000000000..545488be2cd5e
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_validation.ts
@@ -0,0 +1,191 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { validateHotPhase } from './hot_phase';
+import { validateWarmPhase } from './warm_phase';
+import { validateColdPhase } from './cold_phase';
+import { validateDeletePhase } from './delete_phase';
+import { ColdPhase, DeletePhase, HotPhase, Phase, Policy, PolicyFromES, WarmPhase } from './types';
+
+export const propertyof = <T>(propertyName: keyof T & string) => propertyName;
+
+export const numberRequiredMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.numberRequiredError',
+  {
+    defaultMessage: 'A number is required.',
+  }
+);
+
+// TODO validation includes 0 -> should be non-negative number?
+export const positiveNumberRequiredMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.positiveNumberRequiredError',
+  {
+    defaultMessage: 'Only positive numbers are allowed.',
+  }
+);
+
+export const maximumAgeRequiredMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.maximumAgeMissingError',
+  {
+    defaultMessage: 'A maximum age is required.',
+  }
+);
+
+export const maximumSizeRequiredMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.maximumIndexSizeMissingError',
+  {
+    defaultMessage: 'A maximum index size is required.',
+  }
+);
+
+export const maximumDocumentsRequiredMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.maximumDocumentsMissingError',
+  {
+    defaultMessage: 'Maximum documents is required.',
+  }
+);
+
+export const positiveNumbersAboveZeroErrorMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.positiveNumberAboveZeroRequiredError',
+  {
+    defaultMessage: 'Only numbers above 0 are allowed.',
+  }
+);
+
+export const policyNameRequiredMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.policyNameRequiredError',
+  {
+    defaultMessage: 'A policy name is required.',
+  }
+);
+
+export const policyNameStartsWithUnderscoreErrorMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.policyNameStartsWithUnderscoreError',
+  {
+    defaultMessage: 'A policy name cannot start with an underscore.',
+  }
+);
+export const policyNameContainsCommaErrorMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.policyNameContainsCommaError',
+  {
+    defaultMessage: 'A policy name cannot include a comma.',
+  }
+);
+export const policyNameContainsSpaceErrorMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.policyNameContainsSpaceError',
+  {
+    defaultMessage: 'A policy name cannot include a space.',
+  }
+);
+
+export const policyNameTooLongErrorMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.policyNameTooLongError',
+  {
+    defaultMessage: 'A policy name cannot be longer than 255 bytes.',
+  }
+);
+export const policyNameMustBeDifferentErrorMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.differentPolicyNameRequiredError',
+  {
+    defaultMessage: 'The policy name must be different.',
+  }
+);
+export const policyNameAlreadyUsedErrorMessage = i18n.translate(
+  'xpack.indexLifecycleMgmt.editPolicy.policyNameAlreadyUsedError',
+  {
+    defaultMessage: 'That policy name is already used.',
+  }
+);
+export type PhaseValidationErrors<T extends Phase> = {
+  [P in keyof Partial<T>]: string[];
+};
+
+export interface ValidationErrors {
+  hot: PhaseValidationErrors<HotPhase>;
+  warm: PhaseValidationErrors<WarmPhase>;
+  cold: PhaseValidationErrors<ColdPhase>;
+  delete: PhaseValidationErrors<DeletePhase>;
+  policyName: string[];
+}
+
+export const validatePolicy = (
+  saveAsNew: boolean,
+  policy: Policy,
+  policies: PolicyFromES[],
+  originalPolicyName: string
+): [boolean, ValidationErrors] => {
+  const policyNameErrors: string[] = [];
+  if (!policy.name) {
+    policyNameErrors.push(policyNameRequiredMessage);
+  } else {
+    if (policy.name.startsWith('_')) {
+      policyNameErrors.push(policyNameStartsWithUnderscoreErrorMessage);
+    }
+    if (policy.name.includes(',')) {
+      policyNameErrors.push(policyNameContainsCommaErrorMessage);
+    }
+    if (policy.name.includes(' ')) {
+      policyNameErrors.push(policyNameContainsSpaceErrorMessage);
+    }
+    if (window.TextEncoder && new window.TextEncoder().encode(policy.name).length > 255) {
+      policyNameErrors.push(policyNameTooLongErrorMessage);
+    }
+
+    if (saveAsNew && policy.name === originalPolicyName) {
+      policyNameErrors.push(policyNameMustBeDifferentErrorMessage);
+    } else if (policy.name !== originalPolicyName) {
+      const policyNames = policies.map((existingPolicy) => existingPolicy.name);
+      if (policyNames.includes(policy.name)) {
+        policyNameErrors.push(policyNameAlreadyUsedErrorMessage);
+      }
+    }
+  }
+
+  const hotPhaseErrors = validateHotPhase(policy.phases.hot);
+  const warmPhaseErrors = validateWarmPhase(policy.phases.warm);
+  const coldPhaseErrors = validateColdPhase(policy.phases.cold);
+  const deletePhaseErrors = validateDeletePhase(policy.phases.delete);
+  const isValid =
+    policyNameErrors.length === 0 &&
+    Object.keys(hotPhaseErrors).length === 0 &&
+    Object.keys(warmPhaseErrors).length === 0 &&
+    Object.keys(coldPhaseErrors).length === 0 &&
+    Object.keys(deletePhaseErrors).length === 0;
+  return [
+    isValid,
+    {
+      policyName: [...policyNameErrors],
+      hot: hotPhaseErrors,
+      warm: warmPhaseErrors,
+      cold: coldPhaseErrors,
+      delete: deletePhaseErrors,
+    },
+  ];
+};
+
+export const findFirstError = (errors?: ValidationErrors): string | undefined => {
+  if (!errors) {
+    return;
+  }
+
+  if (errors.policyName.length > 0) {
+    return propertyof<ValidationErrors>('policyName');
+  }
+
+  if (Object.keys(errors.hot).length > 0) {
+    return `${propertyof<ValidationErrors>('hot')}.${Object.keys(errors.hot)[0]}`;
+  }
+  if (Object.keys(errors.warm).length > 0) {
+    return `${propertyof<ValidationErrors>('warm')}.${Object.keys(errors.warm)[0]}`;
+  }
+  if (Object.keys(errors.cold).length > 0) {
+    return `${propertyof<ValidationErrors>('cold')}.${Object.keys(errors.cold)[0]}`;
+  }
+  if (Object.keys(errors.delete).length > 0) {
+    return `${propertyof<ValidationErrors>('delete')}.${Object.keys(errors.delete)[0]}`;
+  }
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/types.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/types.ts
new file mode 100644
index 0000000000000..2e2ed5b38bb87
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/types.ts
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export interface SerializedPolicy {
+  name: string;
+  phases: Phases;
+}
+
+export interface Phases {
+  hot?: SerializedHotPhase;
+  warm?: SerializedWarmPhase;
+  cold?: SerializedColdPhase;
+  delete?: SerializedDeletePhase;
+}
+
+export interface PolicyFromES {
+  modified_date: string;
+  name: string;
+  policy: SerializedPolicy;
+  version: number;
+}
+
+export interface SerializedPhase {
+  min_age: string;
+  actions: {
+    [action: string]: any;
+  };
+}
+
+export interface SerializedHotPhase extends SerializedPhase {
+  actions: {
+    rollover?: {
+      max_size?: string;
+      max_age?: string;
+      max_docs?: number;
+    };
+    set_priority?: {
+      priority: number | null;
+    };
+  };
+}
+
+export interface SerializedWarmPhase extends SerializedPhase {
+  actions: {
+    allocate?: AllocateAction;
+    shrink?: {
+      number_of_shards: number;
+    };
+    forcemerge?: {
+      max_num_segments: number;
+    };
+    set_priority?: {
+      priority: number | null;
+    };
+  };
+}
+
+export interface SerializedColdPhase extends SerializedPhase {
+  actions: {
+    freeze?: {};
+    allocate?: AllocateAction;
+    set_priority?: {
+      priority: number | null;
+    };
+  };
+}
+
+export interface SerializedDeletePhase extends SerializedPhase {
+  actions: {
+    wait_for_snapshot?: {
+      policy: string;
+    };
+    delete?: {
+      delete_searchable_snapshot: boolean;
+    };
+  };
+}
+
+export interface AllocateAction {
+  number_of_replicas: number;
+  include: {};
+  exclude: {};
+  require: {
+    [attribute: string]: string;
+  };
+}
+
+export interface Policy {
+  name: string;
+  phases: {
+    hot: HotPhase;
+    warm: WarmPhase;
+    cold: ColdPhase;
+    delete: DeletePhase;
+  };
+}
+
+export interface Phase {
+  phaseEnabled: boolean;
+}
+export interface HotPhase extends Phase {
+  rolloverEnabled: boolean;
+  selectedMaxSizeStored: string;
+  selectedMaxSizeStoredUnits: string;
+  selectedMaxDocuments: string;
+  selectedMaxAge: string;
+  selectedMaxAgeUnits: string;
+  phaseIndexPriority: string;
+}
+
+export interface WarmPhase extends Phase {
+  warmPhaseOnRollover: boolean;
+  selectedMinimumAge: string;
+  selectedMinimumAgeUnits: string;
+  selectedNodeAttrs: string;
+  selectedReplicaCount: string;
+  shrinkEnabled: boolean;
+  selectedPrimaryShardCount: string;
+  forceMergeEnabled: boolean;
+  selectedForceMergeSegments: string;
+  phaseIndexPriority: string;
+}
+
+export interface ColdPhase extends Phase {
+  selectedMinimumAge: string;
+  selectedMinimumAgeUnits: string;
+  selectedNodeAttrs: string;
+  selectedReplicaCount: string;
+  freezeEnabled: boolean;
+  phaseIndexPriority: string;
+}
+
+export interface DeletePhase extends Phase {
+  selectedMinimumAge: string;
+  selectedMinimumAgeUnits: string;
+  waitForSnapshotPolicy: string;
+}
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/warm_phase.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/warm_phase.ts
new file mode 100644
index 0000000000000..3ca1a1cc83371
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/warm_phase.ts
@@ -0,0 +1,219 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { isEmpty } from 'lodash';
+import { serializedPhaseInitialization } from '../../constants';
+import { AllocateAction, WarmPhase, SerializedWarmPhase } from './types';
+import { isNumber, splitSizeAndUnits } from './policy_serialization';
+
+import {
+  numberRequiredMessage,
+  PhaseValidationErrors,
+  positiveNumberRequiredMessage,
+  positiveNumbersAboveZeroErrorMessage,
+} from './policy_validation';
+
+const warmPhaseInitialization: WarmPhase = {
+  phaseEnabled: false,
+  warmPhaseOnRollover: false,
+  selectedMinimumAge: '0',
+  selectedMinimumAgeUnits: 'd',
+  selectedNodeAttrs: '',
+  selectedReplicaCount: '',
+  shrinkEnabled: false,
+  selectedPrimaryShardCount: '',
+  forceMergeEnabled: false,
+  selectedForceMergeSegments: '',
+  phaseIndexPriority: '',
+};
+
+export const warmPhaseFromES = (phaseSerialized?: SerializedWarmPhase): WarmPhase => {
+  const phase: WarmPhase = { ...warmPhaseInitialization };
+
+  if (phaseSerialized === undefined || phaseSerialized === null) {
+    return phase;
+  }
+
+  phase.phaseEnabled = true;
+
+  if (phaseSerialized.min_age) {
+    if (phaseSerialized.min_age === '0ms') {
+      phase.warmPhaseOnRollover = true;
+    } else {
+      const { size: minAge, units: minAgeUnits } = splitSizeAndUnits(phaseSerialized.min_age);
+      phase.selectedMinimumAge = minAge;
+      phase.selectedMinimumAgeUnits = minAgeUnits;
+    }
+  }
+  if (phaseSerialized.actions) {
+    const actions = phaseSerialized.actions;
+    if (actions.allocate) {
+      const allocate = actions.allocate;
+      if (allocate.require) {
+        Object.entries(allocate.require).forEach((entry) => {
+          phase.selectedNodeAttrs = entry.join(':');
+        });
+        if (allocate.number_of_replicas) {
+          phase.selectedReplicaCount = allocate.number_of_replicas.toString();
+        }
+      }
+    }
+
+    if (actions.forcemerge) {
+      const forcemerge = actions.forcemerge;
+      phase.forceMergeEnabled = true;
+      phase.selectedForceMergeSegments = forcemerge.max_num_segments.toString();
+    }
+
+    if (actions.shrink) {
+      phase.shrinkEnabled = true;
+      phase.selectedPrimaryShardCount = actions.shrink.number_of_shards
+        ? actions.shrink.number_of_shards.toString()
+        : '';
+    }
+  }
+  return phase;
+};
+
+export const warmPhaseToES = (
+  phase: WarmPhase,
+  originalEsPhase?: SerializedWarmPhase
+): SerializedWarmPhase => {
+  if (!originalEsPhase) {
+    originalEsPhase = { ...serializedPhaseInitialization };
+  }
+
+  const esPhase = { ...originalEsPhase };
+
+  if (isNumber(phase.selectedMinimumAge)) {
+    esPhase.min_age = `${phase.selectedMinimumAge}${phase.selectedMinimumAgeUnits}`;
+  }
+
+  // If warm phase on rollover is enabled, delete min age field
+  // An index lifecycle switches to warm phase when rollover occurs, so you cannot specify a warm phase time
+  // They are mutually exclusive
+  if (phase.warmPhaseOnRollover) {
+    delete esPhase.min_age;
+  }
+
+  esPhase.actions = esPhase.actions ? { ...esPhase.actions } : {};
+
+  if (phase.selectedNodeAttrs) {
+    const [name, value] = phase.selectedNodeAttrs.split(':');
+    esPhase.actions.allocate = esPhase.actions.allocate || ({} as AllocateAction);
+    esPhase.actions.allocate.require = {
+      [name]: value,
+    };
+  } else {
+    if (esPhase.actions.allocate) {
+      delete esPhase.actions.allocate.require;
+    }
+  }
+
+  if (isNumber(phase.selectedReplicaCount)) {
+    esPhase.actions.allocate = esPhase.actions.allocate || ({} as AllocateAction);
+    esPhase.actions.allocate.number_of_replicas = parseInt(phase.selectedReplicaCount, 10);
+  } else {
+    if (esPhase.actions.allocate) {
+      delete esPhase.actions.allocate.number_of_replicas;
+    }
+  }
+
+  if (
+    esPhase.actions.allocate &&
+    !esPhase.actions.allocate.require &&
+    !isNumber(esPhase.actions.allocate.number_of_replicas) &&
+    isEmpty(esPhase.actions.allocate.include) &&
+    isEmpty(esPhase.actions.allocate.exclude)
+  ) {
+    // remove allocate action if it does not define require or number of nodes
+    // and both include and exclude are empty objects (ES will fail to parse if we don't)
+    delete esPhase.actions.allocate;
+  }
+
+  if (phase.forceMergeEnabled) {
+    esPhase.actions.forcemerge = {
+      max_num_segments: parseInt(phase.selectedForceMergeSegments, 10),
+    };
+  } else {
+    delete esPhase.actions.forcemerge;
+  }
+
+  if (phase.shrinkEnabled && isNumber(phase.selectedPrimaryShardCount)) {
+    esPhase.actions.shrink = {
+      number_of_shards: parseInt(phase.selectedPrimaryShardCount, 10),
+    };
+  } else {
+    delete esPhase.actions.shrink;
+  }
+
+  if (isNumber(phase.phaseIndexPriority)) {
+    esPhase.actions.set_priority = {
+      priority: parseInt(phase.phaseIndexPriority, 10),
+    };
+  } else {
+    delete esPhase.actions.set_priority;
+  }
+
+  return esPhase;
+};
+
+export const validateWarmPhase = (phase: WarmPhase): PhaseValidationErrors<WarmPhase> => {
+  if (!phase.phaseEnabled) {
+    return {};
+  }
+
+  const phaseErrors = {} as PhaseValidationErrors<WarmPhase>;
+
+  // index priority is optional, but if it's set, it needs to be a positive number
+  if (phase.phaseIndexPriority) {
+    if (!isNumber(phase.phaseIndexPriority)) {
+      phaseErrors.phaseIndexPriority = [numberRequiredMessage];
+    } else if (parseInt(phase.phaseIndexPriority, 10) < 0) {
+      phaseErrors.phaseIndexPriority = [positiveNumberRequiredMessage];
+    }
+  }
+
+  // if warm phase on rollover is disabled, min age needs to be a positive number
+  if (!phase.warmPhaseOnRollover) {
+    if (!isNumber(phase.selectedMinimumAge)) {
+      phaseErrors.selectedMinimumAge = [numberRequiredMessage];
+    } else if (parseInt(phase.selectedMinimumAge, 10) < 0) {
+      phaseErrors.selectedMinimumAge = [positiveNumberRequiredMessage];
+    }
+  }
+
+  // if forcemerge is enabled, force merge segments needs to be a number above zero
+  if (phase.forceMergeEnabled) {
+    if (!isNumber(phase.selectedForceMergeSegments)) {
+      phaseErrors.selectedForceMergeSegments = [numberRequiredMessage];
+    } else if (parseInt(phase.selectedForceMergeSegments, 10) < 1) {
+      phaseErrors.selectedForceMergeSegments = [positiveNumbersAboveZeroErrorMessage];
+    }
+  }
+
+  // if shrink is enabled, primary shard count needs to be a number above zero
+  if (phase.shrinkEnabled) {
+    if (!isNumber(phase.selectedPrimaryShardCount)) {
+      phaseErrors.selectedPrimaryShardCount = [numberRequiredMessage];
+    } else if (parseInt(phase.selectedPrimaryShardCount, 10) < 1) {
+      phaseErrors.selectedPrimaryShardCount = [positiveNumbersAboveZeroErrorMessage];
+    }
+  }
+
+  // replica count is optional, but if it's set, it needs to be a positive number
+  if (phase.selectedReplicaCount) {
+    if (!isNumber(phase.selectedReplicaCount)) {
+      phaseErrors.selectedReplicaCount = [numberRequiredMessage];
+    } else if (parseInt(phase.selectedReplicaCount, 10) < 0) {
+      phaseErrors.selectedReplicaCount = [numberRequiredMessage];
+    }
+  }
+
+  return {
+    ...phaseErrors,
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.js b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
similarity index 75%
rename from x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.js
rename to x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
index 99e6bfb99472c..7c7c0b70c0eed 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
@@ -5,14 +5,13 @@
  */
 
 import {
-  PHASE_INDEX_PRIORITY,
   UIM_CONFIG_COLD_PHASE,
   UIM_CONFIG_WARM_PHASE,
   UIM_CONFIG_SET_PRIORITY,
   UIM_CONFIG_FREEZE_INDEX,
-} from '../constants';
-
-import { defaultColdPhase, defaultWarmPhase } from '../store/defaults';
+  defaultNewWarmPhase,
+  defaultNewColdPhase,
+} from '../constants/';
 
 import { getUiMetricsForPhases } from './ui_metric';
 jest.mock('ui/new_platform');
@@ -22,9 +21,10 @@ describe('getUiMetricsForPhases', () => {
     expect(
       getUiMetricsForPhases({
         cold: {
+          min_age: '0ms',
           actions: {
             set_priority: {
-              priority: defaultColdPhase[PHASE_INDEX_PRIORITY],
+              priority: parseInt(defaultNewColdPhase.phaseIndexPriority, 10),
             },
           },
         },
@@ -36,9 +36,10 @@ describe('getUiMetricsForPhases', () => {
     expect(
       getUiMetricsForPhases({
         warm: {
+          min_age: '0ms',
           actions: {
             set_priority: {
-              priority: defaultWarmPhase[PHASE_INDEX_PRIORITY],
+              priority: parseInt(defaultNewWarmPhase.phaseIndexPriority, 10),
             },
           },
         },
@@ -50,9 +51,10 @@ describe('getUiMetricsForPhases', () => {
     expect(
       getUiMetricsForPhases({
         warm: {
+          min_age: '0ms',
           actions: {
             set_priority: {
-              priority: defaultWarmPhase[PHASE_INDEX_PRIORITY] + 1,
+              priority: parseInt(defaultNewWarmPhase.phaseIndexPriority, 10) + 1,
             },
           },
         },
@@ -64,10 +66,11 @@ describe('getUiMetricsForPhases', () => {
     expect(
       getUiMetricsForPhases({
         cold: {
+          min_age: '0ms',
           actions: {
             freeze: {},
             set_priority: {
-              priority: defaultColdPhase[PHASE_INDEX_PRIORITY],
+              priority: parseInt(defaultNewColdPhase.phaseIndexPriority, 10),
             },
           },
         },
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
index d71e38d0b31de..b38a734770546 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.ts
@@ -4,24 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { get } from 'lodash';
-
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
 import { UiStatsMetricType } from '@kbn/analytics';
 
 import {
   UIM_APP_NAME,
   UIM_CONFIG_COLD_PHASE,
-  UIM_CONFIG_WARM_PHASE,
-  UIM_CONFIG_SET_PRIORITY,
   UIM_CONFIG_FREEZE_INDEX,
-  PHASE_HOT,
-  PHASE_WARM,
-  PHASE_COLD,
-  PHASE_INDEX_PRIORITY,
+  UIM_CONFIG_SET_PRIORITY,
+  UIM_CONFIG_WARM_PHASE,
+  defaultNewColdPhase,
+  defaultNewHotPhase,
+  defaultNewWarmPhase,
 } from '../constants';
 
-import { defaultColdPhase, defaultWarmPhase, defaultHotPhase } from '../store/defaults';
+import { Phases } from './policies/types';
 
 export let trackUiMetric = (metricType: UiStatsMetricType, eventName: string) => {};
 
@@ -31,49 +28,54 @@ export function init(usageCollection?: UsageCollectionSetup): void {
   }
 }
 
-export function getUiMetricsForPhases(phases: any): any {
+export function getUiMetricsForPhases(phases: Phases): any {
   const phaseUiMetrics = [
     {
       metric: UIM_CONFIG_COLD_PHASE,
-      isTracked: () => Boolean(phases[PHASE_COLD]),
+      isTracked: () => Boolean(phases.cold),
     },
     {
       metric: UIM_CONFIG_WARM_PHASE,
-      isTracked: () => Boolean(phases[PHASE_WARM]),
+      isTracked: () => Boolean(phases.warm),
     },
     {
       metric: UIM_CONFIG_SET_PRIORITY,
       isTracked: () => {
-        const phaseToDefaultIndexPriorityMap = {
-          [PHASE_HOT]: defaultHotPhase[PHASE_INDEX_PRIORITY],
-          [PHASE_WARM]: defaultWarmPhase[PHASE_INDEX_PRIORITY],
-          [PHASE_COLD]: defaultColdPhase[PHASE_INDEX_PRIORITY],
-        };
-
         // We only care about whether the user has interacted with the priority of *any* phase at all.
-        return [PHASE_HOT, PHASE_WARM, PHASE_COLD].some((phase) => {
-          // If the priority is different than the default, we'll consider it a user interaction,
-          // even if the user has set it to undefined.
-          return (
-            phases[phase] &&
-            get(phases[phase], 'actions.set_priority.priority') !==
-              phaseToDefaultIndexPriorityMap[phase]
-          );
-        });
+        const isHotPhasePriorityChanged =
+          phases.hot &&
+          phases.hot.actions.set_priority &&
+          phases.hot.actions.set_priority.priority !==
+            parseInt(defaultNewHotPhase.phaseIndexPriority, 10);
+
+        const isWarmPhasePriorityChanged =
+          phases.warm &&
+          phases.warm.actions.set_priority &&
+          phases.warm.actions.set_priority.priority !==
+            parseInt(defaultNewWarmPhase.phaseIndexPriority, 10);
+
+        const isColdPhasePriorityChanged =
+          phases.cold &&
+          phases.cold.actions.set_priority &&
+          phases.cold.actions.set_priority.priority !==
+            parseInt(defaultNewColdPhase.phaseIndexPriority, 10);
+        // If the priority is different than the default, we'll consider it a user interaction,
+        // even if the user has set it to undefined.
+        return (
+          isHotPhasePriorityChanged || isWarmPhasePriorityChanged || isColdPhasePriorityChanged
+        );
       },
     },
     {
       metric: UIM_CONFIG_FREEZE_INDEX,
-      isTracked: () => phases[PHASE_COLD] && get(phases[PHASE_COLD], 'actions.freeze'),
+      isTracked: () => phases.cold && phases.cold.actions.freeze,
     },
   ];
 
-  const trackedUiMetrics = phaseUiMetrics.reduce((tracked: any, { metric, isTracked }) => {
+  return phaseUiMetrics.reduce((tracked: any, { metric, isTracked }) => {
     if (isTracked()) {
       tracked.push(metric);
     }
     return tracked;
   }, []);
-
-  return trackedUiMetrics;
 }
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/general.js b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/general.js
deleted file mode 100644
index 28719fde87b0c..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/general.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createAction } from 'redux-actions';
-
-export const setBootstrapEnabled = createAction('SET_BOOTSTRAP_ENABLED');
-export const setIndexName = createAction('SET_INDEX_NAME');
-export const setAliasName = createAction('SET_ALIAS_NAME');
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/index.js b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/index.js
index ea539578c885c..fef79c7782bb0 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/index.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/index.js
@@ -4,7 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './nodes';
 export * from './policies';
-export * from './lifecycle';
-export * from './general';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/nodes.js b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/nodes.js
deleted file mode 100644
index 45a8e63f70e83..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/nodes.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import { createAction } from 'redux-actions';
-export const setSelectedPrimaryShardCount = createAction('SET_SELECTED_PRIMARY_SHARED_COUNT');
-export const setSelectedReplicaCount = createAction('SET_SELECTED_REPLICA_COUNT');
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/policies.js b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/policies.js
index aa20c0eb1d326..d47136679604f 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/policies.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/store/actions/policies.js
@@ -9,7 +9,6 @@ import { createAction } from 'redux-actions';
 
 import { showApiError } from '../../services/api_errors';
 import { loadPolicies } from '../../services/api';
-import { SET_PHASE_DATA } from '../../constants';
 
 export const fetchedPolicies = createAction('FETCHED_POLICIES');
 export const setSelectedPolicy = createAction('SET_SELECTED_POLICY');
@@ -41,9 +40,3 @@ export const fetchPolicies = (withIndices, callback) => async (dispatch) => {
   callback && callback();
   return policies;
 };
-
-export const setPhaseData = createAction(SET_PHASE_DATA, (phase, key, value) => ({
-  phase,
-  key,
-  value,
-}));
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/cold_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/cold_phase.js
deleted file mode 100644
index a8f7fd3f4bdfa..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/cold_phase.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import {
-  PHASE_ENABLED,
-  PHASE_ROLLOVER_MINIMUM_AGE,
-  PHASE_NODE_ATTRS,
-  PHASE_REPLICA_COUNT,
-  PHASE_ROLLOVER_MINIMUM_AGE_UNITS,
-  PHASE_ROLLOVER_ALIAS,
-  PHASE_FREEZE_ENABLED,
-  PHASE_INDEX_PRIORITY,
-} from '../../constants';
-
-export const defaultColdPhase = {
-  [PHASE_ENABLED]: false,
-  [PHASE_ROLLOVER_ALIAS]: '',
-  [PHASE_ROLLOVER_MINIMUM_AGE]: 0,
-  [PHASE_ROLLOVER_MINIMUM_AGE_UNITS]: 'd',
-  [PHASE_NODE_ATTRS]: '',
-  [PHASE_REPLICA_COUNT]: '',
-  [PHASE_FREEZE_ENABLED]: false,
-  [PHASE_INDEX_PRIORITY]: 0,
-};
-export const defaultEmptyColdPhase = {
-  ...defaultColdPhase,
-  [PHASE_INDEX_PRIORITY]: '',
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/delete_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/delete_phase.js
deleted file mode 100644
index 8534893e7e3b3..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/delete_phase.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import {
-  PHASE_ENABLED,
-  PHASE_ROLLOVER_ENABLED,
-  PHASE_ROLLOVER_MINIMUM_AGE,
-  PHASE_ROLLOVER_MINIMUM_AGE_UNITS,
-  PHASE_ROLLOVER_ALIAS,
-  PHASE_WAIT_FOR_SNAPSHOT_POLICY,
-} from '../../constants';
-
-export const defaultDeletePhase = {
-  [PHASE_ENABLED]: false,
-  [PHASE_ROLLOVER_ENABLED]: false,
-  [PHASE_ROLLOVER_ALIAS]: '',
-  [PHASE_ROLLOVER_MINIMUM_AGE]: 0,
-  [PHASE_ROLLOVER_MINIMUM_AGE_UNITS]: 'd',
-  [PHASE_WAIT_FOR_SNAPSHOT_POLICY]: '',
-};
-export const defaultEmptyDeletePhase = defaultDeletePhase;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/hot_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/hot_phase.js
deleted file mode 100644
index 1f5b5c399a642..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/hot_phase.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import {
-  PHASE_ENABLED,
-  PHASE_ROLLOVER_ENABLED,
-  PHASE_ROLLOVER_MAX_AGE,
-  PHASE_ROLLOVER_MAX_AGE_UNITS,
-  PHASE_ROLLOVER_MAX_SIZE_STORED,
-  PHASE_ROLLOVER_MAX_DOCUMENTS,
-  PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS,
-  PHASE_INDEX_PRIORITY,
-} from '../../constants';
-
-export const defaultHotPhase = {
-  [PHASE_ENABLED]: true,
-  [PHASE_ROLLOVER_ENABLED]: true,
-  [PHASE_ROLLOVER_MAX_AGE]: 30,
-  [PHASE_ROLLOVER_MAX_AGE_UNITS]: 'd',
-  [PHASE_ROLLOVER_MAX_SIZE_STORED]: 50,
-  [PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS]: 'gb',
-  [PHASE_INDEX_PRIORITY]: 100,
-  [PHASE_ROLLOVER_MAX_DOCUMENTS]: '',
-};
-export const defaultEmptyHotPhase = {
-  ...defaultHotPhase,
-  [PHASE_ENABLED]: false,
-  [PHASE_ROLLOVER_ENABLED]: false,
-  [PHASE_ROLLOVER_MAX_AGE]: '',
-  [PHASE_ROLLOVER_MAX_SIZE_STORED]: '',
-  [PHASE_INDEX_PRIORITY]: '',
-  [PHASE_ROLLOVER_MAX_DOCUMENTS]: '',
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.d.ts b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.d.ts
deleted file mode 100644
index abf6db416c7f4..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export declare const defaultDeletePhase: any;
-export declare const defaultColdPhase: any;
-export declare const defaultWarmPhase: any;
-export declare const defaultHotPhase: any;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.js b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.js
deleted file mode 100644
index f5661eae91a8c..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './delete_phase';
-export * from './cold_phase';
-export * from './hot_phase';
-export * from './warm_phase';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/warm_phase.js b/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/warm_phase.js
deleted file mode 100644
index f02ac2096675f..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/defaults/warm_phase.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-import {
-  PHASE_ENABLED,
-  PHASE_FORCE_MERGE_SEGMENTS,
-  PHASE_FORCE_MERGE_ENABLED,
-  PHASE_ROLLOVER_MINIMUM_AGE,
-  PHASE_NODE_ATTRS,
-  PHASE_PRIMARY_SHARD_COUNT,
-  PHASE_REPLICA_COUNT,
-  PHASE_ROLLOVER_MINIMUM_AGE_UNITS,
-  PHASE_ROLLOVER_ALIAS,
-  PHASE_SHRINK_ENABLED,
-  WARM_PHASE_ON_ROLLOVER,
-  PHASE_INDEX_PRIORITY,
-} from '../../constants';
-
-export const defaultWarmPhase = {
-  [PHASE_ENABLED]: false,
-  [PHASE_ROLLOVER_ALIAS]: '',
-  [PHASE_FORCE_MERGE_SEGMENTS]: '',
-  [PHASE_FORCE_MERGE_ENABLED]: false,
-  [PHASE_ROLLOVER_MINIMUM_AGE]: 0,
-  [PHASE_ROLLOVER_MINIMUM_AGE_UNITS]: 'd',
-  [PHASE_NODE_ATTRS]: '',
-  [PHASE_SHRINK_ENABLED]: false,
-  [PHASE_PRIMARY_SHARD_COUNT]: '',
-  [PHASE_REPLICA_COUNT]: '',
-  [WARM_PHASE_ON_ROLLOVER]: true,
-  [PHASE_INDEX_PRIORITY]: 50,
-};
-export const defaultEmptyWarmPhase = {
-  ...defaultWarmPhase,
-  [WARM_PHASE_ON_ROLLOVER]: false,
-  [PHASE_INDEX_PRIORITY]: '',
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/general.js b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/general.js
deleted file mode 100644
index fcba2fd1358b0..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/general.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { handleActions } from 'redux-actions';
-import { setIndexName, setAliasName, setBootstrapEnabled } from '../actions/general';
-
-const defaultState = {
-  bootstrapEnabled: false,
-  indexName: '',
-  aliasName: '',
-};
-
-export const general = handleActions(
-  {
-    [setIndexName](state, { payload: indexName }) {
-      return {
-        ...state,
-        indexName,
-      };
-    },
-    [setAliasName](state, { payload: aliasName }) {
-      return {
-        ...state,
-        aliasName,
-      };
-    },
-    [setBootstrapEnabled](state, { payload: bootstrapEnabled }) {
-      return {
-        ...state,
-        bootstrapEnabled,
-      };
-    },
-  },
-  defaultState
-);
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/index.js b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/index.js
index 60126b85c313e..7fe7134f5f5db 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/index.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/index.js
@@ -5,12 +5,8 @@
  */
 
 import { combineReducers } from 'redux';
-import { nodes } from './nodes';
 import { policies } from './policies';
-import { general } from './general';
 
 export const indexLifecycleManagement = combineReducers({
-  nodes,
   policies,
-  general,
 });
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/nodes.js b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/nodes.js
deleted file mode 100644
index 383e61b5aacde..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/nodes.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { handleActions } from 'redux-actions';
-import { setSelectedPrimaryShardCount, setSelectedReplicaCount } from '../actions';
-
-const defaultState = {
-  isLoading: false,
-  selectedNodeAttrs: '',
-  selectedPrimaryShardCount: 1,
-  selectedReplicaCount: 1,
-  nodes: undefined,
-  details: {},
-};
-
-export const nodes = handleActions(
-  {
-    [setSelectedPrimaryShardCount](state, { payload }) {
-      let selectedPrimaryShardCount = parseInt(payload);
-      if (isNaN(selectedPrimaryShardCount)) {
-        selectedPrimaryShardCount = '';
-      }
-      return {
-        ...state,
-        selectedPrimaryShardCount,
-      };
-    },
-    [setSelectedReplicaCount](state, { payload }) {
-      let selectedReplicaCount;
-      if (payload != null) {
-        selectedReplicaCount = parseInt(payload);
-        if (isNaN(selectedReplicaCount)) {
-          selectedReplicaCount = '';
-        }
-      } else {
-        // default value for Elasticsearch
-        selectedReplicaCount = 1;
-      }
-
-      return {
-        ...state,
-        selectedReplicaCount,
-      };
-    },
-  },
-  defaultState
-);
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/policies.js b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/policies.js
index a94e875a71845..ca9d59e295a29 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/policies.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/policies.js
@@ -7,49 +7,17 @@
 import { handleActions } from 'redux-actions';
 import {
   fetchedPolicies,
-  setSelectedPolicy,
-  unsetSelectedPolicy,
-  setSelectedPolicyName,
-  setSaveAsNewPolicy,
-  setPhaseData,
   policyFilterChanged,
   policyPageChanged,
   policyPageSizeChanged,
   policySortChanged,
 } from '../actions';
-import { policyFromES } from '../selectors';
-import {
-  PHASE_HOT,
-  PHASE_WARM,
-  PHASE_COLD,
-  PHASE_DELETE,
-  PHASE_ATTRIBUTES_THAT_ARE_NUMBERS,
-} from '../../constants';
-
-import {
-  defaultColdPhase,
-  defaultDeletePhase,
-  defaultHotPhase,
-  defaultWarmPhase,
-} from '../defaults';
-export const defaultPolicy = {
-  name: '',
-  saveAsNew: true,
-  isNew: true,
-  phases: {
-    [PHASE_HOT]: defaultHotPhase,
-    [PHASE_WARM]: defaultWarmPhase,
-    [PHASE_COLD]: defaultColdPhase,
-    [PHASE_DELETE]: defaultDeletePhase,
-  },
-};
 
 const defaultState = {
   isLoading: false,
   isLoaded: false,
   originalPolicyName: undefined,
   selectedPolicySet: false,
-  selectedPolicy: defaultPolicy,
   policies: [],
   sort: {
     sortField: 'name',
@@ -70,71 +38,6 @@ export const policies = handleActions(
         policies,
       };
     },
-    [setSelectedPolicy](state, { payload: selectedPolicy }) {
-      if (!selectedPolicy) {
-        return {
-          ...state,
-          selectedPolicy: defaultPolicy,
-          selectedPolicySet: true,
-        };
-      }
-
-      return {
-        ...state,
-        originalPolicyName: selectedPolicy.name,
-        selectedPolicySet: true,
-        selectedPolicy: {
-          ...defaultPolicy,
-          ...policyFromES(selectedPolicy),
-        },
-      };
-    },
-    [unsetSelectedPolicy]() {
-      return defaultState;
-    },
-    [setSelectedPolicyName](state, { payload: name }) {
-      return {
-        ...state,
-        selectedPolicy: {
-          ...state.selectedPolicy,
-          name,
-        },
-      };
-    },
-    [setSaveAsNewPolicy](state, { payload: saveAsNew }) {
-      return {
-        ...state,
-        selectedPolicy: {
-          ...state.selectedPolicy,
-          saveAsNew,
-        },
-      };
-    },
-    [setPhaseData](state, { payload }) {
-      const { phase, key } = payload;
-
-      let value = payload.value;
-      if (PHASE_ATTRIBUTES_THAT_ARE_NUMBERS.includes(key)) {
-        value = parseInt(value);
-        if (isNaN(value)) {
-          value = '';
-        }
-      }
-
-      return {
-        ...state,
-        selectedPolicy: {
-          ...state.selectedPolicy,
-          phases: {
-            ...state.selectedPolicy.phases,
-            [phase]: {
-              ...state.selectedPolicy.phases[phase],
-              [key]: value,
-            },
-          },
-        },
-      };
-    },
     [policyFilterChanged](state, action) {
       const { filter } = action.payload;
       return {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/general.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/general.js
deleted file mode 100644
index 2d01749be3087..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/general.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const getBootstrapEnabled = (state) => state.general.bootstrapEnabled;
-export const getIndexName = (state) => state.general.indexName;
-export const getAliasName = (state) => state.general.aliasName;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/index.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/index.js
index ea539578c885c..fef79c7782bb0 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/index.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/index.js
@@ -4,7 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './nodes';
 export * from './policies';
-export * from './lifecycle';
-export * from './general';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/lifecycle.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/lifecycle.js
deleted file mode 100644
index 03538fad9aa83..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/lifecycle.js
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-
-import {
-  PHASE_HOT,
-  PHASE_WARM,
-  PHASE_COLD,
-  PHASE_DELETE,
-  PHASE_ENABLED,
-  PHASE_ROLLOVER_ENABLED,
-  PHASE_ROLLOVER_MAX_AGE,
-  PHASE_ROLLOVER_MINIMUM_AGE,
-  PHASE_ROLLOVER_MAX_SIZE_STORED,
-  STRUCTURE_POLICY_NAME,
-  ERROR_STRUCTURE,
-  PHASE_ATTRIBUTES_THAT_ARE_NUMBERS_VALIDATE,
-  PHASE_PRIMARY_SHARD_COUNT,
-  PHASE_SHRINK_ENABLED,
-  PHASE_FORCE_MERGE_ENABLED,
-  PHASE_FORCE_MERGE_SEGMENTS,
-  PHASE_REPLICA_COUNT,
-  WARM_PHASE_ON_ROLLOVER,
-  PHASE_INDEX_PRIORITY,
-  PHASE_ROLLOVER_MAX_DOCUMENTS,
-} from '../../constants';
-
-import {
-  getPhase,
-  getPhases,
-  phaseToES,
-  getSelectedPolicyName,
-  isNumber,
-  getSaveAsNewPolicy,
-  getSelectedOriginalPolicyName,
-  getPolicies,
-} from '.';
-
-import { getPolicyByName } from './policies';
-
-export const numberRequiredMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.numberRequiredError',
-  {
-    defaultMessage: 'A number is required.',
-  }
-);
-
-export const positiveNumberRequiredMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.positiveNumberRequiredError',
-  {
-    defaultMessage: 'Only positive numbers are allowed.',
-  }
-);
-
-export const maximumAgeRequiredMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.maximumAgeMissingError',
-  {
-    defaultMessage: 'A maximum age is required.',
-  }
-);
-
-export const maximumSizeRequiredMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.maximumIndexSizeMissingError',
-  {
-    defaultMessage: 'A maximum index size is required.',
-  }
-);
-
-export const maximumDocumentsRequiredMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.maximumDocumentsMissingError',
-  {
-    defaultMessage: 'Maximum documents is required.',
-  }
-);
-
-export const positiveNumbersAboveZeroErrorMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.positiveNumberAboveZeroRequiredError',
-  {
-    defaultMessage: 'Only numbers above 0 are allowed.',
-  }
-);
-
-export const validatePhase = (type, phase, errors) => {
-  const phaseErrors = {};
-
-  if (!phase[PHASE_ENABLED]) {
-    return;
-  }
-
-  for (const numberedAttribute of PHASE_ATTRIBUTES_THAT_ARE_NUMBERS_VALIDATE) {
-    if (phase.hasOwnProperty(numberedAttribute)) {
-      // If WARM_PHASE_ON_ROLLOVER or PHASE_HOT there is no need to validate this
-      if (
-        numberedAttribute === PHASE_ROLLOVER_MINIMUM_AGE &&
-        (phase[WARM_PHASE_ON_ROLLOVER] || type === PHASE_HOT)
-      ) {
-        continue;
-      }
-      // If shrink is disabled, there is no need to validate this
-      if (numberedAttribute === PHASE_PRIMARY_SHARD_COUNT && !phase[PHASE_SHRINK_ENABLED]) {
-        continue;
-      }
-      // If forcemerge is disabled, there is no need to validate this
-      if (numberedAttribute === PHASE_FORCE_MERGE_SEGMENTS && !phase[PHASE_FORCE_MERGE_ENABLED]) {
-        continue;
-      }
-      // PHASE_REPLICA_COUNT is optional and can be zero
-      if (numberedAttribute === PHASE_REPLICA_COUNT && !phase[numberedAttribute]) {
-        continue;
-      }
-      // PHASE_INDEX_PRIORITY is optional and can be zero
-      if (numberedAttribute === PHASE_INDEX_PRIORITY && !phase[numberedAttribute]) {
-        continue;
-      }
-      if (!isNumber(phase[numberedAttribute])) {
-        phaseErrors[numberedAttribute] = [numberRequiredMessage];
-      } else if (phase[numberedAttribute] < 0) {
-        phaseErrors[numberedAttribute] = [positiveNumberRequiredMessage];
-      }
-    }
-  }
-  if (phase[PHASE_ROLLOVER_ENABLED]) {
-    if (
-      !isNumber(phase[PHASE_ROLLOVER_MAX_AGE]) &&
-      !isNumber(phase[PHASE_ROLLOVER_MAX_SIZE_STORED]) &&
-      !isNumber(phase[PHASE_ROLLOVER_MAX_DOCUMENTS])
-    ) {
-      phaseErrors[PHASE_ROLLOVER_MAX_AGE] = [maximumAgeRequiredMessage];
-      phaseErrors[PHASE_ROLLOVER_MAX_SIZE_STORED] = [maximumSizeRequiredMessage];
-      phaseErrors[PHASE_ROLLOVER_MAX_DOCUMENTS] = [maximumDocumentsRequiredMessage];
-    }
-    if (isNumber(phase[PHASE_ROLLOVER_MAX_AGE]) && phase[PHASE_ROLLOVER_MAX_AGE] < 1) {
-      phaseErrors[PHASE_ROLLOVER_MAX_AGE] = [positiveNumbersAboveZeroErrorMessage];
-    }
-    if (
-      isNumber(phase[PHASE_ROLLOVER_MAX_SIZE_STORED]) &&
-      phase[PHASE_ROLLOVER_MAX_SIZE_STORED] < 1
-    ) {
-      phaseErrors[PHASE_ROLLOVER_MAX_SIZE_STORED] = [positiveNumbersAboveZeroErrorMessage];
-    }
-    if (isNumber(phase[PHASE_ROLLOVER_MAX_DOCUMENTS]) && phase[PHASE_ROLLOVER_MAX_DOCUMENTS] < 1) {
-      phaseErrors[PHASE_ROLLOVER_MAX_DOCUMENTS] = [positiveNumbersAboveZeroErrorMessage];
-    }
-  }
-  if (phase[PHASE_SHRINK_ENABLED]) {
-    if (!isNumber(phase[PHASE_PRIMARY_SHARD_COUNT])) {
-      phaseErrors[PHASE_PRIMARY_SHARD_COUNT] = [numberRequiredMessage];
-    } else if (phase[PHASE_PRIMARY_SHARD_COUNT] < 1) {
-      phaseErrors[PHASE_PRIMARY_SHARD_COUNT] = [positiveNumbersAboveZeroErrorMessage];
-    }
-  }
-
-  if (phase[PHASE_FORCE_MERGE_ENABLED]) {
-    if (!isNumber(phase[PHASE_FORCE_MERGE_SEGMENTS])) {
-      phaseErrors[PHASE_FORCE_MERGE_SEGMENTS] = [numberRequiredMessage];
-    } else if (phase[PHASE_FORCE_MERGE_SEGMENTS] < 1) {
-      phaseErrors[PHASE_FORCE_MERGE_SEGMENTS] = [positiveNumbersAboveZeroErrorMessage];
-    }
-  }
-  errors[type] = {
-    ...errors[type],
-    ...phaseErrors,
-  };
-};
-
-export const policyNameRequiredMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.policyNameRequiredError',
-  {
-    defaultMessage: 'A policy name is required.',
-  }
-);
-export const policyNameStartsWithUnderscoreErrorMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.policyNameStartsWithUnderscoreError',
-  {
-    defaultMessage: 'A policy name cannot start with an underscore.',
-  }
-);
-export const policyNameContainsCommaErrorMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.policyNameContainsCommaError',
-  {
-    defaultMessage: 'A policy name cannot include a comma.',
-  }
-);
-export const policyNameContainsSpaceErrorMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.policyNameContainsSpaceError',
-  {
-    defaultMessage: 'A policy name cannot include a space.',
-  }
-);
-export const policyNameTooLongErrorMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.policyNameTooLongError',
-  {
-    defaultMessage: 'A policy name cannot be longer than 255 bytes.',
-  }
-);
-export const policyNameMustBeDifferentErrorMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.differentPolicyNameRequiredError',
-  {
-    defaultMessage: 'The policy name must be different.',
-  }
-);
-export const policyNameAlreadyUsedErrorMessage = i18n.translate(
-  'xpack.indexLifecycleMgmt.editPolicy.policyNameAlreadyUsedError',
-  {
-    defaultMessage: 'That policy name is already used.',
-  }
-);
-export const validateLifecycle = (state) => {
-  // This method of deep copy does not always work but it should be fine here
-  const errors = JSON.parse(JSON.stringify(ERROR_STRUCTURE));
-  const policyName = getSelectedPolicyName(state);
-  if (!policyName) {
-    errors[STRUCTURE_POLICY_NAME].push(policyNameRequiredMessage);
-  } else {
-    if (policyName.startsWith('_')) {
-      errors[STRUCTURE_POLICY_NAME].push(policyNameStartsWithUnderscoreErrorMessage);
-    }
-    if (policyName.includes(',')) {
-      errors[STRUCTURE_POLICY_NAME].push(policyNameContainsCommaErrorMessage);
-    }
-    if (policyName.includes(' ')) {
-      errors[STRUCTURE_POLICY_NAME].push(policyNameContainsSpaceErrorMessage);
-    }
-    if (window.TextEncoder && new window.TextEncoder('utf-8').encode(policyName).length > 255) {
-      errors[STRUCTURE_POLICY_NAME].push(policyNameTooLongErrorMessage);
-    }
-  }
-
-  if (
-    getSaveAsNewPolicy(state) &&
-    getSelectedOriginalPolicyName(state) === getSelectedPolicyName(state)
-  ) {
-    errors[STRUCTURE_POLICY_NAME].push(policyNameMustBeDifferentErrorMessage);
-  } else if (getSelectedOriginalPolicyName(state) !== getSelectedPolicyName(state)) {
-    const policyNames = getPolicies(state).map((policy) => policy.name);
-    if (policyNames.includes(getSelectedPolicyName(state))) {
-      errors[STRUCTURE_POLICY_NAME].push(policyNameAlreadyUsedErrorMessage);
-    }
-  }
-
-  const hotPhase = getPhase(state, PHASE_HOT);
-  const warmPhase = getPhase(state, PHASE_WARM);
-  const coldPhase = getPhase(state, PHASE_COLD);
-  const deletePhase = getPhase(state, PHASE_DELETE);
-
-  validatePhase(PHASE_HOT, hotPhase, errors);
-  validatePhase(PHASE_WARM, warmPhase, errors);
-  validatePhase(PHASE_COLD, coldPhase, errors);
-  validatePhase(PHASE_DELETE, deletePhase, errors);
-  return errors;
-};
-
-export const getLifecycle = (state) => {
-  const policyName = getSelectedPolicyName(state);
-  const phases = Object.entries(getPhases(state)).reduce((accum, [phaseName, phase]) => {
-    // Hot is ALWAYS enabled
-    if (phaseName === PHASE_HOT) {
-      phase[PHASE_ENABLED] = true;
-    }
-    const esPolicy = getPolicyByName(state, policyName).policy || {};
-    const esPhase = esPolicy.phases ? esPolicy.phases[phaseName] : {};
-    if (phase[PHASE_ENABLED]) {
-      accum[phaseName] = phaseToES(phase, esPhase);
-
-      // These seem to be constants
-      if (phaseName === PHASE_DELETE) {
-        accum[phaseName].actions = {
-          ...accum[phaseName].actions,
-          delete: {
-            ...accum[phaseName].actions.delete,
-          },
-        };
-      }
-    }
-    return accum;
-  }, {});
-
-  return {
-    name: getSelectedPolicyName(state),
-    //type, TODO: figure this out (jsut store it and not let the user change it?)
-    phases,
-  };
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/nodes.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/nodes.js
deleted file mode 100644
index 72bfd4b15a78a..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/nodes.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const getNodes = (state) => state.nodes.nodes;
-
-export const getSelectedPrimaryShardCount = (state) => state.nodes.selectedPrimaryShardCount;
-
-export const getSelectedReplicaCount = (state) =>
-  state.nodes.selectedReplicaCount !== undefined ? state.nodes.selectedReplicaCount : 1;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/policies.js b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/policies.js
index 5bea22f0b3a76..e1c89314a2ec5 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/policies.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/policies.js
@@ -7,49 +7,9 @@
 import { createSelector } from 'reselect';
 import { Pager } from '@elastic/eui';
 
-import {
-  PHASE_HOT,
-  PHASE_WARM,
-  PHASE_COLD,
-  PHASE_DELETE,
-  PHASE_ROLLOVER_MINIMUM_AGE,
-  PHASE_ROLLOVER_MINIMUM_AGE_UNITS,
-  PHASE_ROLLOVER_ENABLED,
-  PHASE_ROLLOVER_MAX_AGE,
-  PHASE_ROLLOVER_MAX_AGE_UNITS,
-  PHASE_ROLLOVER_MAX_SIZE_STORED,
-  PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS,
-  PHASE_NODE_ATTRS,
-  PHASE_FORCE_MERGE_ENABLED,
-  PHASE_FORCE_MERGE_SEGMENTS,
-  PHASE_PRIMARY_SHARD_COUNT,
-  PHASE_REPLICA_COUNT,
-  PHASE_ENABLED,
-  PHASE_ATTRIBUTES_THAT_ARE_NUMBERS,
-  WARM_PHASE_ON_ROLLOVER,
-  PHASE_SHRINK_ENABLED,
-  PHASE_FREEZE_ENABLED,
-  PHASE_INDEX_PRIORITY,
-  PHASE_ROLLOVER_MAX_DOCUMENTS,
-  PHASE_WAIT_FOR_SNAPSHOT_POLICY,
-} from '../../constants';
-
 import { filterItems, sortTable } from '../../services';
 
-import {
-  defaultEmptyDeletePhase,
-  defaultEmptyColdPhase,
-  defaultEmptyWarmPhase,
-  defaultEmptyHotPhase,
-} from '../defaults';
-
 export const getPolicies = (state) => state.policies.policies;
-export const getPolicyByName = (state, name) =>
-  getPolicies(state).find((policy) => policy.name === name) || {};
-export const getIsNewPolicy = (state) => state.policies.selectedPolicy.isNew;
-export const getSelectedPolicy = (state) => state.policies.selectedPolicy;
-export const getIsSelectedPolicySet = (state) => state.policies.selectedPolicySet;
-export const getSelectedOriginalPolicyName = (state) => state.policies.originalPolicyName;
 export const getPolicyFilter = (state) => state.policies.filter;
 export const getPolicySort = (state) => state.policies.sort;
 export const getPolicyCurrentPage = (state) => state.policies.currentPage;
@@ -77,255 +37,6 @@ export const getPageOfPolicies = createSelector(
   (filteredPolicies, sort, pager) => {
     const sortedPolicies = sortTable(filteredPolicies, sort.sortField, sort.isSortAscending);
     const { firstItemIndex, lastItemIndex } = pager;
-    const pagedPolicies = sortedPolicies.slice(firstItemIndex, lastItemIndex + 1);
-    return pagedPolicies;
+    return sortedPolicies.slice(firstItemIndex, lastItemIndex + 1);
   }
 );
-export const getSaveAsNewPolicy = (state) => state.policies.selectedPolicy.saveAsNew;
-
-export const getSelectedPolicyName = (state) => {
-  if (!getSaveAsNewPolicy(state)) {
-    return getSelectedOriginalPolicyName(state);
-  }
-  return state.policies.selectedPolicy.name;
-};
-
-export const getPhases = (state) => state.policies.selectedPolicy.phases;
-
-export const getPhase = (state, phase) => getPhases(state)[phase];
-
-export const getPhaseData = (state, phase, key) => {
-  if (PHASE_ATTRIBUTES_THAT_ARE_NUMBERS.includes(key)) {
-    return parseInt(getPhase(state, phase)[key]);
-  }
-  return getPhase(state, phase)[key];
-};
-
-export const splitSizeAndUnits = (field) => {
-  let size;
-  let units;
-
-  const result = /(\d+)(\w+)/.exec(field);
-  if (result) {
-    size = parseInt(result[1]) || 0;
-    units = result[2];
-  }
-
-  return {
-    size,
-    units,
-  };
-};
-
-export const isNumber = (value) => typeof value === 'number';
-export const isEmptyObject = (obj) => {
-  return !obj || (Object.entries(obj).length === 0 && obj.constructor === Object);
-};
-
-const phaseFromES = (phase, phaseName, defaultEmptyPolicy) => {
-  const policy = { ...defaultEmptyPolicy };
-  if (!phase) {
-    return policy;
-  }
-
-  policy[PHASE_ENABLED] = true;
-
-  if (phase.min_age) {
-    if (phaseName === PHASE_WARM && phase.min_age === '0ms') {
-      policy[WARM_PHASE_ON_ROLLOVER] = true;
-    } else {
-      const { size: minAge, units: minAgeUnits } = splitSizeAndUnits(phase.min_age);
-      policy[PHASE_ROLLOVER_MINIMUM_AGE] = minAge;
-      policy[PHASE_ROLLOVER_MINIMUM_AGE_UNITS] = minAgeUnits;
-    }
-  }
-  if (phaseName === PHASE_WARM) {
-    policy[PHASE_SHRINK_ENABLED] = false;
-    policy[PHASE_FORCE_MERGE_ENABLED] = false;
-  }
-  if (phase.actions) {
-    const actions = phase.actions;
-
-    if (actions.rollover) {
-      const rollover = actions.rollover;
-      policy[PHASE_ROLLOVER_ENABLED] = true;
-      if (rollover.max_age) {
-        const { size: maxAge, units: maxAgeUnits } = splitSizeAndUnits(rollover.max_age);
-        policy[PHASE_ROLLOVER_MAX_AGE] = maxAge;
-        policy[PHASE_ROLLOVER_MAX_AGE_UNITS] = maxAgeUnits;
-      }
-      if (rollover.max_size) {
-        const { size: maxSize, units: maxSizeUnits } = splitSizeAndUnits(rollover.max_size);
-        policy[PHASE_ROLLOVER_MAX_SIZE_STORED] = maxSize;
-        policy[PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS] = maxSizeUnits;
-      }
-      if (rollover.max_docs) {
-        policy[PHASE_ROLLOVER_MAX_DOCUMENTS] = rollover.max_docs;
-      }
-    }
-
-    if (actions.allocate) {
-      const allocate = actions.allocate;
-      if (allocate.require) {
-        Object.entries(allocate.require).forEach((entry) => {
-          policy[PHASE_NODE_ATTRS] = entry.join(':');
-        });
-        // checking for null or undefined here
-        if (allocate.number_of_replicas != null) {
-          policy[PHASE_REPLICA_COUNT] = allocate.number_of_replicas;
-        }
-      }
-    }
-
-    if (actions.forcemerge) {
-      const forcemerge = actions.forcemerge;
-      policy[PHASE_FORCE_MERGE_ENABLED] = true;
-      policy[PHASE_FORCE_MERGE_SEGMENTS] = forcemerge.max_num_segments;
-    }
-
-    if (actions.shrink) {
-      policy[PHASE_SHRINK_ENABLED] = true;
-      policy[PHASE_PRIMARY_SHARD_COUNT] = actions.shrink.number_of_shards;
-    }
-
-    if (actions.freeze) {
-      policy[PHASE_FREEZE_ENABLED] = true;
-    }
-
-    if (actions.set_priority) {
-      const { priority } = actions.set_priority;
-
-      policy[PHASE_INDEX_PRIORITY] = priority ?? '';
-    }
-
-    if (actions.wait_for_snapshot) {
-      policy[PHASE_WAIT_FOR_SNAPSHOT_POLICY] = actions.wait_for_snapshot.policy;
-    }
-  }
-  return policy;
-};
-
-export const policyFromES = (policy) => {
-  const {
-    name,
-    policy: { phases },
-  } = policy;
-
-  return {
-    name,
-    phases: {
-      [PHASE_HOT]: phaseFromES(phases[PHASE_HOT], PHASE_HOT, defaultEmptyHotPhase),
-      [PHASE_WARM]: phaseFromES(phases[PHASE_WARM], PHASE_WARM, defaultEmptyWarmPhase),
-      [PHASE_COLD]: phaseFromES(phases[PHASE_COLD], PHASE_COLD, defaultEmptyColdPhase),
-      [PHASE_DELETE]: phaseFromES(phases[PHASE_DELETE], PHASE_DELETE, defaultEmptyDeletePhase),
-    },
-    isNew: false,
-    saveAsNew: false,
-  };
-};
-
-export const phaseToES = (phase, originalEsPhase) => {
-  const esPhase = { ...originalEsPhase };
-
-  if (!phase[PHASE_ENABLED]) {
-    return {};
-  }
-  if (isNumber(phase[PHASE_ROLLOVER_MINIMUM_AGE])) {
-    esPhase.min_age = `${phase[PHASE_ROLLOVER_MINIMUM_AGE]}${phase[PHASE_ROLLOVER_MINIMUM_AGE_UNITS]}`;
-  }
-
-  // If warm phase on rollover is enabled, delete min age field
-  // An index lifecycle switches to warm phase when rollover occurs, so you cannot specify a warm phase time
-  // They are mutually exclusive
-  if (phase[WARM_PHASE_ON_ROLLOVER]) {
-    delete esPhase.min_age;
-  }
-
-  esPhase.actions = esPhase.actions || {};
-
-  if (phase[PHASE_ROLLOVER_ENABLED]) {
-    esPhase.actions.rollover = {};
-
-    if (isNumber(phase[PHASE_ROLLOVER_MAX_AGE])) {
-      esPhase.actions.rollover.max_age = `${phase[PHASE_ROLLOVER_MAX_AGE]}${phase[PHASE_ROLLOVER_MAX_AGE_UNITS]}`;
-    }
-    if (isNumber(phase[PHASE_ROLLOVER_MAX_SIZE_STORED])) {
-      esPhase.actions.rollover.max_size = `${phase[PHASE_ROLLOVER_MAX_SIZE_STORED]}${phase[PHASE_ROLLOVER_MAX_SIZE_STORED_UNITS]}`;
-    }
-    if (isNumber(phase[PHASE_ROLLOVER_MAX_DOCUMENTS])) {
-      esPhase.actions.rollover.max_docs = phase[PHASE_ROLLOVER_MAX_DOCUMENTS];
-    }
-  } else {
-    delete esPhase.actions.rollover;
-  }
-  if (phase[PHASE_NODE_ATTRS]) {
-    const [name, value] = phase[PHASE_NODE_ATTRS].split(':');
-    esPhase.actions.allocate = esPhase.actions.allocate || {};
-    esPhase.actions.allocate.require = {
-      [name]: value,
-    };
-  } else {
-    if (esPhase.actions.allocate) {
-      delete esPhase.actions.allocate.require;
-    }
-  }
-  if (isNumber(phase[PHASE_REPLICA_COUNT])) {
-    esPhase.actions.allocate = esPhase.actions.allocate || {};
-    esPhase.actions.allocate.number_of_replicas = phase[PHASE_REPLICA_COUNT];
-  } else {
-    if (esPhase.actions.allocate) {
-      delete esPhase.actions.allocate.number_of_replicas;
-    }
-  }
-  if (
-    esPhase.actions.allocate &&
-    !esPhase.actions.allocate.require &&
-    !isNumber(esPhase.actions.allocate.number_of_replicas) &&
-    isEmptyObject(esPhase.actions.allocate.include) &&
-    isEmptyObject(esPhase.actions.allocate.exclude)
-  ) {
-    // remove allocate action if it does not define require or number of nodes
-    // and both include and exclude are empty objects (ES will fail to parse if we don't)
-    delete esPhase.actions.allocate;
-  }
-
-  if (phase[PHASE_FORCE_MERGE_ENABLED]) {
-    esPhase.actions.forcemerge = {
-      max_num_segments: phase[PHASE_FORCE_MERGE_SEGMENTS],
-    };
-  } else {
-    delete esPhase.actions.forcemerge;
-  }
-
-  if (phase[PHASE_SHRINK_ENABLED] && isNumber(phase[PHASE_PRIMARY_SHARD_COUNT])) {
-    esPhase.actions.shrink = {
-      number_of_shards: phase[PHASE_PRIMARY_SHARD_COUNT],
-    };
-  } else {
-    delete esPhase.actions.shrink;
-  }
-
-  if (phase[PHASE_FREEZE_ENABLED]) {
-    esPhase.actions.freeze = {};
-  } else {
-    delete esPhase.actions.freeze;
-  }
-  if (isNumber(phase[PHASE_INDEX_PRIORITY])) {
-    esPhase.actions.set_priority = {
-      priority: phase[PHASE_INDEX_PRIORITY],
-    };
-  } else if (phase[PHASE_INDEX_PRIORITY] === '') {
-    esPhase.actions.set_priority = {
-      priority: null,
-    };
-  }
-
-  if (phase[PHASE_WAIT_FOR_SNAPSHOT_POLICY]) {
-    esPhase.actions.wait_for_snapshot = {
-      policy: phase[PHASE_WAIT_FOR_SNAPSHOT_POLICY],
-    };
-  } else {
-    delete esPhase.actions.wait_for_snapshot;
-  }
-  return esPhase;
-};

From e9446b2060efd1d25f3a7bda4ee9298cb7844e06 Mon Sep 17 00:00:00 2001
From: Robert Austin <robert.austin@elastic.co>
Date: Tue, 25 Aug 2020 13:34:29 -0400
Subject: [PATCH 040/148] [Resolver] restore function to the resolverTest
 plugin. (#75799)

Restore the resolverTest plugin. This will allow us to run the test plugin and try out Resolver using our mock data access layers. Eventually this could be expanded to support multiple different data access layers. It could even be expanded to allow us to control the data access layer via the browser. Another option: we could export the APIs from the server and use those in this test plugin.

We eventually expect other plugins to use Resolver. This test plugin could allow us to test Resolver via the FTR (separately of the Security Solution.)

This would also be useful for writing tests than use the FTR but which are essentially unit tests. For example: taking screenshots, using the mouse to zoom/pan.

Start using: `yarn start --plugin-path x-pack/test/plugin_functional/plugins/resolver_test/`
---
 .../public/common/store/epic.ts               |  12 +-
 .../public/common/store/store.ts              |   6 +-
 .../security_solution/public/plugin.tsx       |   9 +-
 .../public/resolver/index.ts                  |  30 ++++
 .../public/resolver/store/index.ts            |   2 +-
 .../test_utilities/simulator/index.tsx        |   2 +-
 .../public/resolver/types.ts                  |  42 ++++-
 .../public/resolver/view/index.tsx            |   4 +-
 .../public/timelines/store/timeline/types.ts  |   4 +-
 .../plugins/security_solution/public/types.ts |   6 +-
 .../plugins/resolver_test/kibana.json         |   9 +-
 .../applications/resolver_test/index.tsx      | 158 ++++++++----------
 .../plugins/resolver_test/public/plugin.ts    |  48 +++---
 13 files changed, 195 insertions(+), 137 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/resolver/index.ts

diff --git a/x-pack/plugins/security_solution/public/common/store/epic.ts b/x-pack/plugins/security_solution/public/common/store/epic.ts
index d9de7951a86f4..51a9377b9fd04 100644
--- a/x-pack/plugins/security_solution/public/common/store/epic.ts
+++ b/x-pack/plugins/security_solution/public/common/store/epic.ts
@@ -4,14 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { combineEpics } from 'redux-observable';
+import { combineEpics, Epic } from 'redux-observable';
+import { Action } from 'redux';
+
 import { createTimelineEpic } from '../../timelines/store/timeline/epic';
 import { createTimelineFavoriteEpic } from '../../timelines/store/timeline/epic_favorite';
 import { createTimelineNoteEpic } from '../../timelines/store/timeline/epic_note';
 import { createTimelinePinnedEventEpic } from '../../timelines/store/timeline/epic_pinned_event';
 import { createTimelineLocalStorageEpic } from '../../timelines/store/timeline/epic_local_storage';
+import { TimelineEpicDependencies } from '../../timelines/store/timeline/types';
 
-export const createRootEpic = <State>() =>
+export const createRootEpic = <State>(): Epic<
+  Action,
+  Action,
+  State,
+  TimelineEpicDependencies<State>
+> =>
   combineEpics(
     createTimelineEpic<State>(),
     createTimelineFavoriteEpic<State>(),
diff --git a/x-pack/plugins/security_solution/public/common/store/store.ts b/x-pack/plugins/security_solution/public/common/store/store.ts
index a39c9f18bcdb8..f041e1fd82a9f 100644
--- a/x-pack/plugins/security_solution/public/common/store/store.ts
+++ b/x-pack/plugins/security_solution/public/common/store/store.ts
@@ -13,6 +13,7 @@ import {
   Middleware,
   Dispatch,
   PreloadedState,
+  CombinedState,
 } from 'redux';
 
 import { createEpicMiddleware } from 'redux-observable';
@@ -30,6 +31,7 @@ import { Immutable } from '../../../common/endpoint/types';
 import { State } from './types';
 import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
 import { CoreStart } from '../../../../../../src/core/public';
+import { TimelineEpicDependencies } from '../../timelines/store/timeline/types';
 
 type ComposeType = typeof compose;
 declare global {
@@ -56,7 +58,7 @@ export const createStore = (
 ): Store<State, Action> => {
   const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
 
-  const middlewareDependencies = {
+  const middlewareDependencies: TimelineEpicDependencies<State> = {
     apolloClient$: apolloClient,
     kibana$: kibana,
     selectAllTimelineQuery: inputsSelectors.globalQueryByIdSelector,
@@ -80,7 +82,7 @@ export const createStore = (
     )
   );
 
-  epicMiddleware.run(createRootEpic<State>());
+  epicMiddleware.run(createRootEpic<CombinedState<State>>());
 
   return store;
 };
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
index f1a933fb34d66..a691dd98e7081 100644
--- a/x-pack/plugins/security_solution/public/plugin.tsx
+++ b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -66,7 +66,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     this.kibanaVersion = initializerContext.env.packageInfo.version;
   }
 
-  public setup(core: CoreSetup<StartPlugins, PluginStart>, plugins: SetupPlugins) {
+  public setup(core: CoreSetup<StartPlugins, PluginStart>, plugins: SetupPlugins): PluginSetup {
     initTelemetry(plugins.usageCollection, APP_ID);
 
     plugins.home.featureCatalogue.register({
@@ -319,7 +319,12 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
       },
     });
 
-    return {};
+    return {
+      resolver: async () => {
+        const { resolverPluginSetup } = await import('./resolver');
+        return resolverPluginSetup();
+      },
+    };
   }
 
   public start(core: CoreStart, plugins: StartPlugins) {
diff --git a/x-pack/plugins/security_solution/public/resolver/index.ts b/x-pack/plugins/security_solution/public/resolver/index.ts
new file mode 100644
index 0000000000000..409f82c9d1560
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/index.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { Provider } from 'react-redux';
+import { ResolverPluginSetup } from './types';
+import { resolverStoreFactory } from './store/index';
+import { ResolverWithoutProviders } from './view/resolver_without_providers';
+import { noAncestorsTwoChildren } from './data_access_layer/mocks/no_ancestors_two_children';
+
+/**
+ * These exports are used by the plugin 'resolverTest' defined in x-pack's plugin_functional suite.
+ */
+
+/**
+ * Provide access to Resolver APIs.
+ */
+export function resolverPluginSetup(): ResolverPluginSetup {
+  return {
+    Provider,
+    storeFactory: resolverStoreFactory,
+    ResolverWithoutProviders,
+    mocks: {
+      dataAccessLayer: {
+        noAncestorsTwoChildren,
+      },
+    },
+  };
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/store/index.ts b/x-pack/plugins/security_solution/public/resolver/store/index.ts
index 950a61db33f17..ed8a5129c7ff6 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/index.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/index.ts
@@ -11,7 +11,7 @@ import { resolverReducer } from './reducer';
 import { resolverMiddlewareFactory } from './middleware';
 import { ResolverAction } from './actions';
 
-export const storeFactory = (
+export const resolverStoreFactory = (
   dataAccessLayer: DataAccessLayer
 ): Store<ResolverState, ResolverAction> => {
   const actionsDenylist: Array<ResolverAction['type']> = ['userMovedPointer'];
diff --git a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
index b79b7df48a6de..a6520c8f0e06f 100644
--- a/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/test_utilities/simulator/index.tsx
@@ -7,7 +7,7 @@
 import React from 'react';
 import { Store, createStore, applyMiddleware } from 'redux';
 import { mount, ReactWrapper } from 'enzyme';
-import { createMemoryHistory, History as HistoryPackageHistoryInterface } from 'history';
+import { History as HistoryPackageHistoryInterface, createMemoryHistory } from 'history';
 import { CoreStart } from '../../../../../../../src/core/public';
 import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { spyMiddlewareFactory } from '../spy_middleware_factory';
diff --git a/x-pack/plugins/security_solution/public/resolver/types.ts b/x-pack/plugins/security_solution/public/resolver/types.ts
index 97d97700b11ae..33f7a1d97db13 100644
--- a/x-pack/plugins/security_solution/public/resolver/types.ts
+++ b/x-pack/plugins/security_solution/public/resolver/types.ts
@@ -9,6 +9,7 @@
 import { Store } from 'redux';
 import { Middleware, Dispatch } from 'redux';
 import { BBox } from 'rbush';
+import { Provider } from 'react-redux';
 import { ResolverAction } from './store/actions';
 import {
   ResolverRelatedEvents,
@@ -410,7 +411,7 @@ export interface SideEffectSimulator {
   /**
    * Mocked `SideEffectors`.
    */
-  mock: jest.Mocked<Omit<SideEffectors, 'ResizeObserver'>> & Pick<SideEffectors, 'ResizeObserver'>;
+  mock: SideEffectors;
 }
 
 /**
@@ -532,3 +533,42 @@ export interface SpyMiddleware {
    */
   debugActions: () => () => void;
 }
+
+/**
+ * values of this type are exposed by the Security Solution plugin's setup phase.
+ */
+export interface ResolverPluginSetup {
+  /**
+   * Provide access to the instance of the `react-redux` `Provider` that Resolver recognizes.
+   */
+  Provider: typeof Provider;
+  /**
+   * Takes a `DataAccessLayer`, which could be a mock one, and returns an redux Store.
+   * All data acess (e.g. HTTP requests) are done through the store.
+   */
+  storeFactory: (dataAccessLayer: DataAccessLayer) => Store<ResolverState, ResolverAction>;
+
+  /**
+   * The Resolver component without the required Providers.
+   * You must wrap this component in: `I18nProvider`, `Router` (from react-router,) `KibanaContextProvider`,
+   * and the `Provider` component provided by this object.
+   */
+  ResolverWithoutProviders: React.MemoExoticComponent<
+    React.ForwardRefExoticComponent<ResolverProps & React.RefAttributes<unknown>>
+  >;
+
+  /**
+   * A collection of mock objects that can be used in examples or in testing.
+   */
+  mocks: {
+    /**
+     * Mock `DataAccessLayer`s. All of Resolver's HTTP access is provided by a `DataAccessLayer`.
+     */
+    dataAccessLayer: {
+      /**
+       * A mock `DataAccessLayer` that returns a tree that has no ancestor nodes but which has 2 children nodes.
+       */
+      noAncestorsTwoChildren: () => { dataAccessLayer: DataAccessLayer };
+    };
+  };
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/view/index.tsx b/x-pack/plugins/security_solution/public/resolver/view/index.tsx
index d9a0bf291d0e4..bcc420435e5d9 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/index.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/index.tsx
@@ -7,7 +7,7 @@
 
 import React, { useMemo } from 'react';
 import { Provider } from 'react-redux';
-import { storeFactory } from '../store';
+import { resolverStoreFactory } from '../store';
 import { StartServices } from '../../types';
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { DataAccessLayer, ResolverProps } from '../types';
@@ -24,7 +24,7 @@ export const Resolver = React.memo((props: ResolverProps) => {
   ]);
 
   const store = useMemo(() => {
-    return storeFactory(dataAccessLayer);
+    return resolverStoreFactory(dataAccessLayer);
   }, [dataAccessLayer]);
 
   return (
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
index c64ed608339b6..8a5344e0754db 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/types.ts
@@ -10,9 +10,9 @@ import { Storage } from '../../../../../../../src/plugins/kibana_utils/public';
 import { AppApolloClient } from '../../../common/lib/lib';
 import { inputsModel } from '../../../common/store/inputs';
 import { NotesById } from '../../../common/store/app/model';
-import { StartServices } from '../../../types';
 
 import { TimelineModel } from './model';
+import { CoreStart } from '../../../../../../../src/core/public';
 
 export interface AutoSavedWarningMsg {
   timelineId: string | null;
@@ -55,6 +55,6 @@ export interface TimelineEpicDependencies<State> {
   selectAllTimelineQuery: () => (state: State, id: string) => inputsModel.GlobalQuery;
   selectNotesByIdSelector: (state: State) => NotesById;
   apolloClient$: Observable<AppApolloClient>;
-  kibana$: Observable<StartServices>;
+  kibana$: Observable<CoreStart>;
   storage: Storage;
 }
diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
index 3913b96b3e11a..fd1ff566a7719 100644
--- a/x-pack/plugins/security_solution/public/types.ts
+++ b/x-pack/plugins/security_solution/public/types.ts
@@ -21,6 +21,7 @@ import {
 } from '../../triggers_actions_ui/public';
 import { SecurityPluginSetup } from '../../security/public';
 import { AppFrontendLibs } from './common/lib/lib';
+import { ResolverPluginSetup } from './resolver/types';
 
 export interface SetupPlugins {
   home: HomePublicPluginSetup;
@@ -46,8 +47,9 @@ export type StartServices = CoreStart &
     storage: Storage;
   };
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface PluginSetup {}
+export interface PluginSetup {
+  resolver: () => Promise<ResolverPluginSetup>;
+}
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface PluginStart {}
 
diff --git a/x-pack/test/plugin_functional/plugins/resolver_test/kibana.json b/x-pack/test/plugin_functional/plugins/resolver_test/kibana.json
index c715a0aaa3b20..499983561e89d 100644
--- a/x-pack/test/plugin_functional/plugins/resolver_test/kibana.json
+++ b/x-pack/test/plugin_functional/plugins/resolver_test/kibana.json
@@ -2,8 +2,13 @@
   "id": "resolver_test",
   "version": "1.0.0",
   "kibanaVersion": "kibana",
-  "configPath": ["xpack", "resolver_test"],
-  "requiredPlugins": ["embeddable"],
+  "configPath": ["xpack", "resolverTest"],
+  "requiredPlugins": [
+    "securitySolution"
+  ],
+  "requiredBundles": [
+    "kibanaReact"
+  ],
   "server": false,
   "ui": true
 }
diff --git a/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx b/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx
index 79665b6a393df..4afd71fd67a69 100644
--- a/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx
+++ b/x-pack/test/plugin_functional/plugins/resolver_test/public/applications/resolver_test/index.tsx
@@ -4,119 +4,95 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import * as React from 'react';
+import { Router } from 'react-router-dom';
+
+import React from 'react';
 import ReactDOM from 'react-dom';
-import { AppMountParameters } from 'kibana/public';
-import { I18nProvider } from '@kbn/i18n/react';
-import { IEmbeddable } from 'src/plugins/embeddable/public';
-import { useEffect } from 'react';
+import { AppMountParameters, CoreStart } from 'kibana/public';
+import { useMemo } from 'react';
 import styled from 'styled-components';
+import { I18nProvider } from '@kbn/i18n/react';
+import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
+import {
+  DataAccessLayer,
+  ResolverPluginSetup,
+} from '../../../../../../../plugins/security_solution/public/resolver/types';
 
 /**
  * Render the Resolver Test app. Returns a cleanup function.
  */
 export function renderApp(
-  { element }: AppMountParameters,
-  embeddable: Promise<IEmbeddable | undefined>
+  coreStart: CoreStart,
+  parameters: AppMountParameters,
+  resolverPluginSetup: ResolverPluginSetup
 ) {
   /**
    * The application DOM node should take all available space.
    */
-  element.style.display = 'flex';
-  element.style.flexGrow = '1';
+  parameters.element.style.display = 'flex';
+  parameters.element.style.flexGrow = '1';
 
   ReactDOM.render(
-    <I18nProvider>
-      <AppRoot embeddable={embeddable} />
-    </I18nProvider>,
-    element
+    <AppRoot
+      coreStart={coreStart}
+      parameters={parameters}
+      resolverPluginSetup={resolverPluginSetup}
+    />,
+    parameters.element
   );
 
   return () => {
-    ReactDOM.unmountComponentAtNode(element);
+    ReactDOM.unmountComponentAtNode(parameters.element);
   };
 }
 
-const AppRoot = styled(
-  React.memo(
-    ({
-      embeddable: embeddablePromise,
-      className,
-    }: {
-      /**
-       * A promise which resolves to the Resolver embeddable.
-       */
-      embeddable: Promise<IEmbeddable | undefined>;
-      /**
-       * A `className` string provided by `styled`
-       */
-      className?: string;
-    }) => {
-      /**
-       * This state holds the reference to the embeddable, once resolved.
-       */
-      const [embeddable, setEmbeddable] = React.useState<IEmbeddable | undefined>(undefined);
-      /**
-       * This state holds the reference to the DOM node that will contain the embeddable.
-       */
-      const [renderTarget, setRenderTarget] = React.useState<HTMLDivElement | null>(null);
-
-      /**
-       * Keep component state with the Resolver embeddable.
-       *
-       * If the reference to the embeddablePromise changes, we ignore the stale promise.
-       */
-      useEffect(() => {
-        /**
-         * A promise rejection function that will prevent a stale embeddable promise from being resolved
-         * as the current eembeddable.
-         *
-         * If the embeddablePromise itself changes before the old one is resolved, we cancel and restart this effect.
-         */
-        let cleanUp;
-
-        const cleanupPromise = new Promise<never>((_resolve, reject) => {
-          cleanUp = reject;
-        });
-
-        /**
-         * Either set the embeddable in state, or cancel and restart this process.
-         */
-        Promise.race([cleanupPromise, embeddablePromise]).then((value) => {
-          setEmbeddable(value);
-        });
+const AppRoot = React.memo(
+  ({
+    coreStart,
+    parameters,
+    resolverPluginSetup,
+  }: {
+    coreStart: CoreStart;
+    parameters: AppMountParameters;
+    resolverPluginSetup: ResolverPluginSetup;
+  }) => {
+    const {
+      Provider,
+      storeFactory,
+      ResolverWithoutProviders,
+      mocks: {
+        dataAccessLayer: { noAncestorsTwoChildren },
+      },
+    } = resolverPluginSetup;
+    const dataAccessLayer: DataAccessLayer = useMemo(
+      () => noAncestorsTwoChildren().dataAccessLayer,
+      [noAncestorsTwoChildren]
+    );
 
-        /**
-         * If `embeddablePromise` is changed, the cleanup function is run.
-         */
-        return cleanUp;
-      }, [embeddablePromise]);
+    const store = useMemo(() => {
+      return storeFactory(dataAccessLayer);
+    }, [storeFactory, dataAccessLayer]);
 
-      /**
-       * Render the eembeddable into the DOM node.
-       */
-      useEffect(() => {
-        if (embeddable && renderTarget) {
-          embeddable.render(renderTarget);
-          /**
-           * If the embeddable or DOM node changes then destroy the old embeddable.
-           */
-          return () => {
-            embeddable.destroy();
-          };
-        }
-      }, [embeddable, renderTarget]);
+    return (
+      <I18nProvider>
+        <Router history={parameters.history}>
+          <KibanaContextProvider services={coreStart}>
+            <Provider store={store}>
+              <Wrapper>
+                <ResolverWithoutProviders
+                  databaseDocumentID=""
+                  resolverComponentInstanceID="test"
+                />
+              </Wrapper>
+            </Provider>
+          </KibanaContextProvider>
+        </Router>
+      </I18nProvider>
+    );
+  }
+);
 
-      return (
-        <div
-          className={className}
-          data-test-subj="resolverEmbeddableContainer"
-          ref={setRenderTarget}
-        />
-      );
-    }
-  )
-)`
+const Wrapper = styled.div`
   /**
    * Take all available space.
    */
diff --git a/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts b/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts
index 853265ae6e5de..3da3044283556 100644
--- a/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts
+++ b/x-pack/test/plugin_functional/plugins/resolver_test/public/plugin.ts
@@ -4,16 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Plugin, CoreSetup } from 'kibana/public';
+import { Plugin, CoreSetup, AppMountParameters } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
-import { IEmbeddable, EmbeddableStart } from '../../../../../../src/plugins/embeddable/public';
+import { PluginSetup as SecuritySolutionPluginSetup } from '../../../../../plugins/security_solution/public';
 
 export type ResolverTestPluginSetup = void;
 export type ResolverTestPluginStart = void;
-export interface ResolverTestPluginSetupDependencies {} // eslint-disable-line @typescript-eslint/no-empty-interface
-export interface ResolverTestPluginStartDependencies {
-  embeddable: EmbeddableStart;
+export interface ResolverTestPluginSetupDependencies {
+  securitySolution: SecuritySolutionPluginSetup;
 }
+export interface ResolverTestPluginStartDependencies {} // eslint-disable-line @typescript-eslint/no-empty-interface
 
 export class ResolverTestPlugin
   implements
@@ -23,34 +23,24 @@ export class ResolverTestPlugin
       ResolverTestPluginSetupDependencies,
       ResolverTestPluginStartDependencies
     > {
-  public setup(core: CoreSetup<ResolverTestPluginStartDependencies>) {
+  public setup(
+    core: CoreSetup<ResolverTestPluginStartDependencies, ResolverTestPluginStart>,
+    setupDependencies: ResolverTestPluginSetupDependencies
+  ) {
     core.application.register({
-      id: 'resolver_test',
-      title: i18n.translate('xpack.resolver_test.pluginTitle', {
+      id: 'resolverTest',
+      title: i18n.translate('xpack.resolverTest.pluginTitle', {
         defaultMessage: 'Resolver Test',
       }),
-      mount: async (_context, params) => {
-        let resolveEmbeddable: (
-          value: IEmbeddable | undefined | PromiseLike<IEmbeddable | undefined> | undefined
-        ) => void;
+      mount: async (params: AppMountParameters<unknown>) => {
+        const startServices = await core.getStartServices();
+        const [coreStart] = startServices;
 
-        const promise = new Promise<IEmbeddable | undefined>((resolve) => {
-          resolveEmbeddable = resolve;
-        });
-
-        (async () => {
-          const [, { embeddable }] = await core.getStartServices();
-          const factory = embeddable.getEmbeddableFactory('resolver');
-          if (factory) {
-            resolveEmbeddable!(factory.create({ id: 'test basic render' }));
-          }
-        })();
-
-        const { renderApp } = await import('./applications/resolver_test');
-        /**
-         * Pass a promise which resolves to the Resolver embeddable.
-         */
-        return renderApp(params, promise);
+        const [{ renderApp }, resolverPluginSetup] = await Promise.all([
+          import('./applications/resolver_test'),
+          setupDependencies.securitySolution.resolver(),
+        ]);
+        return renderApp(coreStart, params, resolverPluginSetup);
       },
     });
   }

From e236bdf4af95a8219e30a9e176d3f2169cb19ab8 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Tue, 25 Aug 2020 12:13:57 -0600
Subject: [PATCH 041/148] [Maps] add message to empty add tooltip card (#75809)

* [Maps] add message to empty add tooltip card

* use suggested text
---
 .../tooltip_selector/tooltip_selector.tsx         | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.tsx b/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.tsx
index 84316a1b9105d..9bab590d1f5ea 100644
--- a/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.tsx
+++ b/x-pack/plugins/maps/public/components/tooltip_selector/tooltip_selector.tsx
@@ -13,8 +13,10 @@ import {
   EuiDroppable,
   EuiText,
   EuiTextAlign,
+  EuiTextColor,
   EuiSpacer,
 } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { AddTooltipFieldPopover, FieldProps } from './add_tooltip_field_popover';
 import { IField } from '../../classes/fields/field';
@@ -156,7 +158,18 @@ export class TooltipSelector extends Component<Props, State> {
 
   _renderProperties() {
     if (!this.state.selectedFieldProps.length) {
-      return null;
+      return (
+        <EuiText size="s" textAlign="center">
+          <p>
+            <EuiTextColor color="subdued">
+              <FormattedMessage
+                id="xpack.maps.tooltipSelector.emptyState.description"
+                defaultMessage="Add a tooltip field to create filters from field values."
+              />
+            </EuiTextColor>
+          </p>
+        </EuiText>
+      );
     }
 
     return (

From f2fef70282d7d2e7ecbf4e38b6b9cc075b51f361 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Tue, 25 Aug 2020 14:21:35 -0600
Subject: [PATCH 042/148] Migrate legacy map UI settings (#75887)

* Migrate legacy map UI settings

* i18n fixes
---
 .../kibana/server/ui_setting_defaults.js      |  83 +------------
 src/plugins/maps_legacy/server/index.ts       |   7 +-
 src/plugins/maps_legacy/server/ui_settings.ts | 113 ++++++++++++++++++
 src/plugins/region_map/server/index.ts        |   7 +-
 src/plugins/region_map/server/ui_settings.ts  |  42 +++++++
 .../translations/translations/ja-JP.json      |   8 --
 .../translations/translations/zh-CN.json      |   8 --
 7 files changed, 167 insertions(+), 101 deletions(-)
 create mode 100644 src/plugins/maps_legacy/server/ui_settings.ts
 create mode 100644 src/plugins/region_map/server/ui_settings.ts

diff --git a/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js b/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js
index 2562657a71624..7de5fb581643a 100644
--- a/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js
+++ b/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js
@@ -17,88 +17,7 @@
  * under the License.
  */
 
-import { i18n } from '@kbn/i18n';
-
 export function getUiSettingDefaults() {
   // wrapped in provider so that a new instance is given to each app/test
-  return {
-    'visualization:tileMap:maxPrecision': {
-      name: i18n.translate('kbn.advancedSettings.visualization.tileMap.maxPrecisionTitle', {
-        defaultMessage: 'Maximum tile map precision',
-      }),
-      value: 7,
-      description: i18n.translate('kbn.advancedSettings.visualization.tileMap.maxPrecisionText', {
-        defaultMessage:
-          'The maximum geoHash precision displayed on tile maps: 7 is high, 10 is very high, 12 is the max. {cellDimensionsLink}',
-        description:
-          'Part of composite text: kbn.advancedSettings.visualization.tileMap.maxPrecisionText + ' +
-          'kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText',
-        values: {
-          cellDimensionsLink:
-            `<a href="http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geohashgrid-aggregation.html#_cell_dimensions_at_the_equator"
-            target="_blank" rel="noopener">` +
-            i18n.translate(
-              'kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText',
-              {
-                defaultMessage: 'Explanation of cell dimensions',
-              }
-            ) +
-            '</a>',
-        },
-      }),
-      category: ['visualization'],
-    },
-    'visualization:tileMap:WMSdefaults': {
-      name: i18n.translate('kbn.advancedSettings.visualization.tileMap.wmsDefaultsTitle', {
-        defaultMessage: 'Default WMS properties',
-      }),
-      value: JSON.stringify(
-        {
-          enabled: false,
-          url: undefined,
-          options: {
-            version: undefined,
-            layers: undefined,
-            format: 'image/png',
-            transparent: true,
-            attribution: undefined,
-            styles: undefined,
-          },
-        },
-        null,
-        2
-      ),
-      type: 'json',
-      description: i18n.translate('kbn.advancedSettings.visualization.tileMap.wmsDefaultsText', {
-        defaultMessage:
-          'Default {propertiesLink} for the WMS map server support in the coordinate map',
-        description:
-          'Part of composite text: kbn.advancedSettings.visualization.tileMap.wmsDefaultsText + ' +
-          'kbn.advancedSettings.visualization.tileMap.wmsDefaults.propertiesLinkText',
-        values: {
-          propertiesLink:
-            '<a href="http://leafletjs.com/reference.html#tilelayer-wms" target="_blank" rel="noopener noreferrer">' +
-            i18n.translate(
-              'kbn.advancedSettings.visualization.tileMap.wmsDefaults.propertiesLinkText',
-              {
-                defaultMessage: 'properties',
-              }
-            ) +
-            '</a>',
-        },
-      }),
-      category: ['visualization'],
-    },
-    'visualization:regionmap:showWarnings': {
-      name: i18n.translate('kbn.advancedSettings.visualization.showRegionMapWarningsTitle', {
-        defaultMessage: 'Show region map warning',
-      }),
-      value: true,
-      description: i18n.translate('kbn.advancedSettings.visualization.showRegionMapWarningsText', {
-        defaultMessage:
-          'Whether the region map shows a warning when terms cannot be joined to a shape on the map.',
-      }),
-      category: ['visualization'],
-    },
-  };
+  return {};
 }
diff --git a/src/plugins/maps_legacy/server/index.ts b/src/plugins/maps_legacy/server/index.ts
index 5da3ce1a84408..79ecbb238314a 100644
--- a/src/plugins/maps_legacy/server/index.ts
+++ b/src/plugins/maps_legacy/server/index.ts
@@ -18,9 +18,10 @@
  */
 
 import { Plugin, PluginConfigDescriptor } from 'kibana/server';
-import { PluginInitializerContext } from 'src/core/server';
+import { CoreSetup, PluginInitializerContext } from 'src/core/server';
 import { Observable } from 'rxjs';
 import { configSchema, ConfigSchema } from '../config';
+import { getUiSettings } from './ui_settings';
 
 export const config: PluginConfigDescriptor<ConfigSchema> = {
   exposeToBrowser: {
@@ -49,7 +50,9 @@ export class MapsLegacyPlugin implements Plugin<MapsLegacyPluginSetup> {
     this._initializerContext = initializerContext;
   }
 
-  public setup() {
+  public setup(core: CoreSetup) {
+    core.uiSettings.register(getUiSettings());
+
     // @ts-ignore
     const config$ = this._initializerContext.config.create();
     return {
diff --git a/src/plugins/maps_legacy/server/ui_settings.ts b/src/plugins/maps_legacy/server/ui_settings.ts
new file mode 100644
index 0000000000000..f92ccf848f409
--- /dev/null
+++ b/src/plugins/maps_legacy/server/ui_settings.ts
@@ -0,0 +1,113 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { UiSettingsParams } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
+
+export function getUiSettings(): Record<string, UiSettingsParams<unknown>> {
+  return {
+    'visualization:tileMap:maxPrecision': {
+      name: i18n.translate('maps_legacy.advancedSettings.visualization.tileMap.maxPrecisionTitle', {
+        defaultMessage: 'Maximum tile map precision',
+      }),
+      value: 7,
+      description: i18n.translate(
+        'maps_legacy.advancedSettings.visualization.tileMap.maxPrecisionText',
+        {
+          defaultMessage:
+            'The maximum geoHash precision displayed on tile maps: 7 is high, 10 is very high, 12 is the max. {cellDimensionsLink}',
+          description:
+            'Part of composite text: maps_legacy.advancedSettings.visualization.tileMap.maxPrecisionText + ' +
+            'maps_legacy.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText',
+          values: {
+            cellDimensionsLink:
+              `<a href="http://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geohashgrid-aggregation.html#_cell_dimensions_at_the_equator"
+            target="_blank" rel="noopener">` +
+              i18n.translate(
+                'maps_legacy.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText',
+                {
+                  defaultMessage: 'Explanation of cell dimensions',
+                }
+              ) +
+              '</a>',
+          },
+        }
+      ),
+      schema: schema.number(),
+      category: ['visualization'],
+    },
+    'visualization:tileMap:WMSdefaults': {
+      name: i18n.translate('maps_legacy.advancedSettings.visualization.tileMap.wmsDefaultsTitle', {
+        defaultMessage: 'Default WMS properties',
+      }),
+      value: JSON.stringify(
+        {
+          enabled: false,
+          url: '',
+          options: {
+            version: '',
+            layers: '',
+            format: 'image/png',
+            transparent: true,
+            attribution: '',
+            styles: '',
+          },
+        },
+        null,
+        2
+      ),
+      type: 'json',
+      description: i18n.translate(
+        'maps_legacy.advancedSettings.visualization.tileMap.wmsDefaultsText',
+        {
+          defaultMessage:
+            'Default {propertiesLink} for the WMS map server support in the coordinate map',
+          description:
+            'Part of composite text: maps_legacy.advancedSettings.visualization.tileMap.wmsDefaultsText + ' +
+            'maps_legacy.advancedSettings.visualization.tileMap.wmsDefaults.propertiesLinkText',
+          values: {
+            propertiesLink:
+              '<a href="http://leafletjs.com/reference.html#tilelayer-wms" target="_blank" rel="noopener noreferrer">' +
+              i18n.translate(
+                'maps_legacy.advancedSettings.visualization.tileMap.wmsDefaults.propertiesLinkText',
+                {
+                  defaultMessage: 'properties',
+                }
+              ) +
+              '</a>',
+          },
+        }
+      ),
+      schema: schema.object({
+        enabled: schema.boolean(),
+        url: schema.string(),
+        options: schema.object({
+          version: schema.string(),
+          layers: schema.string(),
+          format: schema.string(),
+          transparent: schema.boolean(),
+          attribution: schema.string(),
+          styles: schema.string(),
+        }),
+      }),
+      category: ['visualization'],
+    },
+  };
+}
diff --git a/src/plugins/region_map/server/index.ts b/src/plugins/region_map/server/index.ts
index e2c544d2d0ba6..f4684e1c60349 100644
--- a/src/plugins/region_map/server/index.ts
+++ b/src/plugins/region_map/server/index.ts
@@ -18,7 +18,9 @@
  */
 
 import { PluginConfigDescriptor } from 'kibana/server';
+import { CoreSetup } from 'src/core/server';
 import { configSchema, ConfigSchema } from '../config';
+import { getUiSettings } from './ui_settings';
 
 export const config: PluginConfigDescriptor<ConfigSchema> = {
   exposeToBrowser: {
@@ -29,6 +31,9 @@ export const config: PluginConfigDescriptor<ConfigSchema> = {
 };
 
 export const plugin = () => ({
-  setup() {},
+  setup(core: CoreSetup) {
+    core.uiSettings.register(getUiSettings());
+  },
+
   start() {},
 });
diff --git a/src/plugins/region_map/server/ui_settings.ts b/src/plugins/region_map/server/ui_settings.ts
new file mode 100644
index 0000000000000..9c404676b9ffd
--- /dev/null
+++ b/src/plugins/region_map/server/ui_settings.ts
@@ -0,0 +1,42 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { UiSettingsParams } from 'kibana/server';
+import { schema } from '@kbn/config-schema';
+
+export function getUiSettings(): Record<string, UiSettingsParams<unknown>> {
+  return {
+    'visualization:regionmap:showWarnings': {
+      name: i18n.translate('regionMap.advancedSettings.visualization.showRegionMapWarningsTitle', {
+        defaultMessage: 'Show region map warning',
+      }),
+      value: true,
+      description: i18n.translate(
+        'regionMap.advancedSettings.visualization.showRegionMapWarningsText',
+        {
+          defaultMessage:
+            'Whether the region map shows a warning when terms cannot be joined to a shape on the map.',
+        }
+      ),
+      schema: schema.boolean(),
+      category: ['visualization'],
+    },
+  };
+}
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 118362f494b47..0b51c00475d7e 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2775,14 +2775,6 @@
     "inspector.requests.statisticsTabLabel": "統計",
     "inspector.title": "インスペクター",
     "inspector.view": "{viewName} を表示",
-    "kbn.advancedSettings.visualization.showRegionMapWarningsText": "用語がマップの形に合わない場合に地域マップに警告を表示するかどうかです。",
-    "kbn.advancedSettings.visualization.showRegionMapWarningsTitle": "地域マップに警告を表示",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText": "ディメンションの説明",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecisionText": "マップに表示されるジオハッシュの最高精度です。7 が高い、10 が非常に高い、12 が最高を意味します。{cellDimensionsLink}",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecisionTitle": "タイルマップの最高精度",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaults.propertiesLinkText": "プロパティ",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsText": "座標マップの WMS マップサーバーサポートのデフォルトの {propertiesLink} です。",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsTitle": "デフォルトの WMS プロパティ",
     "kibana_legacy.notify.fatalError.errorStatusMessage": "エラー {errStatus} {errStatusText}: {errMessage}",
     "kibana_legacy.notify.fatalError.unavailableServerErrorMessage": "HTTP リクエストで接続に失敗しました。Kibana サーバーが実行されていて、ご使用のブラウザの接続が正常に動作していることを確認するか、システム管理者にお問い合わせください。",
     "kibana_legacy.notify.toaster.errorMessage": "エラー: {errorMessage}\n      {errorStack}",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index de1f206118447..d520f63fe7484 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2776,14 +2776,6 @@
     "inspector.requests.statisticsTabLabel": "统计信息",
     "inspector.title": "检查器",
     "inspector.view": "视图：{viewName}",
-    "kbn.advancedSettings.visualization.showRegionMapWarningsText": "词无法联接到地图上的形状时，区域地图是否显示警告。",
-    "kbn.advancedSettings.visualization.showRegionMapWarningsTitle": "显示区域地图警告",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText": "单元格维度的解释",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecisionText": "在磁贴地图上显示的最大 geoHash 精确度：7 为高，10 为很高，12 为最大值。{cellDimensionsLink}",
-    "kbn.advancedSettings.visualization.tileMap.maxPrecisionTitle": "最大磁贴地图精确度",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaults.propertiesLinkText": "属性",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsText": "坐标地图中 WMS 地图服务器支持的默认{propertiesLink}",
-    "kbn.advancedSettings.visualization.tileMap.wmsDefaultsTitle": "默认 WMS 属性",
     "kibana_legacy.notify.fatalError.errorStatusMessage": "错误 {errStatus} {errStatusText}：{errMessage}",
     "kibana_legacy.notify.fatalError.unavailableServerErrorMessage": "HTTP 请求无法连接。请检查 Kibana 服务器是否正在运行以及您的浏览器是否具有有效的连接，或请联系您的系统管理员。",
     "kibana_legacy.notify.toaster.errorMessage": "错误：{errorMessage}\n      {errorStack}",

From c3e226cf31899203c69d8d0616861c7dadecfc3e Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Tue, 25 Aug 2020 14:24:14 -0600
Subject: [PATCH 043/148] [Maps] Originating App Breadcrumb (#75692)

* [Maps] Originating App Breadcrumb

* pass getHasUnsavedChanges instead of passing boolean

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../routes/maps_app/get_breadcrumbs.test.tsx  | 36 +++++++++++
 .../routes/maps_app/get_breadcrumbs.tsx       | 59 +++++++++++++++++++
 .../routing/routes/maps_app/maps_app_view.js  | 36 ++++-------
 3 files changed, 105 insertions(+), 26 deletions(-)
 create mode 100644 x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.test.tsx
 create mode 100644 x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.tsx

diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.test.tsx b/x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.test.tsx
new file mode 100644
index 0000000000000..e8e0e583a7c6d
--- /dev/null
+++ b/x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.test.tsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getBreadcrumbs } from './get_breadcrumbs';
+
+jest.mock('../../../kibana_services', () => {});
+jest.mock('../../maps_router', () => {});
+
+const getHasUnsavedChanges = () => {
+  return false;
+};
+
+test('should get breadcrumbs "Maps / mymap"', () => {
+  const breadcrumbs = getBreadcrumbs({ title: 'mymap', getHasUnsavedChanges });
+  expect(breadcrumbs.length).toBe(2);
+  expect(breadcrumbs[0].text).toBe('Maps');
+  expect(breadcrumbs[1].text).toBe('mymap');
+});
+
+test('should get breadcrumbs "Dashboard / Maps / mymap" with originatingApp', () => {
+  const breadcrumbs = getBreadcrumbs({
+    title: 'mymap',
+    getHasUnsavedChanges,
+    originatingApp: 'dashboardId',
+    getAppNameFromId: (appId) => {
+      return 'Dashboard';
+    },
+  });
+  expect(breadcrumbs.length).toBe(3);
+  expect(breadcrumbs[0].text).toBe('Dashboard');
+  expect(breadcrumbs[1].text).toBe('Maps');
+  expect(breadcrumbs[2].text).toBe('mymap');
+});
diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.tsx b/x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.tsx
new file mode 100644
index 0000000000000..1ccf890597edc
--- /dev/null
+++ b/x-pack/plugins/maps/public/routing/routes/maps_app/get_breadcrumbs.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { getNavigateToApp } from '../../../kibana_services';
+// @ts-expect-error
+import { goToSpecifiedPath } from '../../maps_router';
+
+export const unsavedChangesWarning = i18n.translate(
+  'xpack.maps.breadCrumbs.unsavedChangesWarning',
+  {
+    defaultMessage: 'Your map has unsaved changes. Are you sure you want to leave?',
+  }
+);
+
+export function getBreadcrumbs({
+  title,
+  getHasUnsavedChanges,
+  originatingApp,
+  getAppNameFromId,
+}: {
+  title: string;
+  getHasUnsavedChanges: () => boolean;
+  originatingApp?: string;
+  getAppNameFromId?: (id: string) => string;
+}) {
+  const breadcrumbs = [];
+  if (originatingApp && getAppNameFromId) {
+    breadcrumbs.push({
+      onClick: () => {
+        getNavigateToApp()(originatingApp);
+      },
+      text: getAppNameFromId(originatingApp),
+    });
+  }
+
+  breadcrumbs.push({
+    text: i18n.translate('xpack.maps.mapController.mapsBreadcrumbLabel', {
+      defaultMessage: 'Maps',
+    }),
+    onClick: () => {
+      if (getHasUnsavedChanges()) {
+        const navigateAway = window.confirm(unsavedChangesWarning);
+        if (navigateAway) {
+          goToSpecifiedPath('/');
+        }
+      } else {
+        goToSpecifiedPath('/');
+      }
+    },
+  });
+
+  breadcrumbs.push({ text: title });
+
+  return breadcrumbs;
+}
diff --git a/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js b/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js
index 58f0bf16e93f2..485b0ed7682fa 100644
--- a/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js
+++ b/x-pack/plugins/maps/public/routing/routes/maps_app/maps_app_view.js
@@ -5,7 +5,6 @@
  */
 
 import React from 'react';
-import { i18n } from '@kbn/i18n';
 import 'mapbox-gl/dist/mapbox-gl.css';
 import _ from 'lodash';
 import { DEFAULT_IS_LAYER_TOC_OPEN } from '../../../reducers/ui';
@@ -29,13 +28,9 @@ import { AppStateManager } from '../../state_syncing/app_state_manager';
 import { startAppStateSyncing } from '../../state_syncing/app_sync';
 import { esFilters } from '../../../../../../../src/plugins/data/public';
 import { MapContainer } from '../../../connected_components/map_container';
-import { goToSpecifiedPath } from '../../maps_router';
 import { getIndexPatternsFromIds } from '../../../index_pattern_util';
 import { getTopNavConfig } from './top_nav_config';
-
-const unsavedChangesWarning = i18n.translate('xpack.maps.breadCrumbs.unsavedChangesWarning', {
-  defaultMessage: 'Your map has unsaved changes. Are you sure you want to leave?',
-});
+import { getBreadcrumbs, unsavedChangesWarning } from './get_breadcrumbs';
 
 export class MapsAppView extends React.Component {
   _globalSyncUnsubscribe = null;
@@ -104,7 +99,7 @@ export class MapsAppView extends React.Component {
     getCoreChrome().setBreadcrumbs([]);
   }
 
-  _hasUnsavedChanges() {
+  _hasUnsavedChanges = () => {
     const savedLayerList = this.props.savedMap.getLayerList();
     return !savedLayerList
       ? !_.isEqual(this.props.layerListConfigOnly, this.state.initialLayerListConfig)
@@ -114,27 +109,16 @@ export class MapsAppView extends React.Component {
         // Need to perform the same process for layerListConfigOnly to compare apples to apples
         // and avoid undefined properties in layerListConfigOnly triggering unsaved changes.
         !_.isEqual(JSON.parse(JSON.stringify(this.props.layerListConfigOnly)), savedLayerList);
-  }
+  };
 
   _setBreadcrumbs = () => {
-    getCoreChrome().setBreadcrumbs([
-      {
-        text: i18n.translate('xpack.maps.mapController.mapsBreadcrumbLabel', {
-          defaultMessage: 'Maps',
-        }),
-        onClick: () => {
-          if (this._hasUnsavedChanges()) {
-            const navigateAway = window.confirm(unsavedChangesWarning);
-            if (navigateAway) {
-              goToSpecifiedPath('/');
-            }
-          } else {
-            goToSpecifiedPath('/');
-          }
-        },
-      },
-      { text: this.props.savedMap.title },
-    ]);
+    const breadcrumbs = getBreadcrumbs({
+      title: this.props.savedMap.title,
+      getHasUnsavedChanges: this._hasUnsavedChanges,
+      originatingApp: this.state.originatingApp,
+      getAppNameFromId: this.props.stateTransfer.getAppNameFromId,
+    });
+    getCoreChrome().setBreadcrumbs(breadcrumbs);
   };
 
   _updateFromGlobalState = ({ changes, state: globalState }) => {

From 9511285bbd95f9f074dc28077c22505208272cf9 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Tue, 25 Aug 2020 13:27:27 -0700
Subject: [PATCH 044/148] [src/dev/build] report file count of archives when
 building (#75900)

Co-authored-by: spalger <spalger@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/dev/build/lib/fs.ts                     | 22 ++++++-
 src/dev/build/tasks/create_archives_task.ts | 71 +++++++++++----------
 2 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/src/dev/build/lib/fs.ts b/src/dev/build/lib/fs.ts
index d86901c41e436..a91113ab2d1c4 100644
--- a/src/dev/build/lib/fs.ts
+++ b/src/dev/build/lib/fs.ts
@@ -273,7 +273,16 @@ export async function compressTar({
 
   archive.pipe(output);
 
-  return archive.directory(source, name).finalize();
+  let fileCount = 0;
+  archive.on('entry', (entry) => {
+    if (entry.stats?.isFile()) {
+      fileCount += 1;
+    }
+  });
+
+  await archive.directory(source, name).finalize();
+
+  return fileCount;
 }
 
 interface CompressZipOptions {
@@ -294,5 +303,14 @@ export async function compressZip({
 
   archive.pipe(output);
 
-  return archive.directory(source, name).finalize();
+  let fileCount = 0;
+  archive.on('entry', (entry) => {
+    if (entry.stats?.isFile()) {
+      fileCount += 1;
+    }
+  });
+
+  await archive.directory(source, name).finalize();
+
+  return fileCount;
 }
diff --git a/src/dev/build/tasks/create_archives_task.ts b/src/dev/build/tasks/create_archives_task.ts
index 3ffb1afef7469..0083881e9f748 100644
--- a/src/dev/build/tasks/create_archives_task.ts
+++ b/src/dev/build/tasks/create_archives_task.ts
@@ -21,7 +21,7 @@ import Path from 'path';
 import Fs from 'fs';
 import { promisify } from 'util';
 
-import { CiStatsReporter } from '@kbn/dev-utils';
+import { CiStatsReporter, CiStatsMetrics } from '@kbn/dev-utils';
 
 import { mkdirp, compressTar, compressZip, Task } from '../lib';
 
@@ -47,17 +47,16 @@ export const CreateArchives: Task = {
           archives.push({
             format: 'zip',
             path: destination,
-          });
-
-          await compressZip({
-            source,
-            destination,
-            archiverOptions: {
-              zlib: {
-                level: 9,
+            fileCount: await compressZip({
+              source,
+              destination,
+              archiverOptions: {
+                zlib: {
+                  level: 9,
+                },
               },
-            },
-            createRootDirectory: true,
+              createRootDirectory: true,
+            }),
           });
           break;
 
@@ -65,18 +64,17 @@ export const CreateArchives: Task = {
           archives.push({
             format: 'tar',
             path: destination,
-          });
-
-          await compressTar({
-            source,
-            destination,
-            archiverOptions: {
-              gzip: true,
-              gzipOptions: {
-                level: 9,
+            fileCount: await compressTar({
+              source,
+              destination,
+              archiverOptions: {
+                gzip: true,
+                gzipOptions: {
+                  level: 9,
+                },
               },
-            },
-            createRootDirectory: true,
+              createRootDirectory: true,
+            }),
           });
           break;
 
@@ -85,19 +83,22 @@ export const CreateArchives: Task = {
       }
     }
 
-    const reporter = CiStatsReporter.fromEnv(log);
-    if (reporter.isEnabled()) {
-      await reporter.metrics(
-        await Promise.all(
-          archives.map(async ({ format, path }) => {
-            return {
-              group: `${build.isOss() ? 'oss ' : ''}distributable size`,
-              id: format,
-              value: (await asyncStat(path)).size,
-            };
-          })
-        )
-      );
+    const metrics: CiStatsMetrics = [];
+    for (const { format, path, fileCount } of archives) {
+      metrics.push({
+        group: `${build.isOss() ? 'oss ' : ''}distributable size`,
+        id: format,
+        value: (await asyncStat(path)).size,
+      });
+
+      metrics.push({
+        group: `${build.isOss() ? 'oss ' : ''}distributable file count`,
+        id: 'total',
+        value: fileCount,
+      });
     }
+    log.debug('archive metrics:', metrics);
+
+    await CiStatsReporter.fromEnv(log).metrics(metrics);
   },
 };

From 947a93900d05e8837ac26eae706c96254f48c86d Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Tue, 25 Aug 2020 15:02:38 -0600
Subject: [PATCH 045/148] [Maps] fix IVectorLayer.getStyle typing (#75829)

* [Maps] fix IVectorLayer.getStyle typing

* update typing in VectorLayer type definition

* fix unit tests

* review feedback
---
 .../public/classes/layers/vector_layer/vector_layer.d.ts     | 2 --
 .../classes/styles/vector/properties/__tests__/test_util.ts  | 4 ++--
 .../styles/vector/properties/dynamic_style_property.tsx      | 5 +++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
index ad4479d3a324b..fa614ae87b290 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.d.ts
@@ -32,7 +32,6 @@ export interface IVectorLayer extends ILayer {
   getJoins(): IJoin[];
   getValidJoins(): IJoin[];
   getSource(): IVectorSource;
-  getStyle(): IVectorStyle;
   getFeatureById(id: string | number): Feature | null;
   getPropertiesForTooltip(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
   hasJoins(): boolean;
@@ -79,7 +78,6 @@ export class VectorLayer extends AbstractLayer implements IVectorLayer {
   _setMbPointsProperties(mbMap: unknown, mvtSourceLayer?: string): void;
   _setMbLinePolygonProperties(mbMap: unknown, mvtSourceLayer?: string): void;
   getSource(): IVectorSource;
-  getStyle(): IVectorStyle;
   getFeatureById(id: string | number): Feature | null;
   getPropertiesForTooltip(properties: GeoJsonProperties): Promise<ITooltipProperty[]>;
   hasJoins(): boolean;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/__tests__/test_util.ts b/x-pack/plugins/maps/public/classes/styles/vector/properties/__tests__/test_util.ts
index 3f6edc81e30ef..a2dfdc94d8058 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/__tests__/test_util.ts
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/__tests__/test_util.ts
@@ -5,7 +5,7 @@
  */
 
 // eslint-disable-next-line max-classes-per-file
-import { FIELD_ORIGIN } from '../../../../../../common/constants';
+import { FIELD_ORIGIN, LAYER_STYLE_TYPE } from '../../../../../../common/constants';
 import { StyleMeta } from '../../style_meta';
 import {
   CategoryFieldMeta,
@@ -44,7 +44,7 @@ export class MockStyle implements IStyle {
   }
 
   getType() {
-    return 'mockStyle';
+    return LAYER_STYLE_TYPE.VECTOR;
   }
 
   getStyleMeta(): StyleMeta {
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
index 47659e055936e..826acd41e27a9 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
@@ -27,6 +27,7 @@ import {
 import { IField } from '../../../fields/field';
 import { IVectorLayer } from '../../../layers/vector_layer/vector_layer';
 import { IJoin } from '../../../joins/join';
+import { IVectorStyle } from '../vector_style';
 
 export interface IDynamicStyleProperty<T> extends IStyleProperty<T> {
   getFieldMetaOptions(): FieldMetaOptions;
@@ -88,7 +89,7 @@ export class DynamicStyleProperty<T> extends AbstractStyleProperty<T>
   }
 
   getRangeFieldMeta() {
-    const style = this._layer.getStyle();
+    const style = this._layer.getStyle() as IVectorStyle;
     const styleMeta = style.getStyleMeta();
     const fieldName = this.getFieldName();
     const rangeFieldMetaFromLocalFeatures = styleMeta.getRangeFieldMetaDescriptor(fieldName);
@@ -113,7 +114,7 @@ export class DynamicStyleProperty<T> extends AbstractStyleProperty<T>
   }
 
   getCategoryFieldMeta() {
-    const style = this._layer.getStyle();
+    const style = this._layer.getStyle() as IVectorStyle;
     const styleMeta = style.getStyleMeta();
     const fieldName = this.getFieldName();
     const categoryFieldMetaFromLocalFeatures = styleMeta.getCategoryFieldMetaDescriptor(fieldName);

From fef89334b573b5a4fca89969ff6e2dca9de95a43 Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Tue, 25 Aug 2020 16:43:28 -0500
Subject: [PATCH 046/148] [Enterprise Search] Move views into separate folder
 from components (#75906)

* Move views into separate folder from components

* Fix paths in tests

* More error_state to views
---
 .../public/applications/workplace_search/index.test.tsx   | 4 ++--
 .../public/applications/workplace_search/index.tsx        | 8 ++++----
 .../error_state/error_state.test.tsx                      | 0
 .../{components => views}/error_state/error_state.tsx     | 2 +-
 .../{components => views}/error_state/index.ts            | 0
 .../{components => views}/overview/__mocks__/index.ts     | 0
 .../overview/__mocks__/overview_logic.mock.ts             | 0
 .../{components => views}/overview/index.ts               | 0
 .../overview/onboarding_card.test.tsx                     | 0
 .../{components => views}/overview/onboarding_card.tsx    | 0
 .../overview/onboarding_steps.test.tsx                    | 0
 .../{components => views}/overview/onboarding_steps.tsx   | 4 ++--
 .../overview/organization_stats.test.tsx                  | 0
 .../{components => views}/overview/organization_stats.tsx | 2 +-
 .../{components => views}/overview/overview.test.tsx      | 4 ++--
 .../{components => views}/overview/overview.tsx           | 6 +++---
 .../{components => views}/overview/overview_logic.test.ts | 0
 .../{components => views}/overview/overview_logic.ts      | 0
 .../{components => views}/overview/recent_activity.scss   | 0
 .../overview/recent_activity.test.tsx                     | 0
 .../{components => views}/overview/recent_activity.tsx    | 2 +-
 .../overview/statistic_card.test.tsx                      | 0
 .../{components => views}/overview/statistic_card.tsx     | 0
 .../{components => views}/setup_guide/index.ts            | 0
 .../setup_guide/setup_guide.test.tsx                      | 0
 .../{components => views}/setup_guide/setup_guide.tsx     | 0
 26 files changed, 16 insertions(+), 16 deletions(-)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/error_state/error_state.test.tsx (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/error_state/error_state.tsx (93%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/error_state/index.ts (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/__mocks__/index.ts (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/__mocks__/overview_logic.mock.ts (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/index.ts (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/onboarding_card.test.tsx (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/onboarding_card.tsx (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/onboarding_steps.test.tsx (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/onboarding_steps.tsx (97%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/organization_stats.test.tsx (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/organization_stats.tsx (97%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/overview.test.tsx (93%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/overview.tsx (93%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/overview_logic.test.ts (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/overview_logic.ts (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/recent_activity.scss (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/recent_activity.test.tsx (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/recent_activity.tsx (98%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/statistic_card.test.tsx (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/overview/statistic_card.tsx (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/setup_guide/index.ts (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/setup_guide/setup_guide.test.tsx (100%)
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{components => views}/setup_guide/setup_guide.tsx (100%)

diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
index 654f4dce0ebf3..a0d9352ee9f82 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
@@ -12,8 +12,8 @@ import { Redirect } from 'react-router-dom';
 import { shallow } from 'enzyme';
 import { useValues } from 'kea';
 
-import { Overview } from './components/overview';
-import { ErrorState } from './components/error_state';
+import { Overview } from './views/overview';
+import { ErrorState } from './views/error_state';
 
 import { WorkplaceSearch } from './';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
index b261c83e30dde..8582a003c6fa8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
@@ -16,11 +16,11 @@ import { WorkplaceSearchNav } from './components/layout/nav';
 
 import { SETUP_GUIDE_PATH } from './routes';
 
-import { SetupGuide } from './components/setup_guide';
-import { ErrorState } from './components/error_state';
-import { Overview } from './components/overview';
+import { SetupGuide } from './views/setup_guide';
+import { ErrorState } from './views/error_state';
+import { Overview } from './views/overview';
 
-export const WorkplaceSearch: React.FC<IInitialAppData> = (props) => {
+export const WorkplaceSearch: React.FC<IInitialAppData> = () => {
   const { config } = useContext(KibanaContext) as IKibanaContext;
   const { errorConnecting } = useValues(HttpLogic) as IHttpLogicValues;
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/error_state.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/error_state.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/error_state.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx
similarity index 93%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/error_state.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx
index 53f3a7a274429..9ad649c292fb7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/error_state.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/error_state.tsx
@@ -13,7 +13,7 @@ import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
 import { ErrorStatePrompt } from '../../../shared/error_state';
 import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
-import { ViewContentHeader } from '../shared/view_content_header';
+import { ViewContentHeader } from '../../components/shared/view_content_header';
 
 export const ErrorState: React.FC = () => {
   return (
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/error_state/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/error_state/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/__mocks__/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/__mocks__/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/__mocks__/overview_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/__mocks__/overview_logic.mock.ts
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/onboarding_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_card.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/onboarding_card.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_card.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/onboarding_card.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_card.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/onboarding_card.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_card.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/onboarding_steps.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/onboarding_steps.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/onboarding_steps.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx
similarity index 97%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/onboarding_steps.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx
index d0f5893bdb88a..fa4decccb34b1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/onboarding_steps.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx
@@ -21,12 +21,12 @@ import {
   EuiButtonEmptyProps,
   EuiLinkProps,
 } from '@elastic/eui';
-import sharedSourcesIcon from '../shared/assets/share_circle.svg';
+import sharedSourcesIcon from '../../components/shared/assets/share_circle.svg';
 import { sendTelemetry } from '../../../shared/telemetry';
 import { KibanaContext, IKibanaContext } from '../../../index';
 import { ORG_SOURCES_PATH, USERS_PATH, ORG_SETTINGS_PATH } from '../../routes';
 
-import { ContentSection } from '../shared/content_section';
+import { ContentSection } from '../../components/shared/content_section';
 
 import { OverviewLogic, IOverviewValues } from './overview_logic';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/organization_stats.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/organization_stats.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/organization_stats.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx
similarity index 97%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/organization_stats.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx
index 4c5efce9baf12..53549cfcdbce7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/organization_stats.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx
@@ -11,7 +11,7 @@ import { useValues } from 'kea';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 
-import { ContentSection } from '../shared/content_section';
+import { ContentSection } from '../../components/shared/content_section';
 import { ORG_SOURCES_PATH, USERS_PATH } from '../../routes';
 
 import { OverviewLogic, IOverviewValues } from './overview_logic';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx
similarity index 93%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx
index fee966a56923d..e4531ff03587b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx
@@ -11,8 +11,8 @@ import { mockLogicActions, setMockValues } from './__mocks__';
 import React from 'react';
 import { shallow, mount } from 'enzyme';
 
-import { Loading } from '../shared/loading';
-import { ViewContentHeader } from '../shared/view_content_header';
+import { Loading } from '../../components/shared/loading';
+import { ViewContentHeader } from '../../components/shared/view_content_header';
 
 import { OnboardingSteps } from './onboarding_steps';
 import { OrganizationStats } from './organization_stats';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.tsx
similarity index 93%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.tsx
index 6aa3e1e608bfe..134fc9389694d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.tsx
@@ -16,9 +16,9 @@ import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/t
 
 import { OverviewLogic, IOverviewActions, IOverviewValues } from './overview_logic';
 
-import { Loading } from '../shared/loading';
-import { ProductButton } from '../shared/product_button';
-import { ViewContentHeader } from '../shared/view_content_header';
+import { Loading } from '../../components/shared/loading';
+import { ProductButton } from '../../components/shared/product_button';
+import { ViewContentHeader } from '../../components/shared/view_content_header';
 
 import { OnboardingSteps } from './onboarding_steps';
 import { OrganizationStats } from './organization_stats';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.test.ts
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/overview_logic.ts
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/recent_activity.scss b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.scss
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/recent_activity.scss
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.scss
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/recent_activity.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/recent_activity.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/recent_activity.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.tsx
similarity index 98%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/recent_activity.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.tsx
index 0f4f6c65d083c..ada89c33be7e2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/recent_activity.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.tsx
@@ -12,7 +12,7 @@ import { useValues } from 'kea';
 import { EuiEmptyPrompt, EuiLink, EuiPanel, EuiSpacer, EuiLinkProps } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { ContentSection } from '../shared/content_section';
+import { ContentSection } from '../../components/shared/content_section';
 import { sendTelemetry } from '../../../shared/telemetry';
 import { KibanaContext, IKibanaContext } from '../../../index';
 import { getSourcePath } from '../../routes';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/statistic_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/statistic_card.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/statistic_card.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/statistic_card.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/statistic_card.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/statistic_card.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/overview/statistic_card.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/statistic_card.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/setup_guide/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/setup_guide/index.ts
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/index.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/setup_guide/setup_guide.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.test.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/setup_guide/setup_guide.test.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/setup_guide/setup_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/components/setup_guide/setup_guide.tsx
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.tsx

From 1fee8f16ef8c6399bfa9d00a7c59cdb92be12361 Mon Sep 17 00:00:00 2001
From: Marta Bondyra <marta.bondyra@gmail.com>
Date: Wed, 26 Aug 2020 00:00:24 +0200
Subject: [PATCH 047/148] [Lens] fix dimension popover design on mobile
 (#75866)

---
 .../indexpattern_datasource/dimension_panel/field_select.tsx    | 2 +-
 .../indexpattern_datasource/dimension_panel/popover_editor.scss | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx
index b2a59788b50f9..e4dfa69813743 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx
@@ -181,7 +181,7 @@ export function FieldSelect({
       }}
       renderOption={(option, searchValue) => {
         return (
-          <EuiFlexGroup gutterSize="s" alignItems="center">
+          <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
             <EuiFlexItem grow={null}>
               <LensFieldIcon
                 type={((option.value as unknown) as { dataType: DataType }).dataType}
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/popover_editor.scss b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/popover_editor.scss
index b8986cea48d4e..3f75b5ad86669 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/popover_editor.scss
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/popover_editor.scss
@@ -1,6 +1,7 @@
 .lnsIndexPatternDimensionEditor {
   width: $euiSize * 30;
   padding: $euiSizeS;
+  max-width: 100%;
 }
 
 .lnsIndexPatternDimensionEditor__left,

From 5f89e0003beb1c6d75494b0cea582bb8a7aa8259 Mon Sep 17 00:00:00 2001
From: Davis Plumlee <56367316+dplumlee@users.noreply.github.com>
Date: Tue, 25 Aug 2020 18:13:41 -0400
Subject: [PATCH 048/148] [Security Solution][Detections] Disables add
 exception for ML and threshold rules (#75802)

---
 .../components/alerts_table/default_config.tsx    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/default_config.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/default_config.tsx
index 5bab2e3c78970..ca17d331c67e5 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/default_config.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/default_config.tsx
@@ -9,6 +9,8 @@ import ApolloClient from 'apollo-client';
 import { Dispatch } from 'redux';
 
 import { EuiText } from '@elastic/eui';
+import { RuleType } from '../../../../common/detection_engine/types';
+import { isMlRule } from '../../../../common/machine_learning/helpers';
 import { RowRendererId } from '../../../../common/types/timeline';
 import { DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
 import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
@@ -39,6 +41,7 @@ import {
 import { Ecs, TimelineNonEcsData } from '../../../graphql/types';
 import { AddExceptionModalBaseProps } from '../../../common/components/exceptions/add_exception_modal';
 import { getMappedNonEcsValue } from '../../../common/components/exceptions/helpers';
+import { isThresholdRule } from '../../../../common/detection_engine/utils';
 
 export const buildAlertStatusFilter = (status: Status): Filter[] => [
   {
@@ -193,6 +196,7 @@ export const requiredFieldsForActions = [
   'signal.rule.query',
   'signal.rule.to',
   'signal.rule.id',
+  'signal.rule.type',
   'signal.original_event.kind',
   'signal.original_event.module',
 
@@ -317,6 +321,15 @@ export const getAlertActions = ({
     return module === 'endpoint' && kind === 'alert';
   };
 
+  const exceptionsAreAllowed = () => {
+    const ruleTypes = getMappedNonEcsValue({
+      data: nonEcsRowData,
+      fieldName: 'signal.rule.type',
+    });
+    const [ruleType] = ruleTypes as RuleType[];
+    return !isMlRule(ruleType) && !isThresholdRule(ruleType);
+  };
+
   return [
     {
       ...getInvestigateInResolverAction({ dispatch, timelineId }),
@@ -386,7 +399,7 @@ export const getAlertActions = ({
         }
       },
       id: 'addException',
-      isActionDisabled: () => !canUserCRUD || !hasIndexWrite,
+      isActionDisabled: () => !canUserCRUD || !hasIndexWrite || !exceptionsAreAllowed(),
       dataTestSubj: 'add-exception-menu-item',
       ariaLabel: 'Add Exception',
       content: <EuiText size="m">{i18n.ACTION_ADD_EXCEPTION}</EuiText>,

From ba9a60738425a2948f6e074408a0e5d22d07c721 Mon Sep 17 00:00:00 2001
From: Frank Hassanabad <frank.hassanabad@elastic.co>
Date: Tue, 25 Aug 2020 19:48:18 -0600
Subject: [PATCH 049/148] Optimizes the index queries to not block the NodeJS
 event loop (#75716)

## Summary

Before this PR you can see event loop block times of:

```ts
formatIndexFields: 7986.884ms
```

After this PR you will see event loop block times of:

```ts
formatIndexFields: 85.012ms
```

within the file:

```ts
x-pack/plugins/security_solution/server/lib/index_fields/elasticsearch_adapter.ts
```

For the GraphQL query of `SourceQuery`/`IndexFields`

This also fixes the issue of `unknown` being returned to the front end by removing code that is no longer functioning as it was intended. Ensure during testing of this PR that blank/default and non exist indexes within `securitySolution:defaultIndex` still work as expected.

Before, notice the `unknown` instead of the `filebeat-*`:
<img width="733" alt="Screen Shot 2020-08-20 at 4 55 52 PM" src="https://user-images.githubusercontent.com/1151048/90949129-f5047900-e402-11ea-9278-b4c7bf5cd16d.png">

After:
<img width="830" alt="Screen Shot 2020-08-20 at 4 56 03 PM" src="https://user-images.githubusercontent.com/1151048/90949133-02b9fe80-e403-11ea-8504-f5bbe043048a.png">

An explanation of how to see the block times for before and after
---

For perf testing you first add timed testing to the file:
```ts
x-pack/plugins/security_solution/server/lib/index_fields/elasticsearch_adapter.ts
```

Before this PR, around lines 42:
```ts
console.time('formatIndexFields'); // <--- start timer
const fields = formatIndexFields(
  responsesIndexFields,
  Object.keys(indexesAliasIndices) as IndexAlias[]
);
console.timeEnd('formatIndexFields'); // <--- outputs the end timer
return fields;
```

After this PR, around lines 42:

```ts
console.time('formatIndexFields'); // <--- start timer
const fields = await formatIndexFields(responsesIndexFields, indices);
console.timeEnd('formatIndexFields');  // <--- outputs the end timer
return fields;
```

And then reload the security solutions application web page here:
```
http://localhost:5601/app/security/timelines/default
```

Be sure to load it _twice_ for testing as NodeJS will sometimes report better numbers the second time as it does optimizations after the first time it encounters some code paths.

You will begin to see numbers similar to this before this PR:

```ts
formatIndexFields: 2553.279ms
```

This indicates that it is blocking the event loop for ~2.5 seconds befofe this fix. If you add additional indexes to your `securitySolution:defaultIndex` indexes that have additional fields then this amount will increase exponentially. For developers using our test servers I created two other indexes called delme-1 and delme-2 with additional mappings you can add like below

```ts
apm-*-transaction*, auditbeat-*, endgame-*, filebeat-*, logs-*, packetbeat-*, winlogbeat-*, delme-1, delme-2
```

<img width="980" alt="Screen Shot 2020-08-21 at 8 21 50 PM" src="https://user-images.githubusercontent.com/1151048/90949142-211ffa00-e403-11ea-8ab2-f66de977dce3.png">

Then you are going to see times approaching 8 seconds of blocking the event loop like so:

```ts
formatIndexFields: 7986.884ms
```

After this fix on the first pass unoptimized it will report

```ts
formatIndexFields: 373.082ms
```

Then after it optimizes the code paths on a second page load it will report

```ts
formatIndexFields: 84.304ms
```

### Checklist

Delete any items that are not applicable to this PR.

- [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
---
 .../elasticsearch_adapter.test.ts             | 564 +++++++++++++++++-
 .../lib/index_fields/elasticsearch_adapter.ts | 203 ++++---
 .../server/utils/beat_schema/index.test.ts    |  22 +-
 .../server/utils/beat_schema/index.ts         |  15 -
 .../server/utils/beat_schema/type.ts          |   2 -
 5 files changed, 692 insertions(+), 114 deletions(-)

diff --git a/x-pack/plugins/security_solution/server/lib/index_fields/elasticsearch_adapter.test.ts b/x-pack/plugins/security_solution/server/lib/index_fields/elasticsearch_adapter.test.ts
index 20bc1387a3c4e..e8883111c95f6 100644
--- a/x-pack/plugins/security_solution/server/lib/index_fields/elasticsearch_adapter.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/index_fields/elasticsearch_adapter.test.ts
@@ -6,16 +6,21 @@
 
 import { sortBy } from 'lodash/fp';
 
-import { formatIndexFields } from './elasticsearch_adapter';
+import {
+  formatIndexFields,
+  formatFirstFields,
+  formatSecondFields,
+  createFieldItem,
+} from './elasticsearch_adapter';
 import { mockAuditbeatIndexField, mockFilebeatIndexField, mockPacketbeatIndexField } from './mock';
 
 describe('Index Fields', () => {
   describe('formatIndexFields', () => {
-    test('Test Basic functionality', async () => {
+    test('Basic functionality', async () => {
       expect(
         sortBy(
           'name',
-          formatIndexFields(
+          await formatIndexFields(
             [mockAuditbeatIndexField, mockFilebeatIndexField, mockPacketbeatIndexField],
             ['auditbeat', 'filebeat', 'packetbeat']
           )
@@ -130,4 +135,557 @@ describe('Index Fields', () => {
       );
     });
   });
+
+  describe('formatFirstFields', () => {
+    test('Basic functionality', async () => {
+      const fields = await formatFirstFields(
+        [mockAuditbeatIndexField, mockFilebeatIndexField, mockPacketbeatIndexField],
+        ['auditbeat', 'filebeat', 'packetbeat']
+      );
+      expect(fields).toEqual([
+        {
+          description: 'Each document has an _id that uniquely identifies it',
+          example: 'Y-6TfmcB0WOhS6qyMv3s',
+          footnote: '',
+          group: 1,
+          level: 'core',
+          name: '_id',
+          required: true,
+          type: 'string',
+          searchable: true,
+          aggregatable: false,
+          readFromDocValues: true,
+          category: '_id',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'An index is like a ‘database’ in a relational database. It has a mapping which defines multiple types. An index is a logical namespace which maps to one or more primary shards and can have zero or more replica shards.',
+          example: 'auditbeat-8.0.0-2019.02.19-000001',
+          footnote: '',
+          group: 1,
+          level: 'core',
+          name: '_index',
+          required: true,
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          readFromDocValues: true,
+          category: '_index',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'Date/time when the event originated.\n\nThis is the date/time extracted from the event, typically representing when\nthe event was generated by the source.\n\nIf the event source has no original timestamp, this value is typically populated\nby the first time the event was received by the pipeline.\n\nRequired field for all events.',
+          example: '2016-05-23T08:05:34.853Z',
+          name: '@timestamp',
+          type: 'date',
+          searchable: true,
+          aggregatable: true,
+          category: 'base',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'Ephemeral identifier of this agent (if one exists).\n\nThis id normally changes across restarts, but `agent.id` does not.',
+          example: '8a4f500f',
+          name: 'agent.ephemeral_id',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'Custom name of the agent.\n\nThis is a name that can be given to an agent. This can be helpful if for example\ntwo Filebeat instances are running on the same host but a human readable separation\nis needed on which Filebeat instance data is coming from.\n\nIf no name is given, the name is often left empty.',
+          example: 'foo',
+          name: 'agent.name',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'Type of the agent.\n\nThe agent type stays always the same and should be given by the agent used.\nIn case of Filebeat the agent would always be Filebeat also if two Filebeat\ninstances are run on the same machine.',
+          example: 'filebeat',
+          name: 'agent.type',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat'],
+        },
+        {
+          description: 'Version of the agent.',
+          example: '6.0.0-rc2',
+          name: 'agent.version',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat'],
+        },
+        {
+          description: 'Each document has an _id that uniquely identifies it',
+          example: 'Y-6TfmcB0WOhS6qyMv3s',
+          footnote: '',
+          group: 1,
+          level: 'core',
+          name: '_id',
+          required: true,
+          type: 'string',
+          searchable: true,
+          aggregatable: false,
+          readFromDocValues: true,
+          category: '_id',
+          indexes: ['filebeat'],
+        },
+        {
+          description:
+            'An index is like a ‘database’ in a relational database. It has a mapping which defines multiple types. An index is a logical namespace which maps to one or more primary shards and can have zero or more replica shards.',
+          example: 'auditbeat-8.0.0-2019.02.19-000001',
+          footnote: '',
+          group: 1,
+          level: 'core',
+          name: '_index',
+          required: true,
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          readFromDocValues: true,
+          category: '_index',
+          indexes: ['filebeat'],
+        },
+        {
+          description:
+            'Date/time when the event originated.\n\nThis is the date/time extracted from the event, typically representing when\nthe event was generated by the source.\n\nIf the event source has no original timestamp, this value is typically populated\nby the first time the event was received by the pipeline.\n\nRequired field for all events.',
+          example: '2016-05-23T08:05:34.853Z',
+          name: '@timestamp',
+          type: 'date',
+          searchable: true,
+          aggregatable: true,
+          category: 'base',
+          indexes: ['filebeat'],
+        },
+        {
+          name: 'agent.hostname',
+          searchable: true,
+          type: 'string',
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['filebeat'],
+        },
+        {
+          description:
+            'Custom name of the agent.\n\nThis is a name that can be given to an agent. This can be helpful if for example\ntwo Filebeat instances are running on the same host but a human readable separation\nis needed on which Filebeat instance data is coming from.\n\nIf no name is given, the name is often left empty.',
+          example: 'foo',
+          name: 'agent.name',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['filebeat'],
+        },
+        {
+          description: 'Version of the agent.',
+          example: '6.0.0-rc2',
+          name: 'agent.version',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['filebeat'],
+        },
+        {
+          description: 'Each document has an _id that uniquely identifies it',
+          example: 'Y-6TfmcB0WOhS6qyMv3s',
+          footnote: '',
+          group: 1,
+          level: 'core',
+          name: '_id',
+          required: true,
+          type: 'string',
+          searchable: true,
+          aggregatable: false,
+          readFromDocValues: true,
+          category: '_id',
+          indexes: ['packetbeat'],
+        },
+        {
+          description:
+            'An index is like a ‘database’ in a relational database. It has a mapping which defines multiple types. An index is a logical namespace which maps to one or more primary shards and can have zero or more replica shards.',
+          example: 'auditbeat-8.0.0-2019.02.19-000001',
+          footnote: '',
+          group: 1,
+          level: 'core',
+          name: '_index',
+          required: true,
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          readFromDocValues: true,
+          category: '_index',
+          indexes: ['packetbeat'],
+        },
+        {
+          description:
+            'Date/time when the event originated.\n\nThis is the date/time extracted from the event, typically representing when\nthe event was generated by the source.\n\nIf the event source has no original timestamp, this value is typically populated\nby the first time the event was received by the pipeline.\n\nRequired field for all events.',
+          example: '2016-05-23T08:05:34.853Z',
+          name: '@timestamp',
+          type: 'date',
+          searchable: true,
+          aggregatable: true,
+          category: 'base',
+          indexes: ['packetbeat'],
+        },
+        {
+          description:
+            'Unique identifier of this agent (if one exists).\n\nExample: For Beats this would be beat.id.',
+          example: '8a4f500d',
+          name: 'agent.id',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['packetbeat'],
+        },
+        {
+          description:
+            'Type of the agent.\n\nThe agent type stays always the same and should be given by the agent used.\nIn case of Filebeat the agent would always be Filebeat also if two Filebeat\ninstances are run on the same machine.',
+          example: 'filebeat',
+          name: 'agent.type',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['packetbeat'],
+        },
+      ]);
+    });
+  });
+
+  describe('formatSecondFields', () => {
+    test('Basic functionality', async () => {
+      const fields = await formatSecondFields([
+        {
+          description: 'Each document has an _id that uniquely identifies it',
+          example: 'Y-6TfmcB0WOhS6qyMv3s',
+          name: '_id',
+          type: 'string',
+          searchable: true,
+          aggregatable: false,
+          category: '_id',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'An index is like a ‘database’ in a relational database. It has a mapping which defines multiple types. An index is a logical namespace which maps to one or more primary shards and can have zero or more replica shards.',
+          example: 'auditbeat-8.0.0-2019.02.19-000001',
+          name: '_index',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: '_index',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'Date/time when the event originated.\n\nThis is the date/time extracted from the event, typically representing when\nthe event was generated by the source.\n\nIf the event source has no original timestamp, this value is typically populated\nby the first time the event was received by the pipeline.\n\nRequired field for all events.',
+          example: '2016-05-23T08:05:34.853Z',
+          name: '@timestamp',
+          type: 'date',
+          searchable: true,
+          aggregatable: true,
+          category: 'base',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'Ephemeral identifier of this agent (if one exists).\n\nThis id normally changes across restarts, but `agent.id` does not.',
+          example: '8a4f500f',
+          name: 'agent.ephemeral_id',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'Custom name of the agent.\n\nThis is a name that can be given to an agent. This can be helpful if for example\ntwo Filebeat instances are running on the same host but a human readable separation\nis needed on which Filebeat instance data is coming from.\n\nIf no name is given, the name is often left empty.',
+          example: 'foo',
+          name: 'agent.name',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'Type of the agent.\n\nThe agent type stays always the same and should be given by the agent used.\nIn case of Filebeat the agent would always be Filebeat also if two Filebeat\ninstances are run on the same machine.',
+          example: 'filebeat',
+          name: 'agent.type',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat'],
+        },
+        {
+          description: 'Version of the agent.',
+          example: '6.0.0-rc2',
+          name: 'agent.version',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat'],
+        },
+        {
+          description: 'Each document has an _id that uniquely identifies it',
+          example: 'Y-6TfmcB0WOhS6qyMv3s',
+          name: '_id',
+          type: 'string',
+          searchable: true,
+          aggregatable: false,
+          category: '_id',
+          indexes: ['filebeat'],
+        },
+        {
+          description:
+            'An index is like a ‘database’ in a relational database. It has a mapping which defines multiple types. An index is a logical namespace which maps to one or more primary shards and can have zero or more replica shards.',
+          example: 'auditbeat-8.0.0-2019.02.19-000001',
+          name: '_index',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: '_index',
+          indexes: ['filebeat'],
+        },
+        {
+          description:
+            'Date/time when the event originated.\n\nThis is the date/time extracted from the event, typically representing when\nthe event was generated by the source.\n\nIf the event source has no original timestamp, this value is typically populated\nby the first time the event was received by the pipeline.\n\nRequired field for all events.',
+          example: '2016-05-23T08:05:34.853Z',
+          name: '@timestamp',
+          type: 'date',
+          searchable: true,
+          aggregatable: true,
+          category: 'base',
+          indexes: ['filebeat'],
+        },
+        {
+          name: 'agent.hostname',
+          searchable: true,
+          type: 'string',
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['filebeat'],
+        },
+        {
+          description:
+            'Custom name of the agent.\n\nThis is a name that can be given to an agent. This can be helpful if for example\ntwo Filebeat instances are running on the same host but a human readable separation\nis needed on which Filebeat instance data is coming from.\n\nIf no name is given, the name is often left empty.',
+          example: 'foo',
+          name: 'agent.name',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['filebeat'],
+        },
+        {
+          description: 'Version of the agent.',
+          example: '6.0.0-rc2',
+          name: 'agent.version',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['filebeat'],
+        },
+        {
+          description: 'Each document has an _id that uniquely identifies it',
+          example: 'Y-6TfmcB0WOhS6qyMv3s',
+          name: '_id',
+          type: 'string',
+          searchable: true,
+          aggregatable: false,
+          category: '_id',
+          indexes: ['packetbeat'],
+        },
+        {
+          description:
+            'An index is like a ‘database’ in a relational database. It has a mapping which defines multiple types. An index is a logical namespace which maps to one or more primary shards and can have zero or more replica shards.',
+          example: 'auditbeat-8.0.0-2019.02.19-000001',
+          name: '_index',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: '_index',
+          indexes: ['packetbeat'],
+        },
+        {
+          description:
+            'Date/time when the event originated.\n\nThis is the date/time extracted from the event, typically representing when\nthe event was generated by the source.\n\nIf the event source has no original timestamp, this value is typically populated\nby the first time the event was received by the pipeline.\n\nRequired field for all events.',
+          example: '2016-05-23T08:05:34.853Z',
+          name: '@timestamp',
+          type: 'date',
+          searchable: true,
+          aggregatable: true,
+          category: 'base',
+          indexes: ['packetbeat'],
+        },
+        {
+          description:
+            'Unique identifier of this agent (if one exists).\n\nExample: For Beats this would be beat.id.',
+          example: '8a4f500d',
+          name: 'agent.id',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['packetbeat'],
+        },
+        {
+          description:
+            'Type of the agent.\n\nThe agent type stays always the same and should be given by the agent used.\nIn case of Filebeat the agent would always be Filebeat also if two Filebeat\ninstances are run on the same machine.',
+          example: 'filebeat',
+          name: 'agent.type',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['packetbeat'],
+        },
+      ]);
+      expect(fields).toEqual([
+        {
+          description: 'Each document has an _id that uniquely identifies it',
+          example: 'Y-6TfmcB0WOhS6qyMv3s',
+          name: '_id',
+          type: 'string',
+          searchable: true,
+          aggregatable: false,
+          category: '_id',
+          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
+        },
+        {
+          description:
+            'An index is like a ‘database’ in a relational database. It has a mapping which defines multiple types. An index is a logical namespace which maps to one or more primary shards and can have zero or more replica shards.',
+          example: 'auditbeat-8.0.0-2019.02.19-000001',
+          name: '_index',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: '_index',
+          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
+        },
+        {
+          description:
+            'Date/time when the event originated.\n\nThis is the date/time extracted from the event, typically representing when\nthe event was generated by the source.\n\nIf the event source has no original timestamp, this value is typically populated\nby the first time the event was received by the pipeline.\n\nRequired field for all events.',
+          example: '2016-05-23T08:05:34.853Z',
+          name: '@timestamp',
+          type: 'date',
+          searchable: true,
+          aggregatable: true,
+          category: 'base',
+          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
+        },
+        {
+          description:
+            'Ephemeral identifier of this agent (if one exists).\n\nThis id normally changes across restarts, but `agent.id` does not.',
+          example: '8a4f500f',
+          name: 'agent.ephemeral_id',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat'],
+        },
+        {
+          description:
+            'Custom name of the agent.\n\nThis is a name that can be given to an agent. This can be helpful if for example\ntwo Filebeat instances are running on the same host but a human readable separation\nis needed on which Filebeat instance data is coming from.\n\nIf no name is given, the name is often left empty.',
+          example: 'foo',
+          name: 'agent.name',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat', 'filebeat'],
+        },
+        {
+          description:
+            'Type of the agent.\n\nThe agent type stays always the same and should be given by the agent used.\nIn case of Filebeat the agent would always be Filebeat also if two Filebeat\ninstances are run on the same machine.',
+          example: 'filebeat',
+          name: 'agent.type',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat', 'packetbeat'],
+        },
+        {
+          description: 'Version of the agent.',
+          example: '6.0.0-rc2',
+          name: 'agent.version',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['auditbeat', 'filebeat'],
+        },
+        {
+          name: 'agent.hostname',
+          searchable: true,
+          type: 'string',
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['filebeat'],
+        },
+        {
+          description:
+            'Unique identifier of this agent (if one exists).\n\nExample: For Beats this would be beat.id.',
+          example: '8a4f500d',
+          name: 'agent.id',
+          type: 'string',
+          searchable: true,
+          aggregatable: true,
+          category: 'agent',
+          indexes: ['packetbeat'],
+        },
+      ]);
+    });
+  });
+
+  describe('createFieldItem', () => {
+    test('Basic functionality', () => {
+      const item = createFieldItem(
+        ['auditbeat'],
+        {
+          name: '_id',
+          type: 'string',
+          searchable: true,
+          aggregatable: false,
+        },
+        0
+      );
+      expect(item).toEqual({
+        description: 'Each document has an _id that uniquely identifies it',
+        example: 'Y-6TfmcB0WOhS6qyMv3s',
+        footnote: '',
+        group: 1,
+        level: 'core',
+        name: '_id',
+        required: true,
+        type: 'string',
+        searchable: true,
+        aggregatable: false,
+        category: '_id',
+        indexes: ['auditbeat'],
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/index_fields/elasticsearch_adapter.ts b/x-pack/plugins/security_solution/server/lib/index_fields/elasticsearch_adapter.ts
index bb0a4b9e2ba9b..777b1cf3bb80d 100644
--- a/x-pack/plugins/security_solution/server/lib/index_fields/elasticsearch_adapter.ts
+++ b/x-pack/plugins/security_solution/server/lib/index_fields/elasticsearch_adapter.ts
@@ -4,45 +4,25 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { isEmpty, get } from 'lodash/fp';
+import { isEmpty } from 'lodash/fp';
 
 import { IndexField } from '../../graphql/types';
-import {
-  baseCategoryFields,
-  getDocumentation,
-  getIndexAlias,
-  hasDocumentation,
-  IndexAlias,
-} from '../../utils/beat_schema';
+import { baseCategoryFields, getDocumentation, hasDocumentation } from '../../utils/beat_schema';
 import { FrameworkAdapter, FrameworkRequest } from '../framework';
 import { FieldsAdapter, IndexFieldDescriptor } from './types';
 
 export class ElasticsearchIndexFieldAdapter implements FieldsAdapter {
   constructor(private readonly framework: FrameworkAdapter) {}
-
   public async getIndexFields(request: FrameworkRequest, indices: string[]): Promise<IndexField[]> {
     const indexPatternsService = this.framework.getIndexPatternsService(request);
-    const indexesAliasIndices = indices.reduce<Record<string, string[]>>((accumulator, indice) => {
-      const key = getIndexAlias(indices, indice);
-
-      if (get(key, accumulator)) {
-        accumulator[key] = [...accumulator[key], indice];
-      } else {
-        accumulator[key] = [indice];
-      }
-      return accumulator;
-    }, {});
-    const responsesIndexFields: IndexFieldDescriptor[][] = await Promise.all(
-      Object.values(indexesAliasIndices).map((indicesByGroup) =>
-        indexPatternsService.getFieldsForWildcard({
-          pattern: indicesByGroup,
-        })
-      )
-    );
-    return formatIndexFields(
-      responsesIndexFields,
-      Object.keys(indexesAliasIndices) as IndexAlias[]
+    const responsesIndexFields = await Promise.all(
+      indices.map((index) => {
+        return indexPatternsService.getFieldsForWildcard({
+          pattern: index,
+        });
+      })
     );
+    return formatIndexFields(responsesIndexFields, indices);
   }
 }
 
@@ -63,51 +43,128 @@ const missingFields = [
   },
 ];
 
-export const formatIndexFields = (
+/**
+ * Creates a single field item.
+ *
+ * This is a mutatious HOT CODE PATH function that will have array sizes up to 4.7 megs
+ * in size at a time calling this function repeatedly. This function should be as optimized as possible
+ * and should avoid any and all creation of new arrays, iterating over the arrays or performing
+ * any n^2 operations.
+ * @param indexesAlias The index alias
+ * @param index The index its self
+ * @param indexesAliasIdx The index within the alias
+ */
+export const createFieldItem = (
+  indexesAlias: string[],
+  index: IndexFieldDescriptor,
+  indexesAliasIdx: number
+): IndexField => {
+  const alias = indexesAlias[indexesAliasIdx];
+  const splitName = index.name.split('.');
+  const category = baseCategoryFields.includes(splitName[0]) ? 'base' : splitName[0];
+  return {
+    ...(hasDocumentation(alias, index.name) ? getDocumentation(alias, index.name) : {}),
+    ...index,
+    category,
+    indexes: [alias],
+  };
+};
+
+/**
+ * This is a mutatious HOT CODE PATH function that will have array sizes up to 4.7 megs
+ * in size at a time when being called. This function should be as optimized as possible
+ * and should avoid any and all creation of new arrays, iterating over the arrays or performing
+ * any n^2 operations. The `.push`, and `forEach` operations are expected within this function
+ * to speed up performance.
+ *
+ * This intentionally waits for the next tick on the event loop to process as the large 4.7 megs
+ * has already consumed a lot of the event loop processing up to this function and we want to give
+ * I/O opportunity to occur by scheduling this on the next loop.
+ * @param responsesIndexFields The response index fields to loop over
+ * @param indexesAlias The index aliases such as filebeat-*
+ */
+export const formatFirstFields = async (
   responsesIndexFields: IndexFieldDescriptor[][],
-  indexesAlias: IndexAlias[]
-): IndexField[] =>
-  responsesIndexFields
-    .reduce(
-      (accumulator: IndexField[], indexFields: IndexFieldDescriptor[], indexesAliasIdx: number) => [
-        ...accumulator,
-        ...[...missingFields, ...indexFields].reduce(
-          (itemAccumulator: IndexField[], index: IndexFieldDescriptor) => {
-            const alias: IndexAlias = indexesAlias[indexesAliasIdx];
-            const splitName = index.name.split('.');
-            const category = baseCategoryFields.includes(splitName[0]) ? 'base' : splitName[0];
-            return [
-              ...itemAccumulator,
-              {
-                ...(hasDocumentation(alias, index.name) ? getDocumentation(alias, index.name) : {}),
-                ...index,
-                category,
-                indexes: [alias],
-              } as IndexField,
-            ];
+  indexesAlias: string[]
+): Promise<IndexField[]> => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(
+        responsesIndexFields.reduce(
+          (
+            accumulator: IndexField[],
+            indexFields: IndexFieldDescriptor[],
+            indexesAliasIdx: number
+          ) => {
+            missingFields.forEach((index) => {
+              const item = createFieldItem(indexesAlias, index, indexesAliasIdx);
+              accumulator.push(item);
+            });
+            indexFields.forEach((index) => {
+              const item = createFieldItem(indexesAlias, index, indexesAliasIdx);
+              accumulator.push(item);
+            });
+            return accumulator;
           },
           []
-        ),
-      ],
-      []
-    )
-    .reduce((accumulator: IndexField[], indexfield: IndexField) => {
-      const alreadyExistingIndexField = accumulator.findIndex(
-        (acc) => acc.name === indexfield.name
+        )
       );
-      if (alreadyExistingIndexField > -1) {
-        const existingIndexField = accumulator[alreadyExistingIndexField];
-        return [
-          ...accumulator.slice(0, alreadyExistingIndexField),
-          {
-            ...existingIndexField,
-            description: isEmpty(existingIndexField.description)
-              ? indexfield.description
-              : existingIndexField.description,
-            indexes: Array.from(new Set([...existingIndexField.indexes, ...indexfield.indexes])),
-          },
-          ...accumulator.slice(alreadyExistingIndexField + 1),
-        ];
-      }
-      return [...accumulator, indexfield];
-    }, []);
+    });
+  });
+};
+
+/**
+ * This is a mutatious HOT CODE PATH function that will have array sizes up to 4.7 megs
+ * in size at a time when being called. This function should be as optimized as possible
+ * and should avoid any and all creation of new arrays, iterating over the arrays or performing
+ * any n^2 operations. The `.push`, and `forEach` operations are expected within this function
+ * to speed up performance. The "indexFieldNameHash" side effect hash avoids additional expensive n^2
+ * look ups.
+ *
+ * This intentionally waits for the next tick on the event loop to process as the large 4.7 megs
+ * has already consumed a lot of the event loop processing up to this function and we want to give
+ * I/O opportunity to occur by scheduling this on the next loop.
+ * @param fields The index fields to create the secondary fields for
+ */
+export const formatSecondFields = async (fields: IndexField[]): Promise<IndexField[]> => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      const indexFieldNameHash: Record<string, number> = {};
+      const reduced = fields.reduce((accumulator: IndexField[], indexfield: IndexField) => {
+        const alreadyExistingIndexField = indexFieldNameHash[indexfield.name];
+        if (alreadyExistingIndexField != null) {
+          const existingIndexField = accumulator[alreadyExistingIndexField];
+          if (isEmpty(accumulator[alreadyExistingIndexField].description)) {
+            accumulator[alreadyExistingIndexField].description = indexfield.description;
+          }
+          accumulator[alreadyExistingIndexField].indexes = Array.from(
+            new Set([...existingIndexField.indexes, ...indexfield.indexes])
+          );
+          return accumulator;
+        }
+        accumulator.push(indexfield);
+        indexFieldNameHash[indexfield.name] = accumulator.length - 1;
+        return accumulator;
+      }, []);
+      resolve(reduced);
+    });
+  });
+};
+
+/**
+ * Formats the index fields into a format the UI wants.
+ *
+ * NOTE: This will have array sizes up to 4.7 megs in size at a time when being called.
+ * This function should be as optimized as possible and should avoid any and all creation
+ * of new arrays, iterating over the arrays or performing any n^2 operations.
+ * @param responsesIndexFields  The response index fields to format
+ * @param indexesAlias The index alias
+ */
+export const formatIndexFields = async (
+  responsesIndexFields: IndexFieldDescriptor[][],
+  indexesAlias: string[]
+): Promise<IndexField[]> => {
+  const fields = await formatFirstFields(responsesIndexFields, indexesAlias);
+  const secondFields = await formatSecondFields(fields);
+  return secondFields;
+};
diff --git a/x-pack/plugins/security_solution/server/utils/beat_schema/index.test.ts b/x-pack/plugins/security_solution/server/utils/beat_schema/index.test.ts
index 5f002aa7fad7b..29944edf382f4 100644
--- a/x-pack/plugins/security_solution/server/utils/beat_schema/index.test.ts
+++ b/x-pack/plugins/security_solution/server/utils/beat_schema/index.test.ts
@@ -6,7 +6,7 @@
 
 import { cloneDeep, isArray } from 'lodash/fp';
 
-import { convertSchemaToAssociativeArray, getIndexSchemaDoc, getIndexAlias } from '.';
+import { convertSchemaToAssociativeArray, getIndexSchemaDoc } from '.';
 import { auditbeatSchema, filebeatSchema, packetbeatSchema } from './8.0.0';
 import { Schema } from './type';
 
@@ -394,24 +394,4 @@ describe('Schema Beat', () => {
       ]);
     });
   });
-
-  describe('getIndexAlias', () => {
-    test('getIndexAlias handles values with leading wildcard', () => {
-      const leadingWildcardIndex = '*-auditbeat-*';
-      const result = getIndexAlias([leadingWildcardIndex], leadingWildcardIndex);
-      expect(result).toBe(leadingWildcardIndex);
-    });
-
-    test('getIndexAlias no match returns "unknown" string', () => {
-      const index = 'auditbeat-*';
-      const result = getIndexAlias([index], 'hello');
-      expect(result).toBe('unknown');
-    });
-
-    test('empty index should not cause an error to return although it will cause an invalid regular expression to occur', () => {
-      const index = '';
-      const result = getIndexAlias([index], 'hello');
-      expect(result).toBe('unknown');
-    });
-  });
 });
diff --git a/x-pack/plugins/security_solution/server/utils/beat_schema/index.ts b/x-pack/plugins/security_solution/server/utils/beat_schema/index.ts
index 6ec15d328714d..58627a199a181 100644
--- a/x-pack/plugins/security_solution/server/utils/beat_schema/index.ts
+++ b/x-pack/plugins/security_solution/server/utils/beat_schema/index.ts
@@ -76,21 +76,6 @@ const convertFieldsToAssociativeArray = (
       }, {})
     : {};
 
-export const getIndexAlias = (defaultIndex: string[], indexName: string): string => {
-  try {
-    const found = defaultIndex.find((index) => `\\${indexName}`.match(`\\${index}`) != null);
-    if (found != null) {
-      return found;
-    } else {
-      return 'unknown';
-    }
-  } catch (error) {
-    // if we encounter an error because the index contains invalid regular expressions then we should return an unknown
-    // rather than blow up with a toaster error upstream
-    return 'unknown';
-  }
-};
-
 export const getIndexSchemaDoc = memoize((index: string) => {
   if (index.match('auditbeat') != null) {
     return {
diff --git a/x-pack/plugins/security_solution/server/utils/beat_schema/type.ts b/x-pack/plugins/security_solution/server/utils/beat_schema/type.ts
index 2b7be8f4b7539..722589ce7e2bb 100644
--- a/x-pack/plugins/security_solution/server/utils/beat_schema/type.ts
+++ b/x-pack/plugins/security_solution/server/utils/beat_schema/type.ts
@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export type IndexAlias = 'auditbeat' | 'filebeat' | 'packetbeat' | 'ecs' | 'winlogbeat' | 'unknown';
-
 /*
  * BEAT Interface
  *

From eecf4aa71f27b0fc22113f73ddf745a4fcd59cb5 Mon Sep 17 00:00:00 2001
From: Justin Ibarra <brokensound77@users.noreply.github.com>
Date: Tue, 25 Aug 2020 23:25:07 -0500
Subject: [PATCH 050/148] [Detection Rules] Add 7.9.1 rules (#75939)

* increase lookback (`from`) and bump versions
---
 .../command_and_control_certutil_network_connection.json       | 3 ++-
 .../credential_access_credential_dumping_msbuild.json          | 3 ++-
 .../prepackaged_rules/credential_access_tcpdump_activity.json  | 3 ++-
 ...on_adding_the_hidden_file_attribute_with_via_attribexe.json | 3 ++-
 ...efense_evasion_attempt_to_disable_iptables_or_firewall.json | 3 ++-
 .../defense_evasion_attempt_to_disable_syslog_service.json     | 3 ++-
 ...evasion_base16_or_base32_encoding_or_decoding_activity.json | 3 ++-
 .../defense_evasion_base64_encoding_or_decoding_activity.json  | 3 ++-
 .../defense_evasion_clearing_windows_event_logs.json           | 3 ++-
 .../defense_evasion_delete_volume_usn_journal_with_fsutil.json | 3 ++-
 .../defense_evasion_deleting_backup_catalogs_with_wbadmin.json | 3 ++-
 .../defense_evasion_deletion_of_bash_command_line_history.json | 3 ++-
 .../defense_evasion_disable_selinux_attempt.json               | 3 ++-
 ...ense_evasion_disable_windows_firewall_rules_with_netsh.json | 3 ++-
 ...efense_evasion_encoding_or_decoding_files_via_certutil.json | 3 ++-
 ...efense_evasion_execution_msbuild_started_by_office_app.json | 3 ++-
 .../defense_evasion_execution_msbuild_started_by_script.json   | 3 ++-
 ...se_evasion_execution_msbuild_started_by_system_process.json | 3 ++-
 .../defense_evasion_execution_msbuild_started_renamed.json     | 3 ++-
 ...fense_evasion_execution_msbuild_started_unusal_process.json | 3 ++-
 .../defense_evasion_file_deletion_via_shred.json               | 3 ++-
 .../defense_evasion_file_mod_writable_dir.json                 | 3 ++-
 .../defense_evasion_hex_encoding_or_decoding_activity.json     | 3 ++-
 .../prepackaged_rules/defense_evasion_hidden_file_dir_tmp.json | 3 ++-
 .../defense_evasion_kernel_module_removal.json                 | 3 ++-
 ...defense_evasion_misc_lolbin_connecting_to_the_internet.json | 3 ++-
 .../defense_evasion_modification_of_boot_config.json           | 3 ++-
 ...fense_evasion_volume_shadow_copy_deletion_via_vssadmin.json | 3 ++-
 .../defense_evasion_volume_shadow_copy_deletion_via_wmic.json  | 3 ++-
 .../prepackaged_rules/discovery_kernel_module_enumeration.json | 3 ++-
 .../discovery_net_command_system_account.json                  | 3 ++-
 .../discovery_virtual_machine_fingerprinting.json              | 3 ++-
 .../rules/prepackaged_rules/discovery_whoami_commmand.json     | 3 ++-
 .../execution_command_prompt_connecting_to_the_internet.json   | 3 ++-
 .../execution_command_shell_started_by_powershell.json         | 3 ++-
 .../execution_command_shell_started_by_svchost.json            | 3 ++-
 ...tml_help_executable_program_connecting_to_the_internet.json | 3 ++-
 .../prepackaged_rules/execution_local_service_commands.json    | 3 ++-
 .../execution_msbuild_making_network_connections.json          | 3 ++-
 .../execution_mshta_making_network_connections.json            | 3 ++-
 .../rules/prepackaged_rules/execution_msxsl_network.json       | 3 ++-
 .../rules/prepackaged_rules/execution_perl_tty_shell.json      | 3 ++-
 .../execution_psexec_lateral_movement_command.json             | 3 ++-
 .../rules/prepackaged_rules/execution_python_tty_shell.json    | 3 ++-
 ...ion_register_server_program_connecting_to_the_internet.json | 3 ++-
 .../execution_script_executing_powershell.json                 | 3 ++-
 .../execution_suspicious_ms_office_child_process.json          | 3 ++-
 .../execution_suspicious_ms_outlook_child_process.json         | 3 ++-
 .../prepackaged_rules/execution_suspicious_pdf_reader.json     | 3 ++-
 .../execution_unusual_network_connection_via_rundll32.json     | 3 ++-
 .../execution_unusual_process_network_connection.json          | 3 ++-
 .../prepackaged_rules/execution_via_net_com_assemblies.json    | 3 ++-
 .../lateral_movement_direct_outbound_smb_connection.json       | 3 ++-
 .../lateral_movement_telnet_network_activity_external.json     | 3 ++-
 .../lateral_movement_telnet_network_activity_internal.json     | 3 ++-
 .../rules/prepackaged_rules/linux_hping_activity.json          | 3 ++-
 .../rules/prepackaged_rules/linux_iodine_activity.json         | 3 ++-
 .../rules/prepackaged_rules/linux_mknod_activity.json          | 3 ++-
 .../prepackaged_rules/linux_netcat_network_connection.json     | 3 ++-
 .../rules/prepackaged_rules/linux_nmap_activity.json           | 3 ++-
 .../rules/prepackaged_rules/linux_nping_activity.json          | 3 ++-
 .../linux_process_started_in_temp_directory.json               | 3 ++-
 .../rules/prepackaged_rules/linux_socat_activity.json          | 3 ++-
 .../rules/prepackaged_rules/linux_strace_activity.json         | 3 ++-
 .../persistence_adobe_hijack_persistence.json                  | 3 ++-
 .../prepackaged_rules/persistence_kernel_module_activity.json  | 3 ++-
 .../persistence_local_scheduled_task_commands.json             | 3 ++-
 .../persistence_shell_activity_by_web_server.json              | 3 ++-
 .../persistence_system_shells_via_services.json                | 3 ++-
 .../prepackaged_rules/persistence_user_account_creation.json   | 3 ++-
 .../privilege_escalation_setgid_bit_set_via_chmod.json         | 3 ++-
 .../privilege_escalation_setuid_bit_set_via_chmod.json         | 3 ++-
 .../privilege_escalation_sudoers_file_mod.json                 | 3 ++-
 .../privilege_escalation_uac_bypass_event_viewer.json          | 3 ++-
 .../privilege_escalation_unusual_parentchild_relationship.json | 3 ++-
 75 files changed, 150 insertions(+), 75 deletions(-)

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_certutil_network_connection.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_certutil_network_connection.json
index 25274928aa2b7..a8be0fe97524e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_certutil_network_connection.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/command_and_control_certutil_network_connection.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies certutil.exe making a network connection. Adversaries could abuse certutil.exe to download a certificate, or malware, from a remote URL.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_credential_dumping_msbuild.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_credential_dumping_msbuild.json
index 6be1f037f967e..f2032b5bef218 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_credential_dumping_msbuild.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_credential_dumping_msbuild.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "The Build Engine is commonly used by Windows developers but use by non-engineers is unusual."
   ],
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -39,5 +40,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_tcpdump_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_tcpdump_activity.json
index d5b069f7b81e7..306a38f5d2a28 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_tcpdump_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/credential_access_tcpdump_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Some normal use of this command may originate from server or network administrators engaged in network troubleshooting."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -54,5 +55,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json
index b22b74ebc53bc..c80f24a21d958 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_adding_the_hidden_file_attribute_with_via_attribexe.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Adversaries can add the 'hidden' attribute to files to hide them from the user in an attempt to evade detection.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -51,5 +52,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_iptables_or_firewall.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_iptables_or_firewall.json
index e2ba81da917b3..4d4f10bbaa599 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_iptables_or_firewall.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_iptables_or_firewall.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Adversaries may attempt to disable the iptables or firewall service in an attempt to affect how a host is allowed to receive or send network traffic.",
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_syslog_service.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_syslog_service.json
index 4f4a9aacd79aa..3c34b04a77a50 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_syslog_service.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_attempt_to_disable_syslog_service.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Adversaries may attempt to disable the syslog service in an attempt to an attempt to disrupt event logging and evade detection by security controls.",
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base16_or_base32_encoding_or_decoding_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base16_or_base32_encoding_or_decoding_activity.json
index 5bcc4a00ccd82..3cdfac92572b1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base16_or_base32_encoding_or_decoding_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base16_or_base32_encoding_or_decoding_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Automated tools such as Jenkins may encode or decode files as part of their normal behavior. These events can be filtered by the process executable or username values."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -54,5 +55,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base64_encoding_or_decoding_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base64_encoding_or_decoding_activity.json
index a17fd6d2702dd..2d26d867b8718 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base64_encoding_or_decoding_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_base64_encoding_or_decoding_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Automated tools such as Jenkins may encode or decode files as part of their normal behavior. These events can be filtered by the process executable or username values."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -54,5 +55,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_event_logs.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_event_logs.json
index cf09bc512916f..60ce575148f4c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_event_logs.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_clearing_windows_event_logs.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies attempts to clear Windows event log stores. This is often done by attackers in an attempt to evade detection or destroy forensic evidence on a system.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_delete_volume_usn_journal_with_fsutil.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_delete_volume_usn_journal_with_fsutil.json
index 0c82444dd9397..50213b9f1a42c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_delete_volume_usn_journal_with_fsutil.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_delete_volume_usn_journal_with_fsutil.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies use of the fsutil.exe to delete the volume USNJRNL. This technique is used by attackers to eliminate evidence of files created during post-exploitation activities.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deleting_backup_catalogs_with_wbadmin.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deleting_backup_catalogs_with_wbadmin.json
index c76c5f20fa88b..026735f413eab 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deleting_backup_catalogs_with_wbadmin.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deleting_backup_catalogs_with_wbadmin.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies use of the wbadmin.exe to delete the backup catalog. Ransomware and other malware may do this to prevent system recovery.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deletion_of_bash_command_line_history.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deletion_of_bash_command_line_history.json
index b38ed94e132e1..85d8bdcb2582f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deletion_of_bash_command_line_history.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_deletion_of_bash_command_line_history.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Adversaries may attempt to clear the bash command line history in an attempt to evade detection or forensic investigations.",
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_selinux_attempt.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_selinux_attempt.json
index 229a03de39600..d107c0b262091 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_selinux_attempt.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_selinux_attempt.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies potential attempts to disable Security-Enhanced Linux (SELinux), which is a Linux kernel security feature to support access control policies. Adversaries may disable security tools to avoid possible detection of their tools and activities.",
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
index 4800e87c180e2..6fbf9ca800f79 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_disable_windows_firewall_rules_with_netsh.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies use of the netsh.exe to disable or weaken the local firewall. Attackers will use this command line tool to disable the firewall during troubleshooting or to enable network mobility.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_encoding_or_decoding_files_via_certutil.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_encoding_or_decoding_files_via_certutil.json
index 075dd13d9819b..0d47aab2c64bd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_encoding_or_decoding_files_via_certutil.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_encoding_or_decoding_files_via_certutil.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies the use of certutil.exe to encode or decode data. CertUtil is a native Windows component which is part of Certificate Services. CertUtil is often abused by attackers to encode or decode base64 data for stealthier command and control or exfiltration.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_office_app.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_office_app.json
index 133863f8e2148..df7fc85b63d4a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_office_app.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_office_app.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "The Build Engine is commonly used by Windows developers but use by non-engineers is unusual. It is quite unusual for this program to be started by an Office application like Word or Excel."
   ],
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -57,5 +58,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_script.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_script.json
index 85d348bb14be0..aa4674f75bcd0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_script.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_script.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "The Build Engine is commonly used by Windows developers but use by non-engineers is unusual."
   ],
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -54,5 +55,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_system_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_system_process.json
index 38482c0a70fc9..da7d91933bd2a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_system_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_by_system_process.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "The Build Engine is commonly used by Windows developers but use by non-engineers is unusual."
   ],
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -54,5 +55,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_renamed.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_renamed.json
index 7db683caf2bb2..8e4f7366a7657 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_renamed.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_renamed.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "The Build Engine is commonly used by Windows developers but use by non-engineers is unusual."
   ],
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -39,5 +40,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_unusal_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_unusal_process.json
index 1c4666955dde0..4f353a6ff9e6f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_unusal_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_execution_msbuild_started_unusal_process.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "The Build Engine is commonly used by Windows developers but use by non-engineers is unusual. If a build system triggers this rule it can be exempted by process, user or host name."
   ],
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -42,5 +43,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_deletion_via_shred.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_deletion_via_shred.json
index c375ea7b19b37..5b02f63a1c7f7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_deletion_via_shred.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_deletion_via_shred.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Malware or other files dropped or created on a system by an adversary may leave traces behind as to what was done within a network and how. Adversaries may remove these files over the course of an intrusion to keep their footprint low or remove them at the end as part of the post-intrusion cleanup process.",
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_mod_writable_dir.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_mod_writable_dir.json
index 22090e1a241e7..8ee2d4fda7bf8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_mod_writable_dir.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_file_mod_writable_dir.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Certain programs or applications may modify files or change ownership in writable directories. These can be exempted by username."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -39,5 +40,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hex_encoding_or_decoding_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hex_encoding_or_decoding_activity.json
index 00491937e9aae..f5345b2276e8a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hex_encoding_or_decoding_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hex_encoding_or_decoding_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Automated tools such as Jenkins may encode or decode files as part of their normal behavior. These events can be filtered by the process executable or username values."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -54,5 +55,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hidden_file_dir_tmp.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hidden_file_dir_tmp.json
index 16a398011fc53..e66968a50709e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hidden_file_dir_tmp.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_hidden_file_dir_tmp.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Certain tools may create hidden temporary files or directories upon installation or as part of their normal behavior. These events can be filtered by the process arguments, username, or process name values."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -55,5 +56,5 @@
     }
   ],
   "type": "query",
-  "version": 1
+  "version": 2
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_kernel_module_removal.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_kernel_module_removal.json
index 11781cb719599..ad751a1031437 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_kernel_module_removal.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_kernel_module_removal.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "There is usually no reason to remove modules, but some buggy modules require it. These can be exempted by username. Note that some Linux distributions are not built to support the removal of modules at all."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -57,5 +58,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_misc_lolbin_connecting_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_misc_lolbin_connecting_to_the_internet.json
index 7d931725fa6eb..5b5f69a0aef74 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_misc_lolbin_connecting_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_misc_lolbin_connecting_to_the_internet.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Binaries signed with trusted digital certificates can execute on Windows systems protected by digital signature validation. Adversaries may use these binaries to 'live off the land' and execute malicious files that could bypass application allowlists and signature validation.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -51,5 +52,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modification_of_boot_config.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modification_of_boot_config.json
index 1bffe7a1cfc24..6025fc5ca6452 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modification_of_boot_config.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_modification_of_boot_config.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies use of bcdedit.exe to delete boot configuration data. This tactic is sometimes used as by malware or an attacker as a destructive technique.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_vssadmin.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_vssadmin.json
index f3cc5c2eec8a3..8a504281b03f7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_vssadmin.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_vssadmin.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies use of vssadmin.exe for shadow copy deletion on endpoints. This commonly occurs in tandem with ransomware or other destructive attacks.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_wmic.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_wmic.json
index 334276142ca42..2ae938bb34104 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_wmic.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/defense_evasion_volume_shadow_copy_deletion_via_wmic.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies use of wmic.exe for shadow copy deletion on endpoints. This commonly occurs in tandem with ransomware or other destructive attacks.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_kernel_module_enumeration.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_kernel_module_enumeration.json
index 0e4bea426c591..af9c4b5409964 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_kernel_module_enumeration.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_kernel_module_enumeration.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Security tools and device drivers may run these programs in order to enumerate kernel modules. Use of these programs by ordinary users is uncommon. These can be exempted by process name or username."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -39,5 +40,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
index 6ac2bbf355961..f1a214b7cd436 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_net_command_system_account.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies the SYSTEM account using the Net utility. The Net utility is a component of the Windows operating system. It is used in command line operations for control of users, groups, services, and network connections.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting.json
index e73aa5f4566a7..d913a92e2ee0e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_virtual_machine_fingerprinting.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Certain tools or automated software may enumerate hardware information. These tools can be exempted via user name or process arguments to eliminate potential noise."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -39,5 +40,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_whoami_commmand.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_whoami_commmand.json
index 0017186787139..a8b34362d9579 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_whoami_commmand.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/discovery_whoami_commmand.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Security testing tools and frameworks may run this command. Some normal use of this command may originate from automation tools and frameworks."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -39,5 +40,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_prompt_connecting_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_prompt_connecting_to_the_internet.json
index 0ba6480fe42a1..46208f3753fa1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_prompt_connecting_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_prompt_connecting_to_the_internet.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Administrators may use the command prompt for regular administrative tasks. It's important to baseline your environment for network connections being made from the command prompt to determine any abnormal use of this tool."
   ],
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -54,5 +55,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_powershell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_powershell.json
index 2d3edb0f5f6cc..c619d8f764bc4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_powershell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_powershell.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies a suspicious parent child process relationship with cmd.exe descending from PowerShell.exe.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -51,5 +52,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json
index 3a4b4915f3c8b..140212e4148eb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_command_shell_started_by_svchost.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies a suspicious parent child process relationship with cmd.exe descending from svchost.exe",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json
index a2eb76b9831f0..963c6b2e53ed6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_html_help_executable_program_connecting_to_the_internet.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Compiled HTML files (.chm) are commonly distributed as part of the Microsoft HTML Help system. Adversaries may conceal malicious code in a CHM file and deliver it to a victim for execution. CHM content is loaded by the HTML Help executable program (hh.exe).",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -51,5 +52,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_local_service_commands.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_local_service_commands.json
index e43ab9de86ef7..7b20cefdc67f0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_local_service_commands.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_local_service_commands.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies use of sc.exe to create, modify, or start services on remote hosts. This could be indicative of adversary lateral movement but will be noisy if commonly done by admins.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_msbuild_making_network_connections.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_msbuild_making_network_connections.json
index 9d480259d49de..629efa90a71ea 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_msbuild_making_network_connections.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_msbuild_making_network_connections.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies MsBuild.exe making outbound network connections. This may indicate adversarial activity as MsBuild is often leveraged by adversaries to execute code and evade detection.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_mshta_making_network_connections.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_mshta_making_network_connections.json
index cdef5f16e5cd7..7af823070889f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_mshta_making_network_connections.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_mshta_making_network_connections.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies mshta.exe making a network connection. This may indicate adversarial activity as mshta.exe is often leveraged by adversaries to execute malicious scripts and evade detection.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -39,5 +40,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_msxsl_network.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_msxsl_network.json
index d501bda08c3a5..1dc75575636fb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_msxsl_network.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_msxsl_network.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies msxsl.exe making a network connection. This may indicate adversarial activity as msxsl.exe is often leveraged by adversaries to execute malicious scripts and evade detection.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_perl_tty_shell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_perl_tty_shell.json
index e82b42869e44d..9b6ee099116f3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_perl_tty_shell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_perl_tty_shell.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies when a terminal (tty) is spawned via Perl. Attackers may upgrade a simple reverse shell to a fully interactive tty after obtaining initial access to a host.",
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_psexec_lateral_movement_command.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_psexec_lateral_movement_command.json
index e4c84fd3c3b83..f647d8d00e084 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_psexec_lateral_movement_command.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_psexec_lateral_movement_command.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "PsExec is a dual-use tool that can be used for benign or malicious activity. It's important to baseline your environment to determine the amount of noise to expect from this tool."
   ],
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -54,5 +55,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_python_tty_shell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_python_tty_shell.json
index 3aa9ac20bba9e..d9c26a9c26cc9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_python_tty_shell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_python_tty_shell.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies when a terminal (tty) is spawned via Python. Attackers may upgrade a simple reverse shell to a fully interactive tty after obtaining initial access to a host.",
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_register_server_program_connecting_to_the_internet.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_register_server_program_connecting_to_the_internet.json
index 0a1ba97bd01ea..b3b6a2b0c7fab 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_register_server_program_connecting_to_the_internet.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_register_server_program_connecting_to_the_internet.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Security testing may produce events like this. Activity of this kind performed by non-engineers and ordinary users is unusual."
   ],
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -54,5 +55,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_script_executing_powershell.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_script_executing_powershell.json
index 7305247192f57..6d7f11f01fae0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_script_executing_powershell.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_script_executing_powershell.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies a PowerShell process launched by either cscript.exe or wscript.exe. Observing Windows scripting processes executing a PowerShell script, may be indicative of malicious activity.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_ms_office_child_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_ms_office_child_process.json
index 7ff8eb9424d5f..005a0c38c8a8b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_ms_office_child_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_ms_office_child_process.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies suspicious child processes of frequently targeted Microsoft Office applications (Word, PowerPoint, Excel). These child processes are often launched during exploitation of Office applications or from documents with malicious macros.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_ms_outlook_child_process.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_ms_outlook_child_process.json
index e923407765f8f..74e21c7d17479 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_ms_outlook_child_process.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_ms_outlook_child_process.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies suspicious child processes of Microsoft Outlook. These child processes are often associated with spear phishing activity.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_pdf_reader.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_pdf_reader.json
index 24a744ce30832..adf1a76bfb901 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_pdf_reader.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_suspicious_pdf_reader.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies suspicious child processes of PDF reader applications. These child processes are often launched via exploitation of PDF applications or social engineering.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_unusual_network_connection_via_rundll32.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_unusual_network_connection_via_rundll32.json
index 529f2199e46dc..1104159350655 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_unusual_network_connection_via_rundll32.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_unusual_network_connection_via_rundll32.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies unusual instances of rundll32.exe making outbound network connections. This may indicate adversarial activity and may identify malicious DLLs.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_unusual_process_network_connection.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_unusual_process_network_connection.json
index 69a25b3b24bac..854ecc40d76ab 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_unusual_process_network_connection.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_unusual_process_network_connection.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies network activity from unexpected system applications. This may indicate adversarial activity as these applications are often leveraged by adversaries to execute code and evade detection.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_via_net_com_assemblies.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_via_net_com_assemblies.json
index cae5d1b7e0f1f..d9dcbfe25a4c2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_via_net_com_assemblies.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/execution_via_net_com_assemblies.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "RegSvcs.exe and RegAsm.exe are Windows command line utilities that are used to register .NET Component Object Model (COM) assemblies. Adversaries can use RegSvcs.exe and RegAsm.exe to proxy execution of code through a trusted Windows utility.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -51,5 +52,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_direct_outbound_smb_connection.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_direct_outbound_smb_connection.json
index 8a68b26abad20..e4014b22a6c09 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_direct_outbound_smb_connection.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_direct_outbound_smb_connection.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies unexpected processes making network connections over port 445. Windows File Sharing is typically implemented over Server Message Block (SMB), which communicates between hosts using port 445. When legitimate, these network connections are established by the kernel. Processes making 445/tcp connections may be port scanners, exploits, or suspicious user-level processes moving laterally.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_external.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_external.json
index 2ea75dbd758cb..e4804329c0f30 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_external.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_external.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Telnet can be used for both benign or malicious purposes. Telnet is included by default in some Linux distributions, so its presence is not inherently suspicious. The use of Telnet to manage devices remotely has declined in recent years in favor of more secure protocols such as SSH. Telnet usage by non-automated tools or frameworks may be suspicious."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -39,5 +40,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_internal.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_internal.json
index 4379759608aba..30312987d166c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_internal.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/lateral_movement_telnet_network_activity_internal.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Telnet can be used for both benign or malicious purposes. Telnet is included by default in some Linux distributions, so its presence is not inherently suspicious. The use of Telnet to manage devices remotely has declined in recent years in favor of more secure protocols such as SSH. Telnet usage by non-automated tools or frameworks may be suspicious."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -39,5 +40,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json
index 24104439cd0ec..3a5c4d9e69d49 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_hping_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Normal use of hping is uncommon apart from security testing and research. Use by non-security engineers is very uncommon."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -25,5 +26,5 @@
     "Linux"
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json
index 73bf20a5a175e..63c82c5662df6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_iodine_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Normal use of Iodine is uncommon apart from security testing and research. Use by non-security engineers is very uncommon."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -25,5 +26,5 @@
     "Linux"
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_mknod_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_mknod_activity.json
index 1895caf4dea81..37d5468c773bf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_mknod_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_mknod_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Mknod is a Linux system program. Some normal use of this program, at varying levels of frequency, may originate from scripts, automation tools, and frameworks. Usage by web servers is more likely to be suspicious."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -25,5 +26,5 @@
     "Linux"
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_netcat_network_connection.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_netcat_network_connection.json
index ac46bcbdbc083..bce10f640691b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_netcat_network_connection.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_netcat_network_connection.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Netcat is a dual-use tool that can be used for benign or malicious activity. Netcat is included in some Linux distributions so its presence is not necessarily suspicious. Some normal use of this program, while uncommon, may originate from scripts, automation tools, and frameworks."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -27,5 +28,5 @@
     "Linux"
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nmap_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nmap_activity.json
index 2825dc28ad18f..5d9e338425bda 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nmap_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nmap_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Security testing tools and frameworks may run `Nmap` in the course of security auditing. Some normal use of this command may originate from security engineers and network or server administrators. Use of nmap by ordinary users is uncommon."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -25,5 +26,5 @@
     "Linux"
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json
index 234a09e9607b9..bd019c9a80c4c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_nping_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Some normal use of this command may originate from security engineers and network or server administrators, but this is usually not routine or unannounced. Use of `Nping` by non-engineers or ordinary users is uncommon."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -25,5 +26,5 @@
     "Linux"
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json
index 759622804444e..f0bbc892d7d9c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_process_started_in_temp_directory.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Build systems, like Jenkins, may start processes in the `/tmp` directory. These can be exempted by name or by username."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -22,5 +23,5 @@
     "Linux"
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_socat_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_socat_activity.json
index cd38aff3f2164..fac03d31b57bf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_socat_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_socat_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Socat is a dual-use tool that can be used for benign or malicious activity. Some normal use of this program, at varying levels of frequency, may originate from scripts, automation tools, and frameworks. Usage by web servers is more likely to be suspicious."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -25,5 +26,5 @@
     "Linux"
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json
index 7fcb9f915c560..c1b782d612ccb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/linux_strace_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Strace is a dual-use tool that can be used for benign or malicious activity. Some normal use of this command may originate from developers or SREs engaged in debugging or system call tracing."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -25,5 +26,5 @@
     "Linux"
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json
index 3392a1bff23b8..a4c62b98fb060 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_adobe_hijack_persistence.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Detects writing executable files that will be automatically launched by Adobe on launch.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_kernel_module_activity.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_kernel_module_activity.json
index e76379d171bf7..e3dedeef07eb5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_kernel_module_activity.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_kernel_module_activity.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Security tools and device drivers may run these programs in order to load legitimate kernel modules. Use of these programs by ordinary users is uncommon."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -42,5 +43,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_commands.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_commands.json
index b9e7f941ee5df..8b81789f6aa8f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_commands.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_local_scheduled_task_commands.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Legitimate scheduled tasks may be created during installation of new software."
   ],
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -39,5 +40,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_activity_by_web_server.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_activity_by_web_server.json
index 0cf6fcdb3875a..2aaf0012acabf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_activity_by_web_server.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_shell_activity_by_web_server.json
@@ -6,6 +6,7 @@
   "false_positives": [
     "Network monitoring or management products may have a web server component that runs shell commands as part of normal behavior."
   ],
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -42,5 +43,5 @@
     }
   ],
   "type": "query",
-  "version": 4
+  "version": 5
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json
index 59715dae441f4..32d78480325e6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_system_shells_via_services.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Windows services typically run as SYSTEM and can be used as a privilege escalation opportunity. Malware or penetration testers may run a shell as a service to gain SYSTEM permissions.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
index 7465751d5cd49..3f2e00f0976de 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/persistence_user_account_creation.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies attempts to create new local users. This is sometimes done by attackers to increase access to a system or domain.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setgid_bit_set_via_chmod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setgid_bit_set_via_chmod.json
index 9550eea6ca6aa..bb0856c0452d5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setgid_bit_set_via_chmod.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setgid_bit_set_via_chmod.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "An adversary may add the setgid bit to a file or directory in order to run a file with the privileges of the owning group. An adversary can take advantage of this to either do a shell escape or exploit a vulnerability in an application with the setgid bit to get code running in a different user\u2019s context. Additionally, adversaries can use this mechanism on their own malware to make sure they're able to execute in elevated contexts in the future.",
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -52,5 +53,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setuid_bit_set_via_chmod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setuid_bit_set_via_chmod.json
index 343426953add6..4cf60d2c9d0de 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setuid_bit_set_via_chmod.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_setuid_bit_set_via_chmod.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "An adversary may add the setuid bit to a file or directory in order to run a file with the privileges of the owning user. An adversary can take advantage of this to either do a shell escape or exploit a vulnerability in an application with the setuid bit to get code running in a different user\u2019s context. Additionally, adversaries can use this mechanism on their own malware to make sure they're able to execute in elevated contexts in the future.",
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -52,5 +53,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudoers_file_mod.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudoers_file_mod.json
index 44b50c74bafe6..73a804fcbda8f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudoers_file_mod.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_sudoers_file_mod.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "A sudoers file specifies the commands that users or groups can run and from which terminals. Adversaries can take advantage of these configurations to execute commands as other users or spawn processes with higher privileges.",
+  "from": "now-9m",
   "index": [
     "auditbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_uac_bypass_event_viewer.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_uac_bypass_event_viewer.json
index 50692dae3856f..740ff47e5abe5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_uac_bypass_event_viewer.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_uac_bypass_event_viewer.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies User Account Control (UAC) bypass via eventvwr.exe. Attackers bypass UAC to stealthily execute code with elevated permissions.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 2
+  "version": 3
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_parentchild_relationship.json b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_parentchild_relationship.json
index 8f938c0ceee6d..c6c5cbce2c095 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_parentchild_relationship.json
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules/privilege_escalation_unusual_parentchild_relationship.json
@@ -3,6 +3,7 @@
     "Elastic"
   ],
   "description": "Identifies Windows programs run from unexpected parent processes. This could indicate masquerading or other strange activity on a system.",
+  "from": "now-9m",
   "index": [
     "winlogbeat-*",
     "logs-endpoint.events.*"
@@ -36,5 +37,5 @@
     }
   ],
   "type": "query",
-  "version": 3
+  "version": 4
 }

From ddf99b64db371f22f6752adc50648fcf2ff413fb Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Wed, 26 Aug 2020 09:09:40 +0200
Subject: [PATCH 051/148] [Lens] Fix rollup related bugs (#75314)

Co-authored-by: Marta Bondyra <marta.bondyra@elastic.co>
---
 .../datapanel.test.tsx                        |   19 +-
 .../indexpattern_datasource/datapanel.tsx     |    8 +-
 .../dimension_panel/dimension_panel.test.tsx  |    2 +
 .../fields_accordion.tsx                      |   12 +-
 .../indexpattern.test.ts                      |    2 +
 .../indexpattern_suggestions.test.tsx         |    7 +
 .../layerpanel.test.tsx                       |    3 +
 .../indexpattern_datasource/loader.test.ts    |   15 +-
 .../public/indexpattern_datasource/loader.ts  |    8 +
 .../public/indexpattern_datasource/mocks.ts   |    2 +
 .../definitions/date_histogram.test.tsx       |   43 +-
 .../operations/definitions/date_histogram.tsx |   33 +-
 .../operations/definitions/index.ts           |    2 +-
 .../operations/definitions/metrics.tsx        |    2 +-
 .../operations/definitions/terms.test.tsx     |    5 +-
 .../operations/definitions/terms.tsx          |    2 +-
 .../operations/operations.test.ts             |    1 +
 .../state_helpers.test.ts                     |    1 +
 .../indexpattern_datasource/to_expression.ts  |    6 +-
 .../public/indexpattern_datasource/types.ts   |    1 +
 x-pack/test/functional/apps/lens/index.ts     |    3 +
 x-pack/test/functional/apps/lens/rollup.ts    |   75 +
 .../es_archives/lens/rollup/config/data.json  |   65 +
 .../lens/rollup/config/mappings.json          | 1294 +++++++++++++++++
 .../es_archives/lens/rollup/data/data.json    |   59 +
 .../lens/rollup/data/mappings.json            |  129 ++
 26 files changed, 1765 insertions(+), 34 deletions(-)
 create mode 100644 x-pack/test/functional/apps/lens/rollup.ts
 create mode 100644 x-pack/test/functional/es_archives/lens/rollup/config/data.json
 create mode 100644 x-pack/test/functional/es_archives/lens/rollup/config/mappings.json
 create mode 100644 x-pack/test/functional/es_archives/lens/rollup/data/data.json
 create mode 100644 x-pack/test/functional/es_archives/lens/rollup/data/mappings.json

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
index 8291b673cd17a..f17bf172b0fb1 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.test.tsx
@@ -84,6 +84,7 @@ const initialState: IndexPatternPrivateState = {
       id: '1',
       title: 'idx1',
       timeFieldName: 'timestamp',
+      hasRestrictions: false,
       fields: [
         {
           name: 'timestamp',
@@ -134,6 +135,7 @@ const initialState: IndexPatternPrivateState = {
       id: '2',
       title: 'idx2',
       timeFieldName: 'timestamp',
+      hasRestrictions: true,
       fields: [
         {
           name: 'timestamp',
@@ -191,6 +193,7 @@ const initialState: IndexPatternPrivateState = {
       id: '3',
       title: 'idx3',
       timeFieldName: 'timestamp',
+      hasRestrictions: false,
       fields: [
         {
           name: 'timestamp',
@@ -322,8 +325,20 @@ describe('IndexPattern Data Panel', () => {
           isFirstExistenceFetch: false,
           currentIndexPatternId: 'a',
           indexPatterns: {
-            a: { id: 'a', title: 'aaa', timeFieldName: 'atime', fields: [] },
-            b: { id: 'b', title: 'bbb', timeFieldName: 'btime', fields: [] },
+            a: {
+              id: 'a',
+              title: 'aaa',
+              timeFieldName: 'atime',
+              fields: [],
+              hasRestrictions: false,
+            },
+            b: {
+              id: 'b',
+              title: 'bbb',
+              timeFieldName: 'btime',
+              fields: [],
+              hasRestrictions: false,
+            },
           },
           layers: {
             1: {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
index 0777b9b9d8e57..f7adf91e307da 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
@@ -126,6 +126,7 @@ export function IndexPatternDataPanel({
       title: indexPatterns[id].title,
       timeFieldName: indexPatterns[id].timeFieldName,
       fields: indexPatterns[id].fields,
+      hasRestrictions: indexPatterns[id].hasRestrictions,
     }));
 
   const dslQuery = buildSafeEsQuery(
@@ -422,6 +423,8 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
     ]
   );
 
+  const fieldInfoUnavailable = existenceFetchFailed || currentIndexPattern.hasRestrictions;
+
   return (
     <ChildDragDropProvider {...dragDropContext}>
       <EuiFlexGroup
@@ -568,7 +571,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
                 initialIsOpen={localState.isAvailableAccordionOpen}
                 id="lnsIndexPatternAvailableFields"
                 label={
-                  existenceFetchFailed
+                  fieldInfoUnavailable
                     ? i18n.translate('xpack.lens.indexPattern.allFieldsLabel', {
                         defaultMessage: 'All fields',
                       })
@@ -577,6 +580,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
                       })
                 }
                 exists={true}
+                hideDetails={fieldInfoUnavailable}
                 hasLoaded={!!hasSyncedExistingFields}
                 fieldsCount={filteredFieldGroups.availableFields.length}
                 isFiltered={
@@ -609,7 +613,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
                 }
               />
               <EuiSpacer size="m" />
-              {!existenceFetchFailed && (
+              {!fieldInfoUnavailable && (
                 <FieldsAccordion
                   initialIsOpen={localState.isEmptyAccordionOpen}
                   isFiltered={
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
index bca179b437521..3ee109376d975 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/dimension_panel.test.tsx
@@ -42,6 +42,7 @@ const expectedIndexPatterns = {
     title: 'my-fake-index-pattern',
     timeFieldName: 'timestamp',
     hasExistence: true,
+    hasRestrictions: false,
     fields: [
       {
         name: 'timestamp',
@@ -1256,6 +1257,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
           foo: {
             id: 'foo',
             title: 'Foo pattern',
+            hasRestrictions: false,
             fields: [
               {
                 aggregatable: true,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
index af2ed97ad8125..30a92c21ff661 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/fields_accordion.tsx
@@ -47,6 +47,7 @@ export interface FieldsAccordionProps {
   renderCallout: JSX.Element;
   exists: boolean;
   showExistenceFetchError?: boolean;
+  hideDetails?: boolean;
 }
 
 export const InnerFieldsAccordion = function InnerFieldsAccordion({
@@ -61,13 +62,20 @@ export const InnerFieldsAccordion = function InnerFieldsAccordion({
   fieldProps,
   renderCallout,
   exists,
+  hideDetails,
   showExistenceFetchError,
 }: FieldsAccordionProps) {
   const renderField = useCallback(
     (field: IndexPatternField) => (
-      <FieldItem {...fieldProps} key={field.name} field={field} exists={!!exists} />
+      <FieldItem
+        {...fieldProps}
+        key={field.name}
+        field={field}
+        exists={exists}
+        hideDetails={hideDetails}
+      />
     ),
-    [fieldProps, exists]
+    [fieldProps, exists, hideDetails]
   );
 
   return (
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
index 0ba7b7df97853..900cd02622aaf 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
@@ -21,6 +21,7 @@ const expectedIndexPatterns = {
     id: '1',
     title: 'my-fake-index-pattern',
     timeFieldName: 'timestamp',
+    hasRestrictions: false,
     fields: [
       {
         name: 'timestamp',
@@ -70,6 +71,7 @@ const expectedIndexPatterns = {
     id: '2',
     title: 'my-fake-restricted-pattern',
     timeFieldName: 'timestamp',
+    hasRestrictions: true,
     fields: [
       {
         name: 'timestamp',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
index 5489dcffc52c4..663d7c18bb370 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.test.tsx
@@ -20,6 +20,7 @@ const expectedIndexPatterns = {
     id: '1',
     title: 'my-fake-index-pattern',
     timeFieldName: 'timestamp',
+    hasRestrictions: false,
     fields: [
       {
         name: 'timestamp',
@@ -68,6 +69,7 @@ const expectedIndexPatterns = {
   2: {
     id: '2',
     title: 'my-fake-restricted-pattern',
+    hasRestrictions: true,
     timeFieldName: 'timestamp',
     fields: [
       {
@@ -322,6 +324,7 @@ describe('IndexPattern Data Source suggestions', () => {
             1: {
               id: '1',
               title: 'no timefield',
+              hasRestrictions: false,
               fields: [
                 {
                   name: 'bytes',
@@ -532,6 +535,7 @@ describe('IndexPattern Data Source suggestions', () => {
             1: {
               id: '1',
               title: 'no timefield',
+              hasRestrictions: false,
               fields: [
                 {
                   name: 'bytes',
@@ -1350,6 +1354,7 @@ describe('IndexPattern Data Source suggestions', () => {
           1: {
             id: '1',
             title: 'my-fake-index-pattern',
+            hasRestrictions: false,
             fields: [
               {
                 name: 'field1',
@@ -1493,6 +1498,7 @@ describe('IndexPattern Data Source suggestions', () => {
           1: {
             id: '1',
             title: 'my-fake-index-pattern',
+            hasRestrictions: false,
             fields: [
               {
                 name: 'field1',
@@ -1555,6 +1561,7 @@ describe('IndexPattern Data Source suggestions', () => {
           1: {
             id: '1',
             title: 'my-fake-index-pattern',
+            hasRestrictions: false,
             fields: [
               {
                 name: 'field1',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/layerpanel.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/layerpanel.test.tsx
index 738cdd611a7ba..92e35b257f24a 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/layerpanel.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/layerpanel.test.tsx
@@ -62,6 +62,7 @@ const initialState: IndexPatternPrivateState = {
       id: '1',
       title: 'my-fake-index-pattern',
       timeFieldName: 'timestamp',
+      hasRestrictions: false,
       fields: [
         {
           name: 'timestamp',
@@ -103,6 +104,7 @@ const initialState: IndexPatternPrivateState = {
     '2': {
       id: '2',
       title: 'my-fake-restricted-pattern',
+      hasRestrictions: true,
       timeFieldName: 'timestamp',
       fields: [
         {
@@ -160,6 +162,7 @@ const initialState: IndexPatternPrivateState = {
       id: '3',
       title: 'my-compatible-pattern',
       timeFieldName: 'timestamp',
+      hasRestrictions: false,
       fields: [
         {
           name: 'timestamp',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
index d80bf779a5d17..660be9514a92f 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
@@ -40,6 +40,7 @@ const indexPattern1 = ({
   id: '1',
   title: 'my-fake-index-pattern',
   timeFieldName: 'timestamp',
+  hasRestrictions: false,
   fields: [
     {
       name: 'timestamp',
@@ -105,6 +106,7 @@ const indexPattern2 = ({
   id: '2',
   title: 'my-fake-restricted-pattern',
   timeFieldName: 'timestamp',
+  hasRestrictions: true,
   fields: [
     {
       name: 'timestamp',
@@ -733,9 +735,9 @@ describe('loader', () => {
         dateRange: { fromDate: '1900-01-01', toDate: '2000-01-01' },
         fetchJson,
         indexPatterns: [
-          { id: '1', title: '1', fields: [] },
-          { id: '2', title: '1', fields: [] },
-          { id: '3', title: '1', fields: [] },
+          { id: '1', title: '1', fields: [], hasRestrictions: false },
+          { id: '2', title: '1', fields: [], hasRestrictions: false },
+          { id: '3', title: '1', fields: [], hasRestrictions: false },
         ],
         setState,
         dslQuery,
@@ -783,9 +785,9 @@ describe('loader', () => {
         dateRange: { fromDate: '1900-01-01', toDate: '2000-01-01' },
         fetchJson,
         indexPatterns: [
-          { id: '1', title: '1', fields: [] },
-          { id: '2', title: '1', fields: [] },
-          { id: 'c', title: '1', fields: [] },
+          { id: '1', title: '1', fields: [], hasRestrictions: false },
+          { id: '2', title: '1', fields: [], hasRestrictions: false },
+          { id: 'c', title: '1', fields: [], hasRestrictions: false },
         ],
         setState,
         dslQuery,
@@ -817,6 +819,7 @@ describe('loader', () => {
           {
             id: '1',
             title: '1',
+            hasRestrictions: false,
             fields: [{ name: 'field1' }, { name: 'field2' }] as IndexPatternField[],
           },
         ],
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
index 24906790a9fc9..585a1281cbf51 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
@@ -91,6 +91,7 @@ export async function loadIndexPatterns({
         timeFieldName,
         fieldFormatMap,
         fields: newFields,
+        hasRestrictions: !!typeMeta?.aggs,
       };
 
       return {
@@ -334,6 +335,7 @@ export async function syncExistingFields({
     title: string;
     fields: IndexPatternField[];
     timeFieldName?: string | null;
+    hasRestrictions: boolean;
   }>;
   fetchJson: HttpSetup['post'];
   setState: SetState;
@@ -343,6 +345,12 @@ export async function syncExistingFields({
   showNoDataPopover: () => void;
 }) {
   const existenceRequests = indexPatterns.map((pattern) => {
+    if (pattern.hasRestrictions) {
+      return {
+        indexPatternTitle: pattern.title,
+        existingFieldNames: pattern.fields.map((field) => field.name),
+      };
+    }
     const body: Record<string, string | object> = {
       dslQuery,
       fromDate: dateRange.fromDate,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
index 869eee67d381d..31e6240993d36 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
@@ -11,6 +11,7 @@ export const createMockedIndexPattern = (): IndexPattern => ({
   id: '1',
   title: 'my-fake-index-pattern',
   timeFieldName: 'timestamp',
+  hasRestrictions: false,
   fields: [
     {
       name: 'timestamp',
@@ -70,6 +71,7 @@ export const createMockedRestrictedIndexPattern = () => ({
   id: '2',
   title: 'my-fake-restricted-pattern',
   timeFieldName: 'timestamp',
+  hasRestrictions: true,
   fields: [
     {
       name: 'timestamp',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx
index 48a6079c58ac0..ac6bf63c37110 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.test.tsx
@@ -55,6 +55,7 @@ describe('date_histogram', () => {
           id: '1',
           title: 'Mock Indexpattern',
           timeFieldName: 'timestamp',
+          hasRestrictions: false,
           fields: [
             {
               name: 'timestamp',
@@ -69,6 +70,7 @@ describe('date_histogram', () => {
         2: {
           id: '2',
           title: 'Mock Indexpattern 2',
+          hasRestrictions: false,
           fields: [
             {
               name: 'other_timestamp',
@@ -229,13 +231,50 @@ describe('date_histogram', () => {
     it('should reflect params correctly', () => {
       const esAggsConfig = dateHistogramOperation.toEsAggsConfig(
         state.layers.first.columns.col1 as DateHistogramIndexPatternColumn,
-        'col1'
+        'col1',
+        state.indexPatterns['1']
       );
       expect(esAggsConfig).toEqual(
         expect.objectContaining({
           params: expect.objectContaining({
             interval: '42w',
             field: 'timestamp',
+            useNormalizedEsInterval: true,
+          }),
+        })
+      );
+    });
+
+    it('should not use normalized es interval for rollups', () => {
+      const esAggsConfig = dateHistogramOperation.toEsAggsConfig(
+        state.layers.first.columns.col1 as DateHistogramIndexPatternColumn,
+        'col1',
+        {
+          ...state.indexPatterns['1'],
+          fields: [
+            {
+              name: 'timestamp',
+              displayName: 'timestamp',
+              aggregatable: true,
+              searchable: true,
+              type: 'date',
+              aggregationRestrictions: {
+                date_histogram: {
+                  agg: 'date_histogram',
+                  time_zone: 'UTC',
+                  calendar_interval: '42w',
+                },
+              },
+            },
+          ],
+        }
+      );
+      expect(esAggsConfig).toEqual(
+        expect.objectContaining({
+          params: expect.objectContaining({
+            interval: '42w',
+            field: 'timestamp',
+            useNormalizedEsInterval: false,
           }),
         })
       );
@@ -300,6 +339,7 @@ describe('date_histogram', () => {
         {
           title: '',
           id: '',
+          hasRestrictions: true,
           fields: [
             {
               name: 'dateField',
@@ -343,6 +383,7 @@ describe('date_histogram', () => {
         {
           title: '',
           id: '',
+          hasRestrictions: false,
           fields: [
             {
               name: 'dateField',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
index 2236bc576e2b6..57454291d43c5 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx
@@ -119,21 +119,24 @@ export const dateHistogramOperation: OperationDefinition<DateHistogramIndexPatte
       sourceField: field.name,
     };
   },
-  toEsAggsConfig: (column, columnId) => ({
-    id: columnId,
-    enabled: true,
-    type: 'date_histogram',
-    schema: 'segment',
-    params: {
-      field: column.sourceField,
-      time_zone: column.params.timeZone,
-      useNormalizedEsInterval: true,
-      interval: column.params.interval,
-      drop_partials: false,
-      min_doc_count: 0,
-      extended_bounds: {},
-    },
-  }),
+  toEsAggsConfig: (column, columnId, indexPattern) => {
+    const usedField = indexPattern.fields.find((field) => field.name === column.sourceField);
+    return {
+      id: columnId,
+      enabled: true,
+      type: 'date_histogram',
+      schema: 'segment',
+      params: {
+        field: column.sourceField,
+        time_zone: column.params.timeZone,
+        useNormalizedEsInterval: !usedField || !usedField.aggregationRestrictions?.date_histogram,
+        interval: column.params.interval,
+        drop_partials: false,
+        min_doc_count: 0,
+        extended_bounds: {},
+      },
+    };
+  },
   paramEditor: ({ state, setState, currentColumn: currentColumn, layerId, dateRange, data }) => {
     const field =
       currentColumn &&
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
index ef12fca690f0c..8ef53c1e0b425 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts
@@ -84,7 +84,7 @@ interface BaseOperationDefinitionProps<C extends BaseIndexPatternColumn> {
    * Function turning a column into an agg config passed to the `esaggs` function
    * together with the agg configs returned from other columns.
    */
-  toEsAggsConfig: (column: C, columnId: string) => unknown;
+  toEsAggsConfig: (column: C, columnId: string, indexPattern: IndexPattern) => unknown;
   /**
    * Returns true if the `column` can also be used on `newIndexPattern`.
    * If this function returns false, the column is removed when switching index pattern
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx
index e6c8a5f6ac852..4c37d95f6b050 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx
@@ -68,7 +68,7 @@ function buildMetricOperation<T extends MetricColumn<string>>({
         sourceField: field.name,
       };
     },
-    toEsAggsConfig: (column, columnId) => ({
+    toEsAggsConfig: (column, columnId, _indexPattern) => ({
       id: columnId,
       enabled: true,
       type: column.operationType,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
index 05bb2ef673888..2972ed2d0231b 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.test.tsx
@@ -13,7 +13,7 @@ import { dataPluginMock } from '../../../../../../../src/plugins/data/public/moc
 import { createMockedIndexPattern } from '../../mocks';
 import { TermsIndexPatternColumn } from './terms';
 import { termsOperation } from './index';
-import { IndexPatternPrivateState } from '../../types';
+import { IndexPatternPrivateState, IndexPattern } from '../../types';
 
 const defaultProps = {
   storage: {} as IStorageWrapper,
@@ -69,7 +69,8 @@ describe('terms', () => {
     it('should reflect params correctly', () => {
       const esAggsConfig = termsOperation.toEsAggsConfig(
         state.layers.first.columns.col1 as TermsIndexPatternColumn,
-        'col1'
+        'col1',
+        {} as IndexPattern
       );
       expect(esAggsConfig).toEqual(
         expect.objectContaining({
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
index ac1ff9da2fea0..c1b19fd5549e7 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms.tsx
@@ -95,7 +95,7 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn> = {
       },
     };
   },
-  toEsAggsConfig: (column, columnId) => ({
+  toEsAggsConfig: (column, columnId, _indexPattern) => ({
     id: columnId,
     enabled: true,
     type: 'terms',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts
index 3fce2562f528e..4ac3fc89500f9 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/operations.test.ts
@@ -16,6 +16,7 @@ const expectedIndexPatterns = {
     id: '1',
     title: 'my-fake-index-pattern',
     timeFieldName: 'timestamp',
+    hasRestrictions: false,
     fields: [
       {
         name: 'timestamp',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/state_helpers.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/state_helpers.test.ts
index d7fd0d3661c86..7b6eb11efc494 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/state_helpers.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/state_helpers.test.ts
@@ -570,6 +570,7 @@ describe('state_helpers', () => {
     const indexPattern: IndexPattern = {
       id: 'test',
       title: '',
+      hasRestrictions: true,
       fields: [
         {
           name: 'fieldA',
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts b/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
index 9473a1523b8ca..1b87c48dc7193 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
@@ -21,7 +21,11 @@ function getExpressionForLayer(
   }
 
   function getEsAggsConfig<C extends IndexPatternColumn>(column: C, columnId: string) {
-    return operationDefinitionMap[column.operationType].toEsAggsConfig(column, columnId);
+    return operationDefinitionMap[column.operationType].toEsAggsConfig(
+      column,
+      columnId,
+      indexPattern
+    );
   }
 
   const columnEntries = columnOrder.map((colId) => [colId, columns[colId]] as const);
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/types.ts b/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
index 95cc47e68f8a1..c101f1354b703 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/types.ts
@@ -19,6 +19,7 @@ export interface IndexPattern {
       params: unknown;
     }
   >;
+  hasRestrictions: boolean;
 }
 
 export interface IndexPatternField {
diff --git a/x-pack/test/functional/apps/lens/index.ts b/x-pack/test/functional/apps/lens/index.ts
index f2dcf28c01743..d1ecf8fa0973a 100644
--- a/x-pack/test/functional/apps/lens/index.ts
+++ b/x-pack/test/functional/apps/lens/index.ts
@@ -31,6 +31,9 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       loadTestFile(require.resolve('./dashboard'));
       loadTestFile(require.resolve('./persistent_context'));
       loadTestFile(require.resolve('./lens_reporting'));
+
+      // has to be last one in the suite because it overrides saved objects
+      loadTestFile(require.resolve('./rollup'));
     });
   });
 }
diff --git a/x-pack/test/functional/apps/lens/rollup.ts b/x-pack/test/functional/apps/lens/rollup.ts
new file mode 100644
index 0000000000000..f6882c8aed214
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/rollup.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['visualize', 'lens']);
+  const find = getService('find');
+  const listingTable = getService('listingTable');
+  const esArchiver = getService('esArchiver');
+
+  describe('lens rollup tests', () => {
+    before(async () => {
+      await esArchiver.loadIfNeeded('lens/rollup/data');
+      await esArchiver.loadIfNeeded('lens/rollup/config');
+    });
+
+    after(async () => {
+      await esArchiver.unload('lens/rollup/data');
+      await esArchiver.unload('lens/rollup/config');
+    });
+
+    it('should allow creation of lens xy chart', async () => {
+      await PageObjects.visualize.navigateToNewVisualization();
+      await PageObjects.visualize.clickVisType('lens');
+      await PageObjects.lens.goToTimeRange();
+
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+        operation: 'date_histogram',
+        field: '@timestamp',
+      });
+
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+        operation: 'sum',
+        field: 'bytes',
+      });
+
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsXY_splitDimensionPanel > lns-empty-dimension',
+        operation: 'terms',
+        field: 'geo.src',
+      });
+      expect(await find.allByCssSelector('.echLegendItem')).to.have.length(2);
+
+      await PageObjects.lens.save('Afancilenstest');
+
+      // Ensure the visualization shows up in the visualize list, and takes
+      // us back to the visualization as we configured it.
+      await PageObjects.visualize.gotoVisualizationLandingPage();
+      await listingTable.searchForItemWithName('Afancilenstest');
+      await PageObjects.lens.clickVisualizeListItemTitle('Afancilenstest');
+      await PageObjects.lens.goToTimeRange();
+
+      expect(await PageObjects.lens.getTitle()).to.eql('Afancilenstest');
+
+      // .echLegendItem__title is the only viable way of getting the xy chart's
+      // legend item(s), so we're using a class selector here.
+      expect(await find.allByCssSelector('.echLegendItem')).to.have.length(2);
+    });
+
+    it('should allow seamless transition to and from table view', async () => {
+      await PageObjects.lens.switchToVisualization('lnsMetric');
+      await PageObjects.lens.assertMetric('Sum of bytes', '16,788');
+      await PageObjects.lens.switchToVisualization('lnsDatatable');
+      expect(await PageObjects.lens.getDatatableHeaderText()).to.eql('Sum of bytes');
+      expect(await PageObjects.lens.getDatatableCellText(0, 0)).to.eql('16,788');
+    });
+  });
+}
diff --git a/x-pack/test/functional/es_archives/lens/rollup/config/data.json b/x-pack/test/functional/es_archives/lens/rollup/config/data.json
new file mode 100644
index 0000000000000..268b98542fe11
--- /dev/null
+++ b/x-pack/test/functional/es_archives/lens/rollup/config/data.json
@@ -0,0 +1,65 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "space:default",
+    "index": ".kibana_1",
+    "source": {
+      "migrationVersion": {
+        "space": "6.6.0"
+      },
+      "references": [],
+      "space": {
+        "_reserved": true,
+        "description": "This is the default space!",
+        "disabledFeatures": [],
+        "name": "Default"
+      },
+      "type": "space"
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "index-pattern:lens-rolled-up-data",
+    "index": ".kibana_1",
+    "source": {
+      "index-pattern" : {
+        "title" : "lens_rolled_up_data",
+        "timeFieldName" : "@timestamp",
+        "fields" : "[{\"count\":0,\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"count\":0,\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"count\":0,\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"count\":0,\"name\":\"_score\",\"type\":\"number\",\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"@timestamp\",\"type\":\"date\",\"esTypes\":[\"date\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"bytes\",\"type\":\"number\",\"esTypes\":[\"float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geo.src\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
+        "type" : "rollup",
+        "typeMeta" : "{\"params\":{\"rollup_index\":\"lens_rolled_up_data\"},\"aggs\":{\"date_histogram\":{\"@timestamp\":{\"agg\":\"date_histogram\",\"fixed_interval\":\"60m\",\"time_zone\":\"UTC\"}},\"sum\":{\"bytes\":{\"agg\":\"sum\"}},\"max\":{\"bytes\":{\"agg\":\"max\"}},\"terms\":{\"geo.src\":{\"agg\":\"terms\"}}}}"
+      },
+      "type" : "index-pattern",
+      "references" : [ ],
+      "migrationVersion" : {
+        "index-pattern" : "7.6.0"
+      },
+      "updated_at" : "2020-08-19T08:39:09.998Z"
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "config:8.0.0",
+    "index": ".kibana_1",
+    "source": {
+      "config": {
+        "accessibility:disableAnimations": true,
+        "buildNum": 9007199254740991,
+        "dateFormat:tz": "UTC",
+        "defaultIndex": "logstash-*"
+      },
+      "references": [],
+      "type": "config",
+      "updated_at": "2019-09-04T18:47:24.761Z"
+    },
+    "type": "_doc"
+  }
+}
diff --git a/x-pack/test/functional/es_archives/lens/rollup/config/mappings.json b/x-pack/test/functional/es_archives/lens/rollup/config/mappings.json
new file mode 100644
index 0000000000000..f2a29f022ff5e
--- /dev/null
+++ b/x-pack/test/functional/es_archives/lens/rollup/config/mappings.json
@@ -0,0 +1,1294 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".kibana": {
+      }
+    },
+    "index": ".kibana_1",
+    "mappings": {
+      "_meta": {
+        "migrationMappingPropertyHashes": {
+          "apm-telemetry": "07ee1939fa4302c62ddc052ec03fed90",
+          "canvas-element": "7390014e1091044523666d97247392fc",
+          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
+          "config": "87aca8fdb053154f11383fce3dbf3edf",
+          "dashboard": "d00f614b29a80360e1190193fd333bab",
+          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
+          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
+          "index-pattern": "66eccb05066c5a89924f48a9e9736499",
+          "infrastructure-ui-source": "ddc0ecb18383f6b26101a2fadb2dab0c",
+          "inventory-view": "84b320fd67209906333ffce261128462",
+          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
+          "lens": "21c3ea0763beb1ecb0162529706b88c5",
+          "map": "23d7aa4a720d4938ccde3983f87bd58d",
+          "maps-telemetry": "a4229f8b16a6820c6d724b7e0c1f729d",
+          "metrics-explorer-view": "53c5365793677328df0ccb6138bf3cdd",
+          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
+          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
+          "namespace": "2f4316de49999235636386fe51dc06c1",
+          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
+          "references": "7997cf5a56cc02bdc9c93361bde732b0",
+          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
+          "search": "181661168bbadd1eff5902361e2a0d5c",
+          "server": "ec97f1c5da1a19609a60874e5af1100c",
+          "siem-ui-timeline": "1f6f0860ad7bc0dba3e42467ca40470d",
+          "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
+          "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
+          "space": "c5ca8acafa0beaa4d08d014a97b6bc6b",
+          "telemetry": "e1c8bc94e443aefd9458932cc0697a4d",
+          "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
+          "type": "2f4316de49999235636386fe51dc06c1",
+          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
+          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
+          "upgrade-assistant-reindex-operation": "a53a20fe086b72c9a86da3cc12dad8a6",
+          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
+          "url": "c7f66a0df8b1b52f17c28c4adb111105",
+          "visualization": "52d7a13ad68a150c4525b292d23e12cc"
+        }
+      },
+      "dynamic": "strict",
+      "properties": {
+        "action": {
+          "properties": {
+            "actionTypeId": {
+              "type": "keyword"
+            },
+            "config": {
+              "enabled": false,
+              "type": "object"
+            },
+            "description": {
+              "type": "text"
+            },
+            "secrets": {
+              "type": "binary"
+            }
+          }
+        },
+        "action_task_params": {
+          "properties": {
+            "actionId": {
+              "type": "keyword"
+            },
+            "apiKey": {
+              "type": "binary"
+            },
+            "params": {
+              "enabled": false,
+              "type": "object"
+            }
+          }
+        },
+        "alert": {
+          "properties": {
+            "actions": {
+              "properties": {
+                "actionRef": {
+                  "type": "keyword"
+                },
+                "group": {
+                  "type": "keyword"
+                },
+                "params": {
+                  "enabled": false,
+                  "type": "object"
+                }
+              },
+              "type": "nested"
+            },
+            "alertTypeId": {
+              "type": "keyword"
+            },
+            "params": {
+              "enabled": false,
+              "type": "object"
+            },
+            "apiKey": {
+              "type": "binary"
+            },
+            "apiKeyOwner": {
+              "type": "keyword"
+            },
+            "createdBy": {
+              "type": "keyword"
+            },
+            "enabled": {
+              "type": "boolean"
+            },
+            "interval": {
+              "type": "keyword"
+            },
+            "scheduledTaskId": {
+              "type": "keyword"
+            },
+            "updatedBy": {
+              "type": "keyword"
+            }
+          }
+        },
+        "apm-telemetry": {
+          "properties": {
+            "has_any_services": {
+              "type": "boolean"
+            },
+            "services_per_agent": {
+              "properties": {
+                "dotnet": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "go": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "java": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "js-base": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "nodejs": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "python": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "ruby": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "rum-js": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "canvas-element": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "content": {
+              "type": "text"
+            },
+            "help": {
+              "type": "text"
+            },
+            "image": {
+              "type": "text"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "canvas-workpad": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "config": {
+          "dynamic": "true",
+          "properties": {
+            "accessibility:disableAnimations": {
+              "type": "boolean"
+            },
+            "buildNum": {
+              "type": "keyword"
+            },
+            "dateFormat:tz": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "defaultIndex": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "dashboard": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "optionsJSON": {
+              "type": "text"
+            },
+            "panelsJSON": {
+              "type": "text"
+            },
+            "refreshInterval": {
+              "properties": {
+                "display": {
+                  "type": "keyword"
+                },
+                "pause": {
+                  "type": "boolean"
+                },
+                "section": {
+                  "type": "integer"
+                },
+                "value": {
+                  "type": "integer"
+                }
+              }
+            },
+            "timeFrom": {
+              "type": "keyword"
+            },
+            "timeRestore": {
+              "type": "boolean"
+            },
+            "timeTo": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "file-upload-telemetry": {
+          "properties": {
+            "filesUploadedTotalCount": {
+              "type": "long"
+            }
+          }
+        },
+        "gis-map": {
+          "properties": {
+            "bounds": {
+              "strategy": "recursive",
+              "type": "geo_shape"
+            },
+            "description": {
+              "type": "text"
+            },
+            "layerListJSON": {
+              "type": "text"
+            },
+            "mapStateJSON": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "graph-workspace": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "numLinks": {
+              "type": "integer"
+            },
+            "numVertices": {
+              "type": "integer"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "wsState": {
+              "type": "text"
+            }
+          }
+        },
+        "index-pattern": {
+          "properties": {
+            "fieldFormatMap": {
+              "type": "text"
+            },
+            "fields": {
+              "type": "text"
+            },
+            "intervalName": {
+              "type": "keyword"
+            },
+            "notExpandable": {
+              "type": "boolean"
+            },
+            "sourceFilters": {
+              "type": "text"
+            },
+            "timeFieldName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "typeMeta": {
+              "type": "keyword"
+            }
+          }
+        },
+        "infrastructure-ui-source": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "fields": {
+              "properties": {
+                "container": {
+                  "type": "keyword"
+                },
+                "host": {
+                  "type": "keyword"
+                },
+                "pod": {
+                  "type": "keyword"
+                },
+                "tiebreaker": {
+                  "type": "keyword"
+                },
+                "timestamp": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "logAlias": {
+              "type": "keyword"
+            },
+            "logColumns": {
+              "properties": {
+                "fieldColumn": {
+                  "properties": {
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "messageColumn": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "timestampColumn": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                }
+              },
+              "type": "nested"
+            },
+            "metricAlias": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "text"
+            }
+          }
+        },
+        "inventory-view": {
+          "properties": {
+            "autoBounds": {
+              "type": "boolean"
+            },
+            "autoReload": {
+              "type": "boolean"
+            },
+            "boundsOverride": {
+              "properties": {
+                "max": {
+                  "type": "integer"
+                },
+                "min": {
+                  "type": "integer"
+                }
+              }
+            },
+            "customOptions": {
+              "properties": {
+                "field": {
+                  "type": "keyword"
+                },
+                "text": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "filterQuery": {
+              "properties": {
+                "expression": {
+                  "type": "keyword"
+                },
+                "kind": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "groupBy": {
+              "properties": {
+                "field": {
+                  "type": "keyword"
+                },
+                "label": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "metric": {
+              "properties": {
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "nodeType": {
+              "type": "keyword"
+            },
+            "time": {
+              "type": "integer"
+            },
+            "view": {
+              "type": "keyword"
+            }
+          }
+        },
+        "kql-telemetry": {
+          "properties": {
+            "optInCount": {
+              "type": "long"
+            },
+            "optOutCount": {
+              "type": "long"
+            }
+          }
+        },
+        "lens": {
+          "properties": {
+            "expression": {
+              "index": false,
+              "type": "keyword"
+            },
+            "state": {
+              "type": "flattened"
+            },
+            "title": {
+              "type": "text"
+            },
+            "visualizationType": {
+              "type": "keyword"
+            }
+          }
+        },
+        "map": {
+          "properties": {
+            "bounds": {
+              "type": "geo_shape"
+            },
+            "description": {
+              "type": "text"
+            },
+            "layerListJSON": {
+              "type": "text"
+            },
+            "mapStateJSON": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "maps-telemetry": {
+          "properties": {
+            "attributesPerMap": {
+              "properties": {
+                "dataSourcesCount": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "emsVectorLayersCount": {
+                  "dynamic": "true",
+                  "type": "object"
+                },
+                "layerTypesCount": {
+                  "dynamic": "true",
+                  "type": "object"
+                },
+                "layersCount": {
+                  "properties": {
+                    "avg": {
+                      "type": "long"
+                    },
+                    "max": {
+                      "type": "long"
+                    },
+                    "min": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "mapsTotalCount": {
+              "type": "long"
+            },
+            "timeCaptured": {
+              "type": "date"
+            }
+          }
+        },
+        "metrics-explorer-view": {
+          "properties": {
+            "chartOptions": {
+              "properties": {
+                "stack": {
+                  "type": "boolean"
+                },
+                "type": {
+                  "type": "keyword"
+                },
+                "yAxisMode": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "currentTimerange": {
+              "properties": {
+                "from": {
+                  "type": "keyword"
+                },
+                "interval": {
+                  "type": "keyword"
+                },
+                "to": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "options": {
+              "properties": {
+                "aggregation": {
+                  "type": "keyword"
+                },
+                "filterQuery": {
+                  "type": "keyword"
+                },
+                "groupBy": {
+                  "type": "keyword"
+                },
+                "limit": {
+                  "type": "integer"
+                },
+                "metrics": {
+                  "properties": {
+                    "aggregation": {
+                      "type": "keyword"
+                    },
+                    "color": {
+                      "type": "keyword"
+                    },
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "label": {
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "nested"
+                }
+              }
+            }
+          }
+        },
+        "migrationVersion": {
+          "dynamic": "true",
+          "properties": {
+            "index-pattern": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "space": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "visualization": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "ml-telemetry": {
+          "properties": {
+            "file_data_visualizer": {
+              "properties": {
+                "index_creation_count": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "namespace": {
+          "type": "keyword"
+        },
+        "query": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "filters": {
+              "enabled": false,
+              "type": "object"
+            },
+            "query": {
+              "properties": {
+                "language": {
+                  "type": "keyword"
+                },
+                "query": {
+                  "index": false,
+                  "type": "keyword"
+                }
+              }
+            },
+            "timefilter": {
+              "enabled": false,
+              "type": "object"
+            },
+            "title": {
+              "type": "text"
+            }
+          }
+        },
+        "references": {
+          "properties": {
+            "id": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          },
+          "type": "nested"
+        },
+        "sample-data-telemetry": {
+          "properties": {
+            "installCount": {
+              "type": "long"
+            },
+            "unInstallCount": {
+              "type": "long"
+            }
+          }
+        },
+        "search": {
+          "properties": {
+            "columns": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "sort": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "uuid": {
+              "type": "keyword"
+            }
+          }
+        },
+        "siem-ui-timeline": {
+          "properties": {
+            "columns": {
+              "properties": {
+                "aggregatable": {
+                  "type": "boolean"
+                },
+                "category": {
+                  "type": "keyword"
+                },
+                "columnHeaderType": {
+                  "type": "keyword"
+                },
+                "description": {
+                  "type": "text"
+                },
+                "example": {
+                  "type": "text"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "indexes": {
+                  "type": "keyword"
+                },
+                "name": {
+                  "type": "text"
+                },
+                "placeholder": {
+                  "type": "text"
+                },
+                "searchable": {
+                  "type": "boolean"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "dataProviders": {
+              "properties": {
+                "and": {
+                  "properties": {
+                    "enabled": {
+                      "type": "boolean"
+                    },
+                    "excluded": {
+                      "type": "boolean"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "kqlQuery": {
+                      "type": "text"
+                    },
+                    "name": {
+                      "type": "text"
+                    },
+                    "queryMatch": {
+                      "properties": {
+                        "displayField": {
+                          "type": "text"
+                        },
+                        "displayValue": {
+                          "type": "text"
+                        },
+                        "field": {
+                          "type": "text"
+                        },
+                        "operator": {
+                          "type": "text"
+                        },
+                        "value": {
+                          "type": "text"
+                        }
+                      }
+                    }
+                  }
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "excluded": {
+                  "type": "boolean"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "kqlQuery": {
+                  "type": "text"
+                },
+                "name": {
+                  "type": "text"
+                },
+                "queryMatch": {
+                  "properties": {
+                    "displayField": {
+                      "type": "text"
+                    },
+                    "displayValue": {
+                      "type": "text"
+                    },
+                    "field": {
+                      "type": "text"
+                    },
+                    "operator": {
+                      "type": "text"
+                    },
+                    "value": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "dateRange": {
+              "properties": {
+                "end": {
+                  "type": "date"
+                },
+                "start": {
+                  "type": "date"
+                }
+              }
+            },
+            "description": {
+              "type": "text"
+            },
+            "favorite": {
+              "properties": {
+                "favoriteDate": {
+                  "type": "date"
+                },
+                "fullName": {
+                  "type": "text"
+                },
+                "keySearch": {
+                  "type": "text"
+                },
+                "userName": {
+                  "type": "text"
+                }
+              }
+            },
+            "kqlMode": {
+              "type": "keyword"
+            },
+            "kqlQuery": {
+              "properties": {
+                "filterQuery": {
+                  "properties": {
+                    "kuery": {
+                      "properties": {
+                        "expression": {
+                          "type": "text"
+                        },
+                        "kind": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "serializedQuery": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "sort": {
+              "properties": {
+                "columnId": {
+                  "type": "keyword"
+                },
+                "sortDirection": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "title": {
+              "type": "text"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "siem-ui-timeline-note": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "eventId": {
+              "type": "keyword"
+            },
+            "note": {
+              "type": "text"
+            },
+            "timelineId": {
+              "type": "keyword"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "siem-ui-timeline-pinned-event": {
+          "properties": {
+            "created": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "text"
+            },
+            "eventId": {
+              "type": "keyword"
+            },
+            "timelineId": {
+              "type": "keyword"
+            },
+            "updated": {
+              "type": "date"
+            },
+            "updatedBy": {
+              "type": "text"
+            }
+          }
+        },
+        "space": {
+          "properties": {
+            "_reserved": {
+              "type": "boolean"
+            },
+            "color": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "disabledFeatures": {
+              "type": "keyword"
+            },
+            "imageUrl": {
+              "index": false,
+              "type": "text"
+            },
+            "initials": {
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "spaceId": {
+          "type": "keyword"
+        },
+        "telemetry": {
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            }
+          }
+        },
+        "timelion-sheet": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "timelion_chart_height": {
+              "type": "integer"
+            },
+            "timelion_columns": {
+              "type": "integer"
+            },
+            "timelion_interval": {
+              "type": "keyword"
+            },
+            "timelion_other_interval": {
+              "type": "keyword"
+            },
+            "timelion_rows": {
+              "type": "integer"
+            },
+            "timelion_sheet": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "type": {
+          "type": "keyword"
+        },
+        "ui-metric": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            }
+          }
+        },
+        "updated_at": {
+          "type": "date"
+        },
+        "upgrade-assistant-reindex-operation": {
+          "dynamic": "true",
+          "properties": {
+            "indexName": {
+              "type": "keyword"
+            },
+            "status": {
+              "type": "integer"
+            }
+          }
+        },
+        "upgrade-assistant-telemetry": {
+          "properties": {
+            "features": {
+              "properties": {
+                "deprecation_logging": {
+                  "properties": {
+                    "enabled": {
+                      "null_value": true,
+                      "type": "boolean"
+                    }
+                  }
+                }
+              }
+            },
+            "ui_open": {
+              "properties": {
+                "cluster": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "indices": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "overview": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            },
+            "ui_reindex": {
+              "properties": {
+                "close": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "open": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "start": {
+                  "null_value": 0,
+                  "type": "long"
+                },
+                "stop": {
+                  "null_value": 0,
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "url": {
+          "properties": {
+            "accessCount": {
+              "type": "long"
+            },
+            "accessDate": {
+              "type": "date"
+            },
+            "createDate": {
+              "type": "date"
+            },
+            "url": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "visualization": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchRefName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "type": "text"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/lens/rollup/data/data.json b/x-pack/test/functional/es_archives/lens/rollup/data/data.json
new file mode 100644
index 0000000000000..36dc10c05f0b9
--- /dev/null
+++ b/x-pack/test/functional/es_archives/lens/rollup/data/data.json
@@ -0,0 +1,59 @@
+{
+  "type": "doc",
+  "value": {
+    "index": "lens_rolled_up_data",
+    "id": "lens_rolled_up_data$vuSq1a9Ph2Nq-2yfGpE34g",
+    "source": {
+      "@timestamp.date_histogram.time_zone": "UTC",
+      "@timestamp.date_histogram.timestamp": 1442710800000,
+      "geo.src.terms.value": "CN",
+      "bytes.max.value": 5678.0,
+      "_rollup.version": 2,
+      "bytes.sum.value": 5678.0,
+      "@timestamp.date_histogram.interval": "60m",
+      "geo.src.terms._count": 1,
+      "@timestamp.date_histogram._count": 1,
+      "_rollup.id": "lens_rolled_up_data"
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "index": "lens_rolled_up_data",
+    "id": "lens_rolled_up_data$QFyUWoecErSYPMrIb6CgZA",
+    "source": {
+      "@timestamp.date_histogram.time_zone": "UTC",
+      "@timestamp.date_histogram.timestamp": 1442710800000,
+      "geo.src.terms.value": "US",
+      "bytes.max.value": 1234.0,
+      "_rollup.version": 2,
+      "bytes.sum.value": 1234.0,
+      "@timestamp.date_histogram.interval": "60m",
+      "geo.src.terms._count": 1,
+      "@timestamp.date_histogram._count": 1,
+      "_rollup.id": "lens_rolled_up_data"
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "index": "lens_rolled_up_data",
+    "id": "lens_rolled_up_data$cKCjv1OPjYiyv5WPPblohw",
+    "source": {
+      "@timestamp.date_histogram.time_zone": "UTC",
+      "@timestamp.date_histogram.timestamp": 1442714400000,
+      "geo.src.terms.value": "CN",
+      "bytes.max.value": 9876.0,
+      "_rollup.version": 2,
+      "bytes.sum.value": 9876.0,
+      "@timestamp.date_histogram.interval": "60m",
+      "geo.src.terms._count": 1,
+      "@timestamp.date_histogram._count": 1,
+      "_rollup.id": "lens_rolled_up_data"
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/lens/rollup/data/mappings.json b/x-pack/test/functional/es_archives/lens/rollup/data/mappings.json
new file mode 100644
index 0000000000000..0e47a632bbf3f
--- /dev/null
+++ b/x-pack/test/functional/es_archives/lens/rollup/data/mappings.json
@@ -0,0 +1,129 @@
+{
+  "type": "index",
+  "value": {
+    "index": "lens_rolled_up_data",
+    "mappings": {
+      "_meta": {
+        "_rollup": {
+          "lens_rolled_up_data": {
+            "cron": "0 * * * * ?",
+            "rollup_index": "lens_rolled_up_data",
+            "groups": {
+              "date_histogram": {
+                "fixed_interval": "60m",
+                "field": "@timestamp",
+                "time_zone": "UTC"
+              },
+              "terms": {
+                "fields": ["geo.src", "ip"]
+              }
+            },
+            "id": "lens_rolled_up_data",
+            "metrics": [
+              {
+                "field": "bytes",
+                "metrics": ["sum", "max"]
+              }
+            ],
+            "index_pattern": "lens_raw",
+            "timeout": "20s",
+            "page_size": 1000
+          }
+        },
+        "rollup-version": "8.0.0"
+      },
+      "dynamic_templates": [
+        {
+          "strings": {
+            "match_mapping_type": "string",
+            "mapping": {
+              "type": "keyword"
+            }
+          }
+        },
+        {
+          "date_histograms": {
+            "path_match": "*.date_histogram.timestamp",
+            "mapping": {
+              "type": "date"
+            }
+          }
+        }
+      ],
+      "properties": {
+        "@timestamp": {
+          "properties": {
+            "date_histogram": {
+              "properties": {
+                "_count": {
+                  "type": "long"
+                },
+                "interval": {
+                  "type": "keyword"
+                },
+                "time_zone": {
+                  "type": "keyword"
+                },
+                "timestamp": {
+                  "type": "date"
+                }
+              }
+            }
+          }
+        },
+        "_rollup": {
+          "properties": {
+            "id": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "long"
+            }
+          }
+        },
+        "bytes": {
+          "properties": {
+            "max": {
+              "properties": {
+                "value": {
+                  "type": "float"
+                }
+              }
+            },
+            "sum": {
+              "properties": {
+                "value": {
+                  "type": "float"
+                }
+              }
+            }
+          }
+        },
+        "geo": {
+          "properties": {
+            "src": {
+              "properties": {
+                "terms": {
+                  "properties": {
+                    "_count": {
+                      "type": "long"
+                    },
+                    "value": {
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_shards": "1",
+        "number_of_replicas": "0"
+      }
+    }
+  }
+}

From 686cde88afa4c303ff92906ae6c100d130967812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20G=C3=B3mez?=
 <alejandro.fernandez@elastic.co>
Date: Wed, 26 Aug 2020 10:38:54 +0200
Subject: [PATCH 052/148] [Logs UI] View log details for anomaly log examples
 (#75425)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../logging/log_entry_flyout/index.tsx        |   2 +-
 .../log_entry_flyout/log_entry_flyout.tsx     |  36 ++--
 .../logs/log_entry_rate/page_providers.tsx    |  23 ++-
 .../log_entry_rate/page_results_content.tsx   | 183 +++++++++++-------
 .../sections/anomalies/log_entry_example.tsx  |  27 ++-
 .../pages/logs/stream/page_logs_content.tsx   |  21 +-
 6 files changed, 184 insertions(+), 108 deletions(-)

diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/index.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/index.tsx
index 521fbf209870c..f11d6cdb8d26d 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/index.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/index.tsx
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { LogEntryFlyout } from './log_entry_flyout';
+export * from './log_entry_flyout';
diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx
index 57f27ee76184b..76ffada510e51 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx
@@ -26,12 +26,10 @@ import { InfraLoadingPanel } from '../../loading';
 import { LogEntryActionsMenu } from './log_entry_actions_menu';
 import { LogEntriesItem, LogEntriesItemField } from '../../../../common/http_api';
 
-interface Props {
+export interface LogEntryFlyoutProps {
   flyoutItem: LogEntriesItem | null;
   setFlyoutVisibility: (visible: boolean) => void;
-  setFilter: (filter: string) => void;
-  setTarget: (timeKey: TimeKey, flyoutItemId: string) => void;
-
+  setFilter: (filter: string, flyoutItemId: string, timeKey?: TimeKey) => void;
   loading: boolean;
 }
 
@@ -40,27 +38,27 @@ export const LogEntryFlyout = ({
   loading,
   setFlyoutVisibility,
   setFilter,
-  setTarget,
-}: Props) => {
+}: LogEntryFlyoutProps) => {
   const createFilterHandler = useCallback(
     (field: LogEntriesItemField) => () => {
+      if (!flyoutItem) {
+        return;
+      }
+
       const filter = `${field.field}:"${field.value}"`;
-      setFilter(filter);
+      const timestampMoment = moment(flyoutItem.key.time);
+      let target;
 
-      if (flyoutItem && flyoutItem.key) {
-        const timestampMoment = moment(flyoutItem.key.time);
-        if (timestampMoment.isValid()) {
-          setTarget(
-            {
-              time: timestampMoment.valueOf(),
-              tiebreaker: flyoutItem.key.tiebreaker,
-            },
-            flyoutItem.id
-          );
-        }
+      if (timestampMoment.isValid()) {
+        target = {
+          time: timestampMoment.valueOf(),
+          tiebreaker: flyoutItem.key.tiebreaker,
+        };
       }
+
+      setFilter(filter, flyoutItem.id, target);
     },
-    [flyoutItem, setFilter, setTarget]
+    [flyoutItem, setFilter]
   );
 
   const closeFlyout = useCallback(() => setFlyoutVisibility(false), [setFlyoutVisibility]);
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx
index e986fa37c2b2c..4ad654614237d 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx
@@ -10,6 +10,7 @@ import { LogEntryCategoriesModuleProvider } from '../../../containers/logs/log_a
 import { LogEntryRateModuleProvider } from '../../../containers/logs/log_analysis/modules/log_entry_rate';
 import { useLogSourceContext } from '../../../containers/logs/log_source';
 import { useActiveKibanaSpace } from '../../../hooks/use_kibana_space';
+import { LogFlyout } from '../../../containers/logs/log_flyout';
 
 export const LogEntryRatePageProviders: React.FunctionComponent = ({ children }) => {
   const { sourceId, sourceConfiguration } = useLogSourceContext();
@@ -23,20 +24,22 @@ export const LogEntryRatePageProviders: React.FunctionComponent = ({ children })
   }
 
   return (
-    <LogEntryRateModuleProvider
-      indexPattern={sourceConfiguration?.configuration.logAlias ?? ''}
-      sourceId={sourceId}
-      spaceId={space.id}
-      timestampField={sourceConfiguration?.configuration.fields.timestamp ?? ''}
-    >
-      <LogEntryCategoriesModuleProvider
+    <LogFlyout.Provider>
+      <LogEntryRateModuleProvider
         indexPattern={sourceConfiguration?.configuration.logAlias ?? ''}
         sourceId={sourceId}
         spaceId={space.id}
         timestampField={sourceConfiguration?.configuration.fields.timestamp ?? ''}
       >
-        <LogAnalysisSetupFlyoutStateProvider>{children}</LogAnalysisSetupFlyoutStateProvider>
-      </LogEntryCategoriesModuleProvider>
-    </LogEntryRateModuleProvider>
+        <LogEntryCategoriesModuleProvider
+          indexPattern={sourceConfiguration?.configuration.logAlias ?? ''}
+          sourceId={sourceId}
+          spaceId={space.id}
+          timestampField={sourceConfiguration?.configuration.fields.timestamp ?? ''}
+        >
+          <LogAnalysisSetupFlyoutStateProvider>{children}</LogAnalysisSetupFlyoutStateProvider>
+        </LogEntryCategoriesModuleProvider>
+      </LogEntryRateModuleProvider>
+    </LogFlyout.Provider>
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
index 65cc4a6c4a704..de72ac5c5a574 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_results_content.tsx
@@ -7,7 +7,9 @@
 import datemath from '@elastic/datemath';
 import { EuiFlexGroup, EuiFlexItem, EuiPage, EuiPanel, EuiSuperDatePicker } from '@elastic/eui';
 import moment from 'moment';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { encode, RisonValue } from 'rison-node';
+import { stringify } from 'query-string';
+import React, { useCallback, useEffect, useMemo, useState, useContext } from 'react';
 import { euiStyled, useTrackPageview } from '../../../../../observability/public';
 import { TimeRange } from '../../../../common/http_api/shared/time_range';
 import { bucketSpan } from '../../../../common/log_analysis';
@@ -29,6 +31,9 @@ import {
   StringTimeRange,
   useLogAnalysisResultsUrlState,
 } from './use_log_entry_rate_results_url_state';
+import { LogEntryFlyout, LogEntryFlyoutProps } from '../../../components/logging/log_entry_flyout';
+import { LogFlyout } from '../../../containers/logs/log_flyout';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 export const SORT_DEFAULTS = {
   direction: 'desc' as const,
@@ -42,6 +47,7 @@ export const PAGINATION_DEFAULTS = {
 export const LogEntryRateResultsContent: React.FunctionComponent = () => {
   useTrackPageview({ app: 'infra_logs', path: 'log_entry_rate_results' });
   useTrackPageview({ app: 'infra_logs', path: 'log_entry_rate_results', delay: 15000 });
+  const navigateToApp = useKibana().services.application?.navigateToApp;
 
   const { sourceId } = useLogSourceContext();
 
@@ -79,6 +85,30 @@ export const LogEntryRateResultsContent: React.FunctionComponent = () => {
     lastChangedTime: Date.now(),
   }));
 
+  const linkToLogStream = useCallback<LogEntryFlyoutProps['setFilter']>(
+    (filter, id, timeKey) => {
+      const params = {
+        logPosition: encode({
+          end: moment(queryTimeRange.value.endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+          position: timeKey as RisonValue,
+          start: moment(queryTimeRange.value.startTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
+          streamLive: false,
+        }),
+        flyoutOptions: encode({
+          surroundingLogsId: id,
+        }),
+        logFilter: encode({
+          expression: filter,
+          kind: 'kuery',
+        }),
+      };
+
+      // eslint-disable-next-line no-unused-expressions
+      navigateToApp?.('logs', { path: `/stream?${stringify(params)}` });
+    },
+    [queryTimeRange, navigateToApp]
+  );
+
   const bucketDuration = useMemo(
     () => getBucketDuration(queryTimeRange.value.startTime, queryTimeRange.value.endTime),
     [queryTimeRange.value.endTime, queryTimeRange.value.startTime]
@@ -115,6 +145,10 @@ export const LogEntryRateResultsContent: React.FunctionComponent = () => {
     filteredDatasets: selectedDatasets,
   });
 
+  const { flyoutVisible, setFlyoutVisibility, flyoutItem, isLoading: isFlyoutLoading } = useContext(
+    LogFlyout.Context
+  );
+
   const handleQueryTimeRangeChange = useCallback(
     ({ start: startTime, end: endTime }: { start: string; end: string }) => {
       setQueryTimeRange({
@@ -198,75 +232,86 @@ export const LogEntryRateResultsContent: React.FunctionComponent = () => {
   );
 
   return (
-    <ResultsContentPage>
-      <EuiFlexGroup direction="column">
-        <EuiFlexItem grow={false}>
-          <EuiFlexGroup justifyContent="spaceBetween">
-            <EuiFlexItem>
-              <DatasetsSelector
-                availableDatasets={datasets}
-                isLoading={isLoadingDatasets}
-                selectedDatasets={selectedDatasets}
-                onChangeDatasetSelection={setSelectedDatasets}
-              />
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiSuperDatePicker
-                start={selectedTimeRange.startTime}
-                end={selectedTimeRange.endTime}
-                onTimeChange={handleSelectedTimeRangeChange}
-                isPaused={autoRefresh.isPaused}
-                refreshInterval={autoRefresh.interval}
-                onRefreshChange={handleAutoRefreshChange}
-              />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <LogAnalysisJobProblemIndicator
-            hasOutdatedJobConfigurations={hasOutdatedLogEntryRateJobConfigurations}
-            hasOutdatedJobDefinitions={hasOutdatedLogEntryRateJobDefinitions}
-            hasSetupCapabilities={hasLogAnalysisSetupCapabilities}
-            hasStoppedJobs={hasStoppedLogEntryRateJobs}
-            isFirstUse={false /* the first use message is already shown by the section below */}
-            moduleName={logEntryRateModuleDescriptor.moduleName}
-            onRecreateMlJobForReconfiguration={showLogEntryRateSetup}
-            onRecreateMlJobForUpdate={showLogEntryRateSetup}
-          />
-          <CategoryJobNoticesSection
-            hasOutdatedJobConfigurations={hasOutdatedLogEntryCategoriesJobConfigurations}
-            hasOutdatedJobDefinitions={hasOutdatedLogEntryCategoriesJobDefinitions}
-            hasSetupCapabilities={hasLogAnalysisSetupCapabilities}
-            hasStoppedJobs={hasStoppedLogEntryCategoriesJobs}
-            isFirstUse={isFirstUse}
-            moduleName={logEntryCategoriesModuleDescriptor.moduleName}
-            onRecreateMlJobForReconfiguration={showLogEntryCategoriesSetup}
-            onRecreateMlJobForUpdate={showLogEntryCategoriesSetup}
-            qualityWarnings={categoryQualityWarnings}
-          />
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiPanel paddingSize="m">
-            <AnomaliesResults
-              isLoadingLogRateResults={isLoading}
-              isLoadingAnomaliesResults={isLoadingLogEntryAnomalies}
-              onViewModuleList={showModuleList}
-              logEntryRateResults={logEntryRate}
-              anomalies={logEntryAnomalies}
-              setTimeRange={handleChartTimeRangeChange}
-              timeRange={queryTimeRange.value}
-              page={page}
-              fetchNextPage={fetchNextPage}
-              fetchPreviousPage={fetchPreviousPage}
-              changeSortOptions={changeSortOptions}
-              changePaginationOptions={changePaginationOptions}
-              sortOptions={sortOptions}
-              paginationOptions={paginationOptions}
+    <>
+      <ResultsContentPage>
+        <EuiFlexGroup direction="column">
+          <EuiFlexItem grow={false}>
+            <EuiFlexGroup justifyContent="spaceBetween">
+              <EuiFlexItem>
+                <DatasetsSelector
+                  availableDatasets={datasets}
+                  isLoading={isLoadingDatasets}
+                  selectedDatasets={selectedDatasets}
+                  onChangeDatasetSelection={setSelectedDatasets}
+                />
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <EuiSuperDatePicker
+                  start={selectedTimeRange.startTime}
+                  end={selectedTimeRange.endTime}
+                  onTimeChange={handleSelectedTimeRangeChange}
+                  isPaused={autoRefresh.isPaused}
+                  refreshInterval={autoRefresh.interval}
+                  onRefreshChange={handleAutoRefreshChange}
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <LogAnalysisJobProblemIndicator
+              hasOutdatedJobConfigurations={hasOutdatedLogEntryRateJobConfigurations}
+              hasOutdatedJobDefinitions={hasOutdatedLogEntryRateJobDefinitions}
+              hasSetupCapabilities={hasLogAnalysisSetupCapabilities}
+              hasStoppedJobs={hasStoppedLogEntryRateJobs}
+              isFirstUse={false /* the first use message is already shown by the section below */}
+              moduleName={logEntryRateModuleDescriptor.moduleName}
+              onRecreateMlJobForReconfiguration={showLogEntryRateSetup}
+              onRecreateMlJobForUpdate={showLogEntryRateSetup}
+            />
+            <CategoryJobNoticesSection
+              hasOutdatedJobConfigurations={hasOutdatedLogEntryCategoriesJobConfigurations}
+              hasOutdatedJobDefinitions={hasOutdatedLogEntryCategoriesJobDefinitions}
+              hasSetupCapabilities={hasLogAnalysisSetupCapabilities}
+              hasStoppedJobs={hasStoppedLogEntryCategoriesJobs}
+              isFirstUse={isFirstUse}
+              moduleName={logEntryCategoriesModuleDescriptor.moduleName}
+              onRecreateMlJobForReconfiguration={showLogEntryCategoriesSetup}
+              onRecreateMlJobForUpdate={showLogEntryCategoriesSetup}
+              qualityWarnings={categoryQualityWarnings}
             />
-          </EuiPanel>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </ResultsContentPage>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiPanel paddingSize="m">
+              <AnomaliesResults
+                isLoadingLogRateResults={isLoading}
+                isLoadingAnomaliesResults={isLoadingLogEntryAnomalies}
+                onViewModuleList={showModuleList}
+                logEntryRateResults={logEntryRate}
+                anomalies={logEntryAnomalies}
+                setTimeRange={handleChartTimeRangeChange}
+                timeRange={queryTimeRange.value}
+                page={page}
+                fetchNextPage={fetchNextPage}
+                fetchPreviousPage={fetchPreviousPage}
+                changeSortOptions={changeSortOptions}
+                changePaginationOptions={changePaginationOptions}
+                sortOptions={sortOptions}
+                paginationOptions={paginationOptions}
+              />
+            </EuiPanel>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </ResultsContentPage>
+
+      {flyoutVisible ? (
+        <LogEntryFlyout
+          flyoutItem={flyoutItem}
+          setFlyoutVisibility={setFlyoutVisibility}
+          loading={isFlyoutLoading}
+          setFilter={linkToLogStream}
+        />
+      ) : null}
+    </>
   );
 };
 
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
index fece2522de574..a543f95bf4ffb 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/sections/anomalies/log_entry_example.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useMemo, useCallback, useState } from 'react';
+import React, { useMemo, useCallback, useState, useContext } from 'react';
 import moment from 'moment';
 import { encode } from 'rison-node';
 import { i18n } from '@kbn/i18n';
@@ -37,6 +37,7 @@ import {
 } from '../../../../../utils/source_configuration';
 import { localizedDate } from '../../../../../../common/formatters/datetime';
 import { LogEntryAnomaly } from '../../../../../../common/http_api';
+import { LogFlyout } from '../../../../../containers/logs/log_flyout';
 
 export const exampleMessageScale = 'medium' as const;
 export const exampleTimestampFormat = 'time' as const;
@@ -45,6 +46,13 @@ const MENU_LABEL = i18n.translate('xpack.infra.logAnomalies.logEntryExamplesMenu
   defaultMessage: 'View actions for log entry',
 });
 
+const VIEW_DETAILS_LABEL = i18n.translate(
+  'xpack.infra.logs.analysis.logEntryExamplesViewDetailsLabel',
+  {
+    defaultMessage: 'View details',
+  }
+);
+
 const VIEW_IN_STREAM_LABEL = i18n.translate(
   'xpack.infra.logs.analysis.logEntryExamplesViewInStreamLabel',
   {
@@ -80,6 +88,8 @@ export const LogEntryExampleMessage: React.FunctionComponent<Props> = ({
   const setItemIsHovered = useCallback(() => setIsHovered(true), []);
   const setItemIsNotHovered = useCallback(() => setIsHovered(false), []);
 
+  const { setFlyoutVisibility, setFlyoutId } = useContext(LogFlyout.Context);
+
   // handle special cases for the dataset value
   const humanFriendlyDataset = getFriendlyNameForPartitionId(dataset);
 
@@ -116,6 +126,13 @@ export const LogEntryExampleMessage: React.FunctionComponent<Props> = ({
     }
 
     return [
+      {
+        label: VIEW_DETAILS_LABEL,
+        onClick: () => {
+          setFlyoutId(id);
+          setFlyoutVisibility(true);
+        },
+      },
       {
         label: VIEW_IN_STREAM_LABEL,
         onClick: viewInStreamLinkProps.onClick,
@@ -127,7 +144,13 @@ export const LogEntryExampleMessage: React.FunctionComponent<Props> = ({
         href: viewAnomalyInMachineLearningLinkProps.href,
       },
     ];
-  }, [viewInStreamLinkProps, viewAnomalyInMachineLearningLinkProps]);
+  }, [
+    id,
+    setFlyoutId,
+    setFlyoutVisibility,
+    viewInStreamLinkProps,
+    viewAnomalyInMachineLearningLinkProps,
+  ]);
 
   return (
     <LogEntryRowWrapper
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
index 85781c48f9512..ea9494c7073d4 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useContext } from 'react';
+import React, { useContext, useCallback } from 'react';
 import { euiStyled } from '../../../../../observability/public';
 import { AutoSizer } from '../../../components/auto_sizer';
 import { LogEntryFlyout } from '../../../components/logging/log_entry_flyout';
@@ -57,6 +57,18 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
 
   const [, { setContextEntry }] = useContext(ViewLogInContext.Context);
 
+  const setFilter = useCallback(
+    (filter, flyoutItemId, timeKey) => {
+      applyLogFilterQuery(filter);
+      if (timeKey) {
+        jumpToTargetPosition(timeKey);
+      }
+      setSurroundingLogsId(flyoutItemId);
+      stopLiveStreaming();
+    },
+    [applyLogFilterQuery, jumpToTargetPosition, setSurroundingLogsId, stopLiveStreaming]
+  );
+
   return (
     <>
       <WithLogTextviewUrlState />
@@ -65,12 +77,7 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
       <PageViewLogInContext />
       {flyoutVisible ? (
         <LogEntryFlyout
-          setFilter={applyLogFilterQuery}
-          setTarget={(timeKey, flyoutItemId) => {
-            jumpToTargetPosition(timeKey);
-            setSurroundingLogsId(flyoutItemId);
-            stopLiveStreaming();
-          }}
+          setFilter={setFilter}
           setFlyoutVisibility={setFlyoutVisibility}
           flyoutItem={flyoutItem}
           loading={isLoading}

From 4efaba3298f79ceda4586fcb891d84987fc95980 Mon Sep 17 00:00:00 2001
From: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com>
Date: Wed, 26 Aug 2020 11:48:27 +0300
Subject: [PATCH 053/148] Reset chrome fields while switching an app (#73064)

* Reset chrome help extension while switching an app

* Reset other chrome fields

* Set docTitle in saved objects app

* Add unit tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/core/public/chrome/chrome_service.test.ts | 53 +++++++++++++++++++
 src/core/public/chrome/chrome_service.tsx     |  8 +++
 .../management_section/mount_section.tsx      |  7 +++
 3 files changed, 68 insertions(+)

diff --git a/src/core/public/chrome/chrome_service.test.ts b/src/core/public/chrome/chrome_service.test.ts
index 8dc81dceaccd6..0150554a60906 100644
--- a/src/core/public/chrome/chrome_service.test.ts
+++ b/src/core/public/chrome/chrome_service.test.ts
@@ -405,6 +405,59 @@ describe('start', () => {
             `);
     });
   });
+
+  describe('erase chrome fields', () => {
+    it('while switching an app', async () => {
+      const startDeps = defaultStartDeps([new FakeApp('alpha')]);
+      const { navigateToApp } = startDeps.application;
+      const { chrome, service } = await start({ startDeps });
+
+      const helpExtensionPromise = chrome.getHelpExtension$().pipe(toArray()).toPromise();
+      const breadcrumbsPromise = chrome.getBreadcrumbs$().pipe(toArray()).toPromise();
+      const badgePromise = chrome.getBadge$().pipe(toArray()).toPromise();
+      const docTitleResetSpy = jest.spyOn(chrome.docTitle, 'reset');
+
+      const promises = Promise.all([helpExtensionPromise, breadcrumbsPromise, badgePromise]);
+
+      chrome.setHelpExtension({ appName: 'App name' });
+      chrome.setBreadcrumbs([{ text: 'App breadcrumb' }]);
+      chrome.setBadge({ text: 'App badge', tooltip: 'App tooltip' });
+
+      navigateToApp('alpha');
+
+      service.stop();
+
+      expect(docTitleResetSpy).toBeCalledTimes(1);
+      await expect(promises).resolves.toMatchInlineSnapshot(`
+        Array [
+          Array [
+            undefined,
+            Object {
+              "appName": "App name",
+            },
+            undefined,
+          ],
+          Array [
+            Array [],
+            Array [
+              Object {
+                "text": "App breadcrumb",
+              },
+            ],
+            Array [],
+          ],
+          Array [
+            undefined,
+            Object {
+              "text": "App badge",
+              "tooltip": "App tooltip",
+            },
+            undefined,
+          ],
+        ]
+      `);
+    });
+  });
 });
 
 describe('stop', () => {
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index d29120e6ee9ac..ef9a682d609ec 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -157,6 +157,14 @@ export class ChromeService {
     const recentlyAccessed = await this.recentlyAccessed.start({ http });
     const docTitle = this.docTitle.start({ document: window.document });
 
+    // erase chrome fields from a previous app while switching to a next app
+    application.currentAppId$.subscribe(() => {
+      helpExtension$.next(undefined);
+      breadcrumbs$.next([]);
+      badge$.next(undefined);
+      docTitle.reset();
+    });
+
     const setIsNavDrawerLocked = (isLocked: boolean) => {
       isNavDrawerLocked$.next(isLocked);
       localStorage.setItem(IS_LOCKED_KEY, `${isLocked}`);
diff --git a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
index 9cfe99fd3bbf8..4339c2fa13c0f 100644
--- a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
@@ -21,6 +21,7 @@ import React, { lazy, Suspense } from 'react';
 import ReactDOM from 'react-dom';
 import { Router, Switch, Route } from 'react-router-dom';
 import { I18nProvider } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import { CoreSetup } from 'src/core/public';
 import { ManagementAppMountParams } from '../../../management/public';
@@ -36,6 +37,10 @@ interface MountParams {
 
 let allowedObjectTypes: string[] | undefined;
 
+const title = i18n.translate('savedObjectsManagement.objects.savedObjectsTitle', {
+  defaultMessage: 'Saved Objects',
+});
+
 const SavedObjectsEditionPage = lazy(() => import('./saved_objects_edition_page'));
 const SavedObjectsTablePage = lazy(() => import('./saved_objects_table_page'));
 export const mountManagementSection = async ({
@@ -49,6 +54,8 @@ export const mountManagementSection = async ({
     allowedObjectTypes = await getAllowedTypes(coreStart.http);
   }
 
+  coreStart.chrome.docTitle.change(title);
+
   const capabilities = coreStart.application.capabilities;
 
   const RedirectToHomeIfUnauthorized: React.FunctionComponent = ({ children }) => {

From 789b67fb5f6e6293dba812bfef3f08333f4a798e Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Wed, 26 Aug 2020 10:59:44 +0200
Subject: [PATCH 054/148] [APM] Improvements for breakdown data gaps (#75534)

Closes #69704, #73387, #43780.
---
 .../shared/charts/CustomPlot/StaticPlot.js    |   43 +-
 .../__snapshots__/CustomPlot.test.js.snap     |  372 +++---
 .../ErroneousTransactionsRateChart/index.tsx  |    2 +-
 .../plugins/apm/public/utils/testHelpers.tsx  |   15 +-
 x-pack/plugins/apm/server/index.ts            |    2 +
 .../plugins/apm/server/lib/helpers/metrics.ts |   10 +-
 .../java/gc/fetch_and_transform_gc_metrics.ts |    8 +-
 .../metrics/fetch_and_transform_metrics.ts    |    8 +-
 .../lib/transaction_groups/get_error_rate.ts  |    9 +-
 .../lib/transactions/breakdown/index.ts       |    8 +-
 .../expectation/error_rate.json               | 1010 ++++++++++++++++-
 11 files changed, 1242 insertions(+), 245 deletions(-)

diff --git a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/StaticPlot.js b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/StaticPlot.js
index d489970b55f29..e49899da85e0d 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/StaticPlot.js
+++ b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/StaticPlot.js
@@ -71,11 +71,29 @@ class StaticPlot extends PureComponent {
         const data = serie.data.map((value) => {
           return 'y' in value && isValidCoordinateValue(value.y)
             ? value
-            : {
-                ...value,
-                y: undefined,
-              };
+            : { ...value, y: undefined };
         });
+
+        // make sure individual markers are displayed in cases
+        // where there are gaps
+
+        const markersForGaps = serie.data.map((value, index) => {
+          const prevHasData = getNull(serie.data[index - 1] ?? {});
+          const nextHasData = getNull(serie.data[index + 1] ?? {});
+          const thisHasData = getNull(value);
+
+          const isGap = !prevHasData && !nextHasData && thisHasData;
+
+          if (!isGap) {
+            return {
+              ...value,
+              y: undefined,
+            };
+          }
+
+          return value;
+        });
+
         return [
           <AreaSeries
             getNull={getNull}
@@ -99,6 +117,21 @@ class StaticPlot extends PureComponent {
             stack={true}
             cluster="line"
           />,
+          <LineMarkSeries
+            getNull={getNull}
+            key={`${serie.title}-line-markers`}
+            xType="time-utc"
+            curve={'curveMonotoneX'}
+            data={markersForGaps}
+            stroke={serie.color}
+            color={serie.color}
+            lineStyle={{
+              opacity: 0,
+            }}
+            stack={true}
+            cluster="line-mark"
+            size={1}
+          />,
         ];
       }
 
@@ -132,7 +165,7 @@ class StaticPlot extends PureComponent {
             curve={'curveMonotoneX'}
             data={serie.data}
             color={serie.color}
-            size={0.5}
+            size={1}
           />
         );
       default:
diff --git a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap
index 8101b01a83b08..f413610ebd984 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap
+++ b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/__snapshots__/CustomPlot.test.js.snap
@@ -460,7 +460,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -477,7 +477,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -494,7 +494,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -511,7 +511,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -528,7 +528,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -545,7 +545,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -562,7 +562,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -579,7 +579,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -596,7 +596,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -613,7 +613,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -630,7 +630,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -647,7 +647,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -664,7 +664,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -681,7 +681,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -698,7 +698,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -715,7 +715,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -732,7 +732,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -749,7 +749,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -766,7 +766,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -783,7 +783,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -800,7 +800,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -817,7 +817,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -834,7 +834,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -851,7 +851,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -868,7 +868,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -885,7 +885,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -902,7 +902,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -919,7 +919,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -936,7 +936,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -953,7 +953,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -970,7 +970,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -1013,7 +1013,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1030,7 +1030,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1047,7 +1047,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1064,7 +1064,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1081,7 +1081,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1098,7 +1098,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1115,7 +1115,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1132,7 +1132,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1149,7 +1149,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1166,7 +1166,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1183,7 +1183,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1200,7 +1200,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1217,7 +1217,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1234,7 +1234,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1251,7 +1251,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1268,7 +1268,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1285,7 +1285,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1302,7 +1302,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1319,7 +1319,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1336,7 +1336,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1353,7 +1353,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1370,7 +1370,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1387,7 +1387,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1404,7 +1404,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1421,7 +1421,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1438,7 +1438,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1455,7 +1455,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1472,7 +1472,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1489,7 +1489,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1506,7 +1506,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1523,7 +1523,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -1566,7 +1566,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1583,7 +1583,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1600,7 +1600,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1617,7 +1617,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1634,7 +1634,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1651,7 +1651,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1668,7 +1668,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1685,7 +1685,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1702,7 +1702,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1719,7 +1719,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1736,7 +1736,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1753,7 +1753,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1770,7 +1770,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1787,7 +1787,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1804,7 +1804,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1821,7 +1821,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1838,7 +1838,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1855,7 +1855,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1872,7 +1872,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1889,7 +1889,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1906,7 +1906,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1923,7 +1923,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1940,7 +1940,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1957,7 +1957,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1974,7 +1974,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -1991,7 +1991,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -2008,7 +2008,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -2025,7 +2025,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -2042,7 +2042,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -2059,7 +2059,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -2076,7 +2076,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -3396,7 +3396,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3413,7 +3413,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3430,7 +3430,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3447,7 +3447,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3464,7 +3464,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3481,7 +3481,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3498,7 +3498,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3515,7 +3515,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3532,7 +3532,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3549,7 +3549,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3566,7 +3566,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3583,7 +3583,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3600,7 +3600,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3617,7 +3617,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3634,7 +3634,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3651,7 +3651,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3668,7 +3668,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3685,7 +3685,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3702,7 +3702,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3719,7 +3719,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3736,7 +3736,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3753,7 +3753,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3770,7 +3770,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3787,7 +3787,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3804,7 +3804,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3821,7 +3821,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3838,7 +3838,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3855,7 +3855,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3872,7 +3872,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3889,7 +3889,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3906,7 +3906,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#da8b45",
@@ -3949,7 +3949,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -3966,7 +3966,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -3983,7 +3983,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4000,7 +4000,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4017,7 +4017,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4034,7 +4034,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4051,7 +4051,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4068,7 +4068,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4085,7 +4085,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4102,7 +4102,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4119,7 +4119,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4136,7 +4136,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4153,7 +4153,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4170,7 +4170,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4187,7 +4187,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4204,7 +4204,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4221,7 +4221,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4238,7 +4238,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4255,7 +4255,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4272,7 +4272,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4289,7 +4289,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4306,7 +4306,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4323,7 +4323,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4340,7 +4340,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4357,7 +4357,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4374,7 +4374,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4391,7 +4391,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4408,7 +4408,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4425,7 +4425,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4442,7 +4442,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4459,7 +4459,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#d6bf57",
@@ -4502,7 +4502,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4519,7 +4519,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4536,7 +4536,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4553,7 +4553,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4570,7 +4570,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4587,7 +4587,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4604,7 +4604,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4621,7 +4621,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4638,7 +4638,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4655,7 +4655,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4672,7 +4672,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4689,7 +4689,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4706,7 +4706,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4723,7 +4723,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4740,7 +4740,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4757,7 +4757,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4774,7 +4774,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4791,7 +4791,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4808,7 +4808,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4825,7 +4825,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4842,7 +4842,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4859,7 +4859,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4876,7 +4876,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4893,7 +4893,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4910,7 +4910,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4927,7 +4927,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4944,7 +4944,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4961,7 +4961,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4978,7 +4978,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -4995,7 +4995,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
@@ -5012,7 +5012,7 @@ Array [
                 onContextMenu={[Function]}
                 onMouseOut={[Function]}
                 onMouseOver={[Function]}
-                r={0.5}
+                r={1}
                 style={
                   Object {
                     "fill": "#6092c0",
diff --git a/x-pack/plugins/apm/public/components/shared/charts/ErroneousTransactionsRateChart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/ErroneousTransactionsRateChart/index.tsx
index 8214c081e6ce1..3b6d1684e08e1 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/ErroneousTransactionsRateChart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/ErroneousTransactionsRateChart/index.tsx
@@ -88,7 +88,7 @@ export function ErroneousTransactionsRateChart() {
           },
           {
             data: errorRates,
-            type: 'line',
+            type: 'linemark',
             color: theme.euiColorVis7,
             hideLegend: true,
             title: i18n.translate('xpack.apm.errorRateChart.rateLabel', {
diff --git a/x-pack/plugins/apm/public/utils/testHelpers.tsx b/x-pack/plugins/apm/public/utils/testHelpers.tsx
index 217e6a30a33b4..a750a9ea7af67 100644
--- a/x-pack/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/plugins/apm/public/utils/testHelpers.tsx
@@ -151,7 +151,20 @@ export async function inspectSearchParams(
     end: 1528977600000,
     apmEventClient: { search: spy } as any,
     internalClient: { search: spy } as any,
-    config: new Proxy({}, { get: () => 'myIndex' }) as APMConfig,
+    config: new Proxy(
+      {},
+      {
+        get: (_, key) => {
+          switch (key) {
+            default:
+              return 'myIndex';
+
+            case 'xpack.apm.metricsInterval':
+              return 30;
+          }
+        },
+      }
+    ) as APMConfig,
     uiFiltersES: [{ term: { 'my.custom.ui.filter': 'foo-bar' } }],
     indices: {
       /* eslint-disable @typescript-eslint/naming-convention */
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
index fa4b8b821f9f8..29b2a77df348e 100644
--- a/x-pack/plugins/apm/server/index.ts
+++ b/x-pack/plugins/apm/server/index.ts
@@ -31,6 +31,7 @@ export const config = {
       maxTraceItems: schema.number({ defaultValue: 1000 }),
     }),
     telemetryCollectionEnabled: schema.boolean({ defaultValue: true }),
+    metricsInterval: schema.number({ defaultValue: 30 }),
   }),
 };
 
@@ -68,6 +69,7 @@ export function mergeConfigs(
     'xpack.apm.autocreateApmIndexPattern': apmConfig.autocreateApmIndexPattern,
     'xpack.apm.telemetryCollectionEnabled':
       apmConfig.telemetryCollectionEnabled,
+    'xpack.apm.metricsInterval': apmConfig.metricsInterval,
   };
 }
 
diff --git a/x-pack/plugins/apm/server/lib/helpers/metrics.ts b/x-pack/plugins/apm/server/lib/helpers/metrics.ts
index c57769e9e15da..9f5b5cdf47552 100644
--- a/x-pack/plugins/apm/server/lib/helpers/metrics.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/metrics.ts
@@ -6,13 +6,17 @@
 
 import { getBucketSize } from './get_bucket_size';
 
-export function getMetricsDateHistogramParams(start: number, end: number) {
+export function getMetricsDateHistogramParams(
+  start: number,
+  end: number,
+  metricsInterval: number
+) {
   const { bucketSize } = getBucketSize(start, end, 'auto');
   return {
     field: '@timestamp',
 
-    // ensure minimum bucket size of 30s since this is the default resolution for metric data
-    fixed_interval: `${Math.max(bucketSize, 30)}s`,
+    // ensure minimum bucket size of configured interval since this is the default resolution for metric data
+    fixed_interval: `${Math.max(bucketSize, metricsInterval)}s`,
 
     min_doc_count: 0,
     extended_bounds: { min: start, max: end },
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
index e5c573ba1ec02..551384da2cca7 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts
@@ -42,7 +42,7 @@ export async function fetchAndTransformGcMetrics({
   chartBase: ChartBase;
   fieldName: typeof METRIC_JAVA_GC_COUNT | typeof METRIC_JAVA_GC_TIME;
 }) {
-  const { start, end, apmEventClient } = setup;
+  const { start, end, apmEventClient, config } = setup;
 
   const { bucketSize } = getBucketSize(start, end, 'auto');
 
@@ -75,7 +75,11 @@ export async function fetchAndTransformGcMetrics({
           },
           aggs: {
             over_time: {
-              date_histogram: getMetricsDateHistogramParams(start, end),
+              date_histogram: getMetricsDateHistogramParams(
+                start,
+                end,
+                config['xpack.apm.metricsInterval']
+              ),
               aggs: {
                 // get the max value
                 max: {
diff --git a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
index f6e201b395c37..a42a10d6518a0 100644
--- a/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
@@ -65,7 +65,7 @@ export async function fetchAndTransformMetrics<T extends MetricAggs>({
   aggs: T;
   additionalFilters?: Filter[];
 }) {
-  const { start, end, apmEventClient } = setup;
+  const { start, end, apmEventClient, config } = setup;
 
   const projection = getMetricsProjection({
     setup,
@@ -83,7 +83,11 @@ export async function fetchAndTransformMetrics<T extends MetricAggs>({
       },
       aggs: {
         timeseriesData: {
-          date_histogram: getMetricsDateHistogramParams(start, end),
+          date_histogram: getMetricsDateHistogramParams(
+            start,
+            end,
+            config['xpack.apm.metricsInterval']
+          ),
           aggs,
         },
         ...aggs,
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts
index d4e0bd1d54da1..ec2d8144cf3ff 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_error_rate.ts
@@ -12,12 +12,12 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { rangeFilter } from '../../../common/utils/range_filter';
-import { getMetricsDateHistogramParams } from '../helpers/metrics';
 import {
   Setup,
   SetupTimeRange,
   SetupUIFilters,
 } from '../helpers/setup_request';
+import { getBucketSize } from '../helpers/get_bucket_size';
 
 export async function getErrorRate({
   serviceName,
@@ -57,7 +57,12 @@ export async function getErrorRate({
       query: { bool: { filter } },
       aggs: {
         total_transactions: {
-          date_histogram: getMetricsDateHistogramParams(start, end),
+          date_histogram: {
+            field: '@timestamp',
+            fixed_interval: getBucketSize(start, end, 'auto').intervalString,
+            min_doc_count: 0,
+            extended_bounds: { min: start, max: end },
+          },
           aggs: {
             erroneous_transactions: {
               filter: { range: { [HTTP_RESPONSE_STATUS_CODE]: { gte: 400 } } },
diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
index 7248399d1f93f..fbdddea32deb4 100644
--- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
@@ -36,7 +36,7 @@ export async function getTransactionBreakdown({
   transactionName?: string;
   transactionType: string;
 }) {
-  const { uiFiltersES, apmEventClient, start, end } = setup;
+  const { uiFiltersES, apmEventClient, start, end, config } = setup;
 
   const subAggs = {
     sum_all_self_times: {
@@ -104,7 +104,11 @@ export async function getTransactionBreakdown({
       aggs: {
         ...subAggs,
         by_date: {
-          date_histogram: getMetricsDateHistogramParams(start, end),
+          date_histogram: getMetricsDateHistogramParams(
+            start,
+            end,
+            config['xpack.apm.metricsInterval']
+          ),
           aggs: subAggs,
         },
       },
diff --git a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/error_rate.json b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/error_rate.json
index 9ff45ebdbb21b..e448729f44a98 100644
--- a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/error_rate.json
+++ b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/error_rate.json
@@ -1,42 +1,970 @@
 {
-  "noHits":false,
-  "erroneousTransactionsRate":[
-     {
-        "x":1593413100000,
-        "y":null
-     },
-     {
-        "x":1593413130000,
-        "y":null
-     },
-     {
-        "x":1593413160000,
-        "y":null
-     },
-     {
-        "x":1593413190000,
-        "y":null
-     },
-     {
-        "x":1593413220000,
-        "y":null
-     },
-     {
-        "x":1593413250000,
-        "y":0
-     },
-     {
-        "x":1593413280000,
-        "y":0.14102564102564102
-     },
-     {
-        "x":1593413310000,
-        "y":0.14634146341463414
-     },
-     {
-        "x":1593413340000,
-        "y":null
-     }
-  ],
-  "average":0.09578903481342504
-}
\ No newline at end of file
+   "noHits": false,
+   "erroneousTransactionsRate": [
+      {
+         "x": 1593413100000,
+         "y": null
+      },
+      {
+         "x": 1593413101000,
+         "y": null
+      },
+      {
+         "x": 1593413102000,
+         "y": null
+      },
+      {
+         "x": 1593413103000,
+         "y": null
+      },
+      {
+         "x": 1593413104000,
+         "y": null
+      },
+      {
+         "x": 1593413105000,
+         "y": null
+      },
+      {
+         "x": 1593413106000,
+         "y": null
+      },
+      {
+         "x": 1593413107000,
+         "y": null
+      },
+      {
+         "x": 1593413108000,
+         "y": null
+      },
+      {
+         "x": 1593413109000,
+         "y": null
+      },
+      {
+         "x": 1593413110000,
+         "y": null
+      },
+      {
+         "x": 1593413111000,
+         "y": null
+      },
+      {
+         "x": 1593413112000,
+         "y": null
+      },
+      {
+         "x": 1593413113000,
+         "y": null
+      },
+      {
+         "x": 1593413114000,
+         "y": null
+      },
+      {
+         "x": 1593413115000,
+         "y": null
+      },
+      {
+         "x": 1593413116000,
+         "y": null
+      },
+      {
+         "x": 1593413117000,
+         "y": null
+      },
+      {
+         "x": 1593413118000,
+         "y": null
+      },
+      {
+         "x": 1593413119000,
+         "y": null
+      },
+      {
+         "x": 1593413120000,
+         "y": null
+      },
+      {
+         "x": 1593413121000,
+         "y": null
+      },
+      {
+         "x": 1593413122000,
+         "y": null
+      },
+      {
+         "x": 1593413123000,
+         "y": null
+      },
+      {
+         "x": 1593413124000,
+         "y": null
+      },
+      {
+         "x": 1593413125000,
+         "y": null
+      },
+      {
+         "x": 1593413126000,
+         "y": null
+      },
+      {
+         "x": 1593413127000,
+         "y": null
+      },
+      {
+         "x": 1593413128000,
+         "y": null
+      },
+      {
+         "x": 1593413129000,
+         "y": null
+      },
+      {
+         "x": 1593413130000,
+         "y": null
+      },
+      {
+         "x": 1593413131000,
+         "y": null
+      },
+      {
+         "x": 1593413132000,
+         "y": null
+      },
+      {
+         "x": 1593413133000,
+         "y": null
+      },
+      {
+         "x": 1593413134000,
+         "y": null
+      },
+      {
+         "x": 1593413135000,
+         "y": null
+      },
+      {
+         "x": 1593413136000,
+         "y": null
+      },
+      {
+         "x": 1593413137000,
+         "y": null
+      },
+      {
+         "x": 1593413138000,
+         "y": null
+      },
+      {
+         "x": 1593413139000,
+         "y": null
+      },
+      {
+         "x": 1593413140000,
+         "y": null
+      },
+      {
+         "x": 1593413141000,
+         "y": null
+      },
+      {
+         "x": 1593413142000,
+         "y": null
+      },
+      {
+         "x": 1593413143000,
+         "y": null
+      },
+      {
+         "x": 1593413144000,
+         "y": null
+      },
+      {
+         "x": 1593413145000,
+         "y": null
+      },
+      {
+         "x": 1593413146000,
+         "y": null
+      },
+      {
+         "x": 1593413147000,
+         "y": null
+      },
+      {
+         "x": 1593413148000,
+         "y": null
+      },
+      {
+         "x": 1593413149000,
+         "y": null
+      },
+      {
+         "x": 1593413150000,
+         "y": null
+      },
+      {
+         "x": 1593413151000,
+         "y": null
+      },
+      {
+         "x": 1593413152000,
+         "y": null
+      },
+      {
+         "x": 1593413153000,
+         "y": null
+      },
+      {
+         "x": 1593413154000,
+         "y": null
+      },
+      {
+         "x": 1593413155000,
+         "y": null
+      },
+      {
+         "x": 1593413156000,
+         "y": null
+      },
+      {
+         "x": 1593413157000,
+         "y": null
+      },
+      {
+         "x": 1593413158000,
+         "y": null
+      },
+      {
+         "x": 1593413159000,
+         "y": null
+      },
+      {
+         "x": 1593413160000,
+         "y": null
+      },
+      {
+         "x": 1593413161000,
+         "y": null
+      },
+      {
+         "x": 1593413162000,
+         "y": null
+      },
+      {
+         "x": 1593413163000,
+         "y": null
+      },
+      {
+         "x": 1593413164000,
+         "y": null
+      },
+      {
+         "x": 1593413165000,
+         "y": null
+      },
+      {
+         "x": 1593413166000,
+         "y": null
+      },
+      {
+         "x": 1593413167000,
+         "y": null
+      },
+      {
+         "x": 1593413168000,
+         "y": null
+      },
+      {
+         "x": 1593413169000,
+         "y": null
+      },
+      {
+         "x": 1593413170000,
+         "y": null
+      },
+      {
+         "x": 1593413171000,
+         "y": null
+      },
+      {
+         "x": 1593413172000,
+         "y": null
+      },
+      {
+         "x": 1593413173000,
+         "y": null
+      },
+      {
+         "x": 1593413174000,
+         "y": null
+      },
+      {
+         "x": 1593413175000,
+         "y": null
+      },
+      {
+         "x": 1593413176000,
+         "y": null
+      },
+      {
+         "x": 1593413177000,
+         "y": null
+      },
+      {
+         "x": 1593413178000,
+         "y": null
+      },
+      {
+         "x": 1593413179000,
+         "y": null
+      },
+      {
+         "x": 1593413180000,
+         "y": null
+      },
+      {
+         "x": 1593413181000,
+         "y": null
+      },
+      {
+         "x": 1593413182000,
+         "y": null
+      },
+      {
+         "x": 1593413183000,
+         "y": null
+      },
+      {
+         "x": 1593413184000,
+         "y": null
+      },
+      {
+         "x": 1593413185000,
+         "y": null
+      },
+      {
+         "x": 1593413186000,
+         "y": null
+      },
+      {
+         "x": 1593413187000,
+         "y": null
+      },
+      {
+         "x": 1593413188000,
+         "y": null
+      },
+      {
+         "x": 1593413189000,
+         "y": null
+      },
+      {
+         "x": 1593413190000,
+         "y": null
+      },
+      {
+         "x": 1593413191000,
+         "y": null
+      },
+      {
+         "x": 1593413192000,
+         "y": null
+      },
+      {
+         "x": 1593413193000,
+         "y": null
+      },
+      {
+         "x": 1593413194000,
+         "y": null
+      },
+      {
+         "x": 1593413195000,
+         "y": null
+      },
+      {
+         "x": 1593413196000,
+         "y": null
+      },
+      {
+         "x": 1593413197000,
+         "y": null
+      },
+      {
+         "x": 1593413198000,
+         "y": null
+      },
+      {
+         "x": 1593413199000,
+         "y": null
+      },
+      {
+         "x": 1593413200000,
+         "y": null
+      },
+      {
+         "x": 1593413201000,
+         "y": null
+      },
+      {
+         "x": 1593413202000,
+         "y": null
+      },
+      {
+         "x": 1593413203000,
+         "y": null
+      },
+      {
+         "x": 1593413204000,
+         "y": null
+      },
+      {
+         "x": 1593413205000,
+         "y": null
+      },
+      {
+         "x": 1593413206000,
+         "y": null
+      },
+      {
+         "x": 1593413207000,
+         "y": null
+      },
+      {
+         "x": 1593413208000,
+         "y": null
+      },
+      {
+         "x": 1593413209000,
+         "y": null
+      },
+      {
+         "x": 1593413210000,
+         "y": null
+      },
+      {
+         "x": 1593413211000,
+         "y": null
+      },
+      {
+         "x": 1593413212000,
+         "y": null
+      },
+      {
+         "x": 1593413213000,
+         "y": null
+      },
+      {
+         "x": 1593413214000,
+         "y": null
+      },
+      {
+         "x": 1593413215000,
+         "y": null
+      },
+      {
+         "x": 1593413216000,
+         "y": null
+      },
+      {
+         "x": 1593413217000,
+         "y": null
+      },
+      {
+         "x": 1593413218000,
+         "y": null
+      },
+      {
+         "x": 1593413219000,
+         "y": null
+      },
+      {
+         "x": 1593413220000,
+         "y": null
+      },
+      {
+         "x": 1593413221000,
+         "y": null
+      },
+      {
+         "x": 1593413222000,
+         "y": null
+      },
+      {
+         "x": 1593413223000,
+         "y": null
+      },
+      {
+         "x": 1593413224000,
+         "y": null
+      },
+      {
+         "x": 1593413225000,
+         "y": null
+      },
+      {
+         "x": 1593413226000,
+         "y": null
+      },
+      {
+         "x": 1593413227000,
+         "y": null
+      },
+      {
+         "x": 1593413228000,
+         "y": null
+      },
+      {
+         "x": 1593413229000,
+         "y": null
+      },
+      {
+         "x": 1593413230000,
+         "y": null
+      },
+      {
+         "x": 1593413231000,
+         "y": null
+      },
+      {
+         "x": 1593413232000,
+         "y": null
+      },
+      {
+         "x": 1593413233000,
+         "y": null
+      },
+      {
+         "x": 1593413234000,
+         "y": null
+      },
+      {
+         "x": 1593413235000,
+         "y": null
+      },
+      {
+         "x": 1593413236000,
+         "y": null
+      },
+      {
+         "x": 1593413237000,
+         "y": null
+      },
+      {
+         "x": 1593413238000,
+         "y": null
+      },
+      {
+         "x": 1593413239000,
+         "y": null
+      },
+      {
+         "x": 1593413240000,
+         "y": null
+      },
+      {
+         "x": 1593413241000,
+         "y": null
+      },
+      {
+         "x": 1593413242000,
+         "y": null
+      },
+      {
+         "x": 1593413243000,
+         "y": null
+      },
+      {
+         "x": 1593413244000,
+         "y": null
+      },
+      {
+         "x": 1593413245000,
+         "y": null
+      },
+      {
+         "x": 1593413246000,
+         "y": null
+      },
+      {
+         "x": 1593413247000,
+         "y": null
+      },
+      {
+         "x": 1593413248000,
+         "y": null
+      },
+      {
+         "x": 1593413249000,
+         "y": null
+      },
+      {
+         "x": 1593413250000,
+         "y": null
+      },
+      {
+         "x": 1593413251000,
+         "y": null
+      },
+      {
+         "x": 1593413252000,
+         "y": null
+      },
+      {
+         "x": 1593413253000,
+         "y": null
+      },
+      {
+         "x": 1593413254000,
+         "y": null
+      },
+      {
+         "x": 1593413255000,
+         "y": null
+      },
+      {
+         "x": 1593413256000,
+         "y": null
+      },
+      {
+         "x": 1593413257000,
+         "y": null
+      },
+      {
+         "x": 1593413258000,
+         "y": null
+      },
+      {
+         "x": 1593413259000,
+         "y": null
+      },
+      {
+         "x": 1593413260000,
+         "y": null
+      },
+      {
+         "x": 1593413261000,
+         "y": null
+      },
+      {
+         "x": 1593413262000,
+         "y": null
+      },
+      {
+         "x": 1593413263000,
+         "y": null
+      },
+      {
+         "x": 1593413264000,
+         "y": null
+      },
+      {
+         "x": 1593413265000,
+         "y": null
+      },
+      {
+         "x": 1593413266000,
+         "y": null
+      },
+      {
+         "x": 1593413267000,
+         "y": null
+      },
+      {
+         "x": 1593413268000,
+         "y": null
+      },
+      {
+         "x": 1593413269000,
+         "y": null
+      },
+      {
+         "x": 1593413270000,
+         "y": null
+      },
+      {
+         "x": 1593413271000,
+         "y": null
+      },
+      {
+         "x": 1593413272000,
+         "y": 0
+      },
+      {
+         "x": 1593413273000,
+         "y": 0
+      },
+      {
+         "x": 1593413274000,
+         "y": null
+      },
+      {
+         "x": 1593413275000,
+         "y": null
+      },
+      {
+         "x": 1593413276000,
+         "y": null
+      },
+      {
+         "x": 1593413277000,
+         "y": 0
+      },
+      {
+         "x": 1593413278000,
+         "y": null
+      },
+      {
+         "x": 1593413279000,
+         "y": null
+      },
+      {
+         "x": 1593413280000,
+         "y": null
+      },
+      {
+         "x": 1593413281000,
+         "y": 0
+      },
+      {
+         "x": 1593413282000,
+         "y": null
+      },
+      {
+         "x": 1593413283000,
+         "y": null
+      },
+      {
+         "x": 1593413284000,
+         "y": 0
+      },
+      {
+         "x": 1593413285000,
+         "y": 0
+      },
+      {
+         "x": 1593413286000,
+         "y": 0.125
+      },
+      {
+         "x": 1593413287000,
+         "y": 0.5
+      },
+      {
+         "x": 1593413288000,
+         "y": 0
+      },
+      {
+         "x": 1593413289000,
+         "y": 0.5
+      },
+      {
+         "x": 1593413290000,
+         "y": 0
+      },
+      {
+         "x": 1593413291000,
+         "y": 0
+      },
+      {
+         "x": 1593413292000,
+         "y": 0.5
+      },
+      {
+         "x": 1593413293000,
+         "y": 0
+      },
+      {
+         "x": 1593413294000,
+         "y": 0
+      },
+      {
+         "x": 1593413295000,
+         "y": 0
+      },
+      {
+         "x": 1593413296000,
+         "y": 0
+      },
+      {
+         "x": 1593413297000,
+         "y": 0
+      },
+      {
+         "x": 1593413298000,
+         "y": 0
+      },
+      {
+         "x": 1593413299000,
+         "y": 0.5
+      },
+      {
+         "x": 1593413300000,
+         "y": 0.3333333333333333
+      },
+      {
+         "x": 1593413301000,
+         "y": 0.14285714285714285
+      },
+      {
+         "x": 1593413302000,
+         "y": 0
+      },
+      {
+         "x": 1593413303000,
+         "y": 0
+      },
+      {
+         "x": 1593413304000,
+         "y": 0
+      },
+      {
+         "x": 1593413305000,
+         "y": 0.6666666666666666
+      },
+      {
+         "x": 1593413306000,
+         "y": 0
+      },
+      {
+         "x": 1593413307000,
+         "y": 0
+      },
+      {
+         "x": 1593413308000,
+         "y": 0.3333333333333333
+      },
+      {
+         "x": 1593413309000,
+         "y": 0.3333333333333333
+      },
+      {
+         "x": 1593413310000,
+         "y": 0.3333333333333333
+      },
+      {
+         "x": 1593413311000,
+         "y": 0.5
+      },
+      {
+         "x": 1593413312000,
+         "y": 0
+      },
+      {
+         "x": 1593413313000,
+         "y": 0
+      },
+      {
+         "x": 1593413314000,
+         "y": 0
+      },
+      {
+         "x": 1593413315000,
+         "y": 0.5
+      },
+      {
+         "x": 1593413316000,
+         "y": 0
+      },
+      {
+         "x": 1593413317000,
+         "y": 0
+      },
+      {
+         "x": 1593413318000,
+         "y": 0
+      },
+      {
+         "x": 1593413319000,
+         "y": 0
+      },
+      {
+         "x": 1593413320000,
+         "y": 0.3333333333333333
+      },
+      {
+         "x": 1593413321000,
+         "y": 0
+      },
+      {
+         "x": 1593413322000,
+         "y": 0.5
+      },
+      {
+         "x": 1593413323000,
+         "y": null
+      },
+      {
+         "x": 1593413324000,
+         "y": null
+      },
+      {
+         "x": 1593413325000,
+         "y": null
+      },
+      {
+         "x": 1593413326000,
+         "y": null
+      },
+      {
+         "x": 1593413327000,
+         "y": null
+      },
+      {
+         "x": 1593413328000,
+         "y": null
+      },
+      {
+         "x": 1593413329000,
+         "y": null
+      },
+      {
+         "x": 1593413330000,
+         "y": null
+      },
+      {
+         "x": 1593413331000,
+         "y": null
+      },
+      {
+         "x": 1593413332000,
+         "y": null
+      },
+      {
+         "x": 1593413333000,
+         "y": null
+      },
+      {
+         "x": 1593413334000,
+         "y": null
+      },
+      {
+         "x": 1593413335000,
+         "y": null
+      },
+      {
+         "x": 1593413336000,
+         "y": null
+      },
+      {
+         "x": 1593413337000,
+         "y": null
+      },
+      {
+         "x": 1593413338000,
+         "y": null
+      },
+      {
+         "x": 1593413339000,
+         "y": null
+      },
+      {
+         "x": 1593413340000,
+         "y": null
+      }
+   ],
+   "average": 0.14188815060908083
+}

From 86d7050822865eb96b2fe8faf9997a71b71aaedd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Wed, 26 Aug 2020 12:51:22 +0100
Subject: [PATCH 055/148] [Telemetry] Add Application Usage Schema (#75283)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .telemetryrc.json                             |    1 -
 .../src/tools/__fixture__/mock_schema.json    |   16 +
 ...exed_interface_with_not_matching_schema.ts |   54 +
 .../__fixture__/parsed_working_collector.ts   |   22 +
 .../extract_collectors.test.ts.snap           |   54 +
 .../tools/check_collector__integrity.test.ts  |   15 +
 .../src/tools/extract_collectors.test.ts      |    2 +-
 .../src/tools/serializer.ts                   |    5 +
 .../kbn-telemetry-tools/src/tools/utils.ts    |   37 +-
 ...exed_interface_with_not_matching_schema.ts |   48 +
 .../telemetry_collectors/working_collector.ts |    9 +
 .../collectors/application_usage/schema.ts    |   99 ++
 .../telemetry_application_usage_collector.ts  |  168 +--
 src/plugins/telemetry/schema/oss_plugins.json | 1208 +++++++++++++++++
 14 files changed, 1650 insertions(+), 88 deletions(-)
 create mode 100644 packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_indexed_interface_with_not_matching_schema.ts
 create mode 100644 src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts
 create mode 100644 src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts

diff --git a/.telemetryrc.json b/.telemetryrc.json
index 2f57566159a70..818f9805628e1 100644
--- a/.telemetryrc.json
+++ b/.telemetryrc.json
@@ -7,7 +7,6 @@
       "src/plugins/testbed/",
       "src/plugins/kibana_utils/",
       "src/plugins/kibana_usage_collection/server/collectors/kibana/kibana_usage_collector.ts",
-      "src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts",
       "src/plugins/kibana_usage_collection/server/collectors/management/telemetry_management_collector.ts",
       "src/plugins/kibana_usage_collection/server/collectors/ui_metric/telemetry_ui_metric_collector.ts",
       "src/plugins/telemetry/server/collectors/usage/telemetry_usage_collector.ts"
diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/mock_schema.json b/packages/kbn-telemetry-tools/src/tools/__fixture__/mock_schema.json
index e87699825b4e1..2e69d3625d7ff 100644
--- a/packages/kbn-telemetry-tools/src/tools/__fixture__/mock_schema.json
+++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/mock_schema.json
@@ -5,6 +5,22 @@
         "flat": {
           "type": "keyword"
         },
+        "my_index_signature_prop": {
+          "properties": {
+            "avg": {
+              "type": "number"
+            },
+            "count": {
+              "type": "number"
+            },
+            "max": {
+              "type": "number"
+            },
+            "min": {
+              "type": "number"
+            }
+          }
+        },
         "my_str": {
           "type": "text"
         },
diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_indexed_interface_with_not_matching_schema.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_indexed_interface_with_not_matching_schema.ts
new file mode 100644
index 0000000000000..83866a2b6afec
--- /dev/null
+++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_indexed_interface_with_not_matching_schema.ts
@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SyntaxKind } from 'typescript';
+import { ParsedUsageCollection } from '../ts_parser';
+
+export const parsedIndexedInterfaceWithNoMatchingSchema: ParsedUsageCollection = [
+  'src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts',
+  {
+    collectorName: 'indexed_interface_with_not_matching_schema',
+    schema: {
+      value: {
+        something: {
+          count_1: {
+            type: 'number',
+          },
+        },
+      },
+    },
+    fetch: {
+      typeName: 'Usage',
+      typeDescriptor: {
+        '': {
+          '@@INDEX@@': {
+            count_1: {
+              kind: SyntaxKind.NumberKeyword,
+              type: 'NumberKeyword',
+            },
+            count_2: {
+              kind: SyntaxKind.NumberKeyword,
+              type: 'NumberKeyword',
+            },
+          },
+        },
+      },
+    },
+  },
+];
diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts
index 803bc7f13f59e..b238c5aa346ad 100644
--- a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts
+++ b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts
@@ -32,6 +32,20 @@ export const parsedWorkingCollector: ParsedUsageCollection = [
         my_str: {
           type: 'text',
         },
+        my_index_signature_prop: {
+          avg: {
+            type: 'number',
+          },
+          count: {
+            type: 'number',
+          },
+          max: {
+            type: 'number',
+          },
+          min: {
+            type: 'number',
+          },
+        },
         my_objects: {
           total: {
             type: 'number',
@@ -60,6 +74,14 @@ export const parsedWorkingCollector: ParsedUsageCollection = [
           kind: SyntaxKind.StringKeyword,
           type: 'StringKeyword',
         },
+        my_index_signature_prop: {
+          '': {
+            '@@INDEX@@': {
+              kind: SyntaxKind.NumberKeyword,
+              type: 'NumberKeyword',
+            },
+          },
+        },
         my_objects: {
           total: {
             kind: SyntaxKind.NumberKeyword,
diff --git a/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap b/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap
index fc933b6c7fd35..bf1d5ffc1101e 100644
--- a/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap
+++ b/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap
@@ -90,6 +90,38 @@ Array [
       },
     },
   ],
+  Array [
+    "src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts",
+    Object {
+      "collectorName": "indexed_interface_with_not_matching_schema",
+      "fetch": Object {
+        "typeDescriptor": Object {
+          "": Object {
+            "@@INDEX@@": Object {
+              "count_1": Object {
+                "kind": 140,
+                "type": "NumberKeyword",
+              },
+              "count_2": Object {
+                "kind": 140,
+                "type": "NumberKeyword",
+              },
+            },
+          },
+        },
+        "typeName": "Usage",
+      },
+      "schema": Object {
+        "value": Object {
+          "something": Object {
+            "count_1": Object {
+              "type": "long",
+            },
+          },
+        },
+      },
+    },
+  ],
   Array [
     "src/fixtures/telemetry_collectors/nested_collector.ts",
     Object {
@@ -132,6 +164,14 @@ Array [
               "type": "BooleanKeyword",
             },
           },
+          "my_index_signature_prop": Object {
+            "": Object {
+              "@@INDEX@@": Object {
+                "kind": 140,
+                "type": "NumberKeyword",
+              },
+            },
+          },
           "my_objects": Object {
             "total": Object {
               "kind": 140,
@@ -166,6 +206,20 @@ Array [
               "type": "boolean",
             },
           },
+          "my_index_signature_prop": Object {
+            "avg": Object {
+              "type": "number",
+            },
+            "count": Object {
+              "type": "number",
+            },
+            "max": Object {
+              "type": "number",
+            },
+            "min": Object {
+              "type": "number",
+            },
+          },
           "my_objects": Object {
             "total": Object {
               "type": "number",
diff --git a/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts b/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts
index dbdda3f38afd5..a101210185a63 100644
--- a/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts
+++ b/packages/kbn-telemetry-tools/src/tools/check_collector__integrity.test.ts
@@ -20,6 +20,7 @@
 import { cloneDeep } from 'lodash';
 import * as ts from 'typescript';
 import { parsedWorkingCollector } from './__fixture__/parsed_working_collector';
+import { parsedIndexedInterfaceWithNoMatchingSchema } from './__fixture__/parsed_indexed_interface_with_not_matching_schema';
 import { checkCompatibleTypeDescriptor, checkMatchingMapping } from './check_collector_integrity';
 import * as path from 'path';
 import { readFile } from 'fs';
@@ -82,6 +83,20 @@ describe('checkCompatibleTypeDescriptor', () => {
     expect(incompatibles).toHaveLength(0);
   });
 
+  it('returns diff on indexed interface with no matching schema', () => {
+    const incompatibles = checkCompatibleTypeDescriptor([
+      parsedIndexedInterfaceWithNoMatchingSchema,
+    ]);
+    expect(incompatibles).toHaveLength(1);
+    const { diff, message } = incompatibles[0];
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    expect(diff).toEqual({ '.@@INDEX@@.count_2.kind': 'number' });
+    expect(message).toHaveLength(1);
+    expect(message).toEqual([
+      'incompatible Type key (Usage..@@INDEX@@.count_2): expected (undefined) got ("number").',
+    ]);
+  });
+
   describe('Interface Change', () => {
     it('returns diff on incompatible type descriptor with mapping', () => {
       const malformedParsedCollector = cloneDeep(parsedWorkingCollector);
diff --git a/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts b/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts
index 1b4ed21a1635c..0517cb9034d0a 100644
--- a/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts
+++ b/packages/kbn-telemetry-tools/src/tools/extract_collectors.test.ts
@@ -34,7 +34,7 @@ describe('extractCollectors', () => {
     const programPaths = await getProgramPaths(configs[0]);
 
     const results = [...extractCollectors(programPaths, tsConfig)];
-    expect(results).toHaveLength(6);
+    expect(results).toHaveLength(7);
     expect(results).toMatchSnapshot();
   });
 });
diff --git a/packages/kbn-telemetry-tools/src/tools/serializer.ts b/packages/kbn-telemetry-tools/src/tools/serializer.ts
index bce5dd7f58643..f945402ec5fc2 100644
--- a/packages/kbn-telemetry-tools/src/tools/serializer.ts
+++ b/packages/kbn-telemetry-tools/src/tools/serializer.ts
@@ -84,6 +84,11 @@ export function getDescriptor(node: ts.Node, program: ts.Program): Descriptor |
     }, {} as any);
   }
 
+  // If it's defined as signature { [key: string]: OtherInterface }
+  if (ts.isIndexSignatureDeclaration(node) && node.type) {
+    return { '@@INDEX@@': getDescriptor(node.type, program) };
+  }
+
   if (ts.SyntaxKind.FirstNode === node.kind) {
     return getDescriptor((node as any).right, program);
   }
diff --git a/packages/kbn-telemetry-tools/src/tools/utils.ts b/packages/kbn-telemetry-tools/src/tools/utils.ts
index 212b06a4c9895..c1424785b22a5 100644
--- a/packages/kbn-telemetry-tools/src/tools/utils.ts
+++ b/packages/kbn-telemetry-tools/src/tools/utils.ts
@@ -98,6 +98,14 @@ export function getVariableValue(node: ts.Node): string | Record<string, any> {
     return serializeObject(node);
   }
 
+  if (ts.isIdentifier(node)) {
+    const declaration = getIdentifierDeclaration(node);
+    if (ts.isVariableDeclaration(declaration) && declaration.initializer) {
+      return getVariableValue(declaration.initializer);
+    }
+    // TODO: If this is another imported value from another file, we'll need to go fetch it like in getPropertyValue
+  }
+
   throw Error(`Unsuppored Node: cannot get value of node (${node.getText()}) of kind ${node.kind}`);
 }
 
@@ -112,10 +120,11 @@ export function serializeObject(node: ts.Node) {
     if (typeof propertyName === 'undefined') {
       throw new Error(`Unable to get property name ${property.getText()}`);
     }
+    const cleanPropertyName = propertyName.replace(/["']/g, '');
     if (ts.isPropertyAssignment(property)) {
-      value[propertyName] = getVariableValue(property.initializer);
+      value[cleanPropertyName] = getVariableValue(property.initializer);
     } else {
-      value[propertyName] = getVariableValue(property);
+      value[cleanPropertyName] = getVariableValue(property);
     }
   }
 
@@ -222,9 +231,29 @@ export const flattenKeys = (obj: any, keyPath: any[] = []): any => {
 };
 
 export function difference(actual: any, expected: any) {
-  function changes(obj: any, base: any) {
+  function changes(obj: { [key: string]: any }, base: { [key: string]: any }) {
     return transform(obj, function (result, value, key) {
-      if (key && !isEqual(value, base[key])) {
+      if (key && /@@INDEX@@/.test(`${key}`)) {
+        // The type definition is an Index Signature, fuzzy searching for similar keys
+        const regexp = new RegExp(`${key}`.replace(/@@INDEX@@/g, '(.+)?'));
+        const keysInBase = Object.keys(base)
+          .map((k) => {
+            const match = k.match(regexp);
+            return match && match[0];
+          })
+          .filter((s): s is string => !!s);
+
+        if (keysInBase.length === 0) {
+          // Mark this key as wrong because we couldn't find any matching keys
+          result[key] = value;
+        }
+
+        keysInBase.forEach((k) => {
+          if (!isEqual(value, base[k])) {
+            result[k] = isObject(value) && isObject(base[k]) ? changes(value, base[k]) : value;
+          }
+        });
+      } else if (key && !isEqual(value, base[key])) {
         result[key] = isObject(value) && isObject(base[key]) ? changes(value, base[key]) : value;
       }
     });
diff --git a/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts b/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts
new file mode 100644
index 0000000000000..0ec8d2e15c34a
--- /dev/null
+++ b/src/fixtures/telemetry_collectors/indexed_interface_with_not_matching_schema.ts
@@ -0,0 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { CollectorSet } from '../../plugins/usage_collection/server/collector';
+import { loggerMock } from '../../core/server/logging/logger.mock';
+
+const { makeUsageCollector } = new CollectorSet({
+  logger: loggerMock.create(),
+  maximumWaitTimeForAllCollectorsInS: 0,
+});
+
+interface Usage {
+  [key: string]: {
+    count_1?: number;
+    count_2?: number;
+  };
+}
+
+export const myCollector = makeUsageCollector<Usage>({
+  type: 'indexed_interface_with_not_matching_schema',
+  isReady: () => true,
+  fetch() {
+    if (Math.random()) {
+      return { something: { count_1: 1 } };
+    }
+    return { something: { count_2: 2 } };
+  },
+  schema: {
+    something: {
+      count_1: { type: 'long' }, // Intentionally missing count_2
+    },
+  },
+});
diff --git a/src/fixtures/telemetry_collectors/working_collector.ts b/src/fixtures/telemetry_collectors/working_collector.ts
index d58a89db97d74..bdf10b5e54919 100644
--- a/src/fixtures/telemetry_collectors/working_collector.ts
+++ b/src/fixtures/telemetry_collectors/working_collector.ts
@@ -35,6 +35,9 @@ interface Usage {
   my_objects: MyObject;
   my_array?: MyObject[];
   my_str_array?: string[];
+  my_index_signature_prop?: {
+    [key: string]: number;
+  };
 }
 
 const SOME_NUMBER: number = 123;
@@ -93,5 +96,11 @@ export const myCollector = makeUsageCollector<Usage>({
       type: { type: 'boolean' },
     },
     my_str_array: { type: 'keyword' },
+    my_index_signature_prop: {
+      count: { type: 'number' },
+      avg: { type: 'number' },
+      max: { type: 'number' },
+      min: { type: 'number' },
+    },
   },
 });
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
new file mode 100644
index 0000000000000..6efe872553583
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
@@ -0,0 +1,99 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { MakeSchemaFrom } from 'src/plugins/usage_collection/server';
+import { ApplicationUsageTelemetryReport } from './telemetry_application_usage_collector';
+
+const commonSchema: MakeSchemaFrom<ApplicationUsageTelemetryReport[string]> = {
+  clicks_total: {
+    type: 'long',
+  },
+  clicks_7_days: {
+    type: 'long',
+  },
+  clicks_30_days: {
+    type: 'long',
+  },
+  clicks_90_days: {
+    type: 'long',
+  },
+  minutes_on_screen_total: {
+    type: 'float',
+  },
+  minutes_on_screen_7_days: {
+    type: 'float',
+  },
+  minutes_on_screen_30_days: {
+    type: 'float',
+  },
+  minutes_on_screen_90_days: {
+    type: 'float',
+  },
+};
+
+// These keys obtained by searching for `/application\w*\.register\(/` and checking the value of the attr `id`.
+// TODO: Find a way to update these keys automatically.
+export const applicationUsageSchema = {
+  // OSS
+  dashboards: commonSchema,
+  dev_tools: commonSchema,
+  discover: commonSchema,
+  home: commonSchema,
+  kibana: commonSchema, // It's a forward app so we'll likely never report it
+  management: commonSchema,
+  short_url_redirect: commonSchema, // It's a forward app so we'll likely never report it
+  timelion: commonSchema,
+  visualize: commonSchema,
+
+  // X-Pack
+  apm: commonSchema,
+  csm: commonSchema,
+  canvas: commonSchema,
+  dashboard_mode: commonSchema, // It's a forward app so we'll likely never report it
+  appSearch: commonSchema,
+  workplaceSearch: commonSchema,
+  graph: commonSchema,
+  logs: commonSchema,
+  metrics: commonSchema,
+  infra: commonSchema, // It's a forward app so we'll likely never report it
+  ingestManager: commonSchema,
+  lens: commonSchema,
+  maps: commonSchema,
+  ml: commonSchema,
+  monitoring: commonSchema,
+  'observability-overview': commonSchema,
+  security_account: commonSchema,
+  security_access_agreement: commonSchema,
+  security_capture_url: commonSchema, // It's a forward app so we'll likely never report it
+  security_logged_out: commonSchema,
+  security_login: commonSchema,
+  security_logout: commonSchema,
+  security_overwritten_session: commonSchema,
+  securitySolution: commonSchema, // It's a forward app so we'll likely never report it
+  'securitySolution:overview': commonSchema,
+  'securitySolution:detections': commonSchema,
+  'securitySolution:hosts': commonSchema,
+  'securitySolution:network': commonSchema,
+  'securitySolution:timelines': commonSchema,
+  'securitySolution:case': commonSchema,
+  'securitySolution:administration': commonSchema,
+  siem: commonSchema,
+  space_selector: commonSchema,
+  uptime: commonSchema,
+};
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
index 1f22ab0100101..69137681e0597 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/telemetry_application_usage_collector.ts
@@ -26,6 +26,7 @@ import {
   ApplicationUsageTransactional,
   registerMappings,
 } from './saved_objects_types';
+import { applicationUsageSchema } from './schema';
 
 /**
  * Roll indices every 24h
@@ -40,7 +41,7 @@ export const ROLL_INDICES_START = 5 * 60 * 1000;
 export const SAVED_OBJECTS_TOTAL_TYPE = 'application_usage_totals';
 export const SAVED_OBJECTS_TRANSACTIONAL_TYPE = 'application_usage_transactional';
 
-interface ApplicationUsageTelemetryReport {
+export interface ApplicationUsageTelemetryReport {
   [appId: string]: {
     clicks_total: number;
     clicks_7_days: number;
@@ -60,93 +61,96 @@ export function registerApplicationUsageCollector(
 ) {
   registerMappings(registerType);
 
-  const collector = usageCollection.makeUsageCollector({
-    type: 'application_usage',
-    isReady: () => typeof getSavedObjectsClient() !== 'undefined',
-    fetch: async () => {
-      const savedObjectsClient = getSavedObjectsClient();
-      if (typeof savedObjectsClient === 'undefined') {
-        return;
-      }
-      const [rawApplicationUsageTotals, rawApplicationUsageTransactional] = await Promise.all([
-        findAll<ApplicationUsageTotal>(savedObjectsClient, { type: SAVED_OBJECTS_TOTAL_TYPE }),
-        findAll<ApplicationUsageTransactional>(savedObjectsClient, {
-          type: SAVED_OBJECTS_TRANSACTIONAL_TYPE,
-        }),
-      ]);
-
-      const applicationUsageFromTotals = rawApplicationUsageTotals.reduce(
-        (acc, { attributes: { appId, minutesOnScreen, numberOfClicks } }) => {
-          const existing = acc[appId] || { clicks_total: 0, minutes_on_screen_total: 0 };
-          return {
-            ...acc,
-            [appId]: {
-              clicks_total: numberOfClicks + existing.clicks_total,
+  const collector = usageCollection.makeUsageCollector<ApplicationUsageTelemetryReport | undefined>(
+    {
+      type: 'application_usage',
+      isReady: () => typeof getSavedObjectsClient() !== 'undefined',
+      schema: applicationUsageSchema,
+      fetch: async () => {
+        const savedObjectsClient = getSavedObjectsClient();
+        if (typeof savedObjectsClient === 'undefined') {
+          return;
+        }
+        const [rawApplicationUsageTotals, rawApplicationUsageTransactional] = await Promise.all([
+          findAll<ApplicationUsageTotal>(savedObjectsClient, { type: SAVED_OBJECTS_TOTAL_TYPE }),
+          findAll<ApplicationUsageTransactional>(savedObjectsClient, {
+            type: SAVED_OBJECTS_TRANSACTIONAL_TYPE,
+          }),
+        ]);
+
+        const applicationUsageFromTotals = rawApplicationUsageTotals.reduce(
+          (acc, { attributes: { appId, minutesOnScreen, numberOfClicks } }) => {
+            const existing = acc[appId] || { clicks_total: 0, minutes_on_screen_total: 0 };
+            return {
+              ...acc,
+              [appId]: {
+                clicks_total: numberOfClicks + existing.clicks_total,
+                clicks_7_days: 0,
+                clicks_30_days: 0,
+                clicks_90_days: 0,
+                minutes_on_screen_total: minutesOnScreen + existing.minutes_on_screen_total,
+                minutes_on_screen_7_days: 0,
+                minutes_on_screen_30_days: 0,
+                minutes_on_screen_90_days: 0,
+              },
+            };
+          },
+          {} as ApplicationUsageTelemetryReport
+        );
+        const nowMinus7 = moment().subtract(7, 'days');
+        const nowMinus30 = moment().subtract(30, 'days');
+        const nowMinus90 = moment().subtract(90, 'days');
+
+        const applicationUsage = rawApplicationUsageTransactional.reduce(
+          (acc, { attributes: { appId, minutesOnScreen, numberOfClicks, timestamp } }) => {
+            const existing = acc[appId] || {
+              clicks_total: 0,
               clicks_7_days: 0,
               clicks_30_days: 0,
               clicks_90_days: 0,
-              minutes_on_screen_total: minutesOnScreen + existing.minutes_on_screen_total,
+              minutes_on_screen_total: 0,
               minutes_on_screen_7_days: 0,
               minutes_on_screen_30_days: 0,
               minutes_on_screen_90_days: 0,
-            },
-          };
-        },
-        {} as ApplicationUsageTelemetryReport
-      );
-      const nowMinus7 = moment().subtract(7, 'days');
-      const nowMinus30 = moment().subtract(30, 'days');
-      const nowMinus90 = moment().subtract(90, 'days');
-
-      const applicationUsage = rawApplicationUsageTransactional.reduce(
-        (acc, { attributes: { appId, minutesOnScreen, numberOfClicks, timestamp } }) => {
-          const existing = acc[appId] || {
-            clicks_total: 0,
-            clicks_7_days: 0,
-            clicks_30_days: 0,
-            clicks_90_days: 0,
-            minutes_on_screen_total: 0,
-            minutes_on_screen_7_days: 0,
-            minutes_on_screen_30_days: 0,
-            minutes_on_screen_90_days: 0,
-          };
-
-          const timeOfEntry = moment(timestamp as string);
-          const isInLast7Days = timeOfEntry.isSameOrAfter(nowMinus7);
-          const isInLast30Days = timeOfEntry.isSameOrAfter(nowMinus30);
-          const isInLast90Days = timeOfEntry.isSameOrAfter(nowMinus90);
-
-          const last7Days = {
-            clicks_7_days: existing.clicks_7_days + numberOfClicks,
-            minutes_on_screen_7_days: existing.minutes_on_screen_7_days + minutesOnScreen,
-          };
-          const last30Days = {
-            clicks_30_days: existing.clicks_30_days + numberOfClicks,
-            minutes_on_screen_30_days: existing.minutes_on_screen_30_days + minutesOnScreen,
-          };
-          const last90Days = {
-            clicks_90_days: existing.clicks_90_days + numberOfClicks,
-            minutes_on_screen_90_days: existing.minutes_on_screen_90_days + minutesOnScreen,
-          };
-
-          return {
-            ...acc,
-            [appId]: {
-              ...existing,
-              clicks_total: existing.clicks_total + numberOfClicks,
-              minutes_on_screen_total: existing.minutes_on_screen_total + minutesOnScreen,
-              ...(isInLast7Days ? last7Days : {}),
-              ...(isInLast30Days ? last30Days : {}),
-              ...(isInLast90Days ? last90Days : {}),
-            },
-          };
-        },
-        applicationUsageFromTotals
-      );
-
-      return applicationUsage;
-    },
-  });
+            };
+
+            const timeOfEntry = moment(timestamp as string);
+            const isInLast7Days = timeOfEntry.isSameOrAfter(nowMinus7);
+            const isInLast30Days = timeOfEntry.isSameOrAfter(nowMinus30);
+            const isInLast90Days = timeOfEntry.isSameOrAfter(nowMinus90);
+
+            const last7Days = {
+              clicks_7_days: existing.clicks_7_days + numberOfClicks,
+              minutes_on_screen_7_days: existing.minutes_on_screen_7_days + minutesOnScreen,
+            };
+            const last30Days = {
+              clicks_30_days: existing.clicks_30_days + numberOfClicks,
+              minutes_on_screen_30_days: existing.minutes_on_screen_30_days + minutesOnScreen,
+            };
+            const last90Days = {
+              clicks_90_days: existing.clicks_90_days + numberOfClicks,
+              minutes_on_screen_90_days: existing.minutes_on_screen_90_days + minutesOnScreen,
+            };
+
+            return {
+              ...acc,
+              [appId]: {
+                ...existing,
+                clicks_total: existing.clicks_total + numberOfClicks,
+                minutes_on_screen_total: existing.minutes_on_screen_total + minutesOnScreen,
+                ...(isInLast7Days ? last7Days : {}),
+                ...(isInLast30Days ? last30Days : {}),
+                ...(isInLast90Days ? last90Days : {}),
+              },
+            };
+          },
+          applicationUsageFromTotals
+        );
+
+        return applicationUsage;
+      },
+    }
+  );
 
   usageCollection.registerCollector(collector);
 
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index c306446b9780d..acd575badbe5b 100644
--- a/src/plugins/telemetry/schema/oss_plugins.json
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -48,6 +48,1214 @@
         }
       }
     },
+    "application_usage": {
+      "properties": {
+        "dashboards": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "dev_tools": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "discover": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "home": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "kibana": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "management": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "short_url_redirect": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "timelion": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "visualize": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "apm": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "csm": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "canvas": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "dashboard_mode": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "appSearch": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "workplaceSearch": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "graph": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "logs": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "metrics": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "infra": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "ingestManager": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "lens": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "maps": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "ml": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "monitoring": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "observability-overview": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "security_account": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "security_access_agreement": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "security_capture_url": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "security_logged_out": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "security_login": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "security_logout": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "security_overwritten_session": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "securitySolution": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "securitySolution:overview": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "securitySolution:detections": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "securitySolution:hosts": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "securitySolution:network": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "securitySolution:timelines": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "securitySolution:case": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "securitySolution:administration": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "siem": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "space_selector": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        },
+        "uptime": {
+          "properties": {
+            "clicks_total": {
+              "type": "long"
+            },
+            "clicks_7_days": {
+              "type": "long"
+            },
+            "clicks_30_days": {
+              "type": "long"
+            },
+            "clicks_90_days": {
+              "type": "long"
+            },
+            "minutes_on_screen_total": {
+              "type": "float"
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float"
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float"
+            }
+          }
+        }
+      }
+    },
     "csp": {
       "properties": {
         "strict": {

From 63265b6f57e421c335945aa4e948bd3334876222 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Wed, 26 Aug 2020 08:50:52 -0400
Subject: [PATCH 056/148] Compute AAD to encrypty/decrypt SO only if needed
 (#75818)

---
 .../server/crypto/encrypted_saved_objects_service.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
index 99361107047c2..82d6bb9be15f6 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
@@ -198,12 +198,15 @@ export class EncryptedSavedObjectsService {
     if (typeDefinition === undefined) {
       return attributes;
     }
+    let encryptionAAD: string | undefined;
 
-    const encryptionAAD = this.getAAD(typeDefinition, descriptor, attributes);
     const encryptedAttributes: Record<string, string> = {};
     for (const attributeName of typeDefinition.attributesToEncrypt) {
       const attributeValue = attributes[attributeName];
       if (attributeValue != null) {
+        if (!encryptionAAD) {
+          encryptionAAD = this.getAAD(typeDefinition, descriptor, attributes);
+        }
         try {
           encryptedAttributes[attributeName] = (yield [attributeValue, encryptionAAD])!;
         } catch (err) {
@@ -376,8 +379,7 @@ export class EncryptedSavedObjectsService {
     if (typeDefinition === undefined) {
       return attributes;
     }
-
-    const encryptionAAD = this.getAAD(typeDefinition, descriptor, attributes);
+    let encryptionAAD: string | undefined;
     const decryptedAttributes: Record<string, EncryptOutput> = {};
     for (const attributeName of typeDefinition.attributesToEncrypt) {
       const attributeValue = attributes[attributeName];
@@ -393,7 +395,9 @@ export class EncryptedSavedObjectsService {
           )}`
         );
       }
-
+      if (!encryptionAAD) {
+        encryptionAAD = this.getAAD(typeDefinition, descriptor, attributes);
+      }
       try {
         decryptedAttributes[attributeName] = (yield [attributeValue, encryptionAAD])!;
       } catch (err) {

From 4042f82035f7dd776f54c3452be51c1fc7365786 Mon Sep 17 00:00:00 2001
From: Jonathan Buttner <56361221+jonathan-buttner@users.noreply.github.com>
Date: Wed, 26 Aug 2020 09:25:45 -0400
Subject: [PATCH 057/148] [Security Solution][Resolver] Support kuery filter
 (#74695)

* Adding kql filter

* Adding filter support for the backend and tests

* Moving the filter to the body

* switching events and alerts api to post

* Removing unused import

* Adding tests for events api results being in descending order

* Switching frontend to use post for related events
---
 .../common/endpoint/generate_data.test.ts     |  10 +
 .../common/endpoint/generate_data.ts          |  32 +-
 .../common/endpoint/schema/resolver.ts        |  10 +
 .../resolver/data_access_layer/factory.ts     |   2 +-
 .../server/endpoint/routes/resolver.ts        |   4 +-
 .../server/endpoint/routes/resolver/alerts.ts |   9 +-
 .../server/endpoint/routes/resolver/events.ts |   9 +-
 .../routes/resolver/queries/alerts.ts         |  14 +-
 .../routes/resolver/queries/events.ts         |  15 +-
 .../resolver/utils/alerts_query_handler.ts    |  32 +-
 .../resolver/utils/events_query_handler.ts    |  33 +-
 .../endpoint/routes/resolver/utils/fetch.ts   |  70 ++--
 .../routes/resolver/utils/pagination.test.ts  |  14 +
 .../routes/resolver/utils/pagination.ts       |  18 +-
 .../apis/resolver/alerts.ts                   | 159 ++++++++
 .../apis/resolver/common.ts                   | 222 ++++++++++
 .../apis/resolver/events.ts                   | 213 ++++++++++
 .../apis/resolver/index.ts                    |   2 +
 .../apis/resolver/tree.ts                     | 386 +-----------------
 19 files changed, 808 insertions(+), 446 deletions(-)
 create mode 100644 x-pack/test/security_solution_endpoint_api_int/apis/resolver/alerts.ts
 create mode 100644 x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts
 create mode 100644 x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts

diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.test.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.test.ts
index 46fc002e76e7f..be3a1e82356c8 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.test.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.test.ts
@@ -169,6 +169,7 @@ describe('data generator', () => {
     const childrenPerNode = 3;
     const generations = 3;
     const relatedAlerts = 4;
+
     beforeEach(() => {
       tree = generator.generateTree({
         alwaysGenMaxChildrenPerNode: true,
@@ -182,6 +183,7 @@ describe('data generator', () => {
           { category: RelatedEventCategory.File, count: 2 },
           { category: RelatedEventCategory.Network, count: 1 },
         ],
+        relatedEventsOrdered: true,
         relatedAlerts,
         ancestryArraySize: ANCESTRY_LIMIT,
       });
@@ -212,6 +214,14 @@ describe('data generator', () => {
       }
     };
 
+    it('creates related events in ascending order', () => {
+      // the order should not change since it should already be in ascending order
+      const relatedEventsAsc = _.cloneDeep(tree.origin.relatedEvents).sort(
+        (event1, event2) => event1['@timestamp'] - event2['@timestamp']
+      );
+      expect(tree.origin.relatedEvents).toStrictEqual(relatedEventsAsc);
+    });
+
     it('has ancestry array defined', () => {
       expect(tree.origin.lifecycle[0].process.Ext!.ancestry!.length).toBe(ANCESTRY_LIMIT);
       for (const event of tree.allEvents) {
diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
index 7340b1c021eba..0955f196df176 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -302,6 +302,12 @@ export interface TreeOptions {
   generations?: number;
   children?: number;
   relatedEvents?: RelatedEventInfo[] | number;
+  /**
+   * If true then the related events will be created with timestamps that preserve the
+   * generation order, meaning the first event will always have a timestamp number less
+   * than the next related event
+   */
+  relatedEventsOrdered?: boolean;
   relatedAlerts?: number;
   percentWithRelated?: number;
   percentTerminated?: number;
@@ -322,6 +328,7 @@ export function getTreeOptionsWithDef(options?: TreeOptions): TreeOptionDefaults
     generations: options?.generations ?? 2,
     children: options?.children ?? 2,
     relatedEvents: options?.relatedEvents ?? 5,
+    relatedEventsOrdered: options?.relatedEventsOrdered ?? false,
     relatedAlerts: options?.relatedAlerts ?? 3,
     percentWithRelated: options?.percentWithRelated ?? 30,
     percentTerminated: options?.percentTerminated ?? 100,
@@ -809,7 +816,8 @@ export class EndpointDocGenerator {
       for (const relatedEvent of this.relatedEventsGenerator(
         node,
         opts.relatedEvents,
-        secBeforeEvent
+        secBeforeEvent,
+        opts.relatedEventsOrdered
       )) {
         eventList.push(relatedEvent);
       }
@@ -877,6 +885,8 @@ export class EndpointDocGenerator {
         addRelatedAlerts(ancestor, numAlertsPerNode, processDuration, events);
       }
     }
+    timestamp = timestamp + 1000;
+
     events.push(
       this.generateAlert(
         timestamp,
@@ -961,7 +971,12 @@ export class EndpointDocGenerator {
         });
       }
       if (this.randomN(100) < opts.percentWithRelated) {
-        yield* this.relatedEventsGenerator(child, opts.relatedEvents, processDuration);
+        yield* this.relatedEventsGenerator(
+          child,
+          opts.relatedEvents,
+          processDuration,
+          opts.relatedEventsOrdered
+        );
         yield* this.relatedAlertsGenerator(child, opts.relatedAlerts, processDuration);
       }
     }
@@ -973,13 +988,17 @@ export class EndpointDocGenerator {
    * @param relatedEvents - can be an array of RelatedEventInfo objects describing the related events that should be generated for each process node
    *  or a number which defines the number of related events and will default to random categories
    * @param processDuration - maximum number of seconds after process event that related event timestamp can be
+   * @param ordered - if true the events will have an increasing timestamp, otherwise their timestamp will be random but
+   *  guaranteed to be greater than or equal to the originating event
    */
   public *relatedEventsGenerator(
     node: Event,
     relatedEvents: RelatedEventInfo[] | number = 10,
-    processDuration: number = 6 * 3600
+    processDuration: number = 6 * 3600,
+    ordered: boolean = false
   ) {
     let relatedEventsInfo: RelatedEventInfo[];
+    let ts = node['@timestamp'] + 1;
     if (typeof relatedEvents === 'number') {
       relatedEventsInfo = [{ category: RelatedEventCategory.Random, count: relatedEvents }];
     } else {
@@ -995,7 +1014,12 @@ export class EndpointDocGenerator {
           eventInfo = OTHER_EVENT_CATEGORIES[event.category];
         }
 
-        const ts = node['@timestamp'] + this.randomN(processDuration) * 1000;
+        if (ordered) {
+          ts += this.randomN(processDuration) * 1000;
+        } else {
+          ts = node['@timestamp'] + this.randomN(processDuration) * 1000;
+        }
+
         yield this.generateEvent({
           timestamp: ts,
           entityID: node.process.entity_id,
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/resolver.ts b/x-pack/plugins/security_solution/common/endpoint/schema/resolver.ts
index f3e67f84b2880..311aa0c04c9ab 100644
--- a/x-pack/plugins/security_solution/common/endpoint/schema/resolver.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/resolver.ts
@@ -33,6 +33,11 @@ export const validateEvents = {
     afterEvent: schema.maybe(schema.string()),
     legacyEndpointID: schema.maybe(schema.string({ minLength: 1 })),
   }),
+  body: schema.nullable(
+    schema.object({
+      filter: schema.maybe(schema.string()),
+    })
+  ),
 };
 
 /**
@@ -45,6 +50,11 @@ export const validateAlerts = {
     afterAlert: schema.maybe(schema.string()),
     legacyEndpointID: schema.maybe(schema.string({ minLength: 1 })),
   }),
+  body: schema.nullable(
+    schema.object({
+      filter: schema.maybe(schema.string()),
+    })
+  ),
 };
 
 /**
diff --git a/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts b/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts
index 016ebfa0faee4..dee53a624baff 100644
--- a/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts
+++ b/x-pack/plugins/security_solution/public/resolver/data_access_layer/factory.ts
@@ -25,7 +25,7 @@ export function dataAccessLayerFactory(
      * Used to get non-process related events for a node.
      */
     async relatedEvents(entityID: string): Promise<ResolverRelatedEvents> {
-      return context.services.http.get(`/api/endpoint/resolver/${entityID}/events`, {
+      return context.services.http.post(`/api/endpoint/resolver/${entityID}/events`, {
         query: { events: 100 },
       });
     },
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
index 5c92b23d594de..3ec968e4a0e1a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver.ts
@@ -24,7 +24,7 @@ import { handleEntities } from './resolver/entity';
 export function registerResolverRoutes(router: IRouter, endpointAppContext: EndpointAppContext) {
   const log = endpointAppContext.logFactory.get('resolver');
 
-  router.get(
+  router.post(
     {
       path: '/api/endpoint/resolver/{id}/events',
       validate: validateEvents,
@@ -33,7 +33,7 @@ export function registerResolverRoutes(router: IRouter, endpointAppContext: Endp
     handleEvents(log, endpointAppContext)
   );
 
-  router.get(
+  router.post(
     {
       path: '/api/endpoint/resolver/{id}/alerts',
       validate: validateAlerts,
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/alerts.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/alerts.ts
index 830d92ef2efc0..8e641194ab899 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/alerts.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/alerts.ts
@@ -14,11 +14,16 @@ import { EndpointAppContext } from '../../types';
 export function handleAlerts(
   log: Logger,
   endpointAppContext: EndpointAppContext
-): RequestHandler<TypeOf<typeof validateAlerts.params>, TypeOf<typeof validateAlerts.query>> {
+): RequestHandler<
+  TypeOf<typeof validateAlerts.params>,
+  TypeOf<typeof validateAlerts.query>,
+  TypeOf<typeof validateAlerts.body>
+> {
   return async (context, req, res) => {
     const {
       params: { id },
       query: { alerts, afterAlert, legacyEndpointID: endpointID },
+      body,
     } = req;
     try {
       const client = context.core.elasticsearch.legacy.client;
@@ -26,7 +31,7 @@ export function handleAlerts(
       const fetcher = new Fetcher(client, id, eventsIndexPattern, alertsIndexPattern, endpointID);
 
       return res.ok({
-        body: await fetcher.alerts(alerts, afterAlert),
+        body: await fetcher.alerts(alerts, afterAlert, body?.filter),
       });
     } catch (err) {
       log.warn(err);
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts
index 9e5c6be43f728..80d21ae118284 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/events.ts
@@ -14,11 +14,16 @@ import { EndpointAppContext } from '../../types';
 export function handleEvents(
   log: Logger,
   endpointAppContext: EndpointAppContext
-): RequestHandler<TypeOf<typeof validateEvents.params>, TypeOf<typeof validateEvents.query>> {
+): RequestHandler<
+  TypeOf<typeof validateEvents.params>,
+  TypeOf<typeof validateEvents.query>,
+  TypeOf<typeof validateEvents.body>
+> {
   return async (context, req, res) => {
     const {
       params: { id },
       query: { events, afterEvent, legacyEndpointID: endpointID },
+      body,
     } = req;
     try {
       const client = context.core.elasticsearch.legacy.client;
@@ -26,7 +31,7 @@ export function handleEvents(
       const fetcher = new Fetcher(client, id, eventsIndexPattern, alertsIndexPattern, endpointID);
 
       return res.ok({
-        body: await fetcher.events(events, afterEvent),
+        body: await fetcher.events(events, afterEvent, body?.filter),
       });
     } catch (err) {
       log.warn(err);
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/alerts.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/alerts.ts
index feb4a404b2359..54c6cf432aa89 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/alerts.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/alerts.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { SearchResponse } from 'elasticsearch';
+import { esKuery } from '../../../../../../../../src/plugins/data/server';
 import { ResolverEvent } from '../../../../../common/endpoint/types';
 import { ResolverQuery } from './base';
 import { PaginationBuilder } from '../utils/pagination';
@@ -13,12 +14,17 @@ import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/com
  * Builds a query for retrieving alerts for a node.
  */
 export class AlertsQuery extends ResolverQuery<ResolverEvent[]> {
+  private readonly kqlQuery: JsonObject[] = [];
   constructor(
     private readonly pagination: PaginationBuilder,
     indexPattern: string | string[],
-    endpointID?: string
+    endpointID?: string,
+    kql?: string
   ) {
     super(indexPattern, endpointID);
+    if (kql) {
+      this.kqlQuery.push(esKuery.toElasticsearchQuery(esKuery.fromKueryExpression(kql)));
+    }
   }
 
   protected legacyQuery(endpointID: string, uniquePIDs: string[]): JsonObject {
@@ -26,6 +32,7 @@ export class AlertsQuery extends ResolverQuery<ResolverEvent[]> {
       query: {
         bool: {
           filter: [
+            ...this.kqlQuery,
             {
               terms: { 'endgame.unique_pid': uniquePIDs },
             },
@@ -38,7 +45,7 @@ export class AlertsQuery extends ResolverQuery<ResolverEvent[]> {
           ],
         },
       },
-      ...this.pagination.buildQueryFields('endgame.serial_event_id'),
+      ...this.pagination.buildQueryFields('endgame.serial_event_id', 'asc'),
     };
   }
 
@@ -47,6 +54,7 @@ export class AlertsQuery extends ResolverQuery<ResolverEvent[]> {
       query: {
         bool: {
           filter: [
+            ...this.kqlQuery,
             {
               terms: { 'process.entity_id': entityIDs },
             },
@@ -56,7 +64,7 @@ export class AlertsQuery extends ResolverQuery<ResolverEvent[]> {
           ],
         },
       },
-      ...this.pagination.buildQueryFields('event.id'),
+      ...this.pagination.buildQueryFields('event.id', 'asc'),
     };
   }
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts
index abc86826e77dd..0969a3c360e4a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/queries/events.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { SearchResponse } from 'elasticsearch';
+import { esKuery } from '../../../../../../../../src/plugins/data/server';
 import { ResolverEvent } from '../../../../../common/endpoint/types';
 import { ResolverQuery } from './base';
 import { PaginationBuilder } from '../utils/pagination';
@@ -13,12 +14,18 @@ import { JsonObject } from '../../../../../../../../src/plugins/kibana_utils/com
  * Builds a query for retrieving related events for a node.
  */
 export class EventsQuery extends ResolverQuery<ResolverEvent[]> {
+  private readonly kqlQuery: JsonObject[] = [];
+
   constructor(
     private readonly pagination: PaginationBuilder,
     indexPattern: string | string[],
-    endpointID?: string
+    endpointID?: string,
+    kql?: string
   ) {
     super(indexPattern, endpointID);
+    if (kql) {
+      this.kqlQuery.push(esKuery.toElasticsearchQuery(esKuery.fromKueryExpression(kql)));
+    }
   }
 
   protected legacyQuery(endpointID: string, uniquePIDs: string[]): JsonObject {
@@ -26,6 +33,7 @@ export class EventsQuery extends ResolverQuery<ResolverEvent[]> {
       query: {
         bool: {
           filter: [
+            ...this.kqlQuery,
             {
               terms: { 'endgame.unique_pid': uniquePIDs },
             },
@@ -45,7 +53,7 @@ export class EventsQuery extends ResolverQuery<ResolverEvent[]> {
           ],
         },
       },
-      ...this.pagination.buildQueryFields('endgame.serial_event_id'),
+      ...this.pagination.buildQueryFields('endgame.serial_event_id', 'desc'),
     };
   }
 
@@ -54,6 +62,7 @@ export class EventsQuery extends ResolverQuery<ResolverEvent[]> {
       query: {
         bool: {
           filter: [
+            ...this.kqlQuery,
             {
               terms: { 'process.entity_id': entityIDs },
             },
@@ -70,7 +79,7 @@ export class EventsQuery extends ResolverQuery<ResolverEvent[]> {
           ],
         },
       },
-      ...this.pagination.buildQueryFields('event.id'),
+      ...this.pagination.buildQueryFields('event.id', 'desc'),
     };
   }
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/alerts_query_handler.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/alerts_query_handler.ts
index ae17cf4c3a562..efffbc10473d4 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/alerts_query_handler.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/alerts_query_handler.ts
@@ -13,23 +13,35 @@ import { PaginationBuilder } from './pagination';
 import { QueryInfo } from '../queries/multi_searcher';
 import { SingleQueryHandler } from './fetch';
 
+/**
+ * Parameters for RelatedAlertsQueryHandler
+ */
+export interface RelatedAlertsParams {
+  limit: number;
+  entityID: string;
+  indexPattern: string;
+  after?: string;
+  legacyEndpointID?: string;
+  filter?: string;
+}
+
 /**
  * Requests related alerts for the given node.
  */
 export class RelatedAlertsQueryHandler implements SingleQueryHandler<ResolverRelatedAlerts> {
   private relatedAlerts: ResolverRelatedAlerts | undefined;
   private readonly query: AlertsQuery;
-  constructor(
-    private readonly limit: number,
-    private readonly entityID: string,
-    after: string | undefined,
-    indexPattern: string,
-    legacyEndpointID: string | undefined
-  ) {
+  private readonly limit: number;
+  private readonly entityID: string;
+
+  constructor(options: RelatedAlertsParams) {
+    this.limit = options.limit;
+    this.entityID = options.entityID;
     this.query = new AlertsQuery(
-      PaginationBuilder.createBuilder(limit, after),
-      indexPattern,
-      legacyEndpointID
+      PaginationBuilder.createBuilder(this.limit, options.after),
+      options.indexPattern,
+      options.legacyEndpointID,
+      options.filter
     );
   }
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/events_query_handler.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/events_query_handler.ts
index 849dbc25fe4db..8792f917fb4d6 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/events_query_handler.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/events_query_handler.ts
@@ -13,23 +13,36 @@ import { PaginationBuilder } from './pagination';
 import { QueryInfo } from '../queries/multi_searcher';
 import { SingleQueryHandler } from './fetch';
 
+/**
+ * Parameters for the RelatedEventsQueryHandler
+ */
+export interface RelatedEventsParams {
+  limit: number;
+  entityID: string;
+  indexPattern: string;
+  after?: string;
+  legacyEndpointID?: string;
+  filter?: string;
+}
+
 /**
  * This retrieves the related events for the origin node of a resolver tree.
  */
 export class RelatedEventsQueryHandler implements SingleQueryHandler<ResolverRelatedEvents> {
   private relatedEvents: ResolverRelatedEvents | undefined;
   private readonly query: EventsQuery;
-  constructor(
-    private readonly limit: number,
-    private readonly entityID: string,
-    after: string | undefined,
-    indexPattern: string,
-    legacyEndpointID: string | undefined
-  ) {
+  private readonly limit: number;
+  private readonly entityID: string;
+
+  constructor(options: RelatedEventsParams) {
+    this.limit = options.limit;
+    this.entityID = options.entityID;
+
     this.query = new EventsQuery(
-      PaginationBuilder.createBuilder(limit, after),
-      indexPattern,
-      legacyEndpointID
+      PaginationBuilder.createBuilder(this.limit, options.after),
+      options.indexPattern,
+      options.legacyEndpointID,
+      options.filter
     );
   }
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/fetch.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/fetch.ts
index 43c10d552ab4e..1b88f965909eb 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/fetch.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/fetch.ts
@@ -110,21 +110,21 @@ export class Fetcher {
       this.endpointID
     );
 
-    const eventsHandler = new RelatedEventsQueryHandler(
-      options.events,
-      this.id,
-      options.afterEvent,
-      this.eventsIndexPattern,
-      this.endpointID
-    );
+    const eventsHandler = new RelatedEventsQueryHandler({
+      limit: options.events,
+      entityID: this.id,
+      after: options.afterEvent,
+      indexPattern: this.eventsIndexPattern,
+      legacyEndpointID: this.endpointID,
+    });
 
-    const alertsHandler = new RelatedAlertsQueryHandler(
-      options.alerts,
-      this.id,
-      options.afterAlert,
-      this.alertsIndexPattern,
-      this.endpointID
-    );
+    const alertsHandler = new RelatedAlertsQueryHandler({
+      limit: options.alerts,
+      entityID: this.id,
+      after: options.afterAlert,
+      indexPattern: this.alertsIndexPattern,
+      legacyEndpointID: this.endpointID,
+    });
 
     // we need to get the start events first because the API request defines how many nodes to return and we don't want
     // to count or limit ourselves based on the other lifecycle events (end, etc)
@@ -228,17 +228,24 @@ export class Fetcher {
   /**
    * Retrieves the related events for the origin node.
    *
-   * @param limit the upper bound number of related events to return
+   * @param limit the upper bound number of related events to return. The limit is applied after the cursor is used to
+   *  skip the previous results.
    * @param after a cursor to use as the starting point for retrieving related events
+   * @param filter a kql query for filtering the results
    */
-  public async events(limit: number, after?: string): Promise<ResolverRelatedEvents> {
-    const eventsHandler = new RelatedEventsQueryHandler(
+  public async events(
+    limit: number,
+    after?: string,
+    filter?: string
+  ): Promise<ResolverRelatedEvents> {
+    const eventsHandler = new RelatedEventsQueryHandler({
       limit,
-      this.id,
+      entityID: this.id,
       after,
-      this.eventsIndexPattern,
-      this.endpointID
-    );
+      indexPattern: this.eventsIndexPattern,
+      legacyEndpointID: this.endpointID,
+      filter,
+    });
 
     return eventsHandler.search(this.client);
   }
@@ -246,17 +253,24 @@ export class Fetcher {
   /**
    * Retrieves the alerts for the origin node.
    *
-   * @param limit the upper bound number of alerts to return
+   * @param limit the upper bound number of alerts to return. The limit is applied after the cursor is used to
+   *  skip the previous results.
    * @param after a cursor to use as the starting point for retrieving alerts
+   * @param filter a kql query string for filtering the results
    */
-  public async alerts(limit: number, after?: string): Promise<ResolverRelatedAlerts> {
-    const alertsHandler = new RelatedAlertsQueryHandler(
+  public async alerts(
+    limit: number,
+    after?: string,
+    filter?: string
+  ): Promise<ResolverRelatedAlerts> {
+    const alertsHandler = new RelatedAlertsQueryHandler({
       limit,
-      this.id,
+      entityID: this.id,
       after,
-      this.alertsIndexPattern,
-      this.endpointID
-    );
+      indexPattern: this.alertsIndexPattern,
+      legacyEndpointID: this.endpointID,
+      filter,
+    });
 
     return alertsHandler.search(this.client);
   }
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.test.ts
index 4daa45aec2a74..8e567bfb59c65 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.test.ts
@@ -42,5 +42,19 @@ describe('Pagination', () => {
       const fields = builder.buildQueryFields('');
       expect(fields).not.toHaveProperty('search_after');
     });
+
+    it('creates the sort field in ascending order', () => {
+      const builder = PaginationBuilder.createBuilder(100);
+      expect(builder.buildQueryFields('a').sort).toContainEqual({ '@timestamp': 'asc' });
+      expect(builder.buildQueryFields('', 'asc').sort).toContainEqual({ '@timestamp': 'asc' });
+    });
+
+    it('creates the sort field in descending order', () => {
+      const builder = PaginationBuilder.createBuilder(100);
+      expect(builder.buildQueryFields('a', 'desc').sort).toStrictEqual([
+        { '@timestamp': 'desc' },
+        { a: 'asc' },
+      ]);
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.ts b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.ts
index f6ff4451b5d8e..4a6c65e55a6b6 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/resolver/utils/pagination.ts
@@ -16,6 +16,11 @@ interface PaginationCursor {
   eventID: string;
 }
 
+/**
+ * The sort direction for the timestamp field
+ */
+export type TimeSortDirection = 'asc' | 'desc';
+
 /**
  * Defines the sorting fields for queries that leverage pagination
  */
@@ -158,10 +163,14 @@ export class PaginationBuilder {
    * Helper for creates an object for adding the pagination fields to a query
    *
    * @param tiebreaker a unique field to use as the tiebreaker for the search_after
+   * @param timeSort is the timestamp sort direction
    * @returns an object containing the pagination information
    */
-  buildQueryFieldsAsInterface(tiebreaker: string): PaginationFields {
-    const sort: SortFields = [{ '@timestamp': 'asc' }, { [tiebreaker]: 'asc' }];
+  buildQueryFieldsAsInterface(
+    tiebreaker: string,
+    timeSort: TimeSortDirection = 'asc'
+  ): PaginationFields {
+    const sort: SortFields = [{ '@timestamp': timeSort }, { [tiebreaker]: 'asc' }];
     let searchAfter: SearchAfterFields | undefined;
     if (this.timestamp && this.eventID) {
       searchAfter = [this.timestamp, this.eventID];
@@ -174,11 +183,12 @@ export class PaginationBuilder {
    * Creates an object for adding the pagination fields to a query
    *
    * @param tiebreaker a unique field to use as the tiebreaker for the search_after
+   * @param timeSort is the timestamp sort direction
    * @returns an object containing the pagination information
    */
-  buildQueryFields(tiebreaker: string): JsonObject {
+  buildQueryFields(tiebreaker: string, timeSort: TimeSortDirection = 'asc'): JsonObject {
     const fields: JsonObject = {};
-    const pagination = this.buildQueryFieldsAsInterface(tiebreaker);
+    const pagination = this.buildQueryFieldsAsInterface(tiebreaker, timeSort);
     fields.sort = pagination.sort;
     fields.size = pagination.size;
     if (pagination.searchAfter) {
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/alerts.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/alerts.ts
new file mode 100644
index 0000000000000..82d844aae8016
--- /dev/null
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/alerts.ts
@@ -0,0 +1,159 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect';
+import { eventId } from '../../../../plugins/security_solution/common/endpoint/models/event';
+import { ResolverRelatedAlerts } from '../../../../plugins/security_solution/common/endpoint/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import {
+  Tree,
+  RelatedEventCategory,
+} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+import { Options, GeneratedTrees } from '../../services/resolver';
+import { compareArrays } from './common';
+
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const resolver = getService('resolverGenerator');
+
+  const relatedEventsToGen = [
+    { category: RelatedEventCategory.Driver, count: 2 },
+    { category: RelatedEventCategory.File, count: 1 },
+    { category: RelatedEventCategory.Registry, count: 1 },
+  ];
+  const relatedAlerts = 4;
+  let resolverTrees: GeneratedTrees;
+  let tree: Tree;
+  const treeOptions: Options = {
+    ancestors: 5,
+    relatedEvents: relatedEventsToGen,
+    relatedAlerts,
+    children: 3,
+    generations: 2,
+    percentTerminated: 100,
+    percentWithRelated: 100,
+    numTrees: 1,
+    alwaysGenMaxChildrenPerNode: true,
+    ancestryArraySize: 2,
+  };
+
+  describe('related alerts route', () => {
+    before(async () => {
+      resolverTrees = await resolver.createTrees(treeOptions);
+      // we only requested a single alert so there's only 1 tree
+      tree = resolverTrees.trees[0];
+    });
+    after(async () => {
+      await resolver.deleteData(resolverTrees);
+    });
+
+    it('should not find any alerts', async () => {
+      const { body }: { body: ResolverRelatedAlerts } = await supertest
+        .post(`/api/endpoint/resolver/5555/alerts`)
+        .set('kbn-xsrf', 'xxx')
+        .expect(200);
+      expect(body.nextAlert).to.eql(null);
+      expect(body.alerts).to.be.empty();
+    });
+
+    it('should return details for the root node', async () => {
+      const { body }: { body: ResolverRelatedAlerts } = await supertest
+        .post(`/api/endpoint/resolver/${tree.origin.id}/alerts`)
+        .set('kbn-xsrf', 'xxx')
+        .expect(200);
+      expect(body.alerts.length).to.eql(4);
+      compareArrays(tree.origin.relatedAlerts, body.alerts, true);
+      expect(body.nextAlert).to.eql(null);
+    });
+
+    it('should allow alerts to be filtered', async () => {
+      const filter = `not event.id:"${tree.origin.relatedAlerts[0].event.id}"`;
+      const { body }: { body: ResolverRelatedAlerts } = await supertest
+        .post(`/api/endpoint/resolver/${tree.origin.id}/alerts`)
+        .set('kbn-xsrf', 'xxx')
+        .send({
+          filter,
+        })
+        .expect(200);
+      expect(body.alerts.length).to.eql(3);
+      compareArrays(tree.origin.relatedAlerts, body.alerts);
+      expect(body.nextAlert).to.eql(null);
+
+      // should not find the alert that we excluded in the filter
+      expect(
+        body.alerts.find((bodyAlert) => {
+          return eventId(bodyAlert) === tree.origin.relatedAlerts[0].event.id;
+        })
+      ).to.not.be.ok();
+    });
+
+    it('should return paginated results for the root node', async () => {
+      let { body }: { body: ResolverRelatedAlerts } = await supertest
+        .post(`/api/endpoint/resolver/${tree.origin.id}/alerts?alerts=2`)
+        .set('kbn-xsrf', 'xxx')
+        .expect(200);
+      expect(body.alerts.length).to.eql(2);
+      compareArrays(tree.origin.relatedAlerts, body.alerts);
+      expect(body.nextAlert).not.to.eql(null);
+
+      ({ body } = await supertest
+        .post(
+          `/api/endpoint/resolver/${tree.origin.id}/alerts?alerts=2&afterAlert=${body.nextAlert}`
+        )
+        .set('kbn-xsrf', 'xxx')
+        .expect(200));
+      expect(body.alerts.length).to.eql(2);
+      compareArrays(tree.origin.relatedAlerts, body.alerts);
+      expect(body.nextAlert).to.not.eql(null);
+
+      ({ body } = await supertest
+        .post(
+          `/api/endpoint/resolver/${tree.origin.id}/alerts?alerts=2&afterAlert=${body.nextAlert}`
+        )
+        .set('kbn-xsrf', 'xxx')
+        .expect(200));
+      expect(body.alerts).to.be.empty();
+      expect(body.nextAlert).to.eql(null);
+    });
+
+    it('should return the first page of information when the cursor is invalid', async () => {
+      const { body }: { body: ResolverRelatedAlerts } = await supertest
+        .post(`/api/endpoint/resolver/${tree.origin.id}/alerts?afterAlert=blah`)
+        .set('kbn-xsrf', 'xxx')
+        .expect(200);
+      expect(body.alerts.length).to.eql(4);
+      compareArrays(tree.origin.relatedAlerts, body.alerts, true);
+      expect(body.nextAlert).to.eql(null);
+    });
+
+    it('should sort the alerts in ascending order', async () => {
+      const { body }: { body: ResolverRelatedAlerts } = await supertest
+        .post(`/api/endpoint/resolver/${tree.origin.id}/alerts`)
+        .set('kbn-xsrf', 'xxx')
+        .expect(200);
+      const sortedAsc = [...tree.origin.relatedAlerts].sort((event1, event2) => {
+        // this sorts the events by timestamp in ascending order
+        const diff = event1['@timestamp'] - event2['@timestamp'];
+        // if the timestamps are the same, fallback to the event.id sorted in
+        // ascending order
+        if (diff === 0) {
+          if (event1.event.id < event2.event.id) {
+            return -1;
+          }
+          if (event1.event.id > event2.event.id) {
+            return 1;
+          }
+          return 0;
+        }
+        return diff;
+      });
+
+      expect(body.alerts.length).to.eql(4);
+      for (let i = 0; i < body.alerts.length; i++) {
+        expect(eventId(body.alerts[i])).to.equal(sortedAsc[i].event.id);
+      }
+    });
+  });
+}
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts
new file mode 100644
index 0000000000000..92d14fb94a2d8
--- /dev/null
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/common.ts
@@ -0,0 +1,222 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import _ from 'lodash';
+import expect from '@kbn/expect';
+import {
+  ResolverChildNode,
+  ResolverLifecycleNode,
+  ResolverEvent,
+  ResolverNodeStats,
+} from '../../../../plugins/security_solution/common/endpoint/types';
+import {
+  parentEntityId,
+  eventId,
+} from '../../../../plugins/security_solution/common/endpoint/models/event';
+import {
+  Event,
+  Tree,
+  TreeNode,
+  RelatedEventInfo,
+  categoryMapping,
+} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+
+/**
+ * Check that the given lifecycle is in the resolver tree's corresponding map
+ *
+ * @param node a lifecycle node containing the start and end events for a node
+ * @param nodeMap a map of entity_ids to nodes to look for the passed in `node`
+ */
+const expectLifecycleNodeInMap = (node: ResolverLifecycleNode, nodeMap: Map<string, TreeNode>) => {
+  const genNode = nodeMap.get(node.entityID);
+  expect(genNode).to.be.ok();
+  compareArrays(genNode!.lifecycle, node.lifecycle, true);
+};
+
+/**
+ * Verify that all the ancestor nodes are valid and optionally have parents.
+ *
+ * @param ancestors an array of ancestors
+ * @param tree the generated resolver tree as the source of truth
+ * @param verifyLastParent a boolean indicating whether to check the last ancestor. If the ancestors array intentionally
+ *  does not contain all the ancestors, the last one will not have the parent
+ */
+export const verifyAncestry = (
+  ancestors: ResolverLifecycleNode[],
+  tree: Tree,
+  verifyLastParent: boolean
+) => {
+  // group the ancestors by their entity_id mapped to a lifecycle node
+  const groupedAncestors = _.groupBy(ancestors, (ancestor) => ancestor.entityID);
+  // group by parent entity_id
+  const groupedAncestorsParent = _.groupBy(ancestors, (ancestor) =>
+    parentEntityId(ancestor.lifecycle[0])
+  );
+  // make sure there aren't any nodes with the same entity_id
+  expect(Object.keys(groupedAncestors).length).to.eql(ancestors.length);
+  // make sure there aren't any nodes with the same parent entity_id
+  expect(Object.keys(groupedAncestorsParent).length).to.eql(ancestors.length);
+
+  // make sure each of the ancestors' lifecycle events are in the generated tree
+  for (const node of ancestors) {
+    expectLifecycleNodeInMap(node, tree.ancestry);
+  }
+
+  // start at the origin which is always the first element of the array and make sure we have a connection
+  // using parent id between each of the nodes
+  let foundParents = 0;
+  let node = ancestors[0];
+  for (let i = 0; i < ancestors.length; i++) {
+    const parentID = parentEntityId(node.lifecycle[0]);
+    if (parentID !== undefined) {
+      const nextNode = groupedAncestors[parentID];
+      if (!nextNode) {
+        break;
+      }
+      // the grouped nodes should only have a single entry since each entity is unique
+      node = nextNode[0];
+    }
+    foundParents++;
+  }
+
+  if (verifyLastParent) {
+    expect(foundParents).to.eql(ancestors.length);
+  } else {
+    // if we only retrieved a portion of all the ancestors then the most distant grandparent's parent will not necessarily
+    // be in the results
+    expect(foundParents).to.eql(ancestors.length - 1);
+  }
+};
+
+/**
+ * Retrieves the most distant ancestor in the given array.
+ *
+ * @param ancestors an array of ancestor nodes
+ */
+export const retrieveDistantAncestor = (ancestors: ResolverLifecycleNode[]) => {
+  // group the ancestors by their entity_id mapped to a lifecycle node
+  const groupedAncestors = _.groupBy(ancestors, (ancestor) => ancestor.entityID);
+  let node = ancestors[0];
+  for (let i = 0; i < ancestors.length; i++) {
+    const parentID = parentEntityId(node.lifecycle[0]);
+    if (parentID !== undefined) {
+      const nextNode = groupedAncestors[parentID];
+      if (nextNode) {
+        node = nextNode[0];
+      } else {
+        return node;
+      }
+    }
+  }
+  return node;
+};
+
+/**
+ * Verify that the children nodes are correct
+ *
+ * @param children the children nodes
+ * @param tree the generated resolver tree as the source of truth
+ * @param numberOfParents an optional number to compare that are a certain number of parents in the children array
+ * @param childrenPerParent an optional number to compare that there are a certain number of children for each parent
+ */
+export const verifyChildren = (
+  children: ResolverChildNode[],
+  tree: Tree,
+  numberOfParents?: number,
+  childrenPerParent?: number
+) => {
+  // group the children by their entity_id mapped to a child node
+  const groupedChildren = _.groupBy(children, (child) => child.entityID);
+  // make sure each child is unique
+  expect(Object.keys(groupedChildren).length).to.eql(children.length);
+  if (numberOfParents !== undefined) {
+    const groupParent = _.groupBy(children, (child) => parentEntityId(child.lifecycle[0]));
+    expect(Object.keys(groupParent).length).to.eql(numberOfParents);
+    if (childrenPerParent !== undefined) {
+      Object.values(groupParent).forEach((childNodes) =>
+        expect(childNodes.length).to.be(childrenPerParent)
+      );
+    }
+  }
+
+  children.forEach((child) => {
+    expectLifecycleNodeInMap(child, tree.children);
+  });
+};
+
+/**
+ * Compare an array of events returned from an API with an array of events generated
+ *
+ * @param expected an array to use as the source of truth
+ * @param toTest the array to test against the source of truth
+ * @param lengthCheck an optional flag to check that the arrays are the same length
+ */
+export const compareArrays = (
+  expected: Event[],
+  toTest: ResolverEvent[],
+  lengthCheck: boolean = false
+) => {
+  if (lengthCheck) {
+    expect(expected.length).to.eql(toTest.length);
+  }
+
+  toTest.forEach((toTestEvent) => {
+    expect(
+      expected.find((arrEvent) => {
+        // we're only checking that the event ids are the same here. The reason we can't check the entire document
+        // is because ingest pipelines are used to add fields to the document when it is received by elasticsearch,
+        // therefore it will not be the same as the document created by the generator
+        return eventId(toTestEvent) === eventId(arrEvent);
+      })
+    ).to.be.ok();
+  });
+};
+
+/**
+ * Verifies that the stats received from ES for a node reflect the categories of events that the generator created.
+ *
+ * @param relatedEvents the related events received for a particular node
+ * @param categories the related event info used when generating the resolver tree
+ */
+export const verifyStats = (
+  stats: ResolverNodeStats | undefined,
+  categories: RelatedEventInfo[],
+  relatedAlerts: number
+) => {
+  expect(stats).to.not.be(undefined);
+  let totalExpEvents = 0;
+  for (const cat of categories) {
+    const ecsCategories = categoryMapping[cat.category];
+    if (Array.isArray(ecsCategories)) {
+      // if there are multiple ecs categories used to define a related event, the count for all of them should be the same
+      // and they should equal what is defined in the categories used to generate the related events
+      for (const ecsCat of ecsCategories) {
+        expect(stats?.events.byCategory[ecsCat]).to.be(cat.count);
+      }
+    } else {
+      expect(stats?.events.byCategory[ecsCategories]).to.be(cat.count);
+    }
+
+    totalExpEvents += cat.count;
+  }
+  expect(stats?.events.total).to.be(totalExpEvents);
+  expect(stats?.totalAlerts);
+};
+
+/**
+ * A helper function for verifying the stats information an array of nodes.
+ *
+ * @param nodes an array of lifecycle nodes that should have a stats field defined
+ * @param categories the related event info used when generating the resolver tree
+ */
+export const verifyLifecycleStats = (
+  nodes: ResolverLifecycleNode[],
+  categories: RelatedEventInfo[],
+  relatedAlerts: number
+) => {
+  for (const node of nodes) {
+    verifyStats(node.stats, categories, relatedAlerts);
+  }
+};
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts
new file mode 100644
index 0000000000000..c0e4e466c7b62
--- /dev/null
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/events.ts
@@ -0,0 +1,213 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect';
+import { eventId } from '../../../../plugins/security_solution/common/endpoint/models/event';
+import { ResolverRelatedEvents } from '../../../../plugins/security_solution/common/endpoint/types';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import {
+  Tree,
+  RelatedEventCategory,
+} from '../../../../plugins/security_solution/common/endpoint/generate_data';
+import { Options, GeneratedTrees } from '../../services/resolver';
+import { compareArrays } from './common';
+
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const resolver = getService('resolverGenerator');
+  const esArchiver = getService('esArchiver');
+
+  const relatedEventsToGen = [
+    { category: RelatedEventCategory.Driver, count: 2 },
+    { category: RelatedEventCategory.File, count: 1 },
+    { category: RelatedEventCategory.Registry, count: 1 },
+  ];
+  const relatedAlerts = 4;
+  let resolverTrees: GeneratedTrees;
+  let tree: Tree;
+  const treeOptions: Options = {
+    ancestors: 5,
+    relatedEvents: relatedEventsToGen,
+    relatedEventsOrdered: true,
+    relatedAlerts,
+    children: 3,
+    generations: 2,
+    percentTerminated: 100,
+    percentWithRelated: 100,
+    numTrees: 1,
+    alwaysGenMaxChildrenPerNode: true,
+    ancestryArraySize: 2,
+  };
+
+  describe('related events route', () => {
+    before(async () => {
+      await esArchiver.load('endpoint/resolver/api_feature');
+      resolverTrees = await resolver.createTrees(treeOptions);
+      // we only requested a single alert so there's only 1 tree
+      tree = resolverTrees.trees[0];
+    });
+    after(async () => {
+      await resolver.deleteData(resolverTrees);
+      await esArchiver.unload('endpoint/resolver/api_feature');
+    });
+
+    describe('legacy events', () => {
+      const endpointID = '5a0c957f-b8e7-4538-965e-57e8bb86ad3a';
+      const entityID = '94042';
+      const cursor = 'eyJ0aW1lc3RhbXAiOjE1ODE0NTYyNTUwMDAsImV2ZW50SUQiOiI5NDA0MyJ9';
+
+      it('should return details for the root node', async () => {
+        const { body }: { body: ResolverRelatedEvents } = await supertest
+          .post(`/api/endpoint/resolver/${entityID}/events?legacyEndpointID=${endpointID}`)
+          .set('kbn-xsrf', 'xxx')
+          .expect(200);
+        expect(body.events.length).to.eql(1);
+        expect(body.entityID).to.eql(entityID);
+        expect(body.nextEvent).to.eql(null);
+      });
+
+      it('returns no values when there is no more data', async () => {
+        const { body }: { body: ResolverRelatedEvents } = await supertest
+          // after is set to the document id of the last event so there shouldn't be any more after it
+          .post(
+            `/api/endpoint/resolver/${entityID}/events?legacyEndpointID=${endpointID}&afterEvent=${cursor}`
+          )
+          .set('kbn-xsrf', 'xxx')
+          .expect(200);
+        expect(body.events).be.empty();
+        expect(body.entityID).to.eql(entityID);
+        expect(body.nextEvent).to.eql(null);
+      });
+
+      it('should return the first page of information when the cursor is invalid', async () => {
+        const { body }: { body: ResolverRelatedEvents } = await supertest
+          .post(
+            `/api/endpoint/resolver/${entityID}/events?legacyEndpointID=${endpointID}&afterEvent=blah`
+          )
+          .set('kbn-xsrf', 'xxx')
+          .expect(200);
+        expect(body.entityID).to.eql(entityID);
+        expect(body.nextEvent).to.eql(null);
+      });
+
+      it('should return no results for an invalid endpoint ID', async () => {
+        const { body }: { body: ResolverRelatedEvents } = await supertest
+          .post(`/api/endpoint/resolver/${entityID}/events?legacyEndpointID=foo`)
+          .set('kbn-xsrf', 'xxx')
+          .expect(200);
+        expect(body.nextEvent).to.eql(null);
+        expect(body.entityID).to.eql(entityID);
+        expect(body.events).to.be.empty();
+      });
+
+      it('should error on invalid pagination values', async () => {
+        await supertest
+          .post(`/api/endpoint/resolver/${entityID}/events?events=0`)
+          .set('kbn-xsrf', 'xxx')
+          .expect(400);
+        await supertest
+          .post(`/api/endpoint/resolver/${entityID}/events?events=20000`)
+          .set('kbn-xsrf', 'xxx')
+          .expect(400);
+        await supertest
+          .post(`/api/endpoint/resolver/${entityID}/events?events=-1`)
+          .set('kbn-xsrf', 'xxx')
+          .expect(400);
+      });
+    });
+
+    describe('endpoint events', () => {
+      it('should not find any events', async () => {
+        const { body }: { body: ResolverRelatedEvents } = await supertest
+          .post(`/api/endpoint/resolver/5555/events`)
+          .set('kbn-xsrf', 'xxx')
+          .expect(200);
+        expect(body.nextEvent).to.eql(null);
+        expect(body.events).to.be.empty();
+      });
+
+      it('should return details for the root node', async () => {
+        const { body }: { body: ResolverRelatedEvents } = await supertest
+          .post(`/api/endpoint/resolver/${tree.origin.id}/events`)
+          .set('kbn-xsrf', 'xxx')
+          .expect(200);
+        expect(body.events.length).to.eql(4);
+        compareArrays(tree.origin.relatedEvents, body.events, true);
+        expect(body.nextEvent).to.eql(null);
+      });
+
+      it('should allow for the events to be filtered', async () => {
+        const filter = `event.category:"${RelatedEventCategory.Driver}"`;
+        const { body }: { body: ResolverRelatedEvents } = await supertest
+          .post(`/api/endpoint/resolver/${tree.origin.id}/events`)
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            filter,
+          })
+          .expect(200);
+        expect(body.events.length).to.eql(2);
+        compareArrays(tree.origin.relatedEvents, body.events);
+        expect(body.nextEvent).to.eql(null);
+        for (const event of body.events) {
+          expect(event.event?.category).to.be(RelatedEventCategory.Driver);
+        }
+      });
+
+      it('should return paginated results for the root node', async () => {
+        let { body }: { body: ResolverRelatedEvents } = await supertest
+          .post(`/api/endpoint/resolver/${tree.origin.id}/events?events=2`)
+          .set('kbn-xsrf', 'xxx')
+          .expect(200);
+        expect(body.events.length).to.eql(2);
+        compareArrays(tree.origin.relatedEvents, body.events);
+        expect(body.nextEvent).not.to.eql(null);
+
+        ({ body } = await supertest
+          .post(
+            `/api/endpoint/resolver/${tree.origin.id}/events?events=2&afterEvent=${body.nextEvent}`
+          )
+          .set('kbn-xsrf', 'xxx')
+          .expect(200));
+        expect(body.events.length).to.eql(2);
+        compareArrays(tree.origin.relatedEvents, body.events);
+        expect(body.nextEvent).to.not.eql(null);
+
+        ({ body } = await supertest
+          .post(
+            `/api/endpoint/resolver/${tree.origin.id}/events?events=2&afterEvent=${body.nextEvent}`
+          )
+          .set('kbn-xsrf', 'xxx')
+          .expect(200));
+        expect(body.events).to.be.empty();
+        expect(body.nextEvent).to.eql(null);
+      });
+
+      it('should return the first page of information when the cursor is invalid', async () => {
+        const { body }: { body: ResolverRelatedEvents } = await supertest
+          .post(`/api/endpoint/resolver/${tree.origin.id}/events?afterEvent=blah`)
+          .set('kbn-xsrf', 'xxx')
+          .expect(200);
+        expect(body.events.length).to.eql(4);
+        compareArrays(tree.origin.relatedEvents, body.events, true);
+        expect(body.nextEvent).to.eql(null);
+      });
+
+      it('should sort the events in descending order', async () => {
+        const { body }: { body: ResolverRelatedEvents } = await supertest
+          .post(`/api/endpoint/resolver/${tree.origin.id}/events`)
+          .set('kbn-xsrf', 'xxx')
+          .expect(200);
+        expect(body.events.length).to.eql(4);
+        // these events are created in the order they are defined in the array so the newest one is
+        // the last element in the array so let's reverse it
+        const relatedEvents = tree.origin.relatedEvents.reverse();
+        for (let i = 0; i < body.events.length; i++) {
+          expect(body.events[i].event?.category).to.equal(relatedEvents[i].event.category);
+          expect(eventId(body.events[i])).to.equal(relatedEvents[i].event.id);
+        }
+      });
+    });
+  });
+}
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/index.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/index.ts
index dc9a1fab9ec02..fc603af3619a4 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/index.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/index.ts
@@ -12,5 +12,7 @@ export default function (providerContext: FtrProviderContext) {
     loadTestFile(require.resolve('./entity_id'));
     loadTestFile(require.resolve('./children'));
     loadTestFile(require.resolve('./tree'));
+    loadTestFile(require.resolve('./alerts'));
+    loadTestFile(require.resolve('./events'));
   });
 }
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts
index f4836379ca273..957d559087f5e 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/resolver/tree.ts
@@ -3,232 +3,28 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import _ from 'lodash';
 import expect from '@kbn/expect';
 import {
-  ResolverChildNode,
-  ResolverLifecycleNode,
   ResolverAncestry,
-  ResolverEvent,
-  ResolverRelatedEvents,
   ResolverChildren,
   ResolverTree,
   LegacyEndpointEvent,
-  ResolverNodeStats,
-  ResolverRelatedAlerts,
 } from '../../../../plugins/security_solution/common/endpoint/types';
-import {
-  parentEntityId,
-  eventId,
-} from '../../../../plugins/security_solution/common/endpoint/models/event';
+import { parentEntityId } from '../../../../plugins/security_solution/common/endpoint/models/event';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import {
-  Event,
   Tree,
-  TreeNode,
   RelatedEventCategory,
-  RelatedEventInfo,
-  categoryMapping,
 } from '../../../../plugins/security_solution/common/endpoint/generate_data';
 import { Options, GeneratedTrees } from '../../services/resolver';
-
-/**
- * Check that the given lifecycle is in the resolver tree's corresponding map
- *
- * @param node a lifecycle node containing the start and end events for a node
- * @param nodeMap a map of entity_ids to nodes to look for the passed in `node`
- */
-const expectLifecycleNodeInMap = (node: ResolverLifecycleNode, nodeMap: Map<string, TreeNode>) => {
-  const genNode = nodeMap.get(node.entityID);
-  expect(genNode).to.be.ok();
-  compareArrays(genNode!.lifecycle, node.lifecycle, true);
-};
-
-/**
- * Verify that all the ancestor nodes are valid and optionally have parents.
- *
- * @param ancestors an array of ancestors
- * @param tree the generated resolver tree as the source of truth
- * @param verifyLastParent a boolean indicating whether to check the last ancestor. If the ancestors array intentionally
- *  does not contain all the ancestors, the last one will not have the parent
- */
-const verifyAncestry = (
-  ancestors: ResolverLifecycleNode[],
-  tree: Tree,
-  verifyLastParent: boolean
-) => {
-  // group the ancestors by their entity_id mapped to a lifecycle node
-  const groupedAncestors = _.groupBy(ancestors, (ancestor) => ancestor.entityID);
-  // group by parent entity_id
-  const groupedAncestorsParent = _.groupBy(ancestors, (ancestor) =>
-    parentEntityId(ancestor.lifecycle[0])
-  );
-  // make sure there aren't any nodes with the same entity_id
-  expect(Object.keys(groupedAncestors).length).to.eql(ancestors.length);
-  // make sure there aren't any nodes with the same parent entity_id
-  expect(Object.keys(groupedAncestorsParent).length).to.eql(ancestors.length);
-
-  // make sure each of the ancestors' lifecycle events are in the generated tree
-  for (const node of ancestors) {
-    expectLifecycleNodeInMap(node, tree.ancestry);
-  }
-
-  // start at the origin which is always the first element of the array and make sure we have a connection
-  // using parent id between each of the nodes
-  let foundParents = 0;
-  let node = ancestors[0];
-  for (let i = 0; i < ancestors.length; i++) {
-    const parentID = parentEntityId(node.lifecycle[0]);
-    if (parentID !== undefined) {
-      const nextNode = groupedAncestors[parentID];
-      if (!nextNode) {
-        break;
-      }
-      // the grouped nodes should only have a single entry since each entity is unique
-      node = nextNode[0];
-    }
-    foundParents++;
-  }
-
-  if (verifyLastParent) {
-    expect(foundParents).to.eql(ancestors.length);
-  } else {
-    // if we only retrieved a portion of all the ancestors then the most distant grandparent's parent will not necessarily
-    // be in the results
-    expect(foundParents).to.eql(ancestors.length - 1);
-  }
-};
-
-/**
- * Retrieves the most distant ancestor in the given array.
- *
- * @param ancestors an array of ancestor nodes
- */
-const retrieveDistantAncestor = (ancestors: ResolverLifecycleNode[]) => {
-  // group the ancestors by their entity_id mapped to a lifecycle node
-  const groupedAncestors = _.groupBy(ancestors, (ancestor) => ancestor.entityID);
-  let node = ancestors[0];
-  for (let i = 0; i < ancestors.length; i++) {
-    const parentID = parentEntityId(node.lifecycle[0]);
-    if (parentID !== undefined) {
-      const nextNode = groupedAncestors[parentID];
-      if (nextNode) {
-        node = nextNode[0];
-      } else {
-        return node;
-      }
-    }
-  }
-  return node;
-};
-
-/**
- * Verify that the children nodes are correct
- *
- * @param children the children nodes
- * @param tree the generated resolver tree as the source of truth
- * @param numberOfParents an optional number to compare that are a certain number of parents in the children array
- * @param childrenPerParent an optional number to compare that there are a certain number of children for each parent
- */
-const verifyChildren = (
-  children: ResolverChildNode[],
-  tree: Tree,
-  numberOfParents?: number,
-  childrenPerParent?: number
-) => {
-  // group the children by their entity_id mapped to a child node
-  const groupedChildren = _.groupBy(children, (child) => child.entityID);
-  // make sure each child is unique
-  expect(Object.keys(groupedChildren).length).to.eql(children.length);
-  if (numberOfParents !== undefined) {
-    const groupParent = _.groupBy(children, (child) => parentEntityId(child.lifecycle[0]));
-    expect(Object.keys(groupParent).length).to.eql(numberOfParents);
-    if (childrenPerParent !== undefined) {
-      Object.values(groupParent).forEach((childNodes) =>
-        expect(childNodes.length).to.be(childrenPerParent)
-      );
-    }
-  }
-
-  children.forEach((child) => {
-    expectLifecycleNodeInMap(child, tree.children);
-  });
-};
-
-/**
- * Compare an array of events returned from an API with an array of events generated
- *
- * @param expected an array to use as the source of truth
- * @param toTest the array to test against the source of truth
- * @param lengthCheck an optional flag to check that the arrays are the same length
- */
-const compareArrays = (
-  expected: Event[],
-  toTest: ResolverEvent[],
-  lengthCheck: boolean = false
-) => {
-  if (lengthCheck) {
-    expect(expected.length).to.eql(toTest.length);
-  }
-
-  toTest.forEach((toTestEvent) => {
-    expect(
-      expected.find((arrEvent) => {
-        // we're only checking that the event ids are the same here. The reason we can't check the entire document
-        // is because ingest pipelines are used to add fields to the document when it is received by elasticsearch,
-        // therefore it will not be the same as the document created by the generator
-        return eventId(toTestEvent) === eventId(arrEvent);
-      })
-    ).to.be.ok();
-  });
-};
-
-/**
- * Verifies that the stats received from ES for a node reflect the categories of events that the generator created.
- *
- * @param relatedEvents the related events received for a particular node
- * @param categories the related event info used when generating the resolver tree
- */
-const verifyStats = (
-  stats: ResolverNodeStats | undefined,
-  categories: RelatedEventInfo[],
-  relatedAlerts: number
-) => {
-  expect(stats).to.not.be(undefined);
-  let totalExpEvents = 0;
-  for (const cat of categories) {
-    const ecsCategories = categoryMapping[cat.category];
-    if (Array.isArray(ecsCategories)) {
-      // if there are multiple ecs categories used to define a related event, the count for all of them should be the same
-      // and they should equal what is defined in the categories used to generate the related events
-      for (const ecsCat of ecsCategories) {
-        expect(stats?.events.byCategory[ecsCat]).to.be(cat.count);
-      }
-    } else {
-      expect(stats?.events.byCategory[ecsCategories]).to.be(cat.count);
-    }
-
-    totalExpEvents += cat.count;
-  }
-  expect(stats?.events.total).to.be(totalExpEvents);
-  expect(stats?.totalAlerts);
-};
-
-/**
- * A helper function for verifying the stats information an array of nodes.
- *
- * @param nodes an array of lifecycle nodes that should have a stats field defined
- * @param categories the related event info used when generating the resolver tree
- */
-const verifyLifecycleStats = (
-  nodes: ResolverLifecycleNode[],
-  categories: RelatedEventInfo[],
-  relatedAlerts: number
-) => {
-  for (const node of nodes) {
-    verifyStats(node.stats, categories, relatedAlerts);
-  }
-};
+import {
+  compareArrays,
+  verifyAncestry,
+  retrieveDistantAncestor,
+  verifyChildren,
+  verifyLifecycleStats,
+  verifyStats,
+} from './common';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
@@ -269,170 +65,6 @@ export default function ({ getService }: FtrProviderContext) {
       await esArchiver.unload('endpoint/resolver/api_feature');
     });
 
-    describe('related alerts route', () => {
-      describe('endpoint events', () => {
-        it('should not find any alerts', async () => {
-          const { body }: { body: ResolverRelatedAlerts } = await supertest
-            .get(`/api/endpoint/resolver/5555/alerts`)
-            .expect(200);
-          expect(body.nextAlert).to.eql(null);
-          expect(body.alerts).to.be.empty();
-        });
-
-        it('should return details for the root node', async () => {
-          const { body }: { body: ResolverRelatedAlerts } = await supertest
-            .get(`/api/endpoint/resolver/${tree.origin.id}/alerts`)
-            .expect(200);
-          expect(body.alerts.length).to.eql(4);
-          compareArrays(tree.origin.relatedAlerts, body.alerts, true);
-          expect(body.nextAlert).to.eql(null);
-        });
-
-        it('should return paginated results for the root node', async () => {
-          let { body }: { body: ResolverRelatedAlerts } = await supertest
-            .get(`/api/endpoint/resolver/${tree.origin.id}/alerts?alerts=2`)
-            .expect(200);
-          expect(body.alerts.length).to.eql(2);
-          compareArrays(tree.origin.relatedAlerts, body.alerts);
-          expect(body.nextAlert).not.to.eql(null);
-
-          ({ body } = await supertest
-            .get(
-              `/api/endpoint/resolver/${tree.origin.id}/alerts?alerts=2&afterAlert=${body.nextAlert}`
-            )
-            .expect(200));
-          expect(body.alerts.length).to.eql(2);
-          compareArrays(tree.origin.relatedAlerts, body.alerts);
-          expect(body.nextAlert).to.not.eql(null);
-
-          ({ body } = await supertest
-            .get(
-              `/api/endpoint/resolver/${tree.origin.id}/alerts?alerts=2&afterAlert=${body.nextAlert}`
-            )
-            .expect(200));
-          expect(body.alerts).to.be.empty();
-          expect(body.nextAlert).to.eql(null);
-        });
-
-        it('should return the first page of information when the cursor is invalid', async () => {
-          const { body }: { body: ResolverRelatedAlerts } = await supertest
-            .get(`/api/endpoint/resolver/${tree.origin.id}/alerts?afterAlert=blah`)
-            .expect(200);
-          expect(body.alerts.length).to.eql(4);
-          compareArrays(tree.origin.relatedAlerts, body.alerts, true);
-          expect(body.nextAlert).to.eql(null);
-        });
-      });
-    });
-
-    describe('related events route', () => {
-      describe('legacy events', () => {
-        const endpointID = '5a0c957f-b8e7-4538-965e-57e8bb86ad3a';
-        const entityID = '94042';
-        const cursor = 'eyJ0aW1lc3RhbXAiOjE1ODE0NTYyNTUwMDAsImV2ZW50SUQiOiI5NDA0MyJ9';
-
-        it('should return details for the root node', async () => {
-          const { body }: { body: ResolverRelatedEvents } = await supertest
-            .get(`/api/endpoint/resolver/${entityID}/events?legacyEndpointID=${endpointID}`)
-            .expect(200);
-          expect(body.events.length).to.eql(1);
-          expect(body.entityID).to.eql(entityID);
-          expect(body.nextEvent).to.eql(null);
-        });
-
-        it('returns no values when there is no more data', async () => {
-          const { body }: { body: ResolverRelatedEvents } = await supertest
-            // after is set to the document id of the last event so there shouldn't be any more after it
-            .get(
-              `/api/endpoint/resolver/${entityID}/events?legacyEndpointID=${endpointID}&afterEvent=${cursor}`
-            )
-            .expect(200);
-          expect(body.events).be.empty();
-          expect(body.entityID).to.eql(entityID);
-          expect(body.nextEvent).to.eql(null);
-        });
-
-        it('should return the first page of information when the cursor is invalid', async () => {
-          const { body }: { body: ResolverRelatedEvents } = await supertest
-            .get(
-              `/api/endpoint/resolver/${entityID}/events?legacyEndpointID=${endpointID}&afterEvent=blah`
-            )
-            .expect(200);
-          expect(body.entityID).to.eql(entityID);
-          expect(body.nextEvent).to.eql(null);
-        });
-
-        it('should return no results for an invalid endpoint ID', async () => {
-          const { body }: { body: ResolverRelatedEvents } = await supertest
-            .get(`/api/endpoint/resolver/${entityID}/events?legacyEndpointID=foo`)
-            .expect(200);
-          expect(body.nextEvent).to.eql(null);
-          expect(body.entityID).to.eql(entityID);
-          expect(body.events).to.be.empty();
-        });
-
-        it('should error on invalid pagination values', async () => {
-          await supertest.get(`/api/endpoint/resolver/${entityID}/events?events=0`).expect(400);
-          await supertest.get(`/api/endpoint/resolver/${entityID}/events?events=20000`).expect(400);
-          await supertest.get(`/api/endpoint/resolver/${entityID}/events?events=-1`).expect(400);
-        });
-      });
-
-      describe('endpoint events', () => {
-        it('should not find any events', async () => {
-          const { body }: { body: ResolverRelatedEvents } = await supertest
-            .get(`/api/endpoint/resolver/5555/events`)
-            .expect(200);
-          expect(body.nextEvent).to.eql(null);
-          expect(body.events).to.be.empty();
-        });
-
-        it('should return details for the root node', async () => {
-          const { body }: { body: ResolverRelatedEvents } = await supertest
-            .get(`/api/endpoint/resolver/${tree.origin.id}/events`)
-            .expect(200);
-          expect(body.events.length).to.eql(4);
-          compareArrays(tree.origin.relatedEvents, body.events, true);
-          expect(body.nextEvent).to.eql(null);
-        });
-
-        it('should return paginated results for the root node', async () => {
-          let { body }: { body: ResolverRelatedEvents } = await supertest
-            .get(`/api/endpoint/resolver/${tree.origin.id}/events?events=2`)
-            .expect(200);
-          expect(body.events.length).to.eql(2);
-          compareArrays(tree.origin.relatedEvents, body.events);
-          expect(body.nextEvent).not.to.eql(null);
-
-          ({ body } = await supertest
-            .get(
-              `/api/endpoint/resolver/${tree.origin.id}/events?events=2&afterEvent=${body.nextEvent}`
-            )
-            .expect(200));
-          expect(body.events.length).to.eql(2);
-          compareArrays(tree.origin.relatedEvents, body.events);
-          expect(body.nextEvent).to.not.eql(null);
-
-          ({ body } = await supertest
-            .get(
-              `/api/endpoint/resolver/${tree.origin.id}/events?events=2&afterEvent=${body.nextEvent}`
-            )
-            .expect(200));
-          expect(body.events).to.be.empty();
-          expect(body.nextEvent).to.eql(null);
-        });
-
-        it('should return the first page of information when the cursor is invalid', async () => {
-          const { body }: { body: ResolverRelatedEvents } = await supertest
-            .get(`/api/endpoint/resolver/${tree.origin.id}/events?afterEvent=blah`)
-            .expect(200);
-          expect(body.events.length).to.eql(4);
-          compareArrays(tree.origin.relatedEvents, body.events, true);
-          expect(body.nextEvent).to.eql(null);
-        });
-      });
-    });
-
     describe('ancestry events route', () => {
       describe('legacy events', () => {
         const endpointID = '5a0c957f-b8e7-4538-965e-57e8bb86ad3a';

From 3541edbb5d86dc58824e7abe82a5b326b1b745a9 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Wed, 26 Aug 2020 08:30:47 -0500
Subject: [PATCH 058/148] Minor developer guide doc changes (#75763)

---
 docs/developer/best-practices/index.asciidoc           |  2 +-
 docs/developer/best-practices/stability.asciidoc       | 10 +++++-----
 .../developer/getting-started/building-kibana.asciidoc |  4 ++--
 docs/developer/getting-started/index.asciidoc          |  4 ++--
 .../getting-started/running-kibana-advanced.asciidoc   |  6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/developer/best-practices/index.asciidoc b/docs/developer/best-practices/index.asciidoc
index 63a44b54d454f..42cee6ef0e58a 100644
--- a/docs/developer/best-practices/index.asciidoc
+++ b/docs/developer/best-practices/index.asciidoc
@@ -48,7 +48,7 @@ guidelines]
 * Write all new code on
 {kib-repo}blob/{branch}/src/core/README.md[the
 platform], and following
-{kib-repo}blob/{branch}/src/core/CONVENTIONS.md[conventions]
+{kib-repo}blob/{branch}/src/core/CONVENTIONS.md[conventions].
 * _Always_ use the `SavedObjectClient` for reading and writing Saved
 Objects.
 * Add `README`s to all your plugins and services.
diff --git a/docs/developer/best-practices/stability.asciidoc b/docs/developer/best-practices/stability.asciidoc
index f4b7ae1229909..348412e593d9e 100644
--- a/docs/developer/best-practices/stability.asciidoc
+++ b/docs/developer/best-practices/stability.asciidoc
@@ -52,15 +52,15 @@ storeinSessions?)
 [discrete]
 === Browser coverage
 
-Refer to the list of browsers and OS {kib} supports
+Refer to the list of browsers and OS {kib} supports:
 https://www.elastic.co/support/matrix
 
 Does the feature work efficiently on the list of supported browsers? 
 
 [discrete]
-=== Upgrade Scenarios - Migration scenarios- 
+=== Upgrade and Migration scenarios
 
-Does the feature affect old
-indices, saved objects ? - Has the feature been tested with {kib}
-aliases - Read/Write privileges of the indices before and after the
+* Does the feature affect old indices or saved objects?
+* Has the feature been tested with {kib} aliases?
+* Read/Write privileges of the indices before and after the
 upgrade?
diff --git a/docs/developer/getting-started/building-kibana.asciidoc b/docs/developer/getting-started/building-kibana.asciidoc
index 72054b1628fc2..04771b34bf69f 100644
--- a/docs/developer/getting-started/building-kibana.asciidoc
+++ b/docs/developer/getting-started/building-kibana.asciidoc
@@ -1,7 +1,7 @@
 [[building-kibana]]
 == Building a {kib} distributable
 
-The following commands will build a {kib} production distributable.
+The following command will build a {kib} production distributable:
 
 [source,bash]
 ----
@@ -36,4 +36,4 @@ To specify a package to build you can add `rpm` or `deb` as an argument.
 yarn build --rpm
 ----
 
-Distributable packages can be found in `target/` after the build completes.
\ No newline at end of file
+Distributable packages can be found in `target/` after the build completes.
diff --git a/docs/developer/getting-started/index.asciidoc b/docs/developer/getting-started/index.asciidoc
index eaa35eece5a2c..10e603a8da8bb 100644
--- a/docs/developer/getting-started/index.asciidoc
+++ b/docs/developer/getting-started/index.asciidoc
@@ -49,7 +49,7 @@ ____
 
 (You can also run `yarn kbn` to see the other available commands. For
 more info about this tool, see
-{kib-repo}tree/{branch}/packages/kbn-pm[{kib-repo}tree/{branch}packages/kbn-pm].)
+{kib-repo}tree/{branch}/packages/kbn-pm[{kib-repo}tree/{branch}/packages/kbn-pm].)
 
 When switching branches which use different versions of npm packages you
 may need to run:
@@ -137,4 +137,4 @@ include::debugging.asciidoc[leveloffset=+1]
 
 include::building-kibana.asciidoc[leveloffset=+1]
 
-include::development-plugin-resources.asciidoc[leveloffset=+1]
\ No newline at end of file
+include::development-plugin-resources.asciidoc[leveloffset=+1]
diff --git a/docs/developer/getting-started/running-kibana-advanced.asciidoc b/docs/developer/getting-started/running-kibana-advanced.asciidoc
index c3b7847b0f8ba..44897184f88f2 100644
--- a/docs/developer/getting-started/running-kibana-advanced.asciidoc
+++ b/docs/developer/getting-started/running-kibana-advanced.asciidoc
@@ -73,8 +73,8 @@ settings].
 [discrete]
 === Potential Optimization Pitfalls
 
-* Webpack is trying to include a file in the bundle that I deleted and
-is now complaining about it is missing
+* Webpack is trying to include a file in the bundle that was deleted and
+is now complaining about it being missing
 * A module id that used to resolve to a single file now resolves to a
 directory, but webpack isn’t adapting
 * (if you discover other scenarios, please send a PR!)
@@ -84,4 +84,4 @@ directory, but webpack isn’t adapting
 
 {kib} includes self-signed certificates that can be used for
 development purposes in the browser and for communicating with
-{es}: `yarn start --ssl` & `yarn es snapshot --ssl`.
\ No newline at end of file
+{es}: `yarn start --ssl` & `yarn es snapshot --ssl`.

From 4f2d4f8b018950481f1841792a3b7243152ae39b Mon Sep 17 00:00:00 2001
From: Bhavya RM <bhavya@elastic.co>
Date: Wed, 26 Aug 2020 09:59:41 -0400
Subject: [PATCH 059/148] adding test user to pew pew maps test + adding a role
 for connections index pattern (#75920)

---
 x-pack/test/functional/apps/maps/es_pew_pew_source.js |  6 ++++++
 x-pack/test/functional/config.js                      | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/x-pack/test/functional/apps/maps/es_pew_pew_source.js b/x-pack/test/functional/apps/maps/es_pew_pew_source.js
index 382bde510170f..b0f98f807fd44 100644
--- a/x-pack/test/functional/apps/maps/es_pew_pew_source.js
+++ b/x-pack/test/functional/apps/maps/es_pew_pew_source.js
@@ -9,14 +9,20 @@ import expect from '@kbn/expect';
 export default function ({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['maps']);
   const inspector = getService('inspector');
+  const security = getService('security');
 
   const VECTOR_SOURCE_ID = '67c1de2c-2fc5-4425-8983-094b589afe61';
 
   describe('point to point source', () => {
     before(async () => {
+      await security.testUser.setRoles(['global_maps_all', 'geoconnections_data_reader']);
       await PageObjects.maps.loadSavedMap('pew pew demo');
     });
 
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
+
     it('should request source clusters for destination locations', async () => {
       await inspector.open();
       await inspector.openInspectorRequestsView();
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index fdd694e73394e..003d842cc3d6f 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -273,6 +273,17 @@ export default async function ({ readConfigFile }) {
           },
         },
 
+        geoconnections_data_reader: {
+          elasticsearch: {
+            indices: [
+              {
+                names: ['connections*'],
+                privileges: ['read', 'view_index_metadata'],
+              },
+            ],
+          },
+        },
+
         global_devtools_read: {
           kibana: [
             {

From 4e1b1b5d9e3ab98e177c5b8c763d08918784aad7 Mon Sep 17 00:00:00 2001
From: Bhavya RM <bhavya@elastic.co>
Date: Wed, 26 Aug 2020 10:02:10 -0400
Subject: [PATCH 060/148] adding test user to auto fit to bounds test (#75914)

---
 x-pack/test/functional/apps/maps/auto_fit_to_bounds.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js b/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js
index d3d4fe054ec34..0e8775fa611b5 100644
--- a/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js
+++ b/x-pack/test/functional/apps/maps/auto_fit_to_bounds.js
@@ -6,17 +6,23 @@
 
 import expect from '@kbn/expect';
 
-export default function ({ getPageObjects }) {
+export default function ({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['maps']);
+  const security = getService('security');
 
   describe('auto fit map to bounds', () => {
     describe('initial location', () => {
       before(async () => {
+        await security.testUser.setRoles(['global_maps_all', 'test_logstash_reader']);
         await PageObjects.maps.loadSavedMap(
           'document example - auto fit to bounds for initial location'
         );
       });
 
+      after(async () => {
+        await security.testUser.restoreDefaults();
+      });
+
       it('should automatically fit to bounds on initial map load', async () => {
         const hits = await PageObjects.maps.getHits();
         expect(hits).to.equal('6');

From b9c820120202dc44296e080550e87c93bd37dd55 Mon Sep 17 00:00:00 2001
From: Yara Tercero <yctercero@users.noreply.github.com>
Date: Wed, 26 Aug 2020 10:16:17 -0400
Subject: [PATCH 061/148] [Security Solution][Exceptions] - Improve UX for
 missing exception list associated with rule (#75898)

## Summary

**Current behavior:**
  - **Scenario 1:** User is in the exceptions viewer flow, they select to edit an exception item, but the list the item is associated with has since been deleted (let's say by another user) - a user is able to open modal to edit exception item and on save, an error toaster shows but no information is given to the user to indicate the issue.
  - **Scenario 2:** User exports rules from space 'X' and imports into space 'Y'. The exception lists associated with their newly imported rules do not exist in space 'Y' - a user goes to add an exception item and gets a modal with an error, unable to add any exceptions.
  - **Workaround:** current workaround exists only via API - user would need to remove the exception list from their rule via API

**New behavior:**
  - **Scenario 1:** User is still able to oped edit modal, but on save they see an error explaining that the associated exception list does not exist and prompts them to remove the exception list --> now they're able to add exceptions to their rule
  - **Scenario 2:** User navigates to exceptions after importing their rule, tries to add  exception, modal pops up with error informing them that they need to remove association to missing exception list, button prompts them to do so --> now can continue adding exceptions to rule
---
 .../exceptions/add_exception_modal/index.tsx  |  90 +++++++---
 .../edit_exception_modal/index.test.tsx       |   5 +
 .../exceptions/edit_exception_modal/index.tsx |  91 +++++++---
 .../exceptions/error_callout.test.tsx         | 160 +++++++++++++++++
 .../components/exceptions/error_callout.tsx   | 169 ++++++++++++++++++
 .../components/exceptions/translations.ts     |  49 +++++
 .../exceptions/use_add_exception.test.tsx     |  44 +++++
 .../exceptions/use_add_exception.tsx          |   8 +-
 ...tch_or_create_rule_exception_list.test.tsx |   2 +-
 ...se_fetch_or_create_rule_exception_list.tsx |   8 +-
 .../components/exceptions/viewer/index.tsx    |   2 +
 .../use_dissasociate_exception_list.test.tsx  |  52 ++++++
 .../rules/use_dissasociate_exception_list.tsx |  80 +++++++++
 13 files changed, 706 insertions(+), 54 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
 create mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx

diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
index 03051ead357c9..21f82c6ab4c98 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
@@ -18,7 +18,6 @@ import {
   EuiCheckbox,
   EuiSpacer,
   EuiFormRow,
-  EuiCallOut,
   EuiText,
 } from '@elastic/eui';
 import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
@@ -28,6 +27,7 @@ import {
   ExceptionListType,
 } from '../../../../../public/lists_plugin_deps';
 import * as i18n from './translations';
+import * as sharedI18n from '../translations';
 import { TimelineNonEcsData, Ecs } from '../../../../graphql/types';
 import { useAppToasts } from '../../../hooks/use_app_toasts';
 import { useKibana } from '../../../lib/kibana';
@@ -35,6 +35,7 @@ import { ExceptionBuilderComponent } from '../builder';
 import { Loader } from '../../loader';
 import { useAddOrUpdateException } from '../use_add_exception';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
+import { useRuleAsync } from '../../../../detections/containers/detection_engine/rules/use_rule_async';
 import { useFetchOrCreateRuleExceptionList } from '../use_fetch_or_create_rule_exception_list';
 import { AddExceptionComments } from '../add_exception_comments';
 import {
@@ -46,6 +47,7 @@ import {
   entryHasNonEcsType,
   getMappedNonEcsValue,
 } from '../helpers';
+import { ErrorInfo, ErrorCallout } from '../error_callout';
 import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules';
 
 export interface AddExceptionModalBaseProps {
@@ -107,13 +109,14 @@ export const AddExceptionModal = memo(function AddExceptionModal({
 }: AddExceptionModalProps) {
   const { http } = useKibana().services;
   const [comment, setComment] = useState('');
+  const { rule: maybeRule } = useRuleAsync(ruleId);
   const [shouldCloseAlert, setShouldCloseAlert] = useState(false);
   const [shouldBulkCloseAlert, setShouldBulkCloseAlert] = useState(false);
   const [shouldDisableBulkClose, setShouldDisableBulkClose] = useState(false);
   const [exceptionItemsToAdd, setExceptionItemsToAdd] = useState<
     Array<ExceptionListItemSchema | CreateExceptionListItemSchema>
   >([]);
-  const [fetchOrCreateListError, setFetchOrCreateListError] = useState(false);
+  const [fetchOrCreateListError, setFetchOrCreateListError] = useState<ErrorInfo | null>(null);
   const { addError, addSuccess } = useAppToasts();
   const { loading: isSignalIndexLoading, signalIndexName } = useSignalIndex();
   const [
@@ -164,17 +167,41 @@ export const AddExceptionModal = memo(function AddExceptionModal({
     },
     [onRuleChange]
   );
-  const onFetchOrCreateExceptionListError = useCallback(
-    (error: Error) => {
-      setFetchOrCreateListError(true);
+
+  const handleDissasociationSuccess = useCallback(
+    (id: string): void => {
+      handleRuleChange(true);
+      addSuccess(sharedI18n.DISSASOCIATE_LIST_SUCCESS(id));
+      onCancel();
+    },
+    [handleRuleChange, addSuccess, onCancel]
+  );
+
+  const handleDissasociationError = useCallback(
+    (error: Error): void => {
+      addError(error, { title: sharedI18n.DISSASOCIATE_EXCEPTION_LIST_ERROR });
+      onCancel();
+    },
+    [addError, onCancel]
+  );
+
+  const handleFetchOrCreateExceptionListError = useCallback(
+    (error: Error, statusCode: number | null, message: string | null) => {
+      setFetchOrCreateListError({
+        reason: error.message,
+        code: statusCode,
+        details: message,
+        listListId: null,
+      });
     },
     [setFetchOrCreateListError]
   );
+
   const [isLoadingExceptionList, ruleExceptionList] = useFetchOrCreateRuleExceptionList({
     http,
     ruleId,
     exceptionListType,
-    onError: onFetchOrCreateExceptionListError,
+    onError: handleFetchOrCreateExceptionListError,
     onSuccess: handleRuleChange,
   });
 
@@ -279,7 +306,9 @@ export const AddExceptionModal = memo(function AddExceptionModal({
   ]);
 
   const isSubmitButtonDisabled = useMemo(
-    () => fetchOrCreateListError || exceptionItemsToAdd.every((item) => item.entries.length === 0),
+    () =>
+      fetchOrCreateListError != null ||
+      exceptionItemsToAdd.every((item) => item.entries.length === 0),
     [fetchOrCreateListError, exceptionItemsToAdd]
   );
 
@@ -295,19 +324,27 @@ export const AddExceptionModal = memo(function AddExceptionModal({
           </ModalHeaderSubtitle>
         </ModalHeader>
 
-        {fetchOrCreateListError === true && (
-          <EuiCallOut title={i18n.ADD_EXCEPTION_FETCH_ERROR_TITLE} color="danger" iconType="alert">
-            <p>{i18n.ADD_EXCEPTION_FETCH_ERROR}</p>
-          </EuiCallOut>
+        {fetchOrCreateListError != null && (
+          <EuiModalFooter>
+            <ErrorCallout
+              http={http}
+              errorInfo={fetchOrCreateListError}
+              rule={maybeRule}
+              onCancel={onCancel}
+              onSuccess={handleDissasociationSuccess}
+              onError={handleDissasociationError}
+              data-test-subj="addExceptionModalErrorCallout"
+            />
+          </EuiModalFooter>
         )}
-        {fetchOrCreateListError === false &&
+        {fetchOrCreateListError == null &&
           (isLoadingExceptionList ||
             isIndexPatternLoading ||
             isSignalIndexLoading ||
             isSignalIndexPatternLoading) && (
             <Loader data-test-subj="loadingAddExceptionModal" size="xl" />
           )}
-        {fetchOrCreateListError === false &&
+        {fetchOrCreateListError == null &&
           !isSignalIndexLoading &&
           !isSignalIndexPatternLoading &&
           !isLoadingExceptionList &&
@@ -377,20 +414,21 @@ export const AddExceptionModal = memo(function AddExceptionModal({
               </ModalBodySection>
             </>
           )}
+        {fetchOrCreateListError == null && (
+          <EuiModalFooter>
+            <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
 
-        <EuiModalFooter>
-          <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
-
-          <EuiButton
-            data-test-subj="add-exception-confirm-button"
-            onClick={onAddExceptionConfirm}
-            isLoading={addExceptionIsLoading}
-            isDisabled={isSubmitButtonDisabled}
-            fill
-          >
-            {i18n.ADD_EXCEPTION}
-          </EuiButton>
-        </EuiModalFooter>
+            <EuiButton
+              data-test-subj="add-exception-confirm-button"
+              onClick={onAddExceptionConfirm}
+              isLoading={addExceptionIsLoading}
+              isDisabled={isSubmitButtonDisabled}
+              fill
+            >
+              {i18n.ADD_EXCEPTION}
+            </EuiButton>
+          </EuiModalFooter>
+        )}
       </Modal>
     </EuiOverlayMask>
   );
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
index 6ff218ca06059..c724e6a2c711f 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
@@ -77,6 +77,7 @@ describe('When the edit exception modal is opened', () => {
         <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
           <EditExceptionModal
             ruleIndices={[]}
+            ruleId="123"
             ruleName={ruleName}
             exceptionListType={'endpoint'}
             onCancel={jest.fn()}
@@ -105,6 +106,7 @@ describe('When the edit exception modal is opened', () => {
           <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
             <EditExceptionModal
               ruleIndices={['filebeat-*']}
+              ruleId="123"
               ruleName={ruleName}
               exceptionListType={'endpoint'}
               onCancel={jest.fn()}
@@ -147,6 +149,7 @@ describe('When the edit exception modal is opened', () => {
           <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
             <EditExceptionModal
               ruleIndices={['filebeat-*']}
+              ruleId="123"
               ruleName={ruleName}
               exceptionListType={'endpoint'}
               onCancel={jest.fn()}
@@ -190,6 +193,7 @@ describe('When the edit exception modal is opened', () => {
         <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
           <EditExceptionModal
             ruleIndices={['filebeat-*']}
+            ruleId="123"
             ruleName={ruleName}
             exceptionListType={'detection'}
             onCancel={jest.fn()}
@@ -229,6 +233,7 @@ describe('When the edit exception modal is opened', () => {
         <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
           <EditExceptionModal
             ruleIndices={['filebeat-*']}
+            ruleId="123"
             ruleName={ruleName}
             exceptionListType={'detection'}
             onCancel={jest.fn()}
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
index a2c8531def2ba..41fc6ba57d715 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
@@ -23,12 +23,14 @@ import {
 } from '@elastic/eui';
 import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
+import { useRuleAsync } from '../../../../detections/containers/detection_engine/rules/use_rule_async';
 import {
   ExceptionListItemSchema,
   CreateExceptionListItemSchema,
   ExceptionListType,
 } from '../../../../../public/lists_plugin_deps';
 import * as i18n from './translations';
+import * as sharedI18n from '../translations';
 import { useKibana } from '../../../lib/kibana';
 import { useAppToasts } from '../../../hooks/use_app_toasts';
 import { ExceptionBuilderComponent } from '../builder';
@@ -43,14 +45,17 @@ import {
   lowercaseHashValues,
 } from '../helpers';
 import { Loader } from '../../loader';
+import { ErrorInfo, ErrorCallout } from '../error_callout';
 
 interface EditExceptionModalProps {
   ruleName: string;
+  ruleId: string;
   ruleIndices: string[];
   exceptionItem: ExceptionListItemSchema;
   exceptionListType: ExceptionListType;
   onCancel: () => void;
   onConfirm: () => void;
+  onRuleChange?: () => void;
 }
 
 const Modal = styled(EuiModal)`
@@ -83,14 +88,18 @@ const ModalBodySection = styled.section`
 
 export const EditExceptionModal = memo(function EditExceptionModal({
   ruleName,
+  ruleId,
   ruleIndices,
   exceptionItem,
   exceptionListType,
   onCancel,
   onConfirm,
+  onRuleChange,
 }: EditExceptionModalProps) {
   const { http } = useKibana().services;
   const [comment, setComment] = useState('');
+  const { rule: maybeRule } = useRuleAsync(ruleId);
+  const [updateError, setUpdateError] = useState<ErrorInfo | null>(null);
   const [hasVersionConflict, setHasVersionConflict] = useState(false);
   const [shouldBulkCloseAlert, setShouldBulkCloseAlert] = useState(false);
   const [shouldDisableBulkClose, setShouldDisableBulkClose] = useState(false);
@@ -108,18 +117,44 @@ export const EditExceptionModal = memo(function EditExceptionModal({
     'rules'
   );
 
-  const onError = useCallback(
-    (error) => {
+  const handleExceptionUpdateError = useCallback(
+    (error: Error, statusCode: number | null, message: string | null) => {
       if (error.message.includes('Conflict')) {
         setHasVersionConflict(true);
       } else {
-        addError(error, { title: i18n.EDIT_EXCEPTION_ERROR });
-        onCancel();
+        setUpdateError({
+          reason: error.message,
+          code: statusCode,
+          details: message,
+          listListId: exceptionItem.list_id,
+        });
       }
     },
+    [setUpdateError, setHasVersionConflict, exceptionItem.list_id]
+  );
+
+  const handleDissasociationSuccess = useCallback(
+    (id: string): void => {
+      addSuccess(sharedI18n.DISSASOCIATE_LIST_SUCCESS(id));
+
+      if (onRuleChange) {
+        onRuleChange();
+      }
+
+      onCancel();
+    },
+    [addSuccess, onCancel, onRuleChange]
+  );
+
+  const handleDissasociationError = useCallback(
+    (error: Error): void => {
+      addError(error, { title: sharedI18n.DISSASOCIATE_EXCEPTION_LIST_ERROR });
+      onCancel();
+    },
     [addError, onCancel]
   );
-  const onSuccess = useCallback(() => {
+
+  const handleExceptionUpdateSuccess = useCallback((): void => {
     addSuccess(i18n.EDIT_EXCEPTION_SUCCESS);
     onConfirm();
   }, [addSuccess, onConfirm]);
@@ -127,8 +162,8 @@ export const EditExceptionModal = memo(function EditExceptionModal({
   const [{ isLoading: addExceptionIsLoading }, addOrUpdateExceptionItems] = useAddOrUpdateException(
     {
       http,
-      onSuccess,
-      onError,
+      onSuccess: handleExceptionUpdateSuccess,
+      onError: handleExceptionUpdateError,
     }
   );
 
@@ -222,11 +257,9 @@ export const EditExceptionModal = memo(function EditExceptionModal({
             {ruleName}
           </ModalHeaderSubtitle>
         </ModalHeader>
-
         {(addExceptionIsLoading || isIndexPatternLoading || isSignalIndexLoading) && (
           <Loader data-test-subj="loadingEditExceptionModal" size="xl" />
         )}
-
         {!isSignalIndexLoading && !addExceptionIsLoading && !isIndexPatternLoading && (
           <>
             <ModalBodySection className="builder-section">
@@ -280,7 +313,18 @@ export const EditExceptionModal = memo(function EditExceptionModal({
             </ModalBodySection>
           </>
         )}
-
+        {updateError != null && (
+          <ModalBodySection>
+            <ErrorCallout
+              http={http}
+              errorInfo={updateError}
+              rule={maybeRule}
+              onCancel={onCancel}
+              onSuccess={handleDissasociationSuccess}
+              onError={handleDissasociationError}
+            />
+          </ModalBodySection>
+        )}
         {hasVersionConflict && (
           <ModalBodySection>
             <EuiCallOut title={i18n.VERSION_CONFLICT_ERROR_TITLE} color="danger" iconType="alert">
@@ -288,20 +332,21 @@ export const EditExceptionModal = memo(function EditExceptionModal({
             </EuiCallOut>
           </ModalBodySection>
         )}
+        {updateError == null && (
+          <EuiModalFooter>
+            <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
 
-        <EuiModalFooter>
-          <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
-
-          <EuiButton
-            data-test-subj="edit-exception-confirm-button"
-            onClick={onEditExceptionConfirm}
-            isLoading={addExceptionIsLoading}
-            isDisabled={isSubmitButtonDisabled}
-            fill
-          >
-            {i18n.EDIT_EXCEPTION_SAVE_BUTTON}
-          </EuiButton>
-        </EuiModalFooter>
+            <EuiButton
+              data-test-subj="edit-exception-confirm-button"
+              onClick={onEditExceptionConfirm}
+              isLoading={addExceptionIsLoading}
+              isDisabled={isSubmitButtonDisabled}
+              fill
+            >
+              {i18n.EDIT_EXCEPTION_SAVE_BUTTON}
+            </EuiButton>
+          </EuiModalFooter>
+        )}
       </Modal>
     </EuiOverlayMask>
   );
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
new file mode 100644
index 0000000000000..c9efa5e54dccf
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
@@ -0,0 +1,160 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { ThemeProvider } from 'styled-components';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+
+import { getListMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
+import { useDissasociateExceptionList } from '../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list';
+import { createKibanaCoreStartMock } from '../../mock/kibana_core';
+import { ErrorCallout } from './error_callout';
+import { savedRuleMock } from '../../../detections/containers/detection_engine/rules/mock';
+
+jest.mock('../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list');
+
+const mockKibanaHttpService = createKibanaCoreStartMock().http;
+
+describe('ErrorCallout', () => {
+  const mockDissasociate = jest.fn();
+
+  beforeEach(() => {
+    (useDissasociateExceptionList as jest.Mock).mockReturnValue([false, mockDissasociate]);
+  });
+
+  it('it renders error details', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+        <ErrorCallout
+          http={mockKibanaHttpService}
+          errorInfo={{
+            reason: 'error reason',
+            code: 500,
+            details: null,
+            listListId: null,
+          }}
+          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
+          onCancel={jest.fn()}
+          onSuccess={jest.fn()}
+          onError={jest.fn()}
+        />
+      </ThemeProvider>
+    );
+
+    expect(
+      wrapper.find('[data-test-subj="errorCalloutContainer"] .euiCallOutHeader__title').text()
+    ).toEqual('Error: error reason (500)');
+    expect(wrapper.find('[data-test-subj="errorCalloutMessage"]').at(0).text()).toEqual(
+      'Error fetching exception list'
+    );
+  });
+
+  it('it invokes "onCancel" when cancel button clicked', () => {
+    const mockOnCancel = jest.fn();
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+        <ErrorCallout
+          http={mockKibanaHttpService}
+          errorInfo={{
+            reason: 'error reason',
+            code: 500,
+            details: null,
+            listListId: null,
+          }}
+          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
+          onCancel={mockOnCancel}
+          onSuccess={jest.fn()}
+          onError={jest.fn()}
+        />
+      </ThemeProvider>
+    );
+
+    wrapper.find('[data-test-subj="errorCalloutCancelButton"]').at(0).simulate('click');
+
+    expect(mockOnCancel).toHaveBeenCalled();
+  });
+
+  it('it does not render status code if not available', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+        <ErrorCallout
+          http={mockKibanaHttpService}
+          errorInfo={{
+            reason: 'not found',
+            code: null,
+            details: 'list of id "some_uuid" not found',
+            listListId: null,
+          }}
+          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
+          onCancel={jest.fn()}
+          onSuccess={jest.fn()}
+          onError={jest.fn()}
+        />
+      </ThemeProvider>
+    );
+
+    expect(
+      wrapper.find('[data-test-subj="errorCalloutContainer"] .euiCallOutHeader__title').text()
+    ).toEqual('Error: not found');
+    expect(wrapper.find('[data-test-subj="errorCalloutMessage"]').at(0).text()).toEqual(
+      'Error fetching exception list'
+    );
+    expect(wrapper.find('[data-test-subj="errorCalloutDissasociateButton"]').exists()).toBeFalsy();
+  });
+
+  it('it renders specific missing exceptions list error', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+        <ErrorCallout
+          http={mockKibanaHttpService}
+          errorInfo={{
+            reason: 'not found',
+            code: 404,
+            details: 'list of id "some_uuid" not found',
+            listListId: null,
+          }}
+          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
+          onCancel={jest.fn()}
+          onSuccess={jest.fn()}
+          onError={jest.fn()}
+        />
+      </ThemeProvider>
+    );
+
+    expect(
+      wrapper.find('[data-test-subj="errorCalloutContainer"] .euiCallOutHeader__title').text()
+    ).toEqual('Error: not found (404)');
+    expect(wrapper.find('[data-test-subj="errorCalloutMessage"]').at(0).text()).toEqual(
+      'The associated exception list (some_uuid) no longer exists. Please remove the missing exception list to add additional exceptions to the detection rule.'
+    );
+    expect(wrapper.find('[data-test-subj="errorCalloutDissasociateButton"]').exists()).toBeTruthy();
+  });
+
+  it('it dissasociates list from rule when remove exception list clicked ', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+        <ErrorCallout
+          http={mockKibanaHttpService}
+          errorInfo={{
+            reason: 'not found',
+            code: 404,
+            details: 'list of id "some_uuid" not found',
+            listListId: null,
+          }}
+          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
+          onCancel={jest.fn()}
+          onSuccess={jest.fn()}
+          onError={jest.fn()}
+        />
+      </ThemeProvider>
+    );
+
+    wrapper.find('[data-test-subj="errorCalloutDissasociateButton"]').at(0).simulate('click');
+
+    expect(mockDissasociate).toHaveBeenCalledWith([]);
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
new file mode 100644
index 0000000000000..a2419ef16df3a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
@@ -0,0 +1,169 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useMemo, useEffect, useState, useCallback } from 'react';
+import {
+  EuiButtonEmpty,
+  EuiAccordion,
+  EuiCodeBlock,
+  EuiButton,
+  EuiCallOut,
+  EuiText,
+  EuiSpacer,
+} from '@elastic/eui';
+
+import { HttpSetup } from '../../../../../../../src/core/public';
+import { List } from '../../../../common/detection_engine/schemas/types/lists';
+import { Rule } from '../../../detections/containers/detection_engine/rules/types';
+import * as i18n from './translations';
+import { useDissasociateExceptionList } from '../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list';
+
+export interface ErrorInfo {
+  reason: string | null;
+  code: number | null;
+  details: string | null;
+  listListId: string | null;
+}
+
+export interface ErrorCalloutProps {
+  http: HttpSetup;
+  rule: Rule | null;
+  errorInfo: ErrorInfo;
+  onCancel: () => void;
+  onSuccess: (listId: string) => void;
+  onError: (arg: Error) => void;
+}
+
+const ErrorCalloutComponent = ({
+  http,
+  rule,
+  errorInfo,
+  onCancel,
+  onError,
+  onSuccess,
+}: ErrorCalloutProps): JSX.Element => {
+  const [listToDelete, setListToDelete] = useState<List | null>(null);
+  const [errorTitle, setErrorTitle] = useState<string>('');
+  const [errorMessage, setErrorMessage] = useState<string>(i18n.ADD_EXCEPTION_FETCH_ERROR);
+
+  const handleOnSuccess = useCallback((): void => {
+    onSuccess(listToDelete != null ? listToDelete.id : '');
+  }, [onSuccess, listToDelete]);
+
+  const [isDissasociatingList, handleDissasociateExceptionList] = useDissasociateExceptionList({
+    http,
+    ruleRuleId: rule != null ? rule.rule_id : '',
+    onSuccess: handleOnSuccess,
+    onError,
+  });
+
+  const canDisplay404Actions = useMemo(
+    (): boolean =>
+      errorInfo.code === 404 &&
+      rule != null &&
+      listToDelete != null &&
+      handleDissasociateExceptionList != null,
+    [errorInfo.code, listToDelete, handleDissasociateExceptionList, rule]
+  );
+
+  useEffect((): void => {
+    // Yes, it's redundant, unfortunately typescript wasn't picking up
+    // that `listToDelete` is checked in canDisplay404Actions
+    if (canDisplay404Actions && listToDelete != null) {
+      setErrorMessage(i18n.ADD_EXCEPTION_FETCH_404_ERROR(listToDelete.id));
+    }
+
+    setErrorTitle(`${errorInfo.reason}${errorInfo.code != null ? ` (${errorInfo.code})` : ''}`);
+  }, [errorInfo.reason, errorInfo.code, listToDelete, canDisplay404Actions]);
+
+  const handleDissasociateList = useCallback((): void => {
+    // Yes, it's redundant, unfortunately typescript wasn't picking up
+    // that `handleDissasociateExceptionList` and `list` are checked in
+    // canDisplay404Actions
+    if (
+      canDisplay404Actions &&
+      rule != null &&
+      listToDelete != null &&
+      handleDissasociateExceptionList != null
+    ) {
+      const exceptionLists = (rule.exceptions_list ?? []).filter(
+        ({ id }) => id !== listToDelete.id
+      );
+
+      handleDissasociateExceptionList(exceptionLists);
+    }
+  }, [handleDissasociateExceptionList, listToDelete, canDisplay404Actions, rule]);
+
+  useEffect((): void => {
+    if (errorInfo.code === 404 && rule != null && rule.exceptions_list != null) {
+      const [listFound] = rule.exceptions_list.filter(
+        ({ id, list_id: listId }) =>
+          (errorInfo.details != null && errorInfo.details.includes(id)) ||
+          errorInfo.listListId === listId
+      );
+      setListToDelete(listFound);
+    }
+  }, [rule, errorInfo.details, errorInfo.code, errorInfo.listListId]);
+
+  return (
+    <EuiCallOut
+      data-test-subj="errorCalloutContainer"
+      title={`${i18n.ERROR}: ${errorTitle}`}
+      color="danger"
+      iconType="alert"
+    >
+      <EuiText size="s">
+        <p data-test-subj="errorCalloutMessage">{errorMessage}</p>
+      </EuiText>
+      <EuiSpacer />
+      {listToDelete != null && (
+        <EuiAccordion
+          id="accordion1"
+          buttonContent={
+            <EuiText size="s">
+              <p>{i18n.MODAL_ERROR_ACCORDION_TEXT}</p>
+            </EuiText>
+          }
+        >
+          <EuiCodeBlock
+            language="json"
+            fontSize="s"
+            paddingSize="m"
+            overflowHeight={300}
+            isCopyable
+          >
+            {JSON.stringify(listToDelete)}
+          </EuiCodeBlock>
+        </EuiAccordion>
+      )}
+      <EuiSpacer />
+      <EuiButtonEmpty
+        data-test-subj="errorCalloutCancelButton"
+        color="danger"
+        isDisabled={isDissasociatingList}
+        onClick={onCancel}
+      >
+        {i18n.CANCEL}
+      </EuiButtonEmpty>
+      {canDisplay404Actions && (
+        <EuiButton
+          data-test-subj="errorCalloutDissasociateButton"
+          isLoading={isDissasociatingList}
+          onClick={handleDissasociateList}
+          color="danger"
+        >
+          {i18n.CLEAR_EXCEPTIONS_LABEL}
+        </EuiButton>
+      )}
+    </EuiCallOut>
+  );
+};
+
+ErrorCalloutComponent.displayName = 'ErrorCalloutComponent';
+
+export const ErrorCallout = React.memo(ErrorCalloutComponent);
+
+ErrorCallout.displayName = 'ErrorCallout';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts b/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts
index 13e9d0df549f8..484a3d593026e 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts
@@ -190,3 +190,52 @@ export const TOTAL_ITEMS_FETCH_ERROR = i18n.translate(
     defaultMessage: 'Error getting exception item totals',
   }
 );
+
+export const CLEAR_EXCEPTIONS_LABEL = i18n.translate(
+  'xpack.securitySolution.exceptions.clearExceptionsLabel',
+  {
+    defaultMessage: 'Remove Exception List',
+  }
+);
+
+export const ADD_EXCEPTION_FETCH_404_ERROR = (listId: string) =>
+  i18n.translate('xpack.securitySolution.exceptions.fetch404Error', {
+    values: { listId },
+    defaultMessage:
+      'The associated exception list ({listId}) no longer exists. Please remove the missing exception list to add additional exceptions to the detection rule.',
+  });
+
+export const ADD_EXCEPTION_FETCH_ERROR = i18n.translate(
+  'xpack.securitySolution.exceptions.fetchError',
+  {
+    defaultMessage: 'Error fetching exception list',
+  }
+);
+
+export const ERROR = i18n.translate('xpack.securitySolution.exceptions.errorLabel', {
+  defaultMessage: 'Error',
+});
+
+export const CANCEL = i18n.translate('xpack.securitySolution.exceptions.cancelLabel', {
+  defaultMessage: 'Cancel',
+});
+
+export const MODAL_ERROR_ACCORDION_TEXT = i18n.translate(
+  'xpack.securitySolution.exceptions.modalErrorAccordionText',
+  {
+    defaultMessage: 'Show rule reference information:',
+  }
+);
+
+export const DISSASOCIATE_LIST_SUCCESS = (id: string) =>
+  i18n.translate('xpack.securitySolution.exceptions.dissasociateListSuccessText', {
+    values: { id },
+    defaultMessage: 'Exception list ({id}) has successfully been removed',
+  });
+
+export const DISSASOCIATE_EXCEPTION_LIST_ERROR = i18n.translate(
+  'xpack.securitySolution.exceptions.dissasociateExceptionListError',
+  {
+    defaultMessage: 'Failed to remove exception list',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
index 6611ee2385d10..46923e07d225a 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
@@ -148,6 +148,50 @@ describe('useAddOrUpdateException', () => {
     });
   });
 
+  it('invokes "onError" if call to add exception item fails', async () => {
+    const mockError = new Error('error adding item');
+
+    addExceptionListItem = jest
+      .spyOn(listsApi, 'addExceptionListItem')
+      .mockRejectedValue(mockError);
+
+    await act(async () => {
+      const { rerender, result, waitForNextUpdate } = render();
+      const addOrUpdateItems = await waitForAddOrUpdateFunc({
+        rerender,
+        result,
+        waitForNextUpdate,
+      });
+      if (addOrUpdateItems) {
+        addOrUpdateItems(...addOrUpdateItemsArgs);
+      }
+      await waitForNextUpdate();
+      expect(onError).toHaveBeenCalledWith(mockError, null, null);
+    });
+  });
+
+  it('invokes "onError" if call to update exception item fails', async () => {
+    const mockError = new Error('error updating item');
+
+    updateExceptionListItem = jest
+      .spyOn(listsApi, 'updateExceptionListItem')
+      .mockRejectedValue(mockError);
+
+    await act(async () => {
+      const { rerender, result, waitForNextUpdate } = render();
+      const addOrUpdateItems = await waitForAddOrUpdateFunc({
+        rerender,
+        result,
+        waitForNextUpdate,
+      });
+      if (addOrUpdateItems) {
+        addOrUpdateItems(...addOrUpdateItemsArgs);
+      }
+      await waitForNextUpdate();
+      expect(onError).toHaveBeenCalledWith(mockError, null, null);
+    });
+  });
+
   describe('when alertIdToClose is not passed in', () => {
     it('should not update the alert status', async () => {
       await act(async () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
index 9d45a411b5130..be289b0e85e66 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
@@ -42,7 +42,7 @@ export type ReturnUseAddOrUpdateException = [
 
 export interface UseAddOrUpdateExceptionProps {
   http: HttpStart;
-  onError: (arg: Error) => void;
+  onError: (arg: Error, code: number | null, message: string | null) => void;
   onSuccess: () => void;
 }
 
@@ -157,7 +157,11 @@ export const useAddOrUpdateException = ({
       } catch (error) {
         if (isSubscribed) {
           setIsLoading(false);
-          onError(error);
+          if (error.body != null) {
+            onError(error, error.body.status_code, error.body.message);
+          } else {
+            onError(error, null, null);
+          }
         }
       }
     };
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
index 39d88bd8e4724..f20a58b9ffa36 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
@@ -379,7 +379,7 @@ describe('useFetchOrCreateRuleExceptionList', () => {
         await waitForNextUpdate();
         await waitForNextUpdate();
         expect(onError).toHaveBeenCalledTimes(1);
-        expect(onError).toHaveBeenCalledWith(error);
+        expect(onError).toHaveBeenCalledWith(error, null, null);
       });
     });
 
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
index 0d367e03a799f..944631d4e9fb5 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
@@ -30,7 +30,7 @@ export interface UseFetchOrCreateRuleExceptionListProps {
   http: HttpStart;
   ruleId: Rule['id'];
   exceptionListType: ExceptionListSchema['type'];
-  onError: (arg: Error) => void;
+  onError: (arg: Error, code: number | null, message: string | null) => void;
   onSuccess?: (ruleWasChanged: boolean) => void;
 }
 
@@ -179,7 +179,11 @@ export const useFetchOrCreateRuleExceptionList = ({
         if (isSubscribed) {
           setIsLoading(false);
           setExceptionList(null);
-          onError(error);
+          if (error.body != null) {
+            onError(error, error.body.status_code, error.body.message);
+          } else {
+            onError(error, null, null);
+          }
         }
       }
     }
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
index 7482068454a97..c97895cdfe236 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
@@ -322,11 +322,13 @@ const ExceptionsViewerComponent = ({
         exceptionListTypeToEdit != null && (
           <EditExceptionModal
             ruleName={ruleName}
+            ruleId={ruleId}
             ruleIndices={ruleIndices}
             exceptionListType={exceptionListTypeToEdit}
             exceptionItem={exceptionToEdit}
             onCancel={handleOnCancelExceptionModal}
             onConfirm={handleOnConfirmExceptionModal}
+            onRuleChange={onRuleChange}
           />
         )}
 
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
new file mode 100644
index 0000000000000..6b1938655dc33
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { act, renderHook } from '@testing-library/react-hooks';
+
+import { createKibanaCoreStartMock } from '../../../../common/mock/kibana_core';
+
+import * as api from './api';
+import { ruleMock } from './mock';
+import {
+  ReturnUseDissasociateExceptionList,
+  UseDissasociateExceptionListProps,
+  useDissasociateExceptionList,
+} from './use_dissasociate_exception_list';
+
+const mockKibanaHttpService = createKibanaCoreStartMock().http;
+
+describe('useDissasociateExceptionList', () => {
+  const onError = jest.fn();
+  const onSuccess = jest.fn();
+
+  beforeEach(() => {
+    jest.spyOn(api, 'patchRule').mockResolvedValue(ruleMock);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('initializes hook', async () => {
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<
+        UseDissasociateExceptionListProps,
+        ReturnUseDissasociateExceptionList
+      >(() =>
+        useDissasociateExceptionList({
+          http: mockKibanaHttpService,
+          ruleRuleId: 'rule_id',
+          onError,
+          onSuccess,
+        })
+      );
+
+      await waitForNextUpdate();
+
+      expect(result.current).toEqual([false, null]);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
new file mode 100644
index 0000000000000..dffba3e6e0436
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useEffect, useState, useRef } from 'react';
+
+import { HttpStart } from '../../../../../../../../src/core/public';
+import { List } from '../../../../../common/detection_engine/schemas/types/lists';
+import { patchRule } from './api';
+
+type Func = (lists: List[]) => void;
+export type ReturnUseDissasociateExceptionList = [boolean, Func | null];
+
+export interface UseDissasociateExceptionListProps {
+  http: HttpStart;
+  ruleRuleId: string;
+  onError: (arg: Error) => void;
+  onSuccess: () => void;
+}
+
+/**
+ * Hook for removing an exception list reference from a rule
+ *
+ * @param http Kibana http service
+ * @param ruleRuleId a rule_id (NOT id)
+ * @param onError error callback
+ * @param onSuccess success callback
+ *
+ */
+export const useDissasociateExceptionList = ({
+  http,
+  ruleRuleId,
+  onError,
+  onSuccess,
+}: UseDissasociateExceptionListProps): ReturnUseDissasociateExceptionList => {
+  const [isLoading, setLoading] = useState(false);
+  const dissasociateList = useRef<Func | null>(null);
+
+  useEffect(() => {
+    let isSubscribed = true;
+    const abortCtrl = new AbortController();
+
+    const dissasociateListFromRule = (id: string) => async (
+      exceptionLists: List[]
+    ): Promise<void> => {
+      try {
+        if (isSubscribed) {
+          setLoading(true);
+
+          await patchRule({
+            ruleProperties: {
+              rule_id: id,
+              exceptions_list: exceptionLists,
+            },
+            signal: abortCtrl.signal,
+          });
+
+          onSuccess();
+          setLoading(false);
+        }
+      } catch (err) {
+        if (isSubscribed) {
+          setLoading(false);
+          onError(err);
+        }
+      }
+    };
+
+    dissasociateList.current = dissasociateListFromRule(ruleRuleId);
+
+    return (): void => {
+      isSubscribed = false;
+      abortCtrl.abort();
+    };
+  }, [http, ruleRuleId, onError, onSuccess]);
+
+  return [isLoading, dissasociateList.current];
+};

From d6c45a2e70a20d552c91f3df89da1cd081077209 Mon Sep 17 00:00:00 2001
From: Frank Hassanabad <frank.hassanabad@elastic.co>
Date: Wed, 26 Aug 2020 09:01:32 -0600
Subject: [PATCH 062/148] Fixes runtime error with meta when it is missing
 (#75844)

## Summary

Found in 7.9.0, if you post a rule with an action that has a missing "meta" then you are going to get errors in your UI that look something like:

```ts
An error occurred during rule execution: message: "Cannot read property 'kibana_siem_app_url' of null"
name: "Unusual Windows Remote User" id: "1cc27e7e-d7c7-4f6a-b918-8c272fc6b1a3"
rule id: "1781d055-5c66-4adf-9e93-fc0fa69550c9" signals index: ".siem-signals-default"
```

This fixes the accidental referencing of the null/undefined property and adds both integration and unit tests in that area of code.

If you have an action id handy you can manually test this by editing the json file of:

```ts
test_cases/queries/action_without_meta.json
```

to have your action id and then posting it like so:

```ts
./post_rule.sh ./rules/test_cases/queries/action_without_meta.json
```

### Checklist

Delete any items that are not applicable to this PR.

- [x] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios
---
 .../rules_notification_alert_type.test.ts     |  78 ++++++++++
 .../rules_notification_alert_type.ts          |   4 +-
 .../queries/action_without_meta.json          |  42 ++++++
 .../signals/signal_rule_alert_type.test.ts    | 100 +++++++++++++
 .../signals/signal_rule_alert_type.ts         |   3 +-
 .../security_and_spaces/tests/add_actions.ts  | 134 ++++++++++++++++++
 .../security_and_spaces/tests/index.ts        |   1 +
 .../detection_engine_api_integration/utils.ts |  43 ++++++
 8 files changed, 402 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/server/lib/detection_engine/scripts/rules/test_cases/queries/action_without_meta.json
 create mode 100644 x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts

diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts
index 3eefd3e665cd6..593ada470b118 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.test.ts
@@ -79,6 +79,84 @@ describe('rules_notification_alert_type', () => {
       );
     });
 
+    it('should resolve results_link when meta is undefined to use "/app/security"', async () => {
+      const ruleAlert = getResult();
+      delete ruleAlert.params.meta;
+      alertServices.savedObjectsClient.get.mockResolvedValue({
+        id: 'rule-id',
+        type: 'type',
+        references: [],
+        attributes: ruleAlert,
+      });
+      alertServices.callCluster.mockResolvedValue({
+        count: 10,
+      });
+
+      await alert.executor(payload);
+      expect(alertServices.alertInstanceFactory).toHaveBeenCalled();
+
+      const [{ value: alertInstanceMock }] = alertServices.alertInstanceFactory.mock.results;
+      expect(alertInstanceMock.scheduleActions).toHaveBeenCalledWith(
+        'default',
+        expect.objectContaining({
+          results_link:
+            '/app/security/detections/rules/id/rule-id?timerange=(global:(linkTo:!(timeline),timerange:(from:1576255233400,kind:absolute,to:1576341633400)),timeline:(linkTo:!(global),timerange:(from:1576255233400,kind:absolute,to:1576341633400)))',
+        })
+      );
+    });
+
+    it('should resolve results_link when meta is an empty object to use "/app/security"', async () => {
+      const ruleAlert = getResult();
+      ruleAlert.params.meta = {};
+      alertServices.savedObjectsClient.get.mockResolvedValue({
+        id: 'rule-id',
+        type: 'type',
+        references: [],
+        attributes: ruleAlert,
+      });
+      alertServices.callCluster.mockResolvedValue({
+        count: 10,
+      });
+      await alert.executor(payload);
+      expect(alertServices.alertInstanceFactory).toHaveBeenCalled();
+
+      const [{ value: alertInstanceMock }] = alertServices.alertInstanceFactory.mock.results;
+      expect(alertInstanceMock.scheduleActions).toHaveBeenCalledWith(
+        'default',
+        expect.objectContaining({
+          results_link:
+            '/app/security/detections/rules/id/rule-id?timerange=(global:(linkTo:!(timeline),timerange:(from:1576255233400,kind:absolute,to:1576341633400)),timeline:(linkTo:!(global),timerange:(from:1576255233400,kind:absolute,to:1576341633400)))',
+        })
+      );
+    });
+
+    it('should resolve results_link to custom kibana link when given one', async () => {
+      const ruleAlert = getResult();
+      ruleAlert.params.meta = {
+        kibana_siem_app_url: 'http://localhost',
+      };
+      alertServices.savedObjectsClient.get.mockResolvedValue({
+        id: 'rule-id',
+        type: 'type',
+        references: [],
+        attributes: ruleAlert,
+      });
+      alertServices.callCluster.mockResolvedValue({
+        count: 10,
+      });
+      await alert.executor(payload);
+      expect(alertServices.alertInstanceFactory).toHaveBeenCalled();
+
+      const [{ value: alertInstanceMock }] = alertServices.alertInstanceFactory.mock.results;
+      expect(alertInstanceMock.scheduleActions).toHaveBeenCalledWith(
+        'default',
+        expect.objectContaining({
+          results_link:
+            'http://localhost/detections/rules/id/rule-id?timerange=(global:(linkTo:!(timeline),timerange:(from:1576255233400,kind:absolute,to:1576341633400)),timeline:(linkTo:!(global),timerange:(from:1576255233400,kind:absolute,to:1576341633400)))',
+        })
+      );
+    });
+
     it('should not call alertInstanceFactory if signalsCount was 0', async () => {
       const ruleAlert = getResult();
       alertServices.savedObjectsClient.get.mockResolvedValue({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
index ab824957087fc..2eb34529d044c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
@@ -64,8 +64,8 @@ export const rulesNotificationAlertType = ({
       from: fromInMs,
       to: toInMs,
       id: ruleAlertSavedObject.id,
-      kibanaSiemAppUrl: (ruleAlertParams.meta as { kibana_siem_app_url?: string })
-        .kibana_siem_app_url,
+      kibanaSiemAppUrl: (ruleAlertParams.meta as { kibana_siem_app_url?: string } | undefined)
+        ?.kibana_siem_app_url,
     });
 
     logger.info(
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/rules/test_cases/queries/action_without_meta.json b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/rules/test_cases/queries/action_without_meta.json
new file mode 100644
index 0000000000000..6569a641de3a2
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/rules/test_cases/queries/action_without_meta.json
@@ -0,0 +1,42 @@
+{
+  "type": "query",
+  "index": [
+    "apm-*-transaction*",
+    "auditbeat-*",
+    "endgame-*",
+    "filebeat-*",
+    "logs-*",
+    "packetbeat-*",
+    "winlogbeat-*"
+  ],
+  "filters": [],
+  "language": "kuery",
+  "query": "host.name: *",
+  "author": [],
+  "false_positives": [],
+  "references": [],
+  "risk_score": 50,
+  "risk_score_mapping": [],
+  "severity": "low",
+  "severity_mapping": [],
+  "threat": [],
+  "name": "Host Name Test",
+  "description": "Host Name Test",
+  "tags": [],
+  "license": "",
+  "interval": "5m",
+  "from": "now-30s",
+  "to": "now",
+  "actions": [
+    {
+      "group": "default",
+      "id": "4c42ecf2-5e9b-4ce6-8a7a-ab620fd8b169",
+      "params": {
+        "body": "{}"
+      },
+      "action_type_id": ".webhook"
+    }
+  ],
+  "enabled": true,
+  "throttle": "rule"
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
index b0c855afa8be9..b29d15f5e5c72 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
@@ -16,6 +16,7 @@ import {
   getListsClient,
   getExceptions,
   sortExceptionItems,
+  parseScheduleDates,
 } from './utils';
 import { RuleExecutorOptions } from './types';
 import { searchAfterAndBulkCreate } from './search_after_bulk_create';
@@ -227,6 +228,105 @@ describe('rules_notification_alert_type', () => {
       );
     });
 
+    it('should resolve results_link when meta is an empty object to use "/app/security"', async () => {
+      const ruleAlert = getResult();
+      ruleAlert.params.meta = {};
+      ruleAlert.actions = [
+        {
+          actionTypeId: '.slack',
+          params: {
+            message:
+              'Rule generated {{state.signals_count}} signals\n\n{{context.rule.name}}\n{{{context.results_link}}}',
+          },
+          group: 'default',
+          id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+        },
+      ];
+
+      alertServices.savedObjectsClient.get.mockResolvedValue({
+        id: 'rule-id',
+        type: 'type',
+        references: [],
+        attributes: ruleAlert,
+      });
+      (parseScheduleDates as jest.Mock).mockReturnValue(moment(100));
+      payload.params.meta = {};
+      await alert.executor(payload);
+
+      expect(scheduleNotificationActions).toHaveBeenCalledWith(
+        expect.objectContaining({
+          resultsLink:
+            '/app/security/detections/rules/id/rule-id?timerange=(global:(linkTo:!(timeline),timerange:(from:100,kind:absolute,to:100)),timeline:(linkTo:!(global),timerange:(from:100,kind:absolute,to:100)))',
+        })
+      );
+    });
+
+    it('should resolve results_link when meta is undefined use "/app/security"', async () => {
+      const ruleAlert = getResult();
+      delete ruleAlert.params.meta;
+      ruleAlert.actions = [
+        {
+          actionTypeId: '.slack',
+          params: {
+            message:
+              'Rule generated {{state.signals_count}} signals\n\n{{context.rule.name}}\n{{{context.results_link}}}',
+          },
+          group: 'default',
+          id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+        },
+      ];
+
+      alertServices.savedObjectsClient.get.mockResolvedValue({
+        id: 'rule-id',
+        type: 'type',
+        references: [],
+        attributes: ruleAlert,
+      });
+      (parseScheduleDates as jest.Mock).mockReturnValue(moment(100));
+      delete payload.params.meta;
+      await alert.executor(payload);
+
+      expect(scheduleNotificationActions).toHaveBeenCalledWith(
+        expect.objectContaining({
+          resultsLink:
+            '/app/security/detections/rules/id/rule-id?timerange=(global:(linkTo:!(timeline),timerange:(from:100,kind:absolute,to:100)),timeline:(linkTo:!(global),timerange:(from:100,kind:absolute,to:100)))',
+        })
+      );
+    });
+
+    it('should resolve results_link with a custom link', async () => {
+      const ruleAlert = getResult();
+      ruleAlert.params.meta = { kibana_siem_app_url: 'http://localhost' };
+      ruleAlert.actions = [
+        {
+          actionTypeId: '.slack',
+          params: {
+            message:
+              'Rule generated {{state.signals_count}} signals\n\n{{context.rule.name}}\n{{{context.results_link}}}',
+          },
+          group: 'default',
+          id: '99403909-ca9b-49ba-9d7a-7e5320e68d05',
+        },
+      ];
+
+      alertServices.savedObjectsClient.get.mockResolvedValue({
+        id: 'rule-id',
+        type: 'type',
+        references: [],
+        attributes: ruleAlert,
+      });
+      (parseScheduleDates as jest.Mock).mockReturnValue(moment(100));
+      payload.params.meta = { kibana_siem_app_url: 'http://localhost' };
+      await alert.executor(payload);
+
+      expect(scheduleNotificationActions).toHaveBeenCalledWith(
+        expect.objectContaining({
+          resultsLink:
+            'http://localhost/detections/rules/id/rule-id?timerange=(global:(linkTo:!(timeline),timerange:(from:100,kind:absolute,to:100)),timeline:(linkTo:!(global),timerange:(from:100,kind:absolute,to:100)))',
+        })
+      );
+    });
+
     describe('ML rule', () => {
       it('should throw an error if ML plugin was not available', async () => {
         const ruleAlert = getMlResult();
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
index 0e859ecef31c6..b5cbf80b084f7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -356,7 +356,8 @@ export const signalRulesAlertType = ({
               from: fromInMs,
               to: toInMs,
               id: savedObject.id,
-              kibanaSiemAppUrl: (meta as { kibana_siem_app_url?: string }).kibana_siem_app_url,
+              kibanaSiemAppUrl: (meta as { kibana_siem_app_url?: string } | undefined)
+                ?.kibana_siem_app_url,
             });
 
             logger.info(
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts
new file mode 100644
index 0000000000000..2468851237047
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/add_actions.ts
@@ -0,0 +1,134 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+
+import { DETECTION_ENGINE_RULES_URL } from '../../../../plugins/security_solution/common/constants';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import {
+  createSignalsIndex,
+  deleteAllAlerts,
+  deleteSignalsIndex,
+  removeServerGeneratedProperties,
+  waitFor,
+  getWebHookAction,
+  getRuleWithWebHookAction,
+  getSimpleRuleOutputWithWebHookAction,
+} from '../../utils';
+import { CreateRulesSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request/create_rules_schema';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('add_actions', () => {
+    describe('adding actions', () => {
+      beforeEach(async () => {
+        await createSignalsIndex(supertest);
+      });
+
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest);
+        await deleteAllAlerts(es);
+      });
+
+      it('should be able to create a new webhook action and attach it to a rule', async () => {
+        // create a new action
+        const { body: hookAction } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        // create a rule with the action attached
+        const { body } = await supertest
+          .post(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getRuleWithWebHookAction(hookAction.id))
+          .expect(200);
+
+        const bodyToCompare = removeServerGeneratedProperties(body);
+        expect(bodyToCompare).to.eql(
+          getSimpleRuleOutputWithWebHookAction(`${bodyToCompare?.actions?.[0].id}`)
+        );
+      });
+
+      it('should be able to create a new webhook action and attach it to a rule without a meta field and run it correctly', async () => {
+        // create a new action
+        const { body: hookAction } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        // create a rule with the action attached
+        const { body: rule } = await supertest
+          .post(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getRuleWithWebHookAction(hookAction.id))
+          .expect(200);
+
+        // wait for Task Manager to execute the rule and its update status
+        await waitFor(async () => {
+          const { body } = await supertest
+            .post(`${DETECTION_ENGINE_RULES_URL}/_find_statuses`)
+            .set('kbn-xsrf', 'true')
+            .send({ ids: [rule.id] })
+            .expect(200);
+          return body[rule.id].current_status?.status === 'succeeded';
+        });
+
+        // expected result for status should be 'succeeded'
+        const { body } = await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_find_statuses`)
+          .set('kbn-xsrf', 'true')
+          .send({ ids: [rule.id] })
+          .expect(200);
+        expect(body[rule.id].current_status.status).to.eql('succeeded');
+      });
+
+      it('should be able to create a new webhook action and attach it to a rule with a meta field and run it correctly', async () => {
+        // create a new action
+        const { body: hookAction } = await supertest
+          .post('/api/actions/action')
+          .set('kbn-xsrf', 'true')
+          .send(getWebHookAction())
+          .expect(200);
+
+        // create a rule with the action attached and a meta field
+        const ruleWithAction: CreateRulesSchema = {
+          ...getRuleWithWebHookAction(hookAction.id),
+          meta: {},
+        };
+
+        const { body: rule } = await supertest
+          .post(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .send(ruleWithAction)
+          .expect(200);
+
+        // wait for Task Manager to execute the rule and update status
+        await waitFor(async () => {
+          const { body } = await supertest
+            .post(`${DETECTION_ENGINE_RULES_URL}/_find_statuses`)
+            .set('kbn-xsrf', 'true')
+            .send({ ids: [rule.id] })
+            .expect(200);
+          return body[rule.id].current_status?.status === 'succeeded';
+        });
+
+        // expected result for status should be 'succeeded'
+        const { body } = await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_find_statuses`)
+          .set('kbn-xsrf', 'true')
+          .send({ ids: [rule.id] })
+          .expect(200);
+        expect(body[rule.id].current_status.status).to.eql('succeeded');
+      });
+    });
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
index a480e63ff4a92..779205377621d 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
@@ -11,6 +11,7 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
   describe('detection engine api security and spaces enabled', function () {
     this.tags('ciGroup1');
 
+    loadTestFile(require.resolve('./add_actions'));
     loadTestFile(require.resolve('./add_prepackaged_rules'));
     loadTestFile(require.resolve('./create_rules'));
     loadTestFile(require.resolve('./create_rules_bulk'));
diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts
index 604133a1c2dc7..4cbbc142edd40 100644
--- a/x-pack/test/detection_engine_api_integration/utils.ts
+++ b/x-pack/test/detection_engine_api_integration/utils.ts
@@ -557,6 +557,49 @@ export const getComplexRuleOutput = (ruleId = 'rule-1'): Partial<RulesSchema> =>
   exceptions_list: [],
 });
 
+export const getWebHookAction = () => ({
+  actionTypeId: '.webhook',
+  config: {
+    method: 'post',
+    url: 'http://localhost',
+  },
+  secrets: {
+    user: 'example',
+    password: 'example',
+  },
+  name: 'Some connector',
+});
+
+export const getRuleWithWebHookAction = (id: string): CreateRulesSchema => ({
+  ...getSimpleRule(),
+  throttle: 'rule',
+  actions: [
+    {
+      group: 'default',
+      id,
+      params: {
+        body: '{}',
+      },
+      action_type_id: '.webhook',
+    },
+  ],
+});
+
+export const getSimpleRuleOutputWithWebHookAction = (actionId: string): Partial<RulesSchema> => ({
+  ...getSimpleRuleOutput(),
+  throttle: 'rule',
+  actions: [
+    {
+      action_type_id: '.webhook',
+      group: 'default',
+      id: actionId,
+      params: {
+        body: '{}',
+      },
+    },
+  ],
+});
+
 // Similar to ReactJs's waitFor from here: https://testing-library.com/docs/dom-testing-library/api-async#waitfor
 export const waitFor = async (
   functionToTest: () => Promise<boolean>,

From e773f221a3814700d55284bc34bd4637cc7312bd Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 26 Aug 2020 08:41:09 -0700
Subject: [PATCH 063/148] Revert "[Security Solution][Exceptions] - Improve UX
 for missing exception list associated with rule (#75898)"

This reverts commit b9c820120202dc44296e080550e87c93bd37dd55.
---
 .../exceptions/add_exception_modal/index.tsx  |  90 +++-------
 .../edit_exception_modal/index.test.tsx       |   5 -
 .../exceptions/edit_exception_modal/index.tsx |  91 +++-------
 .../exceptions/error_callout.test.tsx         | 160 -----------------
 .../components/exceptions/error_callout.tsx   | 169 ------------------
 .../components/exceptions/translations.ts     |  49 -----
 .../exceptions/use_add_exception.test.tsx     |  44 -----
 .../exceptions/use_add_exception.tsx          |   8 +-
 ...tch_or_create_rule_exception_list.test.tsx |   2 +-
 ...se_fetch_or_create_rule_exception_list.tsx |   8 +-
 .../components/exceptions/viewer/index.tsx    |   2 -
 .../use_dissasociate_exception_list.test.tsx  |  52 ------
 .../rules/use_dissasociate_exception_list.tsx |  80 ---------
 13 files changed, 54 insertions(+), 706 deletions(-)
 delete mode 100644 x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx

diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
index 21f82c6ab4c98..03051ead357c9 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
@@ -18,6 +18,7 @@ import {
   EuiCheckbox,
   EuiSpacer,
   EuiFormRow,
+  EuiCallOut,
   EuiText,
 } from '@elastic/eui';
 import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
@@ -27,7 +28,6 @@ import {
   ExceptionListType,
 } from '../../../../../public/lists_plugin_deps';
 import * as i18n from './translations';
-import * as sharedI18n from '../translations';
 import { TimelineNonEcsData, Ecs } from '../../../../graphql/types';
 import { useAppToasts } from '../../../hooks/use_app_toasts';
 import { useKibana } from '../../../lib/kibana';
@@ -35,7 +35,6 @@ import { ExceptionBuilderComponent } from '../builder';
 import { Loader } from '../../loader';
 import { useAddOrUpdateException } from '../use_add_exception';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
-import { useRuleAsync } from '../../../../detections/containers/detection_engine/rules/use_rule_async';
 import { useFetchOrCreateRuleExceptionList } from '../use_fetch_or_create_rule_exception_list';
 import { AddExceptionComments } from '../add_exception_comments';
 import {
@@ -47,7 +46,6 @@ import {
   entryHasNonEcsType,
   getMappedNonEcsValue,
 } from '../helpers';
-import { ErrorInfo, ErrorCallout } from '../error_callout';
 import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules';
 
 export interface AddExceptionModalBaseProps {
@@ -109,14 +107,13 @@ export const AddExceptionModal = memo(function AddExceptionModal({
 }: AddExceptionModalProps) {
   const { http } = useKibana().services;
   const [comment, setComment] = useState('');
-  const { rule: maybeRule } = useRuleAsync(ruleId);
   const [shouldCloseAlert, setShouldCloseAlert] = useState(false);
   const [shouldBulkCloseAlert, setShouldBulkCloseAlert] = useState(false);
   const [shouldDisableBulkClose, setShouldDisableBulkClose] = useState(false);
   const [exceptionItemsToAdd, setExceptionItemsToAdd] = useState<
     Array<ExceptionListItemSchema | CreateExceptionListItemSchema>
   >([]);
-  const [fetchOrCreateListError, setFetchOrCreateListError] = useState<ErrorInfo | null>(null);
+  const [fetchOrCreateListError, setFetchOrCreateListError] = useState(false);
   const { addError, addSuccess } = useAppToasts();
   const { loading: isSignalIndexLoading, signalIndexName } = useSignalIndex();
   const [
@@ -167,41 +164,17 @@ export const AddExceptionModal = memo(function AddExceptionModal({
     },
     [onRuleChange]
   );
-
-  const handleDissasociationSuccess = useCallback(
-    (id: string): void => {
-      handleRuleChange(true);
-      addSuccess(sharedI18n.DISSASOCIATE_LIST_SUCCESS(id));
-      onCancel();
-    },
-    [handleRuleChange, addSuccess, onCancel]
-  );
-
-  const handleDissasociationError = useCallback(
-    (error: Error): void => {
-      addError(error, { title: sharedI18n.DISSASOCIATE_EXCEPTION_LIST_ERROR });
-      onCancel();
-    },
-    [addError, onCancel]
-  );
-
-  const handleFetchOrCreateExceptionListError = useCallback(
-    (error: Error, statusCode: number | null, message: string | null) => {
-      setFetchOrCreateListError({
-        reason: error.message,
-        code: statusCode,
-        details: message,
-        listListId: null,
-      });
+  const onFetchOrCreateExceptionListError = useCallback(
+    (error: Error) => {
+      setFetchOrCreateListError(true);
     },
     [setFetchOrCreateListError]
   );
-
   const [isLoadingExceptionList, ruleExceptionList] = useFetchOrCreateRuleExceptionList({
     http,
     ruleId,
     exceptionListType,
-    onError: handleFetchOrCreateExceptionListError,
+    onError: onFetchOrCreateExceptionListError,
     onSuccess: handleRuleChange,
   });
 
@@ -306,9 +279,7 @@ export const AddExceptionModal = memo(function AddExceptionModal({
   ]);
 
   const isSubmitButtonDisabled = useMemo(
-    () =>
-      fetchOrCreateListError != null ||
-      exceptionItemsToAdd.every((item) => item.entries.length === 0),
+    () => fetchOrCreateListError || exceptionItemsToAdd.every((item) => item.entries.length === 0),
     [fetchOrCreateListError, exceptionItemsToAdd]
   );
 
@@ -324,27 +295,19 @@ export const AddExceptionModal = memo(function AddExceptionModal({
           </ModalHeaderSubtitle>
         </ModalHeader>
 
-        {fetchOrCreateListError != null && (
-          <EuiModalFooter>
-            <ErrorCallout
-              http={http}
-              errorInfo={fetchOrCreateListError}
-              rule={maybeRule}
-              onCancel={onCancel}
-              onSuccess={handleDissasociationSuccess}
-              onError={handleDissasociationError}
-              data-test-subj="addExceptionModalErrorCallout"
-            />
-          </EuiModalFooter>
+        {fetchOrCreateListError === true && (
+          <EuiCallOut title={i18n.ADD_EXCEPTION_FETCH_ERROR_TITLE} color="danger" iconType="alert">
+            <p>{i18n.ADD_EXCEPTION_FETCH_ERROR}</p>
+          </EuiCallOut>
         )}
-        {fetchOrCreateListError == null &&
+        {fetchOrCreateListError === false &&
           (isLoadingExceptionList ||
             isIndexPatternLoading ||
             isSignalIndexLoading ||
             isSignalIndexPatternLoading) && (
             <Loader data-test-subj="loadingAddExceptionModal" size="xl" />
           )}
-        {fetchOrCreateListError == null &&
+        {fetchOrCreateListError === false &&
           !isSignalIndexLoading &&
           !isSignalIndexPatternLoading &&
           !isLoadingExceptionList &&
@@ -414,21 +377,20 @@ export const AddExceptionModal = memo(function AddExceptionModal({
               </ModalBodySection>
             </>
           )}
-        {fetchOrCreateListError == null && (
-          <EuiModalFooter>
-            <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
 
-            <EuiButton
-              data-test-subj="add-exception-confirm-button"
-              onClick={onAddExceptionConfirm}
-              isLoading={addExceptionIsLoading}
-              isDisabled={isSubmitButtonDisabled}
-              fill
-            >
-              {i18n.ADD_EXCEPTION}
-            </EuiButton>
-          </EuiModalFooter>
-        )}
+        <EuiModalFooter>
+          <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
+
+          <EuiButton
+            data-test-subj="add-exception-confirm-button"
+            onClick={onAddExceptionConfirm}
+            isLoading={addExceptionIsLoading}
+            isDisabled={isSubmitButtonDisabled}
+            fill
+          >
+            {i18n.ADD_EXCEPTION}
+          </EuiButton>
+        </EuiModalFooter>
       </Modal>
     </EuiOverlayMask>
   );
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
index c724e6a2c711f..6ff218ca06059 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
@@ -77,7 +77,6 @@ describe('When the edit exception modal is opened', () => {
         <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
           <EditExceptionModal
             ruleIndices={[]}
-            ruleId="123"
             ruleName={ruleName}
             exceptionListType={'endpoint'}
             onCancel={jest.fn()}
@@ -106,7 +105,6 @@ describe('When the edit exception modal is opened', () => {
           <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
             <EditExceptionModal
               ruleIndices={['filebeat-*']}
-              ruleId="123"
               ruleName={ruleName}
               exceptionListType={'endpoint'}
               onCancel={jest.fn()}
@@ -149,7 +147,6 @@ describe('When the edit exception modal is opened', () => {
           <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
             <EditExceptionModal
               ruleIndices={['filebeat-*']}
-              ruleId="123"
               ruleName={ruleName}
               exceptionListType={'endpoint'}
               onCancel={jest.fn()}
@@ -193,7 +190,6 @@ describe('When the edit exception modal is opened', () => {
         <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
           <EditExceptionModal
             ruleIndices={['filebeat-*']}
-            ruleId="123"
             ruleName={ruleName}
             exceptionListType={'detection'}
             onCancel={jest.fn()}
@@ -233,7 +229,6 @@ describe('When the edit exception modal is opened', () => {
         <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
           <EditExceptionModal
             ruleIndices={['filebeat-*']}
-            ruleId="123"
             ruleName={ruleName}
             exceptionListType={'detection'}
             onCancel={jest.fn()}
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
index 41fc6ba57d715..a2c8531def2ba 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
@@ -23,14 +23,12 @@ import {
 } from '@elastic/eui';
 import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
-import { useRuleAsync } from '../../../../detections/containers/detection_engine/rules/use_rule_async';
 import {
   ExceptionListItemSchema,
   CreateExceptionListItemSchema,
   ExceptionListType,
 } from '../../../../../public/lists_plugin_deps';
 import * as i18n from './translations';
-import * as sharedI18n from '../translations';
 import { useKibana } from '../../../lib/kibana';
 import { useAppToasts } from '../../../hooks/use_app_toasts';
 import { ExceptionBuilderComponent } from '../builder';
@@ -45,17 +43,14 @@ import {
   lowercaseHashValues,
 } from '../helpers';
 import { Loader } from '../../loader';
-import { ErrorInfo, ErrorCallout } from '../error_callout';
 
 interface EditExceptionModalProps {
   ruleName: string;
-  ruleId: string;
   ruleIndices: string[];
   exceptionItem: ExceptionListItemSchema;
   exceptionListType: ExceptionListType;
   onCancel: () => void;
   onConfirm: () => void;
-  onRuleChange?: () => void;
 }
 
 const Modal = styled(EuiModal)`
@@ -88,18 +83,14 @@ const ModalBodySection = styled.section`
 
 export const EditExceptionModal = memo(function EditExceptionModal({
   ruleName,
-  ruleId,
   ruleIndices,
   exceptionItem,
   exceptionListType,
   onCancel,
   onConfirm,
-  onRuleChange,
 }: EditExceptionModalProps) {
   const { http } = useKibana().services;
   const [comment, setComment] = useState('');
-  const { rule: maybeRule } = useRuleAsync(ruleId);
-  const [updateError, setUpdateError] = useState<ErrorInfo | null>(null);
   const [hasVersionConflict, setHasVersionConflict] = useState(false);
   const [shouldBulkCloseAlert, setShouldBulkCloseAlert] = useState(false);
   const [shouldDisableBulkClose, setShouldDisableBulkClose] = useState(false);
@@ -117,44 +108,18 @@ export const EditExceptionModal = memo(function EditExceptionModal({
     'rules'
   );
 
-  const handleExceptionUpdateError = useCallback(
-    (error: Error, statusCode: number | null, message: string | null) => {
+  const onError = useCallback(
+    (error) => {
       if (error.message.includes('Conflict')) {
         setHasVersionConflict(true);
       } else {
-        setUpdateError({
-          reason: error.message,
-          code: statusCode,
-          details: message,
-          listListId: exceptionItem.list_id,
-        });
+        addError(error, { title: i18n.EDIT_EXCEPTION_ERROR });
+        onCancel();
       }
     },
-    [setUpdateError, setHasVersionConflict, exceptionItem.list_id]
-  );
-
-  const handleDissasociationSuccess = useCallback(
-    (id: string): void => {
-      addSuccess(sharedI18n.DISSASOCIATE_LIST_SUCCESS(id));
-
-      if (onRuleChange) {
-        onRuleChange();
-      }
-
-      onCancel();
-    },
-    [addSuccess, onCancel, onRuleChange]
-  );
-
-  const handleDissasociationError = useCallback(
-    (error: Error): void => {
-      addError(error, { title: sharedI18n.DISSASOCIATE_EXCEPTION_LIST_ERROR });
-      onCancel();
-    },
     [addError, onCancel]
   );
-
-  const handleExceptionUpdateSuccess = useCallback((): void => {
+  const onSuccess = useCallback(() => {
     addSuccess(i18n.EDIT_EXCEPTION_SUCCESS);
     onConfirm();
   }, [addSuccess, onConfirm]);
@@ -162,8 +127,8 @@ export const EditExceptionModal = memo(function EditExceptionModal({
   const [{ isLoading: addExceptionIsLoading }, addOrUpdateExceptionItems] = useAddOrUpdateException(
     {
       http,
-      onSuccess: handleExceptionUpdateSuccess,
-      onError: handleExceptionUpdateError,
+      onSuccess,
+      onError,
     }
   );
 
@@ -257,9 +222,11 @@ export const EditExceptionModal = memo(function EditExceptionModal({
             {ruleName}
           </ModalHeaderSubtitle>
         </ModalHeader>
+
         {(addExceptionIsLoading || isIndexPatternLoading || isSignalIndexLoading) && (
           <Loader data-test-subj="loadingEditExceptionModal" size="xl" />
         )}
+
         {!isSignalIndexLoading && !addExceptionIsLoading && !isIndexPatternLoading && (
           <>
             <ModalBodySection className="builder-section">
@@ -313,18 +280,7 @@ export const EditExceptionModal = memo(function EditExceptionModal({
             </ModalBodySection>
           </>
         )}
-        {updateError != null && (
-          <ModalBodySection>
-            <ErrorCallout
-              http={http}
-              errorInfo={updateError}
-              rule={maybeRule}
-              onCancel={onCancel}
-              onSuccess={handleDissasociationSuccess}
-              onError={handleDissasociationError}
-            />
-          </ModalBodySection>
-        )}
+
         {hasVersionConflict && (
           <ModalBodySection>
             <EuiCallOut title={i18n.VERSION_CONFLICT_ERROR_TITLE} color="danger" iconType="alert">
@@ -332,21 +288,20 @@ export const EditExceptionModal = memo(function EditExceptionModal({
             </EuiCallOut>
           </ModalBodySection>
         )}
-        {updateError == null && (
-          <EuiModalFooter>
-            <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
 
-            <EuiButton
-              data-test-subj="edit-exception-confirm-button"
-              onClick={onEditExceptionConfirm}
-              isLoading={addExceptionIsLoading}
-              isDisabled={isSubmitButtonDisabled}
-              fill
-            >
-              {i18n.EDIT_EXCEPTION_SAVE_BUTTON}
-            </EuiButton>
-          </EuiModalFooter>
-        )}
+        <EuiModalFooter>
+          <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
+
+          <EuiButton
+            data-test-subj="edit-exception-confirm-button"
+            onClick={onEditExceptionConfirm}
+            isLoading={addExceptionIsLoading}
+            isDisabled={isSubmitButtonDisabled}
+            fill
+          >
+            {i18n.EDIT_EXCEPTION_SAVE_BUTTON}
+          </EuiButton>
+        </EuiModalFooter>
       </Modal>
     </EuiOverlayMask>
   );
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
deleted file mode 100644
index c9efa5e54dccf..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { ThemeProvider } from 'styled-components';
-import { mountWithIntl } from 'test_utils/enzyme_helpers';
-import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
-
-import { getListMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
-import { useDissasociateExceptionList } from '../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list';
-import { createKibanaCoreStartMock } from '../../mock/kibana_core';
-import { ErrorCallout } from './error_callout';
-import { savedRuleMock } from '../../../detections/containers/detection_engine/rules/mock';
-
-jest.mock('../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list');
-
-const mockKibanaHttpService = createKibanaCoreStartMock().http;
-
-describe('ErrorCallout', () => {
-  const mockDissasociate = jest.fn();
-
-  beforeEach(() => {
-    (useDissasociateExceptionList as jest.Mock).mockReturnValue([false, mockDissasociate]);
-  });
-
-  it('it renders error details', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
-        <ErrorCallout
-          http={mockKibanaHttpService}
-          errorInfo={{
-            reason: 'error reason',
-            code: 500,
-            details: null,
-            listListId: null,
-          }}
-          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
-          onCancel={jest.fn()}
-          onSuccess={jest.fn()}
-          onError={jest.fn()}
-        />
-      </ThemeProvider>
-    );
-
-    expect(
-      wrapper.find('[data-test-subj="errorCalloutContainer"] .euiCallOutHeader__title').text()
-    ).toEqual('Error: error reason (500)');
-    expect(wrapper.find('[data-test-subj="errorCalloutMessage"]').at(0).text()).toEqual(
-      'Error fetching exception list'
-    );
-  });
-
-  it('it invokes "onCancel" when cancel button clicked', () => {
-    const mockOnCancel = jest.fn();
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
-        <ErrorCallout
-          http={mockKibanaHttpService}
-          errorInfo={{
-            reason: 'error reason',
-            code: 500,
-            details: null,
-            listListId: null,
-          }}
-          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
-          onCancel={mockOnCancel}
-          onSuccess={jest.fn()}
-          onError={jest.fn()}
-        />
-      </ThemeProvider>
-    );
-
-    wrapper.find('[data-test-subj="errorCalloutCancelButton"]').at(0).simulate('click');
-
-    expect(mockOnCancel).toHaveBeenCalled();
-  });
-
-  it('it does not render status code if not available', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
-        <ErrorCallout
-          http={mockKibanaHttpService}
-          errorInfo={{
-            reason: 'not found',
-            code: null,
-            details: 'list of id "some_uuid" not found',
-            listListId: null,
-          }}
-          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
-          onCancel={jest.fn()}
-          onSuccess={jest.fn()}
-          onError={jest.fn()}
-        />
-      </ThemeProvider>
-    );
-
-    expect(
-      wrapper.find('[data-test-subj="errorCalloutContainer"] .euiCallOutHeader__title').text()
-    ).toEqual('Error: not found');
-    expect(wrapper.find('[data-test-subj="errorCalloutMessage"]').at(0).text()).toEqual(
-      'Error fetching exception list'
-    );
-    expect(wrapper.find('[data-test-subj="errorCalloutDissasociateButton"]').exists()).toBeFalsy();
-  });
-
-  it('it renders specific missing exceptions list error', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
-        <ErrorCallout
-          http={mockKibanaHttpService}
-          errorInfo={{
-            reason: 'not found',
-            code: 404,
-            details: 'list of id "some_uuid" not found',
-            listListId: null,
-          }}
-          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
-          onCancel={jest.fn()}
-          onSuccess={jest.fn()}
-          onError={jest.fn()}
-        />
-      </ThemeProvider>
-    );
-
-    expect(
-      wrapper.find('[data-test-subj="errorCalloutContainer"] .euiCallOutHeader__title').text()
-    ).toEqual('Error: not found (404)');
-    expect(wrapper.find('[data-test-subj="errorCalloutMessage"]').at(0).text()).toEqual(
-      'The associated exception list (some_uuid) no longer exists. Please remove the missing exception list to add additional exceptions to the detection rule.'
-    );
-    expect(wrapper.find('[data-test-subj="errorCalloutDissasociateButton"]').exists()).toBeTruthy();
-  });
-
-  it('it dissasociates list from rule when remove exception list clicked ', () => {
-    const wrapper = mountWithIntl(
-      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
-        <ErrorCallout
-          http={mockKibanaHttpService}
-          errorInfo={{
-            reason: 'not found',
-            code: 404,
-            details: 'list of id "some_uuid" not found',
-            listListId: null,
-          }}
-          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
-          onCancel={jest.fn()}
-          onSuccess={jest.fn()}
-          onError={jest.fn()}
-        />
-      </ThemeProvider>
-    );
-
-    wrapper.find('[data-test-subj="errorCalloutDissasociateButton"]').at(0).simulate('click');
-
-    expect(mockDissasociate).toHaveBeenCalledWith([]);
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
deleted file mode 100644
index a2419ef16df3a..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React, { useMemo, useEffect, useState, useCallback } from 'react';
-import {
-  EuiButtonEmpty,
-  EuiAccordion,
-  EuiCodeBlock,
-  EuiButton,
-  EuiCallOut,
-  EuiText,
-  EuiSpacer,
-} from '@elastic/eui';
-
-import { HttpSetup } from '../../../../../../../src/core/public';
-import { List } from '../../../../common/detection_engine/schemas/types/lists';
-import { Rule } from '../../../detections/containers/detection_engine/rules/types';
-import * as i18n from './translations';
-import { useDissasociateExceptionList } from '../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list';
-
-export interface ErrorInfo {
-  reason: string | null;
-  code: number | null;
-  details: string | null;
-  listListId: string | null;
-}
-
-export interface ErrorCalloutProps {
-  http: HttpSetup;
-  rule: Rule | null;
-  errorInfo: ErrorInfo;
-  onCancel: () => void;
-  onSuccess: (listId: string) => void;
-  onError: (arg: Error) => void;
-}
-
-const ErrorCalloutComponent = ({
-  http,
-  rule,
-  errorInfo,
-  onCancel,
-  onError,
-  onSuccess,
-}: ErrorCalloutProps): JSX.Element => {
-  const [listToDelete, setListToDelete] = useState<List | null>(null);
-  const [errorTitle, setErrorTitle] = useState<string>('');
-  const [errorMessage, setErrorMessage] = useState<string>(i18n.ADD_EXCEPTION_FETCH_ERROR);
-
-  const handleOnSuccess = useCallback((): void => {
-    onSuccess(listToDelete != null ? listToDelete.id : '');
-  }, [onSuccess, listToDelete]);
-
-  const [isDissasociatingList, handleDissasociateExceptionList] = useDissasociateExceptionList({
-    http,
-    ruleRuleId: rule != null ? rule.rule_id : '',
-    onSuccess: handleOnSuccess,
-    onError,
-  });
-
-  const canDisplay404Actions = useMemo(
-    (): boolean =>
-      errorInfo.code === 404 &&
-      rule != null &&
-      listToDelete != null &&
-      handleDissasociateExceptionList != null,
-    [errorInfo.code, listToDelete, handleDissasociateExceptionList, rule]
-  );
-
-  useEffect((): void => {
-    // Yes, it's redundant, unfortunately typescript wasn't picking up
-    // that `listToDelete` is checked in canDisplay404Actions
-    if (canDisplay404Actions && listToDelete != null) {
-      setErrorMessage(i18n.ADD_EXCEPTION_FETCH_404_ERROR(listToDelete.id));
-    }
-
-    setErrorTitle(`${errorInfo.reason}${errorInfo.code != null ? ` (${errorInfo.code})` : ''}`);
-  }, [errorInfo.reason, errorInfo.code, listToDelete, canDisplay404Actions]);
-
-  const handleDissasociateList = useCallback((): void => {
-    // Yes, it's redundant, unfortunately typescript wasn't picking up
-    // that `handleDissasociateExceptionList` and `list` are checked in
-    // canDisplay404Actions
-    if (
-      canDisplay404Actions &&
-      rule != null &&
-      listToDelete != null &&
-      handleDissasociateExceptionList != null
-    ) {
-      const exceptionLists = (rule.exceptions_list ?? []).filter(
-        ({ id }) => id !== listToDelete.id
-      );
-
-      handleDissasociateExceptionList(exceptionLists);
-    }
-  }, [handleDissasociateExceptionList, listToDelete, canDisplay404Actions, rule]);
-
-  useEffect((): void => {
-    if (errorInfo.code === 404 && rule != null && rule.exceptions_list != null) {
-      const [listFound] = rule.exceptions_list.filter(
-        ({ id, list_id: listId }) =>
-          (errorInfo.details != null && errorInfo.details.includes(id)) ||
-          errorInfo.listListId === listId
-      );
-      setListToDelete(listFound);
-    }
-  }, [rule, errorInfo.details, errorInfo.code, errorInfo.listListId]);
-
-  return (
-    <EuiCallOut
-      data-test-subj="errorCalloutContainer"
-      title={`${i18n.ERROR}: ${errorTitle}`}
-      color="danger"
-      iconType="alert"
-    >
-      <EuiText size="s">
-        <p data-test-subj="errorCalloutMessage">{errorMessage}</p>
-      </EuiText>
-      <EuiSpacer />
-      {listToDelete != null && (
-        <EuiAccordion
-          id="accordion1"
-          buttonContent={
-            <EuiText size="s">
-              <p>{i18n.MODAL_ERROR_ACCORDION_TEXT}</p>
-            </EuiText>
-          }
-        >
-          <EuiCodeBlock
-            language="json"
-            fontSize="s"
-            paddingSize="m"
-            overflowHeight={300}
-            isCopyable
-          >
-            {JSON.stringify(listToDelete)}
-          </EuiCodeBlock>
-        </EuiAccordion>
-      )}
-      <EuiSpacer />
-      <EuiButtonEmpty
-        data-test-subj="errorCalloutCancelButton"
-        color="danger"
-        isDisabled={isDissasociatingList}
-        onClick={onCancel}
-      >
-        {i18n.CANCEL}
-      </EuiButtonEmpty>
-      {canDisplay404Actions && (
-        <EuiButton
-          data-test-subj="errorCalloutDissasociateButton"
-          isLoading={isDissasociatingList}
-          onClick={handleDissasociateList}
-          color="danger"
-        >
-          {i18n.CLEAR_EXCEPTIONS_LABEL}
-        </EuiButton>
-      )}
-    </EuiCallOut>
-  );
-};
-
-ErrorCalloutComponent.displayName = 'ErrorCalloutComponent';
-
-export const ErrorCallout = React.memo(ErrorCalloutComponent);
-
-ErrorCallout.displayName = 'ErrorCallout';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts b/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts
index 484a3d593026e..13e9d0df549f8 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts
@@ -190,52 +190,3 @@ export const TOTAL_ITEMS_FETCH_ERROR = i18n.translate(
     defaultMessage: 'Error getting exception item totals',
   }
 );
-
-export const CLEAR_EXCEPTIONS_LABEL = i18n.translate(
-  'xpack.securitySolution.exceptions.clearExceptionsLabel',
-  {
-    defaultMessage: 'Remove Exception List',
-  }
-);
-
-export const ADD_EXCEPTION_FETCH_404_ERROR = (listId: string) =>
-  i18n.translate('xpack.securitySolution.exceptions.fetch404Error', {
-    values: { listId },
-    defaultMessage:
-      'The associated exception list ({listId}) no longer exists. Please remove the missing exception list to add additional exceptions to the detection rule.',
-  });
-
-export const ADD_EXCEPTION_FETCH_ERROR = i18n.translate(
-  'xpack.securitySolution.exceptions.fetchError',
-  {
-    defaultMessage: 'Error fetching exception list',
-  }
-);
-
-export const ERROR = i18n.translate('xpack.securitySolution.exceptions.errorLabel', {
-  defaultMessage: 'Error',
-});
-
-export const CANCEL = i18n.translate('xpack.securitySolution.exceptions.cancelLabel', {
-  defaultMessage: 'Cancel',
-});
-
-export const MODAL_ERROR_ACCORDION_TEXT = i18n.translate(
-  'xpack.securitySolution.exceptions.modalErrorAccordionText',
-  {
-    defaultMessage: 'Show rule reference information:',
-  }
-);
-
-export const DISSASOCIATE_LIST_SUCCESS = (id: string) =>
-  i18n.translate('xpack.securitySolution.exceptions.dissasociateListSuccessText', {
-    values: { id },
-    defaultMessage: 'Exception list ({id}) has successfully been removed',
-  });
-
-export const DISSASOCIATE_EXCEPTION_LIST_ERROR = i18n.translate(
-  'xpack.securitySolution.exceptions.dissasociateExceptionListError',
-  {
-    defaultMessage: 'Failed to remove exception list',
-  }
-);
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
index 46923e07d225a..6611ee2385d10 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
@@ -148,50 +148,6 @@ describe('useAddOrUpdateException', () => {
     });
   });
 
-  it('invokes "onError" if call to add exception item fails', async () => {
-    const mockError = new Error('error adding item');
-
-    addExceptionListItem = jest
-      .spyOn(listsApi, 'addExceptionListItem')
-      .mockRejectedValue(mockError);
-
-    await act(async () => {
-      const { rerender, result, waitForNextUpdate } = render();
-      const addOrUpdateItems = await waitForAddOrUpdateFunc({
-        rerender,
-        result,
-        waitForNextUpdate,
-      });
-      if (addOrUpdateItems) {
-        addOrUpdateItems(...addOrUpdateItemsArgs);
-      }
-      await waitForNextUpdate();
-      expect(onError).toHaveBeenCalledWith(mockError, null, null);
-    });
-  });
-
-  it('invokes "onError" if call to update exception item fails', async () => {
-    const mockError = new Error('error updating item');
-
-    updateExceptionListItem = jest
-      .spyOn(listsApi, 'updateExceptionListItem')
-      .mockRejectedValue(mockError);
-
-    await act(async () => {
-      const { rerender, result, waitForNextUpdate } = render();
-      const addOrUpdateItems = await waitForAddOrUpdateFunc({
-        rerender,
-        result,
-        waitForNextUpdate,
-      });
-      if (addOrUpdateItems) {
-        addOrUpdateItems(...addOrUpdateItemsArgs);
-      }
-      await waitForNextUpdate();
-      expect(onError).toHaveBeenCalledWith(mockError, null, null);
-    });
-  });
-
   describe('when alertIdToClose is not passed in', () => {
     it('should not update the alert status', async () => {
       await act(async () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
index be289b0e85e66..9d45a411b5130 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
@@ -42,7 +42,7 @@ export type ReturnUseAddOrUpdateException = [
 
 export interface UseAddOrUpdateExceptionProps {
   http: HttpStart;
-  onError: (arg: Error, code: number | null, message: string | null) => void;
+  onError: (arg: Error) => void;
   onSuccess: () => void;
 }
 
@@ -157,11 +157,7 @@ export const useAddOrUpdateException = ({
       } catch (error) {
         if (isSubscribed) {
           setIsLoading(false);
-          if (error.body != null) {
-            onError(error, error.body.status_code, error.body.message);
-          } else {
-            onError(error, null, null);
-          }
+          onError(error);
         }
       }
     };
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
index f20a58b9ffa36..39d88bd8e4724 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
@@ -379,7 +379,7 @@ describe('useFetchOrCreateRuleExceptionList', () => {
         await waitForNextUpdate();
         await waitForNextUpdate();
         expect(onError).toHaveBeenCalledTimes(1);
-        expect(onError).toHaveBeenCalledWith(error, null, null);
+        expect(onError).toHaveBeenCalledWith(error);
       });
     });
 
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
index 944631d4e9fb5..0d367e03a799f 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
@@ -30,7 +30,7 @@ export interface UseFetchOrCreateRuleExceptionListProps {
   http: HttpStart;
   ruleId: Rule['id'];
   exceptionListType: ExceptionListSchema['type'];
-  onError: (arg: Error, code: number | null, message: string | null) => void;
+  onError: (arg: Error) => void;
   onSuccess?: (ruleWasChanged: boolean) => void;
 }
 
@@ -179,11 +179,7 @@ export const useFetchOrCreateRuleExceptionList = ({
         if (isSubscribed) {
           setIsLoading(false);
           setExceptionList(null);
-          if (error.body != null) {
-            onError(error, error.body.status_code, error.body.message);
-          } else {
-            onError(error, null, null);
-          }
+          onError(error);
         }
       }
     }
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
index c97895cdfe236..7482068454a97 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
@@ -322,13 +322,11 @@ const ExceptionsViewerComponent = ({
         exceptionListTypeToEdit != null && (
           <EditExceptionModal
             ruleName={ruleName}
-            ruleId={ruleId}
             ruleIndices={ruleIndices}
             exceptionListType={exceptionListTypeToEdit}
             exceptionItem={exceptionToEdit}
             onCancel={handleOnCancelExceptionModal}
             onConfirm={handleOnConfirmExceptionModal}
-            onRuleChange={onRuleChange}
           />
         )}
 
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
deleted file mode 100644
index 6b1938655dc33..0000000000000
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { act, renderHook } from '@testing-library/react-hooks';
-
-import { createKibanaCoreStartMock } from '../../../../common/mock/kibana_core';
-
-import * as api from './api';
-import { ruleMock } from './mock';
-import {
-  ReturnUseDissasociateExceptionList,
-  UseDissasociateExceptionListProps,
-  useDissasociateExceptionList,
-} from './use_dissasociate_exception_list';
-
-const mockKibanaHttpService = createKibanaCoreStartMock().http;
-
-describe('useDissasociateExceptionList', () => {
-  const onError = jest.fn();
-  const onSuccess = jest.fn();
-
-  beforeEach(() => {
-    jest.spyOn(api, 'patchRule').mockResolvedValue(ruleMock);
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('initializes hook', async () => {
-    await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<
-        UseDissasociateExceptionListProps,
-        ReturnUseDissasociateExceptionList
-      >(() =>
-        useDissasociateExceptionList({
-          http: mockKibanaHttpService,
-          ruleRuleId: 'rule_id',
-          onError,
-          onSuccess,
-        })
-      );
-
-      await waitForNextUpdate();
-
-      expect(result.current).toEqual([false, null]);
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
deleted file mode 100644
index dffba3e6e0436..0000000000000
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { useEffect, useState, useRef } from 'react';
-
-import { HttpStart } from '../../../../../../../../src/core/public';
-import { List } from '../../../../../common/detection_engine/schemas/types/lists';
-import { patchRule } from './api';
-
-type Func = (lists: List[]) => void;
-export type ReturnUseDissasociateExceptionList = [boolean, Func | null];
-
-export interface UseDissasociateExceptionListProps {
-  http: HttpStart;
-  ruleRuleId: string;
-  onError: (arg: Error) => void;
-  onSuccess: () => void;
-}
-
-/**
- * Hook for removing an exception list reference from a rule
- *
- * @param http Kibana http service
- * @param ruleRuleId a rule_id (NOT id)
- * @param onError error callback
- * @param onSuccess success callback
- *
- */
-export const useDissasociateExceptionList = ({
-  http,
-  ruleRuleId,
-  onError,
-  onSuccess,
-}: UseDissasociateExceptionListProps): ReturnUseDissasociateExceptionList => {
-  const [isLoading, setLoading] = useState(false);
-  const dissasociateList = useRef<Func | null>(null);
-
-  useEffect(() => {
-    let isSubscribed = true;
-    const abortCtrl = new AbortController();
-
-    const dissasociateListFromRule = (id: string) => async (
-      exceptionLists: List[]
-    ): Promise<void> => {
-      try {
-        if (isSubscribed) {
-          setLoading(true);
-
-          await patchRule({
-            ruleProperties: {
-              rule_id: id,
-              exceptions_list: exceptionLists,
-            },
-            signal: abortCtrl.signal,
-          });
-
-          onSuccess();
-          setLoading(false);
-        }
-      } catch (err) {
-        if (isSubscribed) {
-          setLoading(false);
-          onError(err);
-        }
-      }
-    };
-
-    dissasociateList.current = dissasociateListFromRule(ruleRuleId);
-
-    return (): void => {
-      isSubscribed = false;
-      abortCtrl.abort();
-    };
-  }, [http, ruleRuleId, onError, onSuccess]);
-
-  return [isLoading, dissasociateList.current];
-};

From 5a9d227eee1b53673c6445c00746a0846bb69e48 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 26 Aug 2020 08:03:12 -0700
Subject: [PATCH 064/148] Downloads Chrome 84 and adds to PATH

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/dev/ci_setup/setup_env.sh | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh
index 72ec73ad810e6..a82ca011b8a5d 100644
--- a/src/dev/ci_setup/setup_env.sh
+++ b/src/dev/ci_setup/setup_env.sh
@@ -10,6 +10,7 @@ installNode=$1
 
 dir="$(pwd)"
 cacheDir="$HOME/.kibana"
+downloads="$cacheDir/downloads"
 
 RED='\033[0;31m'
 C_RESET='\033[0m' # Reset color
@@ -133,6 +134,26 @@ export CYPRESS_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudf
 
 export CHECKS_REPORTER_ACTIVE=false
 
+###
+### Download Chrome and install to this shell
+###
+
+# Available using the version information search at https://omahaproxy.appspot.com/
+chromeVersion=84
+
+mkdir -p "$downloads"
+
+if [ -d $cacheDir/chrome-$chromeVersion/chrome-linux ]; then
+  echo " -- Chrome already downloaded and extracted"
+else
+  mkdir -p "$cacheDir/chrome-$chromeVersion"
+
+  echo " -- Downloading and extracting Chrome"
+  curl -o "$downloads/chrome.zip" -L "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/chrome_$chromeVersion.zip"
+  unzip -o "$downloads/chrome.zip" -d "$cacheDir/chrome-$chromeVersion"
+  export PATH="$cacheDir/chrome-$chromeVersion/chrome-linux:$PATH"
+fi
+
 # This is mainly for release-manager builds, which run in an environment that doesn't have Chrome installed
 if [[ "$(which google-chrome-stable)" || "$(which google-chrome)" ]]; then
   echo "Chrome detected, setting DETECT_CHROMEDRIVER_VERSION=true"

From 1ca76514933463220e32f4b246c5ba14a553d9a9 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 26 Aug 2020 09:28:22 -0700
Subject: [PATCH 065/148] Revert "Downloads Chrome 84 and adds to PATH"

This reverts commit 5a9d227eee1b53673c6445c00746a0846bb69e48.
---
 src/dev/ci_setup/setup_env.sh | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh
index a82ca011b8a5d..72ec73ad810e6 100644
--- a/src/dev/ci_setup/setup_env.sh
+++ b/src/dev/ci_setup/setup_env.sh
@@ -10,7 +10,6 @@ installNode=$1
 
 dir="$(pwd)"
 cacheDir="$HOME/.kibana"
-downloads="$cacheDir/downloads"
 
 RED='\033[0;31m'
 C_RESET='\033[0m' # Reset color
@@ -134,26 +133,6 @@ export CYPRESS_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudf
 
 export CHECKS_REPORTER_ACTIVE=false
 
-###
-### Download Chrome and install to this shell
-###
-
-# Available using the version information search at https://omahaproxy.appspot.com/
-chromeVersion=84
-
-mkdir -p "$downloads"
-
-if [ -d $cacheDir/chrome-$chromeVersion/chrome-linux ]; then
-  echo " -- Chrome already downloaded and extracted"
-else
-  mkdir -p "$cacheDir/chrome-$chromeVersion"
-
-  echo " -- Downloading and extracting Chrome"
-  curl -o "$downloads/chrome.zip" -L "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/chrome_$chromeVersion.zip"
-  unzip -o "$downloads/chrome.zip" -d "$cacheDir/chrome-$chromeVersion"
-  export PATH="$cacheDir/chrome-$chromeVersion/chrome-linux:$PATH"
-fi
-
 # This is mainly for release-manager builds, which run in an environment that doesn't have Chrome installed
 if [[ "$(which google-chrome-stable)" || "$(which google-chrome)" ]]; then
   echo "Chrome detected, setting DETECT_CHROMEDRIVER_VERSION=true"

From 5447565f0b6b4bca90785268e5008fa9243869ea Mon Sep 17 00:00:00 2001
From: Jen Huang <its.jenetic@gmail.com>
Date: Wed, 26 Aug 2020 10:55:27 -0700
Subject: [PATCH 066/148] [Ingest Manager] Return ID when default output is
 found (#75930)

* Return ID when default output is found

* Fix typing
---
 x-pack/plugins/ingest_manager/server/services/output.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/ingest_manager/server/services/output.ts b/x-pack/plugins/ingest_manager/server/services/output.ts
index b4af231024370..1e5632719fb72 100644
--- a/x-pack/plugins/ingest_manager/server/services/output.ts
+++ b/x-pack/plugins/ingest_manager/server/services/output.ts
@@ -15,7 +15,7 @@ let cachedAdminUser: null | { username: string; password: string } = null;
 
 class OutputService {
   public async getDefaultOutput(soClient: SavedObjectsClientContract) {
-    return await soClient.find<Output>({
+    return await soClient.find<OutputSOAttributes>({
       type: OUTPUT_SAVED_OBJECT_TYPE,
       searchFields: ['is_default'],
       search: 'true',
@@ -42,6 +42,7 @@ class OutputService {
     }
 
     return {
+      id: outputs.saved_objects[0].id,
       ...outputs.saved_objects[0].attributes,
     };
   }

From 61550b7ce0ada786e6962caf5b8c91e37dd4cf31 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Wed, 26 Aug 2020 20:08:39 +0100
Subject: [PATCH 067/148] [ML] Adding authorization header to DFA job update
 request (#75899)

---
 x-pack/plugins/ml/server/routes/data_frame_analytics.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
index 3b964588bef19..75d48056cf458 100644
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -496,6 +496,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         const results = await legacyClient.callAsInternalUser('ml.updateDataFrameAnalytics', {
           body: request.body,
           analyticsId,
+          ...getAuthorizationHeader(request),
         });
         return response.ok({
           body: results,

From eee139295d1d6edff2666be5af855e9370db16e7 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Wed, 26 Aug 2020 21:40:03 +0200
Subject: [PATCH 068/148] Migrate data folder creation from legacy to KP
 (#75527)

* rename uuid service to environment service

* adapt resolve_uuid to directly use the configurations

* move data folder creation to core

* update generated doc

* fix types

* fix monitoring tests

* move instanceUuid to plugin initializer context

* update generated doc
---
 .../kibana-plugin-core-server.coresetup.md    |   1 -
 ...ibana-plugin-core-server.coresetup.uuid.md |  13 --
 .../core/server/kibana-plugin-core-server.md  |   1 -
 ...ore-server.plugininitializercontext.env.md |   1 +
 ...in-core-server.plugininitializercontext.md |   2 +-
 ...server.uuidservicesetup.getinstanceuuid.md |  17 ---
 ...ana-plugin-core-server.uuidservicesetup.md |  20 ---
 .../environment/create_data_folder.test.ts    |  79 ++++++++++++
 .../server/environment/create_data_folder.ts  |  40 ++++++
 .../environment_service.mock.ts}              |  12 +-
 .../environment_service.test.ts}              |  55 +++++++-
 .../environment_service.ts}                   |  28 ++--
 src/core/server/{uuid => environment}/fs.ts   |   1 +
 .../server/{uuid => environment}/index.ts     |   2 +-
 .../resolve_uuid.test.ts                      |  67 +++++-----
 .../{uuid => environment}/resolve_uuid.ts     |  18 +--
 src/core/server/index.ts                      |   4 -
 src/core/server/internal_types.ts             |   4 +-
 src/core/server/legacy/legacy_service.test.ts |  10 +-
 src/core/server/legacy/legacy_service.ts      |   5 +-
 src/core/server/mocks.ts                      |   6 +-
 .../discovery/plugins_discovery.test.ts       |  70 +++++++---
 .../plugins/discovery/plugins_discovery.ts    |  24 +++-
 .../integration_tests/plugins_service.test.ts |   4 +-
 src/core/server/plugins/plugin.test.ts        | 122 +++++++++++++++---
 .../server/plugins/plugin_context.test.ts     |  26 +++-
 src/core/server/plugins/plugin_context.ts     |  11 +-
 .../server/plugins/plugins_service.test.ts    |  39 +++---
 src/core/server/plugins/plugins_service.ts    |  12 +-
 src/core/server/plugins/types.ts              |   1 +
 src/core/server/server.api.md                 |   8 +-
 src/core/server/server.test.mocks.ts          |   8 +-
 src/core/server/server.ts                     |  15 ++-
 src/legacy/core_plugins/kibana/index.js       |  17 ---
 x-pack/plugins/event_log/server/plugin.ts     |   2 +-
 .../plugins/monitoring/server/plugin.test.ts  |   3 -
 x-pack/plugins/monitoring/server/plugin.ts    |   4 +-
 .../plugins/reporting/server/config/config.ts |   2 +-
 x-pack/plugins/task_manager/server/plugin.ts  |   2 +-
 39 files changed, 504 insertions(+), 252 deletions(-)
 delete mode 100644 docs/development/core/server/kibana-plugin-core-server.coresetup.uuid.md
 delete mode 100644 docs/development/core/server/kibana-plugin-core-server.uuidservicesetup.getinstanceuuid.md
 delete mode 100644 docs/development/core/server/kibana-plugin-core-server.uuidservicesetup.md
 create mode 100644 src/core/server/environment/create_data_folder.test.ts
 create mode 100644 src/core/server/environment/create_data_folder.ts
 rename src/core/server/{uuid/uuid_service.mock.ts => environment/environment_service.mock.ts} (74%)
 rename src/core/server/{uuid/uuid_service.test.ts => environment/environment_service.test.ts} (52%)
 rename src/core/server/{uuid/uuid_service.ts => environment/environment_service.ts} (65%)
 rename src/core/server/{uuid => environment}/fs.ts (95%)
 rename src/core/server/{uuid => environment}/index.ts (89%)
 rename src/core/server/{uuid => environment}/resolve_uuid.test.ts (81%)
 rename src/core/server/{uuid => environment}/resolve_uuid.ts (88%)

diff --git a/docs/development/core/server/kibana-plugin-core-server.coresetup.md b/docs/development/core/server/kibana-plugin-core-server.coresetup.md
index 597bb9bc2376a..ccc73d4fb858e 100644
--- a/docs/development/core/server/kibana-plugin-core-server.coresetup.md
+++ b/docs/development/core/server/kibana-plugin-core-server.coresetup.md
@@ -26,5 +26,4 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
 |  [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) |
-|  [uuid](./kibana-plugin-core-server.coresetup.uuid.md) | <code>UuidServiceSetup</code> | [UuidServiceSetup](./kibana-plugin-core-server.uuidservicesetup.md) |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.coresetup.uuid.md b/docs/development/core/server/kibana-plugin-core-server.coresetup.uuid.md
deleted file mode 100644
index c709c74497bd0..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.coresetup.uuid.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- 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; [uuid](./kibana-plugin-core-server.coresetup.uuid.md)
-
-## CoreSetup.uuid property
-
-[UuidServiceSetup](./kibana-plugin-core-server.uuidservicesetup.md)
-
-<b>Signature:</b>
-
-```typescript
-uuid: UuidServiceSetup;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index 98d7b0610abea..e9bc19e9c92a9 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -214,7 +214,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [UiSettingsServiceStart](./kibana-plugin-core-server.uisettingsservicestart.md) |  |
 |  [URLMeaningfulParts](./kibana-plugin-core-server.urlmeaningfulparts.md) | We define our own typings because the current version of @<!-- -->types/node declares properties to be optional "hostname?: string". Although, parse call returns "hostname: null \| string". |
 |  [UserProvidedValues](./kibana-plugin-core-server.userprovidedvalues.md) | Describes the values explicitly set by user. |
-|  [UuidServiceSetup](./kibana-plugin-core-server.uuidservicesetup.md) | APIs to access the application's instance uuid. |
 
 ## Variables
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.env.md b/docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.env.md
index 4d111c8f20887..76e4f222f0228 100644
--- a/docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.env.md
+++ b/docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.env.md
@@ -10,5 +10,6 @@
 env: {
         mode: EnvironmentMode;
         packageInfo: Readonly<PackageInfo>;
+        instanceUuid: string;
     };
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.md b/docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.md
index 0d7fcf3b10bca..18760170afa1f 100644
--- a/docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.md
+++ b/docs/development/core/server/kibana-plugin-core-server.plugininitializercontext.md
@@ -17,7 +17,7 @@ export interface PluginInitializerContext<ConfigSchema = unknown>
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [config](./kibana-plugin-core-server.plugininitializercontext.config.md) | <code>{</code><br/><code>        legacy: {</code><br/><code>            globalConfig$: Observable&lt;SharedGlobalConfig&gt;;</code><br/><code>        };</code><br/><code>        create: &lt;T = ConfigSchema&gt;() =&gt; Observable&lt;T&gt;;</code><br/><code>        createIfExists: &lt;T = ConfigSchema&gt;() =&gt; Observable&lt;T &#124; undefined&gt;;</code><br/><code>    }</code> |  |
-|  [env](./kibana-plugin-core-server.plugininitializercontext.env.md) | <code>{</code><br/><code>        mode: EnvironmentMode;</code><br/><code>        packageInfo: Readonly&lt;PackageInfo&gt;;</code><br/><code>    }</code> |  |
+|  [env](./kibana-plugin-core-server.plugininitializercontext.env.md) | <code>{</code><br/><code>        mode: EnvironmentMode;</code><br/><code>        packageInfo: Readonly&lt;PackageInfo&gt;;</code><br/><code>        instanceUuid: string;</code><br/><code>    }</code> |  |
 |  [logger](./kibana-plugin-core-server.plugininitializercontext.logger.md) | <code>LoggerFactory</code> |  |
 |  [opaqueId](./kibana-plugin-core-server.plugininitializercontext.opaqueid.md) | <code>PluginOpaqueId</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.uuidservicesetup.getinstanceuuid.md b/docs/development/core/server/kibana-plugin-core-server.uuidservicesetup.getinstanceuuid.md
deleted file mode 100644
index f33176a32954d..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.uuidservicesetup.getinstanceuuid.md
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- 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; [UuidServiceSetup](./kibana-plugin-core-server.uuidservicesetup.md) &gt; [getInstanceUuid](./kibana-plugin-core-server.uuidservicesetup.getinstanceuuid.md)
-
-## UuidServiceSetup.getInstanceUuid() method
-
-Retrieve the Kibana instance uuid.
-
-<b>Signature:</b>
-
-```typescript
-getInstanceUuid(): string;
-```
-<b>Returns:</b>
-
-`string`
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.uuidservicesetup.md b/docs/development/core/server/kibana-plugin-core-server.uuidservicesetup.md
deleted file mode 100644
index 99ce4cb08af47..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.uuidservicesetup.md
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- 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; [UuidServiceSetup](./kibana-plugin-core-server.uuidservicesetup.md)
-
-## UuidServiceSetup interface
-
-APIs to access the application's instance uuid.
-
-<b>Signature:</b>
-
-```typescript
-export interface UuidServiceSetup 
-```
-
-## Methods
-
-|  Method | Description |
-|  --- | --- |
-|  [getInstanceUuid()](./kibana-plugin-core-server.uuidservicesetup.getinstanceuuid.md) | Retrieve the Kibana instance uuid. |
-
diff --git a/src/core/server/environment/create_data_folder.test.ts b/src/core/server/environment/create_data_folder.test.ts
new file mode 100644
index 0000000000000..2a480a7a3954f
--- /dev/null
+++ b/src/core/server/environment/create_data_folder.test.ts
@@ -0,0 +1,79 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PathConfigType } from '../path';
+import { createDataFolder } from './create_data_folder';
+import { mkdir } from './fs';
+import { loggingSystemMock } from '../logging/logging_system.mock';
+
+jest.mock('./fs', () => ({
+  mkdir: jest.fn(() => Promise.resolve('')),
+}));
+
+const mkdirMock = mkdir as jest.Mock;
+
+describe('createDataFolder', () => {
+  let logger: ReturnType<typeof loggingSystemMock.createLogger>;
+  let pathConfig: PathConfigType;
+
+  beforeEach(() => {
+    logger = loggingSystemMock.createLogger();
+    pathConfig = {
+      data: '/path/to/data/folder',
+    };
+    mkdirMock.mockResolvedValue(undefined);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('calls `mkdir` with the correct parameters', async () => {
+    await createDataFolder({ pathConfig, logger });
+    expect(mkdirMock).toHaveBeenCalledTimes(1);
+    expect(mkdirMock).toHaveBeenCalledWith(pathConfig.data, { recursive: true });
+  });
+
+  it('does not log error if the `mkdir` call is successful', async () => {
+    await createDataFolder({ pathConfig, logger });
+    expect(logger.error).not.toHaveBeenCalled();
+  });
+
+  it('throws an error if the `mkdir` call fails', async () => {
+    mkdirMock.mockRejectedValue('some-error');
+    await expect(() => createDataFolder({ pathConfig, logger })).rejects.toMatchInlineSnapshot(
+      `"some-error"`
+    );
+  });
+
+  it('logs an error message if the `mkdir` call fails', async () => {
+    mkdirMock.mockRejectedValue('some-error');
+    try {
+      await createDataFolder({ pathConfig, logger });
+    } catch (e) {
+      /* trap */
+    }
+    expect(logger.error).toHaveBeenCalledTimes(1);
+    expect(logger.error.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "Error trying to create data folder at /path/to/data/folder: some-error",
+      ]
+    `);
+  });
+});
diff --git a/src/core/server/environment/create_data_folder.ts b/src/core/server/environment/create_data_folder.ts
new file mode 100644
index 0000000000000..641d95cbf9411
--- /dev/null
+++ b/src/core/server/environment/create_data_folder.ts
@@ -0,0 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mkdir } from './fs';
+import { Logger } from '../logging';
+import { PathConfigType } from '../path';
+
+export async function createDataFolder({
+  pathConfig,
+  logger,
+}: {
+  pathConfig: PathConfigType;
+  logger: Logger;
+}): Promise<void> {
+  const dataFolder = pathConfig.data;
+  try {
+    // Create the data directory (recursively, if the a parent dir doesn't exist).
+    // If it already exists, does nothing.
+    await mkdir(dataFolder, { recursive: true });
+  } catch (e) {
+    logger.error(`Error trying to create data folder at ${dataFolder}: ${e}`);
+    throw e;
+  }
+}
diff --git a/src/core/server/uuid/uuid_service.mock.ts b/src/core/server/environment/environment_service.mock.ts
similarity index 74%
rename from src/core/server/uuid/uuid_service.mock.ts
rename to src/core/server/environment/environment_service.mock.ts
index bf40eaee20636..8bf726b4a6388 100644
--- a/src/core/server/uuid/uuid_service.mock.ts
+++ b/src/core/server/environment/environment_service.mock.ts
@@ -17,25 +17,25 @@
  * under the License.
  */
 
-import { UuidService, UuidServiceSetup } from './uuid_service';
+import { EnvironmentService, InternalEnvironmentServiceSetup } from './environment_service';
 
 const createSetupContractMock = () => {
-  const setupContract: jest.Mocked<UuidServiceSetup> = {
-    getInstanceUuid: jest.fn().mockImplementation(() => 'uuid'),
+  const setupContract: jest.Mocked<InternalEnvironmentServiceSetup> = {
+    instanceUuid: 'uuid',
   };
   return setupContract;
 };
 
-type UuidServiceContract = PublicMethodsOf<UuidService>;
+type EnvironmentServiceContract = PublicMethodsOf<EnvironmentService>;
 const createMock = () => {
-  const mocked: jest.Mocked<UuidServiceContract> = {
+  const mocked: jest.Mocked<EnvironmentServiceContract> = {
     setup: jest.fn(),
   };
   mocked.setup.mockResolvedValue(createSetupContractMock());
   return mocked;
 };
 
-export const uuidServiceMock = {
+export const environmentServiceMock = {
   create: createMock,
   createSetupContract: createSetupContractMock,
 };
diff --git a/src/core/server/uuid/uuid_service.test.ts b/src/core/server/environment/environment_service.test.ts
similarity index 52%
rename from src/core/server/uuid/uuid_service.test.ts
rename to src/core/server/environment/environment_service.test.ts
index 3b1087d72c677..06fd250ebe4f9 100644
--- a/src/core/server/uuid/uuid_service.test.ts
+++ b/src/core/server/environment/environment_service.test.ts
@@ -17,10 +17,13 @@
  * under the License.
  */
 
-import { UuidService } from './uuid_service';
+import { BehaviorSubject } from 'rxjs';
+import { EnvironmentService } from './environment_service';
 import { resolveInstanceUuid } from './resolve_uuid';
+import { createDataFolder } from './create_data_folder';
 import { CoreContext } from '../core_context';
 
+import { configServiceMock } from '../config/config_service.mock';
 import { loggingSystemMock } from '../logging/logging_system.mock';
 import { mockCoreContext } from '../core_context.mock';
 
@@ -28,31 +31,69 @@ jest.mock('./resolve_uuid', () => ({
   resolveInstanceUuid: jest.fn().mockResolvedValue('SOME_UUID'),
 }));
 
+jest.mock('./create_data_folder', () => ({
+  createDataFolder: jest.fn(),
+}));
+
+const pathConfig = {
+  data: 'data-folder',
+};
+const serverConfig = {
+  uuid: 'SOME_UUID',
+};
+
+const getConfigService = () => {
+  const configService = configServiceMock.create();
+  configService.atPath.mockImplementation((path) => {
+    if (path === 'path') {
+      return new BehaviorSubject(pathConfig);
+    }
+    if (path === 'server') {
+      return new BehaviorSubject(serverConfig);
+    }
+    return new BehaviorSubject({});
+  });
+  return configService;
+};
+
 describe('UuidService', () => {
   let logger: ReturnType<typeof loggingSystemMock.create>;
+  let configService: ReturnType<typeof configServiceMock.create>;
   let coreContext: CoreContext;
 
   beforeEach(() => {
     jest.clearAllMocks();
     logger = loggingSystemMock.create();
-    coreContext = mockCoreContext.create({ logger });
+    configService = getConfigService();
+    coreContext = mockCoreContext.create({ logger, configService });
   });
 
   describe('#setup()', () => {
-    it('calls resolveInstanceUuid with core configuration service', async () => {
-      const service = new UuidService(coreContext);
+    it('calls resolveInstanceUuid with correct parameters', async () => {
+      const service = new EnvironmentService(coreContext);
       await service.setup();
       expect(resolveInstanceUuid).toHaveBeenCalledTimes(1);
       expect(resolveInstanceUuid).toHaveBeenCalledWith({
-        configService: coreContext.configService,
+        pathConfig,
+        serverConfig,
+        logger: logger.get('uuid'),
+      });
+    });
+
+    it('calls createDataFolder with correct parameters', async () => {
+      const service = new EnvironmentService(coreContext);
+      await service.setup();
+      expect(createDataFolder).toHaveBeenCalledTimes(1);
+      expect(createDataFolder).toHaveBeenCalledWith({
+        pathConfig,
         logger: logger.get('uuid'),
       });
     });
 
     it('returns the uuid resolved from resolveInstanceUuid', async () => {
-      const service = new UuidService(coreContext);
+      const service = new EnvironmentService(coreContext);
       const setup = await service.setup();
-      expect(setup.getInstanceUuid()).toEqual('SOME_UUID');
+      expect(setup.instanceUuid).toEqual('SOME_UUID');
     });
   });
 });
diff --git a/src/core/server/uuid/uuid_service.ts b/src/core/server/environment/environment_service.ts
similarity index 65%
rename from src/core/server/uuid/uuid_service.ts
rename to src/core/server/environment/environment_service.ts
index d7c1b3331c447..6a0b1122c7053 100644
--- a/src/core/server/uuid/uuid_service.ts
+++ b/src/core/server/environment/environment_service.ts
@@ -17,25 +17,27 @@
  * under the License.
  */
 
-import { resolveInstanceUuid } from './resolve_uuid';
+import { take } from 'rxjs/operators';
 import { CoreContext } from '../core_context';
 import { Logger } from '../logging';
 import { IConfigService } from '../config';
+import { PathConfigType, config as pathConfigDef } from '../path';
+import { HttpConfigType, config as httpConfigDef } from '../http';
+import { resolveInstanceUuid } from './resolve_uuid';
+import { createDataFolder } from './create_data_folder';
 
 /**
- * APIs to access the application's instance uuid.
- *
- * @public
+ * @internal
  */
-export interface UuidServiceSetup {
+export interface InternalEnvironmentServiceSetup {
   /**
    * Retrieve the Kibana instance uuid.
    */
-  getInstanceUuid(): string;
+  instanceUuid: string;
 }
 
 /** @internal */
-export class UuidService {
+export class EnvironmentService {
   private readonly log: Logger;
   private readonly configService: IConfigService;
   private uuid: string = '';
@@ -46,13 +48,21 @@ export class UuidService {
   }
 
   public async setup() {
+    const [pathConfig, serverConfig] = await Promise.all([
+      this.configService.atPath<PathConfigType>(pathConfigDef.path).pipe(take(1)).toPromise(),
+      this.configService.atPath<HttpConfigType>(httpConfigDef.path).pipe(take(1)).toPromise(),
+    ]);
+
+    await createDataFolder({ pathConfig, logger: this.log });
+
     this.uuid = await resolveInstanceUuid({
-      configService: this.configService,
+      pathConfig,
+      serverConfig,
       logger: this.log,
     });
 
     return {
-      getInstanceUuid: () => this.uuid,
+      instanceUuid: this.uuid,
     };
   }
 }
diff --git a/src/core/server/uuid/fs.ts b/src/core/server/environment/fs.ts
similarity index 95%
rename from src/core/server/uuid/fs.ts
rename to src/core/server/environment/fs.ts
index f10d6370c09d1..dc040ccb73615 100644
--- a/src/core/server/uuid/fs.ts
+++ b/src/core/server/environment/fs.ts
@@ -22,3 +22,4 @@ import { promisify } from 'util';
 
 export const readFile = promisify(Fs.readFile);
 export const writeFile = promisify(Fs.writeFile);
+export const mkdir = promisify(Fs.mkdir);
diff --git a/src/core/server/uuid/index.ts b/src/core/server/environment/index.ts
similarity index 89%
rename from src/core/server/uuid/index.ts
rename to src/core/server/environment/index.ts
index ad57041a124c9..57a26d5ea3c79 100644
--- a/src/core/server/uuid/index.ts
+++ b/src/core/server/environment/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { UuidService, UuidServiceSetup } from './uuid_service';
+export { EnvironmentService, InternalEnvironmentServiceSetup } from './environment_service';
diff --git a/src/core/server/uuid/resolve_uuid.test.ts b/src/core/server/environment/resolve_uuid.test.ts
similarity index 81%
rename from src/core/server/uuid/resolve_uuid.test.ts
rename to src/core/server/environment/resolve_uuid.test.ts
index 3132f639e536f..d162c9d8e364b 100644
--- a/src/core/server/uuid/resolve_uuid.test.ts
+++ b/src/core/server/environment/resolve_uuid.test.ts
@@ -18,12 +18,11 @@
  */
 
 import { join } from 'path';
+import { loggingSystemMock } from '../logging/logging_system.mock';
 import { readFile, writeFile } from './fs';
 import { resolveInstanceUuid, UUID_7_6_0_BUG } from './resolve_uuid';
-import { configServiceMock } from '../config/config_service.mock';
-import { loggingSystemMock } from '../logging/logging_system.mock';
-import { BehaviorSubject } from 'rxjs';
-import { Logger } from '../logging';
+import { PathConfigType } from '../path';
+import { HttpConfigType } from '../http';
 
 jest.mock('uuid', () => ({
   v4: () => 'NEW_UUID',
@@ -66,40 +65,34 @@ const mockWriteFile = (error?: object) => {
   });
 };
 
-const getConfigService = (serverUuid: string | undefined) => {
-  const configService = configServiceMock.create();
-  configService.atPath.mockImplementation((path) => {
-    if (path === 'path') {
-      return new BehaviorSubject({
-        data: 'data-folder',
-      });
-    }
-    if (path === 'server') {
-      return new BehaviorSubject({
-        uuid: serverUuid,
-      });
-    }
-    return new BehaviorSubject({});
-  });
-  return configService;
+const createServerConfig = (serverUuid: string | undefined) => {
+  return {
+    uuid: serverUuid,
+  } as HttpConfigType;
 };
 
 describe('resolveInstanceUuid', () => {
-  let configService: ReturnType<typeof configServiceMock.create>;
-  let logger: jest.Mocked<Logger>;
+  let logger: ReturnType<typeof loggingSystemMock.createLogger>;
+  let pathConfig: PathConfigType;
+  let serverConfig: HttpConfigType;
 
   beforeEach(() => {
     jest.clearAllMocks();
     mockReadFile({ uuid: DEFAULT_FILE_UUID });
     mockWriteFile();
-    configService = getConfigService(DEFAULT_CONFIG_UUID);
-    logger = loggingSystemMock.create().get() as any;
+
+    pathConfig = {
+      data: 'data-folder',
+    };
+    serverConfig = createServerConfig(DEFAULT_CONFIG_UUID);
+
+    logger = loggingSystemMock.createLogger();
   });
 
   describe('when file is present and config property is set', () => {
     describe('when they mismatch', () => {
       it('writes to file and returns the config uuid', async () => {
-        const uuid = await resolveInstanceUuid({ configService, logger });
+        const uuid = await resolveInstanceUuid({ pathConfig, serverConfig, logger });
         expect(uuid).toEqual(DEFAULT_CONFIG_UUID);
         expect(writeFile).toHaveBeenCalledWith(
           join('data-folder', 'uuid'),
@@ -118,7 +111,7 @@ describe('resolveInstanceUuid', () => {
     describe('when they match', () => {
       it('does not write to file', async () => {
         mockReadFile({ uuid: DEFAULT_CONFIG_UUID });
-        const uuid = await resolveInstanceUuid({ configService, logger });
+        const uuid = await resolveInstanceUuid({ pathConfig, serverConfig, logger });
         expect(uuid).toEqual(DEFAULT_CONFIG_UUID);
         expect(writeFile).not.toHaveBeenCalled();
         expect(logger.debug).toHaveBeenCalledTimes(1);
@@ -134,7 +127,7 @@ describe('resolveInstanceUuid', () => {
   describe('when file is not present and config property is set', () => {
     it('writes the uuid to file and returns the config uuid', async () => {
       mockReadFile({ error: fileNotFoundError });
-      const uuid = await resolveInstanceUuid({ configService, logger });
+      const uuid = await resolveInstanceUuid({ pathConfig, serverConfig, logger });
       expect(uuid).toEqual(DEFAULT_CONFIG_UUID);
       expect(writeFile).toHaveBeenCalledWith(
         join('data-folder', 'uuid'),
@@ -152,8 +145,8 @@ describe('resolveInstanceUuid', () => {
 
   describe('when file is present and config property is not set', () => {
     it('does not write to file and returns the file uuid', async () => {
-      configService = getConfigService(undefined);
-      const uuid = await resolveInstanceUuid({ configService, logger });
+      serverConfig = createServerConfig(undefined);
+      const uuid = await resolveInstanceUuid({ pathConfig, serverConfig, logger });
       expect(uuid).toEqual(DEFAULT_FILE_UUID);
       expect(writeFile).not.toHaveBeenCalled();
       expect(logger.debug).toHaveBeenCalledTimes(1);
@@ -169,8 +162,8 @@ describe('resolveInstanceUuid', () => {
     describe('when config property is not set', () => {
       it('writes new uuid to file and returns new uuid', async () => {
         mockReadFile({ uuid: UUID_7_6_0_BUG });
-        configService = getConfigService(undefined);
-        const uuid = await resolveInstanceUuid({ configService, logger });
+        serverConfig = createServerConfig(undefined);
+        const uuid = await resolveInstanceUuid({ pathConfig, serverConfig, logger });
         expect(uuid).not.toEqual(UUID_7_6_0_BUG);
         expect(uuid).toEqual('NEW_UUID');
         expect(writeFile).toHaveBeenCalledWith(
@@ -195,8 +188,8 @@ describe('resolveInstanceUuid', () => {
     describe('when config property is set', () => {
       it('writes config uuid to file and returns config uuid', async () => {
         mockReadFile({ uuid: UUID_7_6_0_BUG });
-        configService = getConfigService(DEFAULT_CONFIG_UUID);
-        const uuid = await resolveInstanceUuid({ configService, logger });
+        serverConfig = createServerConfig(DEFAULT_CONFIG_UUID);
+        const uuid = await resolveInstanceUuid({ pathConfig, serverConfig, logger });
         expect(uuid).not.toEqual(UUID_7_6_0_BUG);
         expect(uuid).toEqual(DEFAULT_CONFIG_UUID);
         expect(writeFile).toHaveBeenCalledWith(
@@ -221,9 +214,9 @@ describe('resolveInstanceUuid', () => {
 
   describe('when file is not present and config property is not set', () => {
     it('generates a new uuid and write it to file', async () => {
-      configService = getConfigService(undefined);
+      serverConfig = createServerConfig(undefined);
       mockReadFile({ error: fileNotFoundError });
-      const uuid = await resolveInstanceUuid({ configService, logger });
+      const uuid = await resolveInstanceUuid({ pathConfig, serverConfig, logger });
       expect(uuid).toEqual('NEW_UUID');
       expect(writeFile).toHaveBeenCalledWith(
         join('data-folder', 'uuid'),
@@ -243,7 +236,7 @@ describe('resolveInstanceUuid', () => {
     it('throws an explicit error for file read errors', async () => {
       mockReadFile({ error: permissionError });
       await expect(
-        resolveInstanceUuid({ configService, logger })
+        resolveInstanceUuid({ pathConfig, serverConfig, logger })
       ).rejects.toThrowErrorMatchingInlineSnapshot(
         `"Unable to read Kibana UUID file, please check the uuid.server configuration value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. Error was: EACCES"`
       );
@@ -251,7 +244,7 @@ describe('resolveInstanceUuid', () => {
     it('throws an explicit error for file write errors', async () => {
       mockWriteFile(isDirectoryError);
       await expect(
-        resolveInstanceUuid({ configService, logger })
+        resolveInstanceUuid({ pathConfig, serverConfig, logger })
       ).rejects.toThrowErrorMatchingInlineSnapshot(
         `"Unable to write Kibana UUID file, please check the uuid.server configuration value in kibana.yml and ensure Kibana has sufficient permissions to read / write to this file. Error was: EISDIR"`
       );
diff --git a/src/core/server/uuid/resolve_uuid.ts b/src/core/server/environment/resolve_uuid.ts
similarity index 88%
rename from src/core/server/uuid/resolve_uuid.ts
rename to src/core/server/environment/resolve_uuid.ts
index 36f0eb73b1de7..0267e06939997 100644
--- a/src/core/server/uuid/resolve_uuid.ts
+++ b/src/core/server/environment/resolve_uuid.ts
@@ -19,11 +19,9 @@
 
 import uuid from 'uuid';
 import { join } from 'path';
-import { take } from 'rxjs/operators';
 import { readFile, writeFile } from './fs';
-import { IConfigService } from '../config';
-import { PathConfigType, config as pathConfigDef } from '../path';
-import { HttpConfigType, config as httpConfigDef } from '../http';
+import { PathConfigType } from '../path';
+import { HttpConfigType } from '../http';
 import { Logger } from '../logging';
 
 const FILE_ENCODING = 'utf8';
@@ -35,19 +33,15 @@ const FILE_NAME = 'uuid';
 export const UUID_7_6_0_BUG = `ce42b997-a913-4d58-be46-bb1937feedd6`;
 
 export async function resolveInstanceUuid({
-  configService,
+  pathConfig,
+  serverConfig,
   logger,
 }: {
-  configService: IConfigService;
+  pathConfig: PathConfigType;
+  serverConfig: HttpConfigType;
   logger: Logger;
 }): Promise<string> {
-  const [pathConfig, serverConfig] = await Promise.all([
-    configService.atPath<PathConfigType>(pathConfigDef.path).pipe(take(1)).toPromise(),
-    configService.atPath<HttpConfigType>(httpConfigDef.path).pipe(take(1)).toPromise(),
-  ]);
-
   const uuidFilePath = join(pathConfig.data, FILE_NAME);
-
   const uuidFromFile = await readUuidFromFile(uuidFilePath, logger);
   const uuidFromConfig = serverConfig.uuid;
 
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 76bcf5f7df665..5c91d5a8c73ed 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -60,7 +60,6 @@ import {
   SavedObjectsServiceStart,
 } from './saved_objects';
 import { CapabilitiesSetup, CapabilitiesStart } from './capabilities';
-import { UuidServiceSetup } from './uuid';
 import { MetricsServiceStart } from './metrics';
 import { StatusServiceSetup } from './status';
 import { Auditor, AuditTrailSetup, AuditTrailStart } from './audit_trail';
@@ -432,8 +431,6 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
   status: StatusServiceSetup;
   /** {@link UiSettingsServiceSetup} */
   uiSettings: UiSettingsServiceSetup;
-  /** {@link UuidServiceSetup} */
-  uuid: UuidServiceSetup;
   /** {@link StartServicesAccessor} */
   getStartServices: StartServicesAccessor<TPluginsStart, TStart>;
   /** {@link AuditTrailSetup} */
@@ -483,7 +480,6 @@ export {
   PluginsServiceSetup,
   PluginsServiceStart,
   PluginOpaqueId,
-  UuidServiceSetup,
   AuditTrailStart,
 };
 
diff --git a/src/core/server/internal_types.ts b/src/core/server/internal_types.ts
index 4f4bf50f07b8e..6780ca6b59f4d 100644
--- a/src/core/server/internal_types.ts
+++ b/src/core/server/internal_types.ts
@@ -32,7 +32,7 @@ import {
   InternalSavedObjectsServiceStart,
 } from './saved_objects';
 import { InternalUiSettingsServiceSetup, InternalUiSettingsServiceStart } from './ui_settings';
-import { UuidServiceSetup } from './uuid';
+import { InternalEnvironmentServiceSetup } from './environment';
 import { InternalMetricsServiceStart } from './metrics';
 import { InternalRenderingServiceSetup } from './rendering';
 import { InternalHttpResourcesSetup } from './http_resources';
@@ -49,7 +49,7 @@ export interface InternalCoreSetup {
   savedObjects: InternalSavedObjectsServiceSetup;
   status: InternalStatusServiceSetup;
   uiSettings: InternalUiSettingsServiceSetup;
-  uuid: UuidServiceSetup;
+  environment: InternalEnvironmentServiceSetup;
   rendering: InternalRenderingServiceSetup;
   httpResources: InternalHttpResourcesSetup;
   auditTrail: AuditTrailSetup;
diff --git a/src/core/server/legacy/legacy_service.test.ts b/src/core/server/legacy/legacy_service.test.ts
index f8f04c59766b3..45869fd12d2b4 100644
--- a/src/core/server/legacy/legacy_service.test.ts
+++ b/src/core/server/legacy/legacy_service.test.ts
@@ -45,7 +45,7 @@ import { savedObjectsServiceMock } from '../saved_objects/saved_objects_service.
 import { capabilitiesServiceMock } from '../capabilities/capabilities_service.mock';
 import { httpResourcesMock } from '../http_resources/http_resources_service.mock';
 import { setupMock as renderingServiceMock } from '../rendering/__mocks__/rendering_service';
-import { uuidServiceMock } from '../uuid/uuid_service.mock';
+import { environmentServiceMock } from '../environment/environment_service.mock';
 import { findLegacyPluginSpecs } from './plugins';
 import { LegacyVars, LegacyServiceSetupDeps, LegacyServiceStartDeps } from './types';
 import { LegacyService } from './legacy_service';
@@ -66,13 +66,13 @@ let startDeps: LegacyServiceStartDeps;
 
 const logger = loggingSystemMock.create();
 let configService: ReturnType<typeof configServiceMock.create>;
-let uuidSetup: ReturnType<typeof uuidServiceMock.createSetupContract>;
+let environmentSetup: ReturnType<typeof environmentServiceMock.createSetupContract>;
 
 beforeEach(() => {
   coreId = Symbol();
   env = Env.createDefault(getEnvOptions());
   configService = configServiceMock.create();
-  uuidSetup = uuidServiceMock.createSetupContract();
+  environmentSetup = environmentServiceMock.createSetupContract();
 
   findLegacyPluginSpecsMock.mockClear();
   MockKbnServer.prototype.ready = jest.fn().mockReturnValue(Promise.resolve());
@@ -97,7 +97,7 @@ beforeEach(() => {
         contracts: new Map([['plugin-id', 'plugin-value']]),
       },
       rendering: renderingServiceMock,
-      uuid: uuidSetup,
+      environment: environmentSetup,
       status: statusServiceMock.createInternalSetupContract(),
       auditTrail: auditTrailServiceMock.createSetupContract(),
       logging: loggingServiceMock.createInternalSetupContract(),
@@ -523,7 +523,7 @@ test('Sets the server.uuid property on the legacy configuration', async () => {
     configService: configService as any,
   });
 
-  uuidSetup.getInstanceUuid.mockImplementation(() => 'UUID_FROM_SERVICE');
+  environmentSetup.instanceUuid = 'UUID_FROM_SERVICE';
 
   const configSetMock = jest.fn();
 
diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
index f39282a6f9cb0..adfdecdd7c976 100644
--- a/src/core/server/legacy/legacy_service.ts
+++ b/src/core/server/legacy/legacy_service.ts
@@ -188,7 +188,7 @@ export class LegacyService implements CoreService {
     }
 
     // propagate the instance uuid to the legacy config, as it was the legacy way to access it.
-    this.legacyRawConfig!.set('server.uuid', setupDeps.core.uuid.getInstanceUuid());
+    this.legacyRawConfig!.set('server.uuid', setupDeps.core.environment.instanceUuid);
     this.setupDeps = setupDeps;
     this.legacyInternals = new LegacyInternals(
       this.legacyPlugins.uiExports,
@@ -327,9 +327,6 @@ export class LegacyService implements CoreService {
       uiSettings: {
         register: setupDeps.core.uiSettings.register,
       },
-      uuid: {
-        getInstanceUuid: setupDeps.core.uuid.getInstanceUuid,
-      },
       auditTrail: setupDeps.core.auditTrail,
       getStartServices: () => Promise.resolve([coreStart, startDeps.plugins, {}]),
     };
diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index bf9dcc4abe01c..3c79706422cd4 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -33,7 +33,7 @@ import { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
 import { SharedGlobalConfig } from './plugins';
 import { capabilitiesServiceMock } from './capabilities/capabilities_service.mock';
 import { metricsServiceMock } from './metrics/metrics_service.mock';
-import { uuidServiceMock } from './uuid/uuid_service.mock';
+import { environmentServiceMock } from './environment/environment_service.mock';
 import { statusServiceMock } from './status/status_service.mock';
 import { auditTrailServiceMock } from './audit_trail/audit_trail_service.mock';
 
@@ -94,6 +94,7 @@ function pluginInitializerContextMock<T>(config: T = {} as T) {
         buildSha: 'buildSha',
         dist: false,
       },
+      instanceUuid: 'instance-uuid',
     },
     config: pluginInitializerContextConfigMock<T>(config),
   };
@@ -130,7 +131,6 @@ function createCoreSetupMock({
     savedObjects: savedObjectsServiceMock.createInternalSetupContract(),
     status: statusServiceMock.createSetupContract(),
     uiSettings: uiSettingsMock,
-    uuid: uuidServiceMock.createSetupContract(),
     auditTrail: auditTrailServiceMock.createSetupContract(),
     logging: loggingServiceMock.createSetupContract(),
     getStartServices: jest
@@ -163,7 +163,7 @@ function createInternalCoreSetupMock() {
     http: httpServiceMock.createInternalSetupContract(),
     savedObjects: savedObjectsServiceMock.createInternalSetupContract(),
     status: statusServiceMock.createInternalSetupContract(),
-    uuid: uuidServiceMock.createSetupContract(),
+    environment: environmentServiceMock.createSetupContract(),
     httpResources: httpResourcesMock.createSetupContract(),
     rendering: renderingMock.createSetupContract(),
     uiSettings: uiSettingsServiceMock.createSetupContract(),
diff --git a/src/core/server/plugins/discovery/plugins_discovery.test.ts b/src/core/server/plugins/discovery/plugins_discovery.test.ts
index 70413757de9da..4894f19e38df4 100644
--- a/src/core/server/plugins/discovery/plugins_discovery.test.ts
+++ b/src/core/server/plugins/discovery/plugins_discovery.test.ts
@@ -26,6 +26,7 @@ import { resolve } from 'path';
 import { ConfigService, Env } from '../../config';
 import { getEnvOptions } from '../../config/__mocks__/env';
 import { PluginsConfig, PluginsConfigType, config } from '../plugins_config';
+import type { InstanceInfo } from '../plugin_context';
 import { discover } from './plugins_discovery';
 import { rawConfigServiceMock } from '../../config/raw_config_service.mock';
 import { CoreContext } from '../../core_context';
@@ -77,6 +78,7 @@ const manifestPath = (...pluginPath: string[]) =>
 
 describe('plugins discovery system', () => {
   let logger: ReturnType<typeof loggingSystemMock.create>;
+  let instanceInfo: InstanceInfo;
   let env: Env;
   let configService: ConfigService;
   let pluginConfig: PluginsConfigType;
@@ -87,6 +89,10 @@ describe('plugins discovery system', () => {
 
     mockPackage.raw = packageMock;
 
+    instanceInfo = {
+      uuid: 'instance-uuid',
+    };
+
     env = Env.createDefault(
       getEnvOptions({
         cliArgs: { envName: 'development' },
@@ -127,7 +133,7 @@ describe('plugins discovery system', () => {
   });
 
   it('discovers plugins in the search locations', async () => {
-    const { plugin$ } = discover(new PluginsConfig(pluginConfig, env), coreContext);
+    const { plugin$ } = discover(new PluginsConfig(pluginConfig, env), coreContext, instanceInfo);
 
     mockFs(
       {
@@ -146,7 +152,11 @@ describe('plugins discovery system', () => {
   });
 
   it('return errors when the manifest is invalid or incompatible', async () => {
-    const { plugin$, error$ } = discover(new PluginsConfig(pluginConfig, env), coreContext);
+    const { plugin$, error$ } = discover(
+      new PluginsConfig(pluginConfig, env),
+      coreContext,
+      instanceInfo
+    );
 
     mockFs(
       {
@@ -184,7 +194,11 @@ describe('plugins discovery system', () => {
   });
 
   it('return errors when the plugin search path is not accessible', async () => {
-    const { plugin$, error$ } = discover(new PluginsConfig(pluginConfig, env), coreContext);
+    const { plugin$, error$ } = discover(
+      new PluginsConfig(pluginConfig, env),
+      coreContext,
+      instanceInfo
+    );
 
     mockFs(
       {
@@ -219,7 +233,11 @@ describe('plugins discovery system', () => {
   });
 
   it('return an error when the manifest file is not accessible', async () => {
-    const { plugin$, error$ } = discover(new PluginsConfig(pluginConfig, env), coreContext);
+    const { plugin$, error$ } = discover(
+      new PluginsConfig(pluginConfig, env),
+      coreContext,
+      instanceInfo
+    );
 
     mockFs(
       {
@@ -250,7 +268,11 @@ describe('plugins discovery system', () => {
   });
 
   it('discovers plugins in nested directories', async () => {
-    const { plugin$, error$ } = discover(new PluginsConfig(pluginConfig, env), coreContext);
+    const { plugin$, error$ } = discover(
+      new PluginsConfig(pluginConfig, env),
+      coreContext,
+      instanceInfo
+    );
 
     mockFs(
       {
@@ -287,7 +309,7 @@ describe('plugins discovery system', () => {
   });
 
   it('does not discover plugins nested inside another plugin', async () => {
-    const { plugin$ } = discover(new PluginsConfig(pluginConfig, env), coreContext);
+    const { plugin$ } = discover(new PluginsConfig(pluginConfig, env), coreContext, instanceInfo);
 
     mockFs(
       {
@@ -306,7 +328,7 @@ describe('plugins discovery system', () => {
   });
 
   it('stops scanning when reaching `maxDepth`', async () => {
-    const { plugin$ } = discover(new PluginsConfig(pluginConfig, env), coreContext);
+    const { plugin$ } = discover(new PluginsConfig(pluginConfig, env), coreContext, instanceInfo);
 
     mockFs(
       {
@@ -332,7 +354,7 @@ describe('plugins discovery system', () => {
   });
 
   it('works with symlinks', async () => {
-    const { plugin$ } = discover(new PluginsConfig(pluginConfig, env), coreContext);
+    const { plugin$ } = discover(new PluginsConfig(pluginConfig, env), coreContext, instanceInfo);
 
     const pluginFolder = resolve(KIBANA_ROOT, '..', 'ext-plugins');
 
@@ -365,12 +387,16 @@ describe('plugins discovery system', () => {
       })
     );
 
-    discover(new PluginsConfig({ ...pluginConfig, paths: [extraPluginTestPath] }, env), {
-      coreId: Symbol(),
-      configService,
-      env,
-      logger,
-    });
+    discover(
+      new PluginsConfig({ ...pluginConfig, paths: [extraPluginTestPath] }, env),
+      {
+        coreId: Symbol(),
+        configService,
+        env,
+        logger,
+      },
+      instanceInfo
+    );
 
     expect(loggingSystemMock.collect(logger).warn).toEqual([
       [
@@ -388,12 +414,16 @@ describe('plugins discovery system', () => {
       })
     );
 
-    discover(new PluginsConfig({ ...pluginConfig, paths: [extraPluginTestPath] }, env), {
-      coreId: Symbol(),
-      configService,
-      env,
-      logger,
-    });
+    discover(
+      new PluginsConfig({ ...pluginConfig, paths: [extraPluginTestPath] }, env),
+      {
+        coreId: Symbol(),
+        configService,
+        env,
+        logger,
+      },
+      instanceInfo
+    );
 
     expect(loggingSystemMock.collect(logger).warn).toEqual([]);
   });
diff --git a/src/core/server/plugins/discovery/plugins_discovery.ts b/src/core/server/plugins/discovery/plugins_discovery.ts
index 5e765a9632e55..2b5b8ad071fb5 100644
--- a/src/core/server/plugins/discovery/plugins_discovery.ts
+++ b/src/core/server/plugins/discovery/plugins_discovery.ts
@@ -24,7 +24,7 @@ import { catchError, filter, map, mergeMap, shareReplay } from 'rxjs/operators';
 import { CoreContext } from '../../core_context';
 import { Logger } from '../../logging';
 import { PluginWrapper } from '../plugin';
-import { createPluginInitializerContext } from '../plugin_context';
+import { createPluginInitializerContext, InstanceInfo } from '../plugin_context';
 import { PluginsConfig } from '../plugins_config';
 import { PluginDiscoveryError } from './plugin_discovery_error';
 import { parseManifest } from './plugin_manifest_parser';
@@ -49,7 +49,11 @@ interface PluginSearchPathEntry {
  * @param coreContext Kibana core values.
  * @internal
  */
-export function discover(config: PluginsConfig, coreContext: CoreContext) {
+export function discover(
+  config: PluginsConfig,
+  coreContext: CoreContext,
+  instanceInfo: InstanceInfo
+) {
   const log = coreContext.logger.get('plugins-discovery');
   log.debug('Discovering plugins...');
 
@@ -65,7 +69,7 @@ export function discover(config: PluginsConfig, coreContext: CoreContext) {
   ).pipe(
     mergeMap((pluginPathOrError) => {
       return typeof pluginPathOrError === 'string'
-        ? createPlugin$(pluginPathOrError, log, coreContext)
+        ? createPlugin$(pluginPathOrError, log, coreContext, instanceInfo)
         : [pluginPathOrError];
     }),
     shareReplay()
@@ -180,7 +184,12 @@ function mapSubdirectories(
  * @param log Plugin discovery logger instance.
  * @param coreContext Kibana core context.
  */
-function createPlugin$(path: string, log: Logger, coreContext: CoreContext) {
+function createPlugin$(
+  path: string,
+  log: Logger,
+  coreContext: CoreContext,
+  instanceInfo: InstanceInfo
+) {
   return from(parseManifest(path, coreContext.env.packageInfo, log)).pipe(
     map((manifest) => {
       log.debug(`Successfully discovered plugin "${manifest.id}" at "${path}"`);
@@ -189,7 +198,12 @@ function createPlugin$(path: string, log: Logger, coreContext: CoreContext) {
         path,
         manifest,
         opaqueId,
-        initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+        initializerContext: createPluginInitializerContext(
+          coreContext,
+          opaqueId,
+          manifest,
+          instanceInfo
+        ),
       });
     }),
     catchError((err) => [err])
diff --git a/src/core/server/plugins/integration_tests/plugins_service.test.ts b/src/core/server/plugins/integration_tests/plugins_service.test.ts
index 49c129d0ae67d..5a216b75a83b9 100644
--- a/src/core/server/plugins/integration_tests/plugins_service.test.ts
+++ b/src/core/server/plugins/integration_tests/plugins_service.test.ts
@@ -28,12 +28,14 @@ import { BehaviorSubject, from } from 'rxjs';
 import { rawConfigServiceMock } from '../../config/raw_config_service.mock';
 import { config } from '../plugins_config';
 import { loggingSystemMock } from '../../logging/logging_system.mock';
+import { environmentServiceMock } from '../../environment/environment_service.mock';
 import { coreMock } from '../../mocks';
 import { Plugin } from '../types';
 import { PluginWrapper } from '../plugin';
 
 describe('PluginsService', () => {
   const logger = loggingSystemMock.create();
+  const environmentSetup = environmentServiceMock.createSetupContract();
   let pluginsService: PluginsService;
 
   const createPlugin = (
@@ -158,7 +160,7 @@ describe('PluginsService', () => {
       }
     );
 
-    await pluginsService.discover();
+    await pluginsService.discover({ environment: environmentSetup });
 
     const setupDeps = coreMock.createInternalSetup();
     await pluginsService.setup(setupDeps);
diff --git a/src/core/server/plugins/plugin.test.ts b/src/core/server/plugins/plugin.test.ts
index 4f26686e1f5e0..1108ffc248161 100644
--- a/src/core/server/plugins/plugin.test.ts
+++ b/src/core/server/plugins/plugin.test.ts
@@ -30,7 +30,11 @@ import { loggingSystemMock } from '../logging/logging_system.mock';
 
 import { PluginWrapper } from './plugin';
 import { PluginManifest } from './types';
-import { createPluginInitializerContext, createPluginSetupContext } from './plugin_context';
+import {
+  createPluginInitializerContext,
+  createPluginSetupContext,
+  InstanceInfo,
+} from './plugin_context';
 
 const mockPluginInitializer = jest.fn();
 const logger = loggingSystemMock.create();
@@ -67,12 +71,16 @@ configService.atPath.mockReturnValue(new BehaviorSubject({ initialize: true }));
 let coreId: symbol;
 let env: Env;
 let coreContext: CoreContext;
+let instanceInfo: InstanceInfo;
 
 const setupDeps = coreMock.createInternalSetup();
 
 beforeEach(() => {
   coreId = Symbol('core');
   env = Env.createDefault(getEnvOptions());
+  instanceInfo = {
+    uuid: 'instance-uuid',
+  };
 
   coreContext = { coreId, env, logger, configService: configService as any };
 });
@@ -88,7 +96,12 @@ test('`constructor` correctly initializes plugin instance', () => {
     path: 'some-plugin-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
 
   expect(plugin.name).toBe('some-plugin-id');
@@ -105,7 +118,12 @@ test('`setup` fails if `plugin` initializer is not exported', async () => {
     path: 'plugin-without-initializer-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
 
   await expect(
@@ -122,7 +140,12 @@ test('`setup` fails if plugin initializer is not a function', async () => {
     path: 'plugin-with-wrong-initializer-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
 
   await expect(
@@ -139,7 +162,12 @@ test('`setup` fails if initializer does not return object', async () => {
     path: 'plugin-with-initializer-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
 
   mockPluginInitializer.mockReturnValue(null);
@@ -158,7 +186,12 @@ test('`setup` fails if object returned from initializer does not define `setup`
     path: 'plugin-with-initializer-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
 
   const mockPluginInstance = { run: jest.fn() };
@@ -174,7 +207,12 @@ test('`setup` fails if object returned from initializer does not define `setup`
 test('`setup` initializes plugin and calls appropriate lifecycle hook', async () => {
   const manifest = createPluginManifest();
   const opaqueId = Symbol();
-  const initializerContext = createPluginInitializerContext(coreContext, opaqueId, manifest);
+  const initializerContext = createPluginInitializerContext(
+    coreContext,
+    opaqueId,
+    manifest,
+    instanceInfo
+  );
   const plugin = new PluginWrapper({
     path: 'plugin-with-initializer-path',
     manifest,
@@ -203,7 +241,12 @@ test('`start` fails if setup is not called first', async () => {
     path: 'some-plugin-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
 
   await expect(plugin.start({} as any, {} as any)).rejects.toThrowErrorMatchingInlineSnapshot(
@@ -218,7 +261,12 @@ test('`start` calls plugin.start with context and dependencies', async () => {
     path: 'plugin-with-initializer-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
   const context = { any: 'thing' } as any;
   const deps = { otherDep: 'value' };
@@ -247,7 +295,12 @@ test("`start` resolves `startDependencies` Promise after plugin's start", async
     path: 'plugin-with-initializer-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
   const startContext = { any: 'thing' } as any;
   const pluginDeps = { someDep: 'value' };
@@ -286,7 +339,12 @@ test('`stop` fails if plugin is not set up', async () => {
     path: 'plugin-with-initializer-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
 
   const mockPluginInstance = { setup: jest.fn(), stop: jest.fn() };
@@ -305,7 +363,12 @@ test('`stop` does nothing if plugin does not define `stop` function', async () =
     path: 'plugin-with-initializer-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
 
   mockPluginInitializer.mockReturnValue({ setup: jest.fn() });
@@ -321,7 +384,12 @@ test('`stop` calls `stop` defined by the plugin instance', async () => {
     path: 'plugin-with-initializer-path',
     manifest,
     opaqueId,
-    initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+    initializerContext: createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    ),
   });
 
   const mockPluginInstance = { setup: jest.fn(), stop: jest.fn() };
@@ -351,7 +419,12 @@ describe('#getConfigSchema()', () => {
       path: 'plugin-with-schema',
       manifest,
       opaqueId,
-      initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+      initializerContext: createPluginInitializerContext(
+        coreContext,
+        opaqueId,
+        manifest,
+        instanceInfo
+      ),
     });
 
     expect(plugin.getConfigDescriptor()).toBe(configDescriptor);
@@ -365,7 +438,12 @@ describe('#getConfigSchema()', () => {
       path: 'plugin-with-no-definition',
       manifest,
       opaqueId,
-      initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+      initializerContext: createPluginInitializerContext(
+        coreContext,
+        opaqueId,
+        manifest,
+        instanceInfo
+      ),
     });
     expect(plugin.getConfigDescriptor()).toBe(null);
   });
@@ -377,7 +455,12 @@ describe('#getConfigSchema()', () => {
       path: 'plugin-with-no-definition',
       manifest,
       opaqueId,
-      initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+      initializerContext: createPluginInitializerContext(
+        coreContext,
+        opaqueId,
+        manifest,
+        instanceInfo
+      ),
     });
     expect(plugin.getConfigDescriptor()).toBe(null);
   });
@@ -400,7 +483,12 @@ describe('#getConfigSchema()', () => {
       path: 'plugin-invalid-schema',
       manifest,
       opaqueId,
-      initializerContext: createPluginInitializerContext(coreContext, opaqueId, manifest),
+      initializerContext: createPluginInitializerContext(
+        coreContext,
+        opaqueId,
+        manifest,
+        instanceInfo
+      ),
     });
     expect(() => plugin.getConfigDescriptor()).toThrowErrorMatchingInlineSnapshot(
       `"Configuration schema expected to be an instance of Type"`
diff --git a/src/core/server/plugins/plugin_context.test.ts b/src/core/server/plugins/plugin_context.test.ts
index ebd068caadfb9..578c5f39d71ea 100644
--- a/src/core/server/plugins/plugin_context.test.ts
+++ b/src/core/server/plugins/plugin_context.test.ts
@@ -19,7 +19,7 @@
 
 import { duration } from 'moment';
 import { first } from 'rxjs/operators';
-import { createPluginInitializerContext } from './plugin_context';
+import { createPluginInitializerContext, InstanceInfo } from './plugin_context';
 import { CoreContext } from '../core_context';
 import { Env } from '../config';
 import { loggingSystemMock } from '../logging/logging_system.mock';
@@ -35,6 +35,7 @@ let coreId: symbol;
 let env: Env;
 let coreContext: CoreContext;
 let server: Server;
+let instanceInfo: InstanceInfo;
 
 function createPluginManifest(manifestProps: Partial<PluginManifest> = {}): PluginManifest {
   return {
@@ -51,9 +52,12 @@ function createPluginManifest(manifestProps: Partial<PluginManifest> = {}): Plug
   };
 }
 
-describe('Plugin Context', () => {
+describe('createPluginInitializerContext', () => {
   beforeEach(async () => {
     coreId = Symbol('core');
+    instanceInfo = {
+      uuid: 'instance-uuid',
+    };
     env = Env.createDefault(getEnvOptions());
     const config$ = rawConfigServiceMock.create({ rawConfig: {} });
     server = new Server(config$, env, logger);
@@ -67,7 +71,8 @@ describe('Plugin Context', () => {
     const pluginInitializerContext = createPluginInitializerContext(
       coreContext,
       opaqueId,
-      manifest
+      manifest,
+      instanceInfo
     );
 
     expect(pluginInitializerContext.config.legacy.globalConfig$).toBeDefined();
@@ -90,4 +95,19 @@ describe('Plugin Context', () => {
       path: { data: fromRoot('data') },
     });
   });
+
+  it('allow to access the provided instance uuid', () => {
+    const manifest = createPluginManifest();
+    const opaqueId = Symbol();
+    instanceInfo = {
+      uuid: 'kibana-uuid',
+    };
+    const pluginInitializerContext = createPluginInitializerContext(
+      coreContext,
+      opaqueId,
+      manifest,
+      instanceInfo
+    );
+    expect(pluginInitializerContext.env.instanceUuid).toBe('kibana-uuid');
+  });
 });
diff --git a/src/core/server/plugins/plugin_context.ts b/src/core/server/plugins/plugin_context.ts
index 62058f6d478e7..fa2659ca130a0 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -37,6 +37,10 @@ import {
 import { pick, deepFreeze } from '../../utils';
 import { CoreSetup, CoreStart } from '..';
 
+export interface InstanceInfo {
+  uuid: string;
+}
+
 /**
  * This returns a facade for `CoreContext` that will be exposed to the plugin initializer.
  * This facade should be safe to use across entire plugin lifespan.
@@ -53,7 +57,8 @@ import { CoreSetup, CoreStart } from '..';
 export function createPluginInitializerContext(
   coreContext: CoreContext,
   opaqueId: PluginOpaqueId,
-  pluginManifest: PluginManifest
+  pluginManifest: PluginManifest,
+  instanceInfo: InstanceInfo
 ): PluginInitializerContext {
   return {
     opaqueId,
@@ -64,6 +69,7 @@ export function createPluginInitializerContext(
     env: {
       mode: coreContext.env.mode,
       packageInfo: coreContext.env.packageInfo,
+      instanceUuid: instanceInfo.uuid,
     },
 
     /**
@@ -183,9 +189,6 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
     uiSettings: {
       register: deps.uiSettings.register,
     },
-    uuid: {
-      getInstanceUuid: deps.uuid.getInstanceUuid,
-    },
     getStartServices: () => plugin.startDependencies,
     auditTrail: deps.auditTrail,
   };
diff --git a/src/core/server/plugins/plugins_service.test.ts b/src/core/server/plugins/plugins_service.test.ts
index aa77335991e2c..5e613343c302f 100644
--- a/src/core/server/plugins/plugins_service.test.ts
+++ b/src/core/server/plugins/plugins_service.test.ts
@@ -29,6 +29,7 @@ import { rawConfigServiceMock } from '../config/raw_config_service.mock';
 import { getEnvOptions } from '../config/__mocks__/env';
 import { coreMock } from '../mocks';
 import { loggingSystemMock } from '../logging/logging_system.mock';
+import { environmentServiceMock } from '../environment/environment_service.mock';
 import { PluginDiscoveryError } from './discovery';
 import { PluginWrapper } from './plugin';
 import { PluginsService } from './plugins_service';
@@ -45,6 +46,7 @@ let configService: ConfigService;
 let coreId: symbol;
 let env: Env;
 let mockPluginSystem: jest.Mocked<PluginsSystem>;
+let environmentSetup: ReturnType<typeof environmentServiceMock.createSetupContract>;
 
 const setupDeps = coreMock.createInternalSetup();
 const logger = loggingSystemMock.create();
@@ -124,6 +126,8 @@ describe('PluginsService', () => {
 
     [mockPluginSystem] = MockPluginsSystem.mock.instances as any;
     mockPluginSystem.uiPlugins.mockReturnValue(new Map());
+
+    environmentSetup = environmentServiceMock.createSetupContract();
   });
 
   afterEach(() => {
@@ -137,7 +141,8 @@ describe('PluginsService', () => {
         plugin$: from([]),
       });
 
-      await expect(pluginsService.discover()).rejects.toMatchInlineSnapshot(`
+      await expect(pluginsService.discover({ environment: environmentSetup })).rejects
+        .toMatchInlineSnapshot(`
               [Error: Failed to initialize plugins:
               	Invalid JSON (invalid-manifest, path-1)]
             `);
@@ -158,7 +163,8 @@ describe('PluginsService', () => {
         plugin$: from([]),
       });
 
-      await expect(pluginsService.discover()).rejects.toMatchInlineSnapshot(`
+      await expect(pluginsService.discover({ environment: environmentSetup })).rejects
+        .toMatchInlineSnapshot(`
               [Error: Failed to initialize plugins:
               	Incompatible version (incompatible-version, path-3)]
             `);
@@ -192,7 +198,9 @@ describe('PluginsService', () => {
         ]),
       });
 
-      await expect(pluginsService.discover()).rejects.toMatchInlineSnapshot(
+      await expect(
+        pluginsService.discover({ environment: environmentSetup })
+      ).rejects.toMatchInlineSnapshot(
         `[Error: Plugin with id "conflicting-id" is already registered!]`
       );
 
@@ -253,7 +261,7 @@ describe('PluginsService', () => {
         ]),
       });
 
-      await pluginsService.discover();
+      await pluginsService.discover({ environment: environmentSetup });
       const setup = await pluginsService.setup(setupDeps);
 
       expect(setup.contracts).toBeInstanceOf(Map);
@@ -300,7 +308,7 @@ describe('PluginsService', () => {
         plugin$: from([firstPlugin, secondPlugin]),
       });
 
-      const { pluginTree } = await pluginsService.discover();
+      const { pluginTree } = await pluginsService.discover({ environment: environmentSetup });
       expect(pluginTree).toBeUndefined();
 
       expect(mockDiscover).toHaveBeenCalledTimes(1);
@@ -336,7 +344,7 @@ describe('PluginsService', () => {
         plugin$: from([firstPlugin, secondPlugin, thirdPlugin, lastPlugin, missingDepsPlugin]),
       });
 
-      const { pluginTree } = await pluginsService.discover();
+      const { pluginTree } = await pluginsService.discover({ environment: environmentSetup });
       expect(pluginTree).toBeUndefined();
 
       expect(mockDiscover).toHaveBeenCalledTimes(1);
@@ -369,7 +377,7 @@ describe('PluginsService', () => {
         plugin$: from([firstPlugin, secondPlugin]),
       });
 
-      await pluginsService.discover();
+      await pluginsService.discover({ environment: environmentSetup });
       expect(mockPluginSystem.addPlugin).toHaveBeenCalledTimes(2);
       expect(mockPluginSystem.addPlugin).toHaveBeenCalledWith(firstPlugin);
       expect(mockPluginSystem.addPlugin).toHaveBeenCalledWith(secondPlugin);
@@ -386,7 +394,8 @@ describe('PluginsService', () => {
             resolve(process.cwd(), '..', 'kibana-extra'),
           ],
         },
-        { coreId, env, logger, configService }
+        { coreId, env, logger, configService },
+        { uuid: 'uuid' }
       );
 
       const logs = loggingSystemMock.collect(logger);
@@ -417,7 +426,7 @@ describe('PluginsService', () => {
           }),
         ]),
       });
-      await pluginsService.discover();
+      await pluginsService.discover({ environment: environmentSetup });
       expect(configService.setSchema).toBeCalledWith('path', configSchema);
     });
 
@@ -448,7 +457,7 @@ describe('PluginsService', () => {
           }),
         ]),
       });
-      await pluginsService.discover();
+      await pluginsService.discover({ environment: environmentSetup });
       expect(configService.addDeprecationProvider).toBeCalledWith(
         'config-path',
         deprecationProvider
@@ -496,7 +505,7 @@ describe('PluginsService', () => {
       });
       mockPluginSystem.uiPlugins.mockReturnValue(new Map([pluginToDiscoveredEntry(plugin)]));
 
-      const { uiPlugins } = await pluginsService.discover();
+      const { uiPlugins } = await pluginsService.discover({ environment: environmentSetup });
       const uiConfig$ = uiPlugins.browserConfigs.get('plugin-with-expose');
       expect(uiConfig$).toBeDefined();
 
@@ -532,7 +541,7 @@ describe('PluginsService', () => {
       });
       mockPluginSystem.uiPlugins.mockReturnValue(new Map([pluginToDiscoveredEntry(plugin)]));
 
-      const { uiPlugins } = await pluginsService.discover();
+      const { uiPlugins } = await pluginsService.discover({ environment: environmentSetup });
       expect([...uiPlugins.browserConfigs.entries()]).toHaveLength(0);
     });
   });
@@ -561,7 +570,7 @@ describe('PluginsService', () => {
     describe('uiPlugins.internal', () => {
       it('includes disabled plugins', async () => {
         config$.next({ plugins: { initialize: true }, plugin1: { enabled: false } });
-        const { uiPlugins } = await pluginsService.discover();
+        const { uiPlugins } = await pluginsService.discover({ environment: environmentSetup });
         expect(uiPlugins.internal).toMatchInlineSnapshot(`
           Map {
             "plugin-1" => Object {
@@ -582,7 +591,7 @@ describe('PluginsService', () => {
     describe('plugin initialization', () => {
       it('does initialize if plugins.initialize is true', async () => {
         config$.next({ plugins: { initialize: true } });
-        await pluginsService.discover();
+        await pluginsService.discover({ environment: environmentSetup });
         const { initialized } = await pluginsService.setup(setupDeps);
         expect(mockPluginSystem.setupPlugins).toHaveBeenCalled();
         expect(initialized).toBe(true);
@@ -590,7 +599,7 @@ describe('PluginsService', () => {
 
       it('does not initialize if plugins.initialize is false', async () => {
         config$.next({ plugins: { initialize: false } });
-        await pluginsService.discover();
+        await pluginsService.discover({ environment: environmentSetup });
         const { initialized } = await pluginsService.setup(setupDeps);
         expect(mockPluginSystem.setupPlugins).not.toHaveBeenCalled();
         expect(initialized).toBe(false);
diff --git a/src/core/server/plugins/plugins_service.ts b/src/core/server/plugins/plugins_service.ts
index 06de48a215881..30cd47c9d44e1 100644
--- a/src/core/server/plugins/plugins_service.ts
+++ b/src/core/server/plugins/plugins_service.ts
@@ -32,6 +32,7 @@ import { PluginsSystem } from './plugins_system';
 import { InternalCoreSetup, InternalCoreStart } from '../internal_types';
 import { IConfigService } from '../config';
 import { pick } from '../../utils';
+import { InternalEnvironmentServiceSetup } from '../environment';
 
 /** @internal */
 export interface PluginsServiceSetup {
@@ -72,6 +73,11 @@ export type PluginsServiceSetupDeps = InternalCoreSetup;
 /** @internal */
 export type PluginsServiceStartDeps = InternalCoreStart;
 
+/** @internal */
+export interface PluginsServiceDiscoverDeps {
+  environment: InternalEnvironmentServiceSetup;
+}
+
 /** @internal */
 export class PluginsService implements CoreService<PluginsServiceSetup, PluginsServiceStart> {
   private readonly log: Logger;
@@ -90,12 +96,14 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
       .pipe(map((rawConfig) => new PluginsConfig(rawConfig, coreContext.env)));
   }
 
-  public async discover() {
+  public async discover({ environment }: PluginsServiceDiscoverDeps) {
     this.log.debug('Discovering plugins');
 
     const config = await this.config$.pipe(first()).toPromise();
 
-    const { error$, plugin$ } = discover(config, this.coreContext);
+    const { error$, plugin$ } = discover(config, this.coreContext, {
+      uuid: environment.instanceUuid,
+    });
     await this.handleDiscoveryErrors(error$);
     await this.handleDiscoveredPlugins(plugin$);
 
diff --git a/src/core/server/plugins/types.ts b/src/core/server/plugins/types.ts
index 9695c9171a771..eb2a9ca3daf5f 100644
--- a/src/core/server/plugins/types.ts
+++ b/src/core/server/plugins/types.ts
@@ -278,6 +278,7 @@ export interface PluginInitializerContext<ConfigSchema = unknown> {
   env: {
     mode: EnvironmentMode;
     packageInfo: Readonly<PackageInfo>;
+    instanceUuid: string;
   };
   logger: LoggerFactory;
   config: {
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index cd7f4973f886c..6186906bc3a42 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -499,8 +499,6 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
     status: StatusServiceSetup;
     // (undocumented)
     uiSettings: UiSettingsServiceSetup;
-    // (undocumented)
-    uuid: UuidServiceSetup;
 }
 
 // @public
@@ -1778,6 +1776,7 @@ export interface PluginInitializerContext<ConfigSchema = unknown> {
     env: {
         mode: EnvironmentMode;
         packageInfo: Readonly<PackageInfo>;
+        instanceUuid: string;
     };
     // (undocumented)
     logger: LoggerFactory;
@@ -2883,11 +2882,6 @@ export interface UserProvidedValues<T = any> {
     userValue?: T;
 }
 
-// @public
-export interface UuidServiceSetup {
-    getInstanceUuid(): string;
-}
-
 // @public
 export const validBodyOutput: readonly ["data", "stream"];
 
diff --git a/src/core/server/server.test.mocks.ts b/src/core/server/server.test.mocks.ts
index 82d0c095bfe95..471e482a20e96 100644
--- a/src/core/server/server.test.mocks.ts
+++ b/src/core/server/server.test.mocks.ts
@@ -74,10 +74,10 @@ import { RenderingService, mockRenderingService } from './rendering/__mocks__/re
 export { mockRenderingService };
 jest.doMock('./rendering/rendering_service', () => ({ RenderingService }));
 
-import { uuidServiceMock } from './uuid/uuid_service.mock';
-export const mockUuidService = uuidServiceMock.create();
-jest.doMock('./uuid/uuid_service', () => ({
-  UuidService: jest.fn(() => mockUuidService),
+import { environmentServiceMock } from './environment/environment_service.mock';
+export const mockEnvironmentService = environmentServiceMock.create();
+jest.doMock('./environment/environment_service', () => ({
+  EnvironmentService: jest.fn(() => mockEnvironmentService),
 }));
 
 import { metricsServiceMock } from './metrics/metrics_service.mock';
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index aff749ca97534..cc6d8171e7a03 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -31,7 +31,7 @@ import { PluginsService, config as pluginsConfig } from './plugins';
 import { SavedObjectsService } from '../server/saved_objects';
 import { MetricsService, opsConfig } from './metrics';
 import { CapabilitiesService } from './capabilities';
-import { UuidService } from './uuid';
+import { EnvironmentService } from './environment';
 import { StatusService } from './status/status_service';
 
 import { config as cspConfig } from './csp';
@@ -64,7 +64,7 @@ export class Server {
   private readonly plugins: PluginsService;
   private readonly savedObjects: SavedObjectsService;
   private readonly uiSettings: UiSettingsService;
-  private readonly uuid: UuidService;
+  private readonly environment: EnvironmentService;
   private readonly metrics: MetricsService;
   private readonly httpResources: HttpResourcesService;
   private readonly status: StatusService;
@@ -95,7 +95,7 @@ export class Server {
     this.savedObjects = new SavedObjectsService(core);
     this.uiSettings = new UiSettingsService(core);
     this.capabilities = new CapabilitiesService(core);
-    this.uuid = new UuidService(core);
+    this.environment = new EnvironmentService(core);
     this.metrics = new MetricsService(core);
     this.status = new StatusService(core);
     this.coreApp = new CoreApp(core);
@@ -107,8 +107,12 @@ export class Server {
   public async setup() {
     this.log.debug('setting up server');
 
+    const environmentSetup = await this.environment.setup();
+
     // Discover any plugins before continuing. This allows other systems to utilize the plugin dependency graph.
-    const { pluginTree, uiPlugins } = await this.plugins.discover();
+    const { pluginTree, uiPlugins } = await this.plugins.discover({
+      environment: environmentSetup,
+    });
     const legacyPlugins = await this.legacy.discoverPlugins();
 
     // Immediately terminate in case of invalid configuration
@@ -124,7 +128,6 @@ export class Server {
     });
 
     const auditTrailSetup = this.auditTrail.setup();
-    const uuidSetup = await this.uuid.setup();
 
     const httpSetup = await this.http.setup({
       context: contextServiceSetup,
@@ -174,11 +177,11 @@ export class Server {
       capabilities: capabilitiesSetup,
       context: contextServiceSetup,
       elasticsearch: elasticsearchServiceSetup,
+      environment: environmentSetup,
       http: httpSetup,
       savedObjects: savedObjectsSetup,
       status: statusSetup,
       uiSettings: uiSettingsSetup,
-      uuid: uuidSetup,
       rendering: renderingSetup,
       httpResources: httpResourcesSetup,
       auditTrail: auditTrailSetup,
diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
index 176c5386961a5..722d75d00f78f 100644
--- a/src/legacy/core_plugins/kibana/index.js
+++ b/src/legacy/core_plugins/kibana/index.js
@@ -17,13 +17,8 @@
  * under the License.
  */
 
-import Fs from 'fs';
-import { promisify } from 'util';
-
 import { getUiSettingDefaults } from './server/ui_setting_defaults';
 
-const mkdirAsync = promisify(Fs.mkdir);
-
 export default function (kibana) {
   return new kibana.Plugin({
     id: 'kibana',
@@ -40,17 +35,5 @@ export default function (kibana) {
     uiExports: {
       uiSettingDefaults: getUiSettingDefaults(),
     },
-
-    preInit: async function (server) {
-      try {
-        // Create the data directory (recursively, if the a parent dir doesn't exist).
-        // If it already exists, does nothing.
-        await mkdirAsync(server.config().get('path.data'), { recursive: true });
-      } catch (err) {
-        server.log(['error', 'init'], err);
-        // Stop the server startup with a fatal error
-        throw err;
-      }
-    },
   });
 }
diff --git a/x-pack/plugins/event_log/server/plugin.ts b/x-pack/plugins/event_log/server/plugin.ts
index 1353877fa4629..4439a4fb9fdbb 100644
--- a/x-pack/plugins/event_log/server/plugin.ts
+++ b/x-pack/plugins/event_log/server/plugin.ts
@@ -85,7 +85,7 @@ export class Plugin implements CorePlugin<IEventLogService, IEventLogClientServi
       config,
       esContext: this.esContext,
       systemLogger: this.systemLogger,
-      kibanaUUID: core.uuid.getInstanceUuid(),
+      kibanaUUID: this.context.env.instanceUuid,
       savedObjectProviderRegistry: this.savedObjectProviderRegistry,
     });
 
diff --git a/x-pack/plugins/monitoring/server/plugin.test.ts b/x-pack/plugins/monitoring/server/plugin.test.ts
index 13da0a3c9242e..8bd43b6be0a8d 100644
--- a/x-pack/plugins/monitoring/server/plugin.test.ts
+++ b/x-pack/plugins/monitoring/server/plugin.test.ts
@@ -65,9 +65,6 @@ describe('Monitoring plugin', () => {
         serverBasePath: '',
       },
     },
-    uuid: {
-      getInstanceUuid: jest.fn(),
-    },
     elasticsearch: {
       legacy: {
         client: {},
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index 043435c48a211..501c96b12fde8 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -92,7 +92,7 @@ export class Plugin {
     const router = core.http.createRouter();
     this.legacyShimDependencies = {
       router,
-      instanceUuid: core.uuid.getInstanceUuid(),
+      instanceUuid: this.initializerContext.env.instanceUuid,
       esDataClient: core.elasticsearch.legacy.client,
       kibanaStatsCollector: plugins.usageCollection?.getCollectorByType(
         KIBANA_STATS_TYPE_MONITORING
@@ -159,7 +159,7 @@ export class Plugin {
       config,
       log: kibanaMonitoringLog,
       kibanaStats: {
-        uuid: core.uuid.getInstanceUuid(),
+        uuid: this.initializerContext.env.instanceUuid,
         name: serverInfo.name,
         index: get(legacyConfig, 'kibana.index'),
         host: serverInfo.hostname,
diff --git a/x-pack/plugins/reporting/server/config/config.ts b/x-pack/plugins/reporting/server/config/config.ts
index ca07fd8452372..088598829a3e1 100644
--- a/x-pack/plugins/reporting/server/config/config.ts
+++ b/x-pack/plugins/reporting/server/config/config.ts
@@ -75,7 +75,7 @@ export const buildConfig = async (
       host: serverInfo.hostname,
       name: serverInfo.name,
       port: serverInfo.port,
-      uuid: core.uuid.getInstanceUuid(),
+      uuid: initContext.env.instanceUuid,
       protocol: serverInfo.protocol,
     },
   };
diff --git a/x-pack/plugins/task_manager/server/plugin.ts b/x-pack/plugins/task_manager/server/plugin.ts
index 70295046d19f4..d7dcf779376bf 100644
--- a/x-pack/plugins/task_manager/server/plugin.ts
+++ b/x-pack/plugins/task_manager/server/plugin.ts
@@ -42,7 +42,7 @@ export class TaskManagerPlugin
       .toPromise();
 
     setupSavedObjects(core.savedObjects, this.config);
-    this.taskManagerId = core.uuid.getInstanceUuid();
+    this.taskManagerId = this.initContext.env.instanceUuid;
 
     return {
       addMiddleware: (middleware: Middleware) => {

From 2946e68581a81c6a685a248192c8f08fec77a552 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Wed, 26 Aug 2020 15:51:47 -0400
Subject: [PATCH 069/148] [Ingest Manager] Remove useless saved object update
 in agent checkin (#75586)

---
 .../server/services/agents/checkin/index.ts            | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts b/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
index 78e6a11fa78a4..19a5c2dc08762 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/checkin/index.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import deepEqual from 'fast-deep-equal';
 import { SavedObjectsClientContract, SavedObjectsBulkCreateObject } from 'src/core/server';
 import {
   Agent,
@@ -29,16 +30,19 @@ export async function agentCheckin(
 ) {
   const updateData: Partial<AgentSOAttributes> = {};
   const { updatedErrorEvents } = await processEventsForCheckin(soClient, agent, data.events);
-  if (updatedErrorEvents) {
+  if (
+    updatedErrorEvents &&
+    !(updatedErrorEvents.length === 0 && agent.current_error_events.length === 0)
+  ) {
     updateData.current_error_events = JSON.stringify(updatedErrorEvents);
   }
-  if (data.localMetadata) {
+  if (data.localMetadata && !deepEqual(data.localMetadata, agent.local_metadata)) {
     updateData.local_metadata = data.localMetadata;
   }
-
   if (data.status !== agent.last_checkin_status) {
     updateData.last_checkin_status = data.status;
   }
+  // Update agent only if something changed
   if (Object.keys(updateData).length > 0) {
     await soClient.update<AgentSOAttributes>(AGENT_SAVED_OBJECT_TYPE, agent.id, updateData);
   }

From 638df5820c04d2c21311dda3198855e2ae569b64 Mon Sep 17 00:00:00 2001
From: Garrett Spong <spong@users.noreply.github.com>
Date: Wed, 26 Aug 2020 13:56:18 -0600
Subject: [PATCH 070/148] [Security Solution][Detections] Fixes Alerts Table
 'Select all [x] alerts' action (#75945)

## Summary

Resolves https://github.com/elastic/kibana/issues/75194

Fixes issue where the `Select all [x] alerts` feature would not select the checkboxes within the Alerts Table. Also resolves issue where bulk actions wouldn't work with Building Block Alerts.


##### Select All Before
<p align="center">
  <img width="700" src="https://user-images.githubusercontent.com/2946766/91266588-d2d66800-e72e-11ea-8c57-c91bd80a8f0e.gif" />
</p>




##### Select All After
<p align="center">
  <img width="700" src="https://user-images.githubusercontent.com/2946766/91266573-cc47f080-e72e-11ea-9812-67e7182f90f3.gif" />
</p>



##### Building Block Query Before
<p align="center">
  <img width="700" src="https://user-images.githubusercontent.com/2946766/91266516-af132200-e72e-11ea-9088-63de64d2774e.gif" />
</p>

##### Building Block Query After
<p align="center">
  <img width="700" src="https://user-images.githubusercontent.com/2946766/91266531-bb977a80-e72e-11ea-8071-904b355856f7.gif" />
</p>
---
 .../components/alerts_table/index.tsx         | 42 ++++++++++++-------
 .../components/manage_timeline/index.tsx      | 24 +++++++++++
 .../timeline/body/stateful_body.tsx           |  4 +-
 3 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
index 66423259ec155..07e69d850f173 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -105,7 +105,6 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
   updateTimelineIsLoading,
 }) => {
   const dispatch = useDispatch();
-  const [selectAll, setSelectAll] = useState(false);
   const apolloClient = useApolloClient();
 
   const [showClearSelectionAction, setShowClearSelectionAction] = useState(false);
@@ -120,6 +119,12 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
   );
   const kibana = useKibana();
   const [, dispatchToaster] = useStateToaster();
+  const {
+    initializeTimeline,
+    setSelectAll,
+    setTimelineRowActions,
+    setIndexToAdd,
+  } = useManageTimeline();
 
   const getGlobalQuery = useCallback(
     (customFilters: Filter[]) => {
@@ -141,8 +146,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
       }
       return null;
     },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [browserFields, globalFilters, globalQuery, indexPatterns, kibana, to, from]
+    [browserFields, defaultFilters, globalFilters, globalQuery, indexPatterns, kibana, to, from]
   );
 
   // Callback for creating a new timeline -- utilized by row/batch actions
@@ -240,12 +244,15 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
 
   // Catches state change isSelectAllChecked->false upon user selection change to reset utility bar
   useEffect(() => {
-    if (!isSelectAllChecked) {
-      setShowClearSelectionAction(false);
+    if (isSelectAllChecked) {
+      setSelectAll({
+        id: timelineId,
+        selectAll: false,
+      });
     } else {
-      setSelectAll(false);
+      setShowClearSelectionAction(false);
     }
-  }, [isSelectAllChecked]);
+  }, [isSelectAllChecked, setSelectAll, timelineId]);
 
   // Callback for when open/closed filter changes
   const onFilterGroupChangedCallback = useCallback(
@@ -261,17 +268,23 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
   // Callback for clearing entire selection from utility bar
   const clearSelectionCallback = useCallback(() => {
     clearSelected!({ id: timelineId });
-    setSelectAll(false);
+    setSelectAll({
+      id: timelineId,
+      selectAll: false,
+    });
     setShowClearSelectionAction(false);
   }, [clearSelected, setSelectAll, setShowClearSelectionAction, timelineId]);
 
   // Callback for selecting all events on all pages from utility bar
   // Dispatches to stateful_body's selectAll via TimelineTypeContext props
   // as scope of response data required to actually set selectedEvents
-  const selectAllCallback = useCallback(() => {
-    setSelectAll(true);
+  const selectAllOnAllPagesCallback = useCallback(() => {
+    setSelectAll({
+      id: timelineId,
+      selectAll: true,
+    });
     setShowClearSelectionAction(true);
-  }, [setSelectAll, setShowClearSelectionAction]);
+  }, [setSelectAll, setShowClearSelectionAction, timelineId]);
 
   const updateAlertsStatusCallback: UpdateAlertsStatusCallback = useCallback(
     async (
@@ -314,7 +327,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
           clearSelection={clearSelectionCallback}
           hasIndexWrite={hasIndexWrite}
           currentFilter={filterGroup}
-          selectAll={selectAllCallback}
+          selectAll={selectAllOnAllPagesCallback}
           selectedEventIds={selectedEventIds}
           showBuildingBlockAlerts={showBuildingBlockAlerts}
           onShowBuildingBlockAlertsChanged={onShowBuildingBlockAlertsChanged}
@@ -332,7 +345,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
       showBuildingBlockAlerts,
       onShowBuildingBlockAlertsChanged,
       loadingEventIds.length,
-      selectAllCallback,
+      selectAllOnAllPagesCallback,
       selectedEventIds,
       showClearSelectionAction,
       updateAlertsStatusCallback,
@@ -384,7 +397,6 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
     }
   }, [defaultFilters, filterGroup]);
   const { filterManager } = useKibana().services.data.query;
-  const { initializeTimeline, setTimelineRowActions, setIndexToAdd } = useManageTimeline();
 
   useEffect(() => {
     initializeTimeline({
@@ -395,7 +407,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
       id: timelineId,
       indexToAdd: defaultIndices,
       loadingText: i18n.LOADING_ALERTS,
-      selectAll: canUserCRUD ? selectAll : false,
+      selectAll: false,
       timelineRowActions: () => [getInvestigateInResolverAction({ dispatch, timelineId })],
       title: '',
     });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.tsx
index a425f9b49add0..560d4c6928e4e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.tsx
@@ -71,6 +71,11 @@ type ActionManageTimeline =
       id: string;
       payload: string[];
     }
+  | {
+      type: 'SET_SELECT_ALL';
+      id: string;
+      payload: boolean;
+    }
   | {
       type: 'SET_TIMELINE_ACTIONS';
       id: string;
@@ -116,6 +121,14 @@ const reducerManageTimeline = (
           indexToAdd: action.payload,
         },
       } as ManageTimelineById;
+    case 'SET_SELECT_ALL':
+      return {
+        ...state,
+        [action.id]: {
+          ...state[action.id],
+          selectAll: action.payload,
+        },
+      } as ManageTimelineById;
     case 'SET_TIMELINE_ACTIONS':
       return {
         ...state,
@@ -145,6 +158,7 @@ export interface UseTimelineManager {
   isManagedTimeline: (id: string) => boolean;
   setIndexToAdd: (indexToAddArgs: { id: string; indexToAdd: string[] }) => void;
   setIsTimelineLoading: (isLoadingArgs: { id: string; isLoading: boolean }) => void;
+  setSelectAll: (selectAllArgs: { id: string; selectAll: boolean }) => void;
   setTimelineRowActions: (actionsArgs: {
     id: string;
     queryFields?: string[];
@@ -205,6 +219,14 @@ export const useTimelineManager = (
     });
   }, []);
 
+  const setSelectAll = useCallback(({ id, selectAll }: { id: string; selectAll: boolean }) => {
+    dispatch({
+      type: 'SET_SELECT_ALL',
+      id,
+      payload: selectAll,
+    });
+  }, []);
+
   const getTimelineFilterManager = useCallback(
     (id: string): FilterManager | undefined => state[id]?.filterManager,
     [state]
@@ -238,6 +260,7 @@ export const useTimelineManager = (
     isManagedTimeline,
     setIndexToAdd,
     setIsTimelineLoading,
+    setSelectAll,
     setTimelineRowActions,
   };
 };
@@ -250,6 +273,7 @@ const init = {
   isManagedTimeline: () => false,
   setIndexToAdd: () => undefined,
   setIsTimelineLoading: () => noop,
+  setSelectAll: () => noop,
   setTimelineRowActions: () => noop,
 };
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/stateful_body.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/stateful_body.tsx
index 15fa13b1a08f1..8deda03ece70e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/stateful_body.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/stateful_body.tsx
@@ -169,10 +169,10 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
 
     // Sync to selectAll so parent components can select all events
     useEffect(() => {
-      if (selectAll) {
+      if (selectAll && !isSelectAllChecked) {
         onSelectAll({ isSelected: true });
       }
-    }, [onSelectAll, selectAll]);
+    }, [isSelectAllChecked, onSelectAll, selectAll]);
 
     const enabledRowRenderers = useMemo(() => {
       if (

From 532f2d70e84af2aec4df06331643fbb6e0ba5033 Mon Sep 17 00:00:00 2001
From: Catherine Liu <catherine.liu@elastic.co>
Date: Wed, 26 Aug 2020 13:00:00 -0700
Subject: [PATCH 071/148] [Home] Elastic home page redesign (#70571)

Co-authored-by: Catherine Liu <catherine.liu@elastic.co>
Co-authored-by: Ryan Keairns <contactryank@gmail.com>
Co-authored-by: Catherine Liu <catherineqliu@outlook.com>
Co-authored-by: Michael Marcialis <michael.marcialis@elastic.co>
---
 .../collapsible_nav.test.tsx.snap             |   10 +-
 .../header/__snapshots__/header.test.tsx.snap |    6 +
 src/core/public/chrome/ui/header/header.tsx   |    2 +-
 .../overlays/banners/_banners_list.scss       |    2 +-
 src/core/utils/default_app_categories.ts      |    2 +-
 src/plugins/advanced_settings/kibana.json     |    3 +-
 .../management_app/advanced_settings.tsx      |   15 +
 .../field/__snapshots__/field.test.tsx.snap   |   54 +
 .../management_app/components/field/field.tsx |    1 +
 .../advanced_settings/public/plugin.ts        |   18 +-
 src/plugins/advanced_settings/public/types.ts |    3 +
 src/plugins/console/kibana.json               |    6 +-
 src/plugins/console/public/plugin.ts          |   28 +-
 .../public/types/plugin_dependencies.ts       |    2 +-
 src/plugins/dashboard/public/plugin.tsx       |    2 +-
 .../discover/public/register_feature.ts       |    2 +-
 src/plugins/home/common/constants.ts          |   21 +
 .../home/public/application/application.tsx   |    8 +-
 .../__snapshots__/add_data.test.js.snap       | 1163 --------
 .../__snapshots__/home.test.js.snap           | 2360 ++++++++++-------
 .../__snapshots__/synopsis.test.js.snap       |   12 +-
 .../application/components/_add_data.scss     |   83 +-
 .../public/application/components/_home.scss  |   74 +-
 .../public/application/components/_index.scss |    4 +-
 .../application/components/_manage_data.scss  |   22 +
 .../components/_solutions_section.scss        |  122 +
 .../application/components/_synopsis.scss     |    4 +
 .../public/application/components/add_data.js |  320 ---
 .../application/components/add_data.test.js   |   68 -
 .../__snapshots__/add_data.test.tsx.snap      |   96 +
 .../components/add_data/add_data.test.tsx     |   95 +
 .../components/add_data/add_data.tsx          |   95 +
 .../application/components/add_data/index.ts  |   20 +
 .../components/app_navigation_handler.ts      |    1 +
 .../components/feature_directory.js           |    2 +
 .../public/application/components/home.js     |  250 +-
 .../application/components/home.test.js       |  113 +-
 .../public/application/components/home_app.js |   19 +-
 .../__snapshots__/manage_data.test.tsx.snap   |   91 +
 .../components/manage_data/index.tsx          |   20 +
 .../manage_data/manage_data.test.tsx          |   91 +
 .../components/manage_data/manage_data.tsx    |   81 +
 .../solution_panel.test.tsx.snap              |   47 +
 .../solution_title.test.tsx.snap              |   41 +
 .../solutions_section.test.tsx.snap           |  288 ++
 .../components/solutions_section/index.ts     |   20 +
 .../solutions_section/solution_panel.test.tsx |   43 +
 .../solutions_section/solution_panel.tsx      |   83 +
 .../solutions_section/solution_title.test.tsx |   45 +
 .../solutions_section/solution_title.tsx      |   59 +
 .../solutions_section.test.tsx                |   94 +
 .../solutions_section/solutions_section.tsx   |   93 +
 .../public/application/components/synopsis.js |    4 +-
 .../application/components/synopsis.test.js   |    4 +
 .../components/tutorial_directory.js          |    3 +
 src/plugins/home/public/index.ts              |    1 +
 src/plugins/home/public/plugin.test.ts        |   36 +
 src/plugins/home/public/plugin.ts             |   59 +-
 .../feature_catalogue_registry.mock.ts        |    2 +
 .../feature_catalogue_registry.test.ts        |   20 +-
 .../feature_catalogue_registry.ts             |   40 +
 .../services/feature_catalogue/index.ts       |    1 +
 src/plugins/management/kibana.json            |    5 +-
 src/plugins/management/public/plugin.ts       |   30 +-
 .../saved_objects_management/kibana.json      |    6 +-
 .../saved_objects_management/public/plugin.ts |   32 +-
 src/plugins/visualize/public/plugin.ts        |    2 +-
 test/functional/page_objects/home_page.ts     |    8 +-
 x-pack/plugins/apm/kibana.json                |    7 +-
 .../apm/public/featureCatalogueEntry.ts       |    2 +-
 x-pack/plugins/apm/public/plugin.ts           |    8 +-
 x-pack/plugins/canvas/kibana.json             |    6 +-
 .../canvas/public/feature_catalogue_entry.ts  |    2 +-
 x-pack/plugins/canvas/public/plugin.tsx       |    6 +-
 x-pack/plugins/enterprise_search/kibana.json  |    7 +-
 .../enterprise_search/public/plugin.ts        |   71 +-
 .../enterprise_search/server/plugin.ts        |    3 +-
 x-pack/plugins/graph/public/plugin.ts         |    5 +-
 .../index_lifecycle_management/kibana.json    |    7 +-
 .../public/plugin.tsx                         |   23 +-
 .../public/types.ts                           |    2 +
 x-pack/plugins/infra/kibana.json              |    7 +-
 x-pack/plugins/infra/public/plugin.ts         |    4 +-
 .../plugins/infra/public/register_feature.ts  |    4 +-
 x-pack/plugins/infra/public/types.ts          |    2 +-
 x-pack/plugins/infra/server/features.ts       |   12 +-
 x-pack/plugins/ingest_manager/kibana.json     |    2 +-
 .../plugins/ingest_manager/public/plugin.ts   |   21 +-
 .../plugins/ingest_manager/server/plugin.ts   |    3 +
 x-pack/plugins/logstash/public/plugin.ts      |    2 +-
 x-pack/plugins/maps/kibana.json               |    5 +-
 .../maps/public/feature_catalogue_entry.ts    |    4 +-
 x-pack/plugins/maps/public/plugin.ts          |    6 +-
 .../plugins/ml/common/types/capabilities.ts   |    2 +
 x-pack/plugins/ml/kibana.json                 |    5 +-
 x-pack/plugins/ml/public/plugin.ts            |    6 +-
 x-pack/plugins/ml/public/register_feature.ts  |   17 +-
 x-pack/plugins/ml/server/plugin.ts            |    2 +-
 x-pack/plugins/monitoring/public/plugin.ts    |    9 +-
 x-pack/plugins/observability/kibana.json      |    3 +-
 x-pack/plugins/observability/public/plugin.ts |   35 +-
 x-pack/plugins/painless_lab/public/plugin.tsx |    2 +-
 x-pack/plugins/rollup/public/plugin.ts        |    2 +-
 x-pack/plugins/security/public/plugin.tsx     |    8 +-
 .../cypress/screens/kibana_navigation.ts      |   17 +-
 .../security_solution/cypress/tasks/login.ts  |    6 +-
 x-pack/plugins/security_solution/kibana.json  |    4 +-
 .../security_solution/public/plugin.tsx       |   45 +-
 .../plugins/security_solution/public/types.ts |    2 +-
 .../security_solution/server/plugin.ts        |    3 +-
 x-pack/plugins/snapshot_restore/kibana.json   |    7 +-
 .../plugins/snapshot_restore/public/plugin.ts |   25 +-
 .../public/create_feature_catalogue_entry.ts  |    2 +-
 x-pack/plugins/spaces/public/plugin.test.ts   |    2 +-
 .../transform/public/register_feature.ts      |    2 +-
 .../translations/translations/ja-JP.json      |   28 -
 .../translations/translations/zh-CN.json      |   28 -
 x-pack/plugins/uptime/public/apps/plugin.ts   |    5 +-
 x-pack/plugins/watcher/public/plugin.ts       |    1 -
 x-pack/test/accessibility/apps/home.ts        |    2 +-
 .../security_and_spaces/tests/catalogue.ts    |   14 +-
 .../security_only/tests/catalogue.ts          |   14 +-
 122 files changed, 4073 insertions(+), 2903 deletions(-)
 create mode 100644 src/plugins/home/common/constants.ts
 delete mode 100644 src/plugins/home/public/application/components/__snapshots__/add_data.test.js.snap
 create mode 100644 src/plugins/home/public/application/components/_manage_data.scss
 create mode 100644 src/plugins/home/public/application/components/_solutions_section.scss
 delete mode 100644 src/plugins/home/public/application/components/add_data.js
 delete mode 100644 src/plugins/home/public/application/components/add_data.test.js
 create mode 100644 src/plugins/home/public/application/components/add_data/__snapshots__/add_data.test.tsx.snap
 create mode 100644 src/plugins/home/public/application/components/add_data/add_data.test.tsx
 create mode 100644 src/plugins/home/public/application/components/add_data/add_data.tsx
 create mode 100644 src/plugins/home/public/application/components/add_data/index.ts
 create mode 100644 src/plugins/home/public/application/components/manage_data/__snapshots__/manage_data.test.tsx.snap
 create mode 100644 src/plugins/home/public/application/components/manage_data/index.tsx
 create mode 100644 src/plugins/home/public/application/components/manage_data/manage_data.test.tsx
 create mode 100644 src/plugins/home/public/application/components/manage_data/manage_data.tsx
 create mode 100644 src/plugins/home/public/application/components/solutions_section/__snapshots__/solution_panel.test.tsx.snap
 create mode 100644 src/plugins/home/public/application/components/solutions_section/__snapshots__/solution_title.test.tsx.snap
 create mode 100644 src/plugins/home/public/application/components/solutions_section/__snapshots__/solutions_section.test.tsx.snap
 create mode 100644 src/plugins/home/public/application/components/solutions_section/index.ts
 create mode 100644 src/plugins/home/public/application/components/solutions_section/solution_panel.test.tsx
 create mode 100644 src/plugins/home/public/application/components/solutions_section/solution_panel.tsx
 create mode 100644 src/plugins/home/public/application/components/solutions_section/solution_title.test.tsx
 create mode 100644 src/plugins/home/public/application/components/solutions_section/solution_title.tsx
 create mode 100644 src/plugins/home/public/application/components/solutions_section/solutions_section.test.tsx
 create mode 100644 src/plugins/home/public/application/components/solutions_section/solutions_section.tsx

diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index 2cfe232bf5653..fe959e570ab98 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -147,7 +147,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "baseUrl": "/",
           "category": Object {
             "euiIconType": "logoSecurity",
-            "id": "security",
+            "id": "securitySolution",
             "label": "Security",
             "order": 4000,
           },
@@ -1393,11 +1393,11 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                 </EuiAccordion>
               </EuiCollapsibleNavGroup>
               <EuiCollapsibleNavGroup
-                data-test-subj="collapsibleNavGroup-security"
+                data-test-subj="collapsibleNavGroup-securitySolution"
                 iconType="logoSecurity"
                 initialIsOpen={true}
                 isCollapsible={true}
-                key="security"
+                key="securitySolution"
                 onToggle={[Function]}
                 title="Security"
               >
@@ -1433,7 +1433,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                     </EuiFlexGroup>
                   }
                   className="euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                  data-test-subj="collapsibleNavGroup-security"
+                  data-test-subj="collapsibleNavGroup-securitySolution"
                   id="mockId"
                   initialIsOpen={true}
                   onToggle={[Function]}
@@ -1441,7 +1441,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                 >
                   <div
                     className="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
-                    data-test-subj="collapsibleNavGroup-security"
+                    data-test-subj="collapsibleNavGroup-securitySolution"
                     onToggle={[Function]}
                   >
                     <div
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index c02a763c40101..f101c30a1241b 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -2283,10 +2283,12 @@ exports[`Header renders 2`] = `
     data-test-subj="headerGlobalNav"
   >
     <EuiHeader
+      id="headerGlobalNav"
       position="fixed"
     >
       <div
         className="euiHeader euiHeader--default euiHeader--fixed"
+        id="headerGlobalNav"
       >
         <EuiHeaderSection
           grow={false}
@@ -6494,10 +6496,12 @@ exports[`Header renders 3`] = `
     data-test-subj="headerGlobalNav"
   >
     <EuiHeader
+      id="headerGlobalNav"
       position="fixed"
     >
       <div
         className="euiHeader euiHeader--default euiHeader--fixed"
+        id="headerGlobalNav"
       >
         <EuiHeaderSection
           grow={false}
@@ -11306,10 +11310,12 @@ exports[`Header renders 4`] = `
     data-test-subj="headerGlobalNav"
   >
     <EuiHeader
+      id="headerGlobalNav"
       position="fixed"
     >
       <div
         className="euiHeader euiHeader--default euiHeader--fixed"
+        id="headerGlobalNav"
       >
         <EuiHeaderSection
           grow={false}
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index 3da3caaaa4a4f..0624d66a9598b 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -125,7 +125,7 @@ export function Header({
     <>
       <LoadingIndicator loadingCount$={observables.loadingCount$} />
       <header className={className} data-test-subj="headerGlobalNav">
-        <EuiHeader position="fixed">
+        <EuiHeader position="fixed" id="headerGlobalNav">
           <EuiHeaderSection grow={false}>
             {navType === 'modern' ? (
               <EuiHeaderSectionItem border="right" className="header__toggleNavButtonSection">
diff --git a/src/core/public/overlays/banners/_banners_list.scss b/src/core/public/overlays/banners/_banners_list.scss
index ff260f7dc42fd..9d4df065a0a4f 100644
--- a/src/core/public/overlays/banners/_banners_list.scss
+++ b/src/core/public/overlays/banners/_banners_list.scss
@@ -3,5 +3,5 @@
 }
 
 .kbnGlobalBannerList__item + .kbnGlobalBannerList__item {
-  margin-top: $euiSize;
+  margin-top: $euiSizeS;
 }
diff --git a/src/core/utils/default_app_categories.ts b/src/core/utils/default_app_categories.ts
index cc9bfb1db04d5..1fb7c284c0dfd 100644
--- a/src/core/utils/default_app_categories.ts
+++ b/src/core/utils/default_app_categories.ts
@@ -46,7 +46,7 @@ export const DEFAULT_APP_CATEGORIES = Object.freeze({
     order: 3000,
   },
   security: {
-    id: 'security',
+    id: 'securitySolution',
     label: i18n.translate('core.ui.securityNavList.label', {
       defaultMessage: 'Security',
     }),
diff --git a/src/plugins/advanced_settings/kibana.json b/src/plugins/advanced_settings/kibana.json
index 8cf9b9c656d8f..0e49fe17089f0 100644
--- a/src/plugins/advanced_settings/kibana.json
+++ b/src/plugins/advanced_settings/kibana.json
@@ -4,5 +4,6 @@
   "server": true,
   "ui": true,
   "requiredPlugins": ["management"],
-  "requiredBundles": ["kibanaReact"]
+  "optionalPlugins": ["home"],
+  "requiredBundles": ["kibanaReact", "home"]
 }
diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
index d8853015d362a..4afcba14abef4 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
@@ -114,6 +114,21 @@ export class AdvancedSettingsComponent extends Component<
         filteredSettings: this.mapSettings(Query.execute(query, this.settings)),
       });
     });
+
+    // scrolls to setting provided in the URL hash
+    const { hash } = window.location;
+    if (hash !== '') {
+      setTimeout(() => {
+        const id = hash.replace('#', '');
+        const element = document.getElementById(id);
+        const globalNavOffset = document.getElementById('headerGlobalNav')?.offsetHeight || 0;
+
+        if (element) {
+          element.scrollIntoView();
+          window.scrollBy(0, -globalNavOffset); // offsets scroll by height of the global nav
+        }
+      }, 0);
+    }
   }
 
   componentWillUnmount() {
diff --git a/src/plugins/advanced_settings/public/management_app/components/field/__snapshots__/field.test.tsx.snap b/src/plugins/advanced_settings/public/management_app/components/field/__snapshots__/field.test.tsx.snap
index da18eb70e5874..2aabacb061667 100644
--- a/src/plugins/advanced_settings/public/management_app/components/field/__snapshots__/field.test.tsx.snap
+++ b/src/plugins/advanced_settings/public/management_app/components/field/__snapshots__/field.test.tsx.snap
@@ -15,6 +15,7 @@ exports[`Field for array setting should render as read only if saving is disable
     </React.Fragment>
   }
   fullWidth={true}
+  id="array:test:setting"
   title={
     <h3>
       <span
@@ -87,6 +88,7 @@ exports[`Field for array setting should render as read only with help text if ov
     </React.Fragment>
   }
   fullWidth={true}
+  id="array:test:setting"
   title={
     <h3>
       <span
@@ -147,6 +149,7 @@ exports[`Field for array setting should render custom setting icon if it is cust
     </React.Fragment>
   }
   fullWidth={true}
+  id="array:test:setting"
   title={
     <h3>
       <span
@@ -208,6 +211,7 @@ exports[`Field for array setting should render default value if there is no user
     </React.Fragment>
   }
   fullWidth={true}
+  id="array:test:setting"
   title={
     <h3>
       <span
@@ -258,6 +262,7 @@ exports[`Field for array setting should render unsaved value if there are unsave
     </React.Fragment>
   }
   fullWidth={true}
+  id="array:test:setting"
   title={
     <h3>
       <span
@@ -359,6 +364,7 @@ exports[`Field for array setting should render user value if there is user value
     </React.Fragment>
   }
   fullWidth={true}
+  id="array:test:setting"
   title={
     <h3>
       <span
@@ -426,6 +432,7 @@ exports[`Field for boolean setting should render as read only if saving is disab
     </React.Fragment>
   }
   fullWidth={true}
+  id="boolean:test:setting"
   title={
     <h3>
       <span
@@ -504,6 +511,7 @@ exports[`Field for boolean setting should render as read only with help text if
     </React.Fragment>
   }
   fullWidth={true}
+  id="boolean:test:setting"
   title={
     <h3>
       <span
@@ -570,6 +578,7 @@ exports[`Field for boolean setting should render custom setting icon if it is cu
     </React.Fragment>
   }
   fullWidth={true}
+  id="boolean:test:setting"
   title={
     <h3>
       <span
@@ -637,6 +646,7 @@ exports[`Field for boolean setting should render default value if there is no us
     </React.Fragment>
   }
   fullWidth={true}
+  id="boolean:test:setting"
   title={
     <h3>
       <span
@@ -693,6 +703,7 @@ exports[`Field for boolean setting should render unsaved value if there are unsa
     </React.Fragment>
   }
   fullWidth={true}
+  id="boolean:test:setting"
   title={
     <h3>
       <span
@@ -796,6 +807,7 @@ exports[`Field for boolean setting should render user value if there is user val
     </React.Fragment>
   }
   fullWidth={true}
+  id="boolean:test:setting"
   title={
     <h3>
       <span
@@ -869,6 +881,7 @@ exports[`Field for image setting should render as read only if saving is disable
     </React.Fragment>
   }
   fullWidth={true}
+  id="image:test:setting"
   title={
     <h3>
       <span
@@ -943,6 +956,7 @@ exports[`Field for image setting should render as read only with help text if ov
     </React.Fragment>
   }
   fullWidth={true}
+  id="image:test:setting"
   title={
     <h3>
       <span
@@ -1001,6 +1015,7 @@ exports[`Field for image setting should render custom setting icon if it is cust
     </React.Fragment>
   }
   fullWidth={true}
+  id="image:test:setting"
   title={
     <h3>
       <span
@@ -1064,6 +1079,7 @@ exports[`Field for image setting should render default value if there is no user
     </React.Fragment>
   }
   fullWidth={true}
+  id="image:test:setting"
   title={
     <h3>
       <span
@@ -1116,6 +1132,7 @@ exports[`Field for image setting should render unsaved value if there are unsave
     </React.Fragment>
   }
   fullWidth={true}
+  id="image:test:setting"
   title={
     <h3>
       <span
@@ -1214,6 +1231,7 @@ exports[`Field for image setting should render user value if there is user value
     </React.Fragment>
   }
   fullWidth={true}
+  id="image:test:setting"
   title={
     <h3>
       <span
@@ -1317,6 +1335,7 @@ exports[`Field for json setting should render as read only if saving is disabled
     </React.Fragment>
   }
   fullWidth={true}
+  id="json:test:setting"
   title={
     <h3>
       <span
@@ -1412,6 +1431,7 @@ exports[`Field for json setting should render as read only with help text if ove
     </React.Fragment>
   }
   fullWidth={true}
+  id="json:test:setting"
   title={
     <h3>
       <span
@@ -1492,6 +1512,7 @@ exports[`Field for json setting should render custom setting icon if it is custo
     </React.Fragment>
   }
   fullWidth={true}
+  id="json:test:setting"
   title={
     <h3>
       <span
@@ -1598,6 +1619,7 @@ exports[`Field for json setting should render default value if there is no user
     </React.Fragment>
   }
   fullWidth={true}
+  id="json:test:setting"
   title={
     <h3>
       <span
@@ -1685,6 +1707,7 @@ exports[`Field for json setting should render unsaved value if there are unsaved
     </React.Fragment>
   }
   fullWidth={true}
+  id="json:test:setting"
   title={
     <h3>
       <span
@@ -1809,6 +1832,7 @@ exports[`Field for json setting should render user value if there is user value
     </React.Fragment>
   }
   fullWidth={true}
+  id="json:test:setting"
   title={
     <h3>
       <span
@@ -1896,6 +1920,7 @@ exports[`Field for markdown setting should render as read only if saving is disa
     </React.Fragment>
   }
   fullWidth={true}
+  id="markdown:test:setting"
   title={
     <h3>
       <span
@@ -1988,6 +2013,7 @@ exports[`Field for markdown setting should render as read only with help text if
     </React.Fragment>
   }
   fullWidth={true}
+  id="markdown:test:setting"
   title={
     <h3>
       <span
@@ -2068,6 +2094,7 @@ exports[`Field for markdown setting should render custom setting icon if it is c
     </React.Fragment>
   }
   fullWidth={true}
+  id="markdown:test:setting"
   title={
     <h3>
       <span
@@ -2149,6 +2176,7 @@ exports[`Field for markdown setting should render default value if there is no u
     </React.Fragment>
   }
   fullWidth={true}
+  id="markdown:test:setting"
   title={
     <h3>
       <span
@@ -2219,6 +2247,7 @@ exports[`Field for markdown setting should render unsaved value if there are uns
     </React.Fragment>
   }
   fullWidth={true}
+  id="markdown:test:setting"
   title={
     <h3>
       <span
@@ -2336,6 +2365,7 @@ exports[`Field for markdown setting should render user value if there is user va
     </React.Fragment>
   }
   fullWidth={true}
+  id="markdown:test:setting"
   title={
     <h3>
       <span
@@ -2423,6 +2453,7 @@ exports[`Field for number setting should render as read only if saving is disabl
     </React.Fragment>
   }
   fullWidth={true}
+  id="number:test:setting"
   title={
     <h3>
       <span
@@ -2495,6 +2526,7 @@ exports[`Field for number setting should render as read only with help text if o
     </React.Fragment>
   }
   fullWidth={true}
+  id="number:test:setting"
   title={
     <h3>
       <span
@@ -2555,6 +2587,7 @@ exports[`Field for number setting should render custom setting icon if it is cus
     </React.Fragment>
   }
   fullWidth={true}
+  id="number:test:setting"
   title={
     <h3>
       <span
@@ -2616,6 +2649,7 @@ exports[`Field for number setting should render default value if there is no use
     </React.Fragment>
   }
   fullWidth={true}
+  id="number:test:setting"
   title={
     <h3>
       <span
@@ -2666,6 +2700,7 @@ exports[`Field for number setting should render unsaved value if there are unsav
     </React.Fragment>
   }
   fullWidth={true}
+  id="number:test:setting"
   title={
     <h3>
       <span
@@ -2763,6 +2798,7 @@ exports[`Field for number setting should render user value if there is user valu
     </React.Fragment>
   }
   fullWidth={true}
+  id="number:test:setting"
   title={
     <h3>
       <span
@@ -2830,6 +2866,7 @@ exports[`Field for select setting should render as read only if saving is disabl
     </React.Fragment>
   }
   fullWidth={true}
+  id="select:test:setting"
   title={
     <h3>
       <span
@@ -2918,6 +2955,7 @@ exports[`Field for select setting should render as read only with help text if o
     </React.Fragment>
   }
   fullWidth={true}
+  id="select:test:setting"
   title={
     <h3>
       <span
@@ -2994,6 +3032,7 @@ exports[`Field for select setting should render custom setting icon if it is cus
     </React.Fragment>
   }
   fullWidth={true}
+  id="select:test:setting"
   title={
     <h3>
       <span
@@ -3071,6 +3110,7 @@ exports[`Field for select setting should render default value if there is no use
     </React.Fragment>
   }
   fullWidth={true}
+  id="select:test:setting"
   title={
     <h3>
       <span
@@ -3137,6 +3177,7 @@ exports[`Field for select setting should render unsaved value if there are unsav
     </React.Fragment>
   }
   fullWidth={true}
+  id="select:test:setting"
   title={
     <h3>
       <span
@@ -3250,6 +3291,7 @@ exports[`Field for select setting should render user value if there is user valu
     </React.Fragment>
   }
   fullWidth={true}
+  id="select:test:setting"
   title={
     <h3>
       <span
@@ -3333,6 +3375,7 @@ exports[`Field for string setting should render as read only if saving is disabl
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test:setting"
   title={
     <h3>
       <span
@@ -3405,6 +3448,7 @@ exports[`Field for string setting should render as read only with help text if o
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test:setting"
   title={
     <h3>
       <span
@@ -3465,6 +3509,7 @@ exports[`Field for string setting should render custom setting icon if it is cus
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test:setting"
   title={
     <h3>
       <span
@@ -3526,6 +3571,7 @@ exports[`Field for string setting should render default value if there is no use
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test:setting"
   title={
     <h3>
       <span
@@ -3576,6 +3622,7 @@ exports[`Field for string setting should render unsaved value if there are unsav
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test:setting"
   title={
     <h3>
       <span
@@ -3673,6 +3720,7 @@ exports[`Field for string setting should render user value if there is user valu
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test:setting"
   title={
     <h3>
       <span
@@ -3740,6 +3788,7 @@ exports[`Field for stringWithValidation setting should render as read only if sa
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test-validation:setting"
   title={
     <h3>
       <span
@@ -3812,6 +3861,7 @@ exports[`Field for stringWithValidation setting should render as read only with
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test-validation:setting"
   title={
     <h3>
       <span
@@ -3872,6 +3922,7 @@ exports[`Field for stringWithValidation setting should render custom setting ico
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test-validation:setting"
   title={
     <h3>
       <span
@@ -3933,6 +3984,7 @@ exports[`Field for stringWithValidation setting should render default value if t
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test-validation:setting"
   title={
     <h3>
       <span
@@ -3983,6 +4035,7 @@ exports[`Field for stringWithValidation setting should render unsaved value if t
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test-validation:setting"
   title={
     <h3>
       <span
@@ -4080,6 +4133,7 @@ exports[`Field for stringWithValidation setting should render user value if ther
     </React.Fragment>
   }
   fullWidth={true}
+  id="string:test-validation:setting"
   title={
     <h3>
       <span
diff --git a/src/plugins/advanced_settings/public/management_app/components/field/field.tsx b/src/plugins/advanced_settings/public/management_app/components/field/field.tsx
index 45e359679056f..6561269630d9c 100644
--- a/src/plugins/advanced_settings/public/management_app/components/field/field.tsx
+++ b/src/plugins/advanced_settings/public/management_app/components/field/field.tsx
@@ -673,6 +673,7 @@ export class Field extends PureComponent<FieldProps> {
 
     return (
       <EuiDescribedFormGroup
+        id={id}
         className={className}
         title={this.renderTitle(setting)}
         description={this.renderDescription(setting)}
diff --git a/src/plugins/advanced_settings/public/plugin.ts b/src/plugins/advanced_settings/public/plugin.ts
index 35f6dd65925ba..188b11177eaec 100644
--- a/src/plugins/advanced_settings/public/plugin.ts
+++ b/src/plugins/advanced_settings/public/plugin.ts
@@ -18,6 +18,7 @@
  */
 import { i18n } from '@kbn/i18n';
 import { CoreSetup, Plugin } from 'kibana/public';
+import { FeatureCatalogueCategory } from '../../home/public';
 import { ComponentRegistry } from './component_registry';
 import { AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup } from './types';
 
@@ -29,7 +30,7 @@ const title = i18n.translate('advancedSettings.advancedSettingsLabel', {
 
 export class AdvancedSettingsPlugin
   implements Plugin<AdvancedSettingsSetup, AdvancedSettingsStart, AdvancedSettingsPluginSetup> {
-  public setup(core: CoreSetup, { management }: AdvancedSettingsPluginSetup) {
+  public setup(core: CoreSetup, { management, home }: AdvancedSettingsPluginSetup) {
     const kibanaSection = management.sections.section.kibana;
 
     kibanaSection.registerApp({
@@ -44,6 +45,21 @@ export class AdvancedSettingsPlugin
       },
     });
 
+    if (home) {
+      home.featureCatalogue.register({
+        id: 'advanced_settings',
+        title,
+        description: i18n.translate('advancedSettings.featureCatalogueTitle', {
+          defaultMessage:
+            'Customize your Kibana experience — change the date format, turn on dark mode, and more.',
+        }),
+        icon: 'gear',
+        path: '/app/management/kibana/settings',
+        showOnHomePage: false,
+        category: FeatureCatalogueCategory.ADMIN,
+      });
+    }
+
     return {
       component: component.setup,
     };
diff --git a/src/plugins/advanced_settings/public/types.ts b/src/plugins/advanced_settings/public/types.ts
index a233b3debab8d..cc59f52b1f30f 100644
--- a/src/plugins/advanced_settings/public/types.ts
+++ b/src/plugins/advanced_settings/public/types.ts
@@ -18,6 +18,8 @@
  */
 
 import { ComponentRegistry } from './component_registry';
+import { HomePublicPluginSetup } from '../../home/public';
+
 import { ManagementSetup } from '../../management/public';
 
 export interface AdvancedSettingsSetup {
@@ -29,6 +31,7 @@ export interface AdvancedSettingsStart {
 
 export interface AdvancedSettingsPluginSetup {
   management: ManagementSetup;
+  home?: HomePublicPluginSetup;
 }
 
 export { ComponentRegistry };
diff --git a/src/plugins/console/kibana.json b/src/plugins/console/kibana.json
index 031aa00eb6613..ca43e4f258add 100644
--- a/src/plugins/console/kibana.json
+++ b/src/plugins/console/kibana.json
@@ -3,7 +3,7 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["devTools", "home"],
-  "optionalPlugins": ["usageCollection"],
-  "requiredBundles": ["esUiShared", "kibanaReact", "kibanaUtils"]
+  "requiredPlugins": ["devTools"],
+  "optionalPlugins": ["usageCollection", "home"],
+  "requiredBundles": ["esUiShared", "kibanaReact", "kibanaUtils", "home"]
 }
diff --git a/src/plugins/console/public/plugin.ts b/src/plugins/console/public/plugin.ts
index 03b65a8bd145c..f3421aefaf38d 100644
--- a/src/plugins/console/public/plugin.ts
+++ b/src/plugins/console/public/plugin.ts
@@ -28,19 +28,21 @@ export class ConsoleUIPlugin implements Plugin<void, void, AppSetupUIPluginDepen
     { notifications, getStartServices, http }: CoreSetup,
     { devTools, home, usageCollection }: AppSetupUIPluginDependencies
   ) {
-    home.featureCatalogue.register({
-      id: 'console',
-      title: i18n.translate('console.devToolsTitle', {
-        defaultMessage: 'Console',
-      }),
-      description: i18n.translate('console.devToolsDescription', {
-        defaultMessage: 'Skip cURL and use this JSON interface to work with your data directly.',
-      }),
-      icon: 'consoleApp',
-      path: '/app/dev_tools#/console',
-      showOnHomePage: true,
-      category: FeatureCatalogueCategory.ADMIN,
-    });
+    if (home) {
+      home.featureCatalogue.register({
+        id: 'console',
+        title: i18n.translate('console.devToolsTitle', {
+          defaultMessage: 'Interact with the Elasticsearch API',
+        }),
+        description: i18n.translate('console.devToolsDescription', {
+          defaultMessage: 'Skip cURL and use a JSON interface to work with your data in Console.',
+        }),
+        icon: 'consoleApp',
+        path: '/app/dev_tools#/console',
+        showOnHomePage: false,
+        category: FeatureCatalogueCategory.ADMIN,
+      });
+    }
 
     devTools.register({
       id: 'console',
diff --git a/src/plugins/console/public/types/plugin_dependencies.ts b/src/plugins/console/public/types/plugin_dependencies.ts
index 62202d5e1e438..a386167b7a193 100644
--- a/src/plugins/console/public/types/plugin_dependencies.ts
+++ b/src/plugins/console/public/types/plugin_dependencies.ts
@@ -21,7 +21,7 @@ import { DevToolsSetup } from '../../../dev_tools/public';
 import { UsageCollectionSetup } from '../../../usage_collection/public';
 
 export interface AppSetupUIPluginDependencies {
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
   devTools: DevToolsSetup;
   usageCollection?: UsageCollectionSetup;
 }
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index a788b06f91905..8b9b92faf9031 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -384,7 +384,7 @@ export class DashboardPlugin
         }),
         icon: 'dashboardApp',
         path: `/app/dashboards#${DashboardConstants.LANDING_PAGE_PATH}`,
-        showOnHomePage: true,
+        showOnHomePage: false,
         category: FeatureCatalogueCategory.DATA,
       });
     }
diff --git a/src/plugins/discover/public/register_feature.ts b/src/plugins/discover/public/register_feature.ts
index 80e14702c6f22..5443bb261ab10 100644
--- a/src/plugins/discover/public/register_feature.ts
+++ b/src/plugins/discover/public/register_feature.ts
@@ -30,7 +30,7 @@ export function registerFeature(home: HomePublicPluginSetup) {
     }),
     icon: 'discoverApp',
     path: '/app/discover#/',
-    showOnHomePage: true,
+    showOnHomePage: false,
     category: FeatureCatalogueCategory.DATA,
   });
 }
diff --git a/src/plugins/home/common/constants.ts b/src/plugins/home/common/constants.ts
new file mode 100644
index 0000000000000..a9457a9d3307c
--- /dev/null
+++ b/src/plugins/home/common/constants.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export const PLUGIN_ID = 'home';
+export const HOME_APP_BASE_PATH = `/app/${PLUGIN_ID}`;
diff --git a/src/plugins/home/public/application/application.tsx b/src/plugins/home/public/application/application.tsx
index 627bd10d7c2c8..5d71bf8651d88 100644
--- a/src/plugins/home/public/application/application.tsx
+++ b/src/plugins/home/public/application/application.tsx
@@ -35,15 +35,21 @@ export const renderApp = async (
 ) => {
   const homeTitle = i18n.translate('home.breadcrumbs.homeTitle', { defaultMessage: 'Home' });
   const { featureCatalogue, chrome } = getServices();
+  const navLinks = chrome.navLinks.getAll();
 
   // all the directories could be get in "start" phase of plugin after all of the legacy plugins will be moved to a NP
   const directories = featureCatalogue.get();
 
+  // Filters solutions by available nav links
+  const solutions = featureCatalogue
+    .getSolutions()
+    .filter(({ id }) => navLinks.find(({ category, hidden }) => !hidden && category?.id === id));
+
   chrome.setBreadcrumbs([{ text: homeTitle }]);
 
   render(
     <KibanaContextProvider services={{ ...coreStart }}>
-      <HomeApp directories={directories} />
+      <HomeApp directories={directories} solutions={solutions} />
     </KibanaContextProvider>,
     element
   );
diff --git a/src/plugins/home/public/application/components/__snapshots__/add_data.test.js.snap b/src/plugins/home/public/application/components/__snapshots__/add_data.test.js.snap
deleted file mode 100644
index 9178d0e08f3e0..0000000000000
--- a/src/plugins/home/public/application/components/__snapshots__/add_data.test.js.snap
+++ /dev/null
@@ -1,1163 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`apmUiEnabled 1`] = `
-<EuiPanel
-  paddingSize="l"
->
-  <EuiFlexGroup
-    className="homeAddData__flexGroup homAddData__flexTablet"
-    gutterSize="l"
-    justifyContent="spaceAround"
-    responsive={false}
-    wrap={true}
-  >
-    <EuiFlexItem
-      className="homAddData__cardDivider homAddData__flexItem"
-      grow={3}
-    >
-      <EuiSpacer
-        size="m"
-      />
-      <EuiFlexGroup
-        alignItems="center"
-        gutterSize="m"
-        responsive={false}
-      >
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiIcon
-            className="homAddData__logo"
-            size="xl"
-            type="logoObservability"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiTitle
-            size="s"
-          >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Observability"
-                id="home.addData.title.observability"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer />
-      <EuiFlexGroup
-        className="homeAddData__flexGroup"
-        gutterSize="l"
-        justifyContent="spaceAround"
-        responsive={false}
-        wrap={true}
-      >
-        <EuiFlexItem
-          className="homAddData__flexItem"
-          grow={1}
-        >
-          <EuiCard
-            className="homAddData__card"
-            description={
-              <span
-                id="aria-describedby.addAmpButtonLabel"
-              >
-                APM automatically collects in-depth performance metrics and errors from inside your applications.
-              </span>
-            }
-            footer={
-              <EuiButton
-                aria-describedby="aria-describedby.addAmpButtonLabel"
-                className="homAddData__button"
-                href="#/tutorial/apm"
-              >
-                <FormattedMessage
-                  defaultMessage="Add APM"
-                  id="home.addData.apm.addApmButtonLabel"
-                  values={Object {}}
-                />
-              </EuiButton>
-            }
-            textAlign="left"
-            title="APM"
-            titleSize="xs"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          className="homAddData__flexItem"
-          grow={1}
-        >
-          <EuiCard
-            className="homAddData__card"
-            description={
-              <span
-                id="aria-describedby.addLogDataButtonLabel"
-              >
-                Ingest logs from popular data sources and easily visualize in preconfigured dashboards.
-              </span>
-            }
-            footer={
-              <EuiButton
-                aria-describedby="aria-describedby.addLogDataButtonLabel"
-                className="homAddData__button"
-                data-test-subj="logsData"
-                href="#/tutorial_directory/logging"
-              >
-                <FormattedMessage
-                  defaultMessage="Add log data"
-                  id="home.addData.logging.addLogDataButtonLabel"
-                  values={Object {}}
-                />
-              </EuiButton>
-            }
-            textAlign="left"
-            title="Logs"
-            titleSize="xs"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          className="homAddData__flexItem"
-          grow={1}
-        >
-          <EuiCard
-            className="homAddData__card"
-            description={
-              <span
-                id="aria-describedby.addMetricsButtonLabel"
-              >
-                Collect metrics from the operating system and services running on your servers.
-              </span>
-            }
-            footer={
-              <EuiButton
-                aria-describedby="aria-describedby.addMetricsButtonLabel"
-                className="homAddData__button"
-                href="#/tutorial_directory/metrics"
-              >
-                <FormattedMessage
-                  defaultMessage="Add metric data"
-                  id="home.addData.metrics.addMetricsDataButtonLabel"
-                  values={Object {}}
-                />
-              </EuiButton>
-            }
-            textAlign="left"
-            title="Metrics"
-            titleSize="xs"
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="homAddData__flexItem"
-      grow={1}
-    >
-      <EuiFlexGroup
-        alignItems="center"
-        gutterSize="m"
-        responsive={false}
-      >
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiIcon
-            className="homAddData__logo"
-            size="xl"
-            type="logoSecurity"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiTitle
-            size="s"
-          >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Security"
-                id="home.addData.title.security"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiCard
-        className="homAddData__card"
-        description={
-          <span
-            id="aria-describedby.addSiemButtonLabel"
-          >
-            Protect hosts, analyze security information and events, hunt threats, automate detections, and create cases.
-          </span>
-        }
-        footer={
-          <EuiButton
-            aria-describedby="aria-describedby.addSiemButtonLabel"
-            className="homAddData__button"
-            href="#/tutorial_directory/security"
-          >
-            <FormattedMessage
-              defaultMessage="Add events"
-              id="home.addData.securitySolution.addSecurityEventsButtonLabel"
-              values={Object {}}
-            />
-          </EuiButton>
-        }
-        textAlign="left"
-        title="SIEM + Endpoint Security"
-        titleSize="xs"
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiHorizontalRule />
-  <EuiFlexGrid
-    columns={2}
-  >
-    <EuiFlexItem
-      className="homAddData__footerItem"
-    >
-      <EuiText
-        size="s"
-      >
-        <strong
-          style={
-            Object {
-              "height": 38,
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Add sample data"
-            id="home.addData.sampleDataTitle"
-            values={Object {}}
-          />
-        </strong>
-        <EuiLink
-          href="#/tutorial_directory/sampleData"
-          style={
-            Object {
-              "display": "block",
-              "textAlign": "center",
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Load a data set and a Kibana dashboard"
-            id="home.addData.sampleDataLink"
-            values={Object {}}
-          />
-        </EuiLink>
-      </EuiText>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="homAddData__footerItem"
-    >
-      <EuiText
-        size="s"
-      >
-        <strong
-          style={
-            Object {
-              "height": 38,
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Use Elasticsearch data"
-            id="home.addData.yourDataTitle"
-            values={Object {}}
-          />
-        </strong>
-        <EuiLink
-          href="path/app/management/kibana/indexPatterns"
-          style={
-            Object {
-              "display": "block",
-              "textAlign": "center",
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Connect to your Elasticsearch index"
-            id="home.addData.yourDataLink"
-            values={Object {}}
-          />
-        </EuiLink>
-      </EuiText>
-    </EuiFlexItem>
-  </EuiFlexGrid>
-</EuiPanel>
-`;
-
-exports[`isNewKibanaInstance 1`] = `
-<EuiPanel
-  paddingSize="l"
->
-  <EuiFlexGroup
-    className="homeAddData__flexGroup homAddData__flexTablet"
-    gutterSize="l"
-    justifyContent="spaceAround"
-    responsive={false}
-    wrap={false}
-  >
-    <EuiFlexItem
-      className="homAddData__cardDivider homAddData__flexItem"
-      grow={3}
-    >
-      <EuiSpacer
-        size="m"
-      />
-      <EuiFlexGroup
-        alignItems="center"
-        gutterSize="m"
-        responsive={false}
-      >
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiIcon
-            className="homAddData__logo"
-            size="xl"
-            type="logoObservability"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiTitle
-            size="s"
-          >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Observability"
-                id="home.addData.title.observability"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer />
-      <EuiFlexGroup
-        className="homeAddData__flexGroup"
-        gutterSize="l"
-        justifyContent="spaceAround"
-        responsive={false}
-        wrap={false}
-      >
-        <EuiFlexItem
-          className="homAddData__flexItem"
-          grow={1}
-        >
-          <EuiCard
-            className="homAddData__card"
-            description={
-              <span
-                id="aria-describedby.addLogDataButtonLabel"
-              >
-                Ingest logs from popular data sources and easily visualize in preconfigured dashboards.
-              </span>
-            }
-            footer={
-              <EuiButton
-                aria-describedby="aria-describedby.addLogDataButtonLabel"
-                className="homAddData__button"
-                data-test-subj="logsData"
-                href="#/tutorial_directory/logging"
-              >
-                <FormattedMessage
-                  defaultMessage="Add log data"
-                  id="home.addData.logging.addLogDataButtonLabel"
-                  values={Object {}}
-                />
-              </EuiButton>
-            }
-            textAlign="left"
-            title="Logs"
-            titleSize="xs"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          className="homAddData__flexItem"
-          grow={1}
-        >
-          <EuiCard
-            className="homAddData__card"
-            description={
-              <span
-                id="aria-describedby.addMetricsButtonLabel"
-              >
-                Collect metrics from the operating system and services running on your servers.
-              </span>
-            }
-            footer={
-              <EuiButton
-                aria-describedby="aria-describedby.addMetricsButtonLabel"
-                className="homAddData__button"
-                href="#/tutorial_directory/metrics"
-              >
-                <FormattedMessage
-                  defaultMessage="Add metric data"
-                  id="home.addData.metrics.addMetricsDataButtonLabel"
-                  values={Object {}}
-                />
-              </EuiButton>
-            }
-            textAlign="left"
-            title="Metrics"
-            titleSize="xs"
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="homAddData__flexItem"
-      grow={1}
-    >
-      <EuiFlexGroup
-        alignItems="center"
-        gutterSize="m"
-        responsive={false}
-      >
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiIcon
-            className="homAddData__logo"
-            size="xl"
-            type="logoSecurity"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiTitle
-            size="s"
-          >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Security"
-                id="home.addData.title.security"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiCard
-        className="homAddData__card"
-        description={
-          <span
-            id="aria-describedby.addSiemButtonLabel"
-          >
-            Protect hosts, analyze security information and events, hunt threats, automate detections, and create cases.
-          </span>
-        }
-        footer={
-          <EuiButton
-            aria-describedby="aria-describedby.addSiemButtonLabel"
-            className="homAddData__button"
-            href="#/tutorial_directory/security"
-          >
-            <FormattedMessage
-              defaultMessage="Add events"
-              id="home.addData.securitySolution.addSecurityEventsButtonLabel"
-              values={Object {}}
-            />
-          </EuiButton>
-        }
-        textAlign="left"
-        title="SIEM + Endpoint Security"
-        titleSize="xs"
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiHorizontalRule />
-  <EuiFlexGrid
-    columns={2}
-  >
-    <EuiFlexItem
-      className="homAddData__footerItem homAddData__footerItem--highlight"
-    >
-      <EuiText
-        size="s"
-      >
-        <strong
-          style={
-            Object {
-              "height": 38,
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Add sample data"
-            id="home.addData.sampleDataTitle"
-            values={Object {}}
-          />
-        </strong>
-        <EuiLink
-          href="#/tutorial_directory/sampleData"
-          style={
-            Object {
-              "display": "block",
-              "textAlign": "center",
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Load a data set and a Kibana dashboard"
-            id="home.addData.sampleDataLink"
-            values={Object {}}
-          />
-        </EuiLink>
-      </EuiText>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="homAddData__footerItem homAddData__footerItem--highlight"
-    >
-      <EuiText
-        size="s"
-      >
-        <strong
-          style={
-            Object {
-              "height": 38,
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Use Elasticsearch data"
-            id="home.addData.yourDataTitle"
-            values={Object {}}
-          />
-        </strong>
-        <EuiLink
-          href="path/app/management/kibana/indexPatterns"
-          style={
-            Object {
-              "display": "block",
-              "textAlign": "center",
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Connect to your Elasticsearch index"
-            id="home.addData.yourDataLink"
-            values={Object {}}
-          />
-        </EuiLink>
-      </EuiText>
-    </EuiFlexItem>
-  </EuiFlexGrid>
-</EuiPanel>
-`;
-
-exports[`mlEnabled 1`] = `
-<EuiPanel
-  paddingSize="l"
->
-  <EuiFlexGroup
-    className="homeAddData__flexGroup homAddData__flexTablet"
-    gutterSize="l"
-    justifyContent="spaceAround"
-    responsive={false}
-    wrap={true}
-  >
-    <EuiFlexItem
-      className="homAddData__cardDivider homAddData__flexItem"
-      grow={3}
-    >
-      <EuiSpacer
-        size="m"
-      />
-      <EuiFlexGroup
-        alignItems="center"
-        gutterSize="m"
-        responsive={false}
-      >
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiIcon
-            className="homAddData__logo"
-            size="xl"
-            type="logoObservability"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiTitle
-            size="s"
-          >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Observability"
-                id="home.addData.title.observability"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer />
-      <EuiFlexGroup
-        className="homeAddData__flexGroup"
-        gutterSize="l"
-        justifyContent="spaceAround"
-        responsive={false}
-        wrap={true}
-      >
-        <EuiFlexItem
-          className="homAddData__flexItem"
-          grow={1}
-        >
-          <EuiCard
-            className="homAddData__card"
-            description={
-              <span
-                id="aria-describedby.addAmpButtonLabel"
-              >
-                APM automatically collects in-depth performance metrics and errors from inside your applications.
-              </span>
-            }
-            footer={
-              <EuiButton
-                aria-describedby="aria-describedby.addAmpButtonLabel"
-                className="homAddData__button"
-                href="#/tutorial/apm"
-              >
-                <FormattedMessage
-                  defaultMessage="Add APM"
-                  id="home.addData.apm.addApmButtonLabel"
-                  values={Object {}}
-                />
-              </EuiButton>
-            }
-            textAlign="left"
-            title="APM"
-            titleSize="xs"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          className="homAddData__flexItem"
-          grow={1}
-        >
-          <EuiCard
-            className="homAddData__card"
-            description={
-              <span
-                id="aria-describedby.addLogDataButtonLabel"
-              >
-                Ingest logs from popular data sources and easily visualize in preconfigured dashboards.
-              </span>
-            }
-            footer={
-              <EuiButton
-                aria-describedby="aria-describedby.addLogDataButtonLabel"
-                className="homAddData__button"
-                data-test-subj="logsData"
-                href="#/tutorial_directory/logging"
-              >
-                <FormattedMessage
-                  defaultMessage="Add log data"
-                  id="home.addData.logging.addLogDataButtonLabel"
-                  values={Object {}}
-                />
-              </EuiButton>
-            }
-            textAlign="left"
-            title="Logs"
-            titleSize="xs"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          className="homAddData__flexItem"
-          grow={1}
-        >
-          <EuiCard
-            className="homAddData__card"
-            description={
-              <span
-                id="aria-describedby.addMetricsButtonLabel"
-              >
-                Collect metrics from the operating system and services running on your servers.
-              </span>
-            }
-            footer={
-              <EuiButton
-                aria-describedby="aria-describedby.addMetricsButtonLabel"
-                className="homAddData__button"
-                href="#/tutorial_directory/metrics"
-              >
-                <FormattedMessage
-                  defaultMessage="Add metric data"
-                  id="home.addData.metrics.addMetricsDataButtonLabel"
-                  values={Object {}}
-                />
-              </EuiButton>
-            }
-            textAlign="left"
-            title="Metrics"
-            titleSize="xs"
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="homAddData__flexItem"
-      grow={1}
-    >
-      <EuiFlexGroup
-        alignItems="center"
-        gutterSize="m"
-        responsive={false}
-      >
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiIcon
-            className="homAddData__logo"
-            size="xl"
-            type="logoSecurity"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiTitle
-            size="s"
-          >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Security"
-                id="home.addData.title.security"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiCard
-        className="homAddData__card"
-        description={
-          <span
-            id="aria-describedby.addSiemButtonLabel"
-          >
-            Protect hosts, analyze security information and events, hunt threats, automate detections, and create cases.
-          </span>
-        }
-        footer={
-          <EuiButton
-            aria-describedby="aria-describedby.addSiemButtonLabel"
-            className="homAddData__button"
-            href="#/tutorial_directory/security"
-          >
-            <FormattedMessage
-              defaultMessage="Add events"
-              id="home.addData.securitySolution.addSecurityEventsButtonLabel"
-              values={Object {}}
-            />
-          </EuiButton>
-        }
-        textAlign="left"
-        title="SIEM + Endpoint Security"
-        titleSize="xs"
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiHorizontalRule />
-  <EuiFlexGrid
-    columns={3}
-  >
-    <EuiFlexItem
-      className="homAddData__footerItem"
-    >
-      <EuiText
-        size="s"
-      >
-        <strong
-          style={
-            Object {
-              "height": 38,
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Add sample data"
-            id="home.addData.sampleDataTitle"
-            values={Object {}}
-          />
-        </strong>
-        <EuiLink
-          href="#/tutorial_directory/sampleData"
-          style={
-            Object {
-              "display": "block",
-              "textAlign": "center",
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Load a data set and a Kibana dashboard"
-            id="home.addData.sampleDataLink"
-            values={Object {}}
-          />
-        </EuiLink>
-      </EuiText>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="homAddData__footerItem"
-    >
-      <EuiText
-        size="s"
-      >
-        <strong
-          style={
-            Object {
-              "height": 38,
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Upload data from log file"
-            id="home.addData.uploadFileTitle"
-            values={Object {}}
-          />
-        </strong>
-        <EuiLink
-          href="path/app/ml#/filedatavisualizer"
-          style={
-            Object {
-              "display": "block",
-              "textAlign": "center",
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Import a CSV, NDJSON, or log file"
-            id="home.addData.uploadFileLink"
-            values={Object {}}
-          />
-        </EuiLink>
-      </EuiText>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="homAddData__footerItem"
-    >
-      <EuiText
-        size="s"
-      >
-        <strong
-          style={
-            Object {
-              "height": 38,
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Use Elasticsearch data"
-            id="home.addData.yourDataTitle"
-            values={Object {}}
-          />
-        </strong>
-        <EuiLink
-          href="path/app/management/kibana/indexPatterns"
-          style={
-            Object {
-              "display": "block",
-              "textAlign": "center",
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Connect to your Elasticsearch index"
-            id="home.addData.yourDataLink"
-            values={Object {}}
-          />
-        </EuiLink>
-      </EuiText>
-    </EuiFlexItem>
-  </EuiFlexGrid>
-</EuiPanel>
-`;
-
-exports[`render 1`] = `
-<EuiPanel
-  paddingSize="l"
->
-  <EuiFlexGroup
-    className="homeAddData__flexGroup homAddData__flexTablet"
-    gutterSize="l"
-    justifyContent="spaceAround"
-    responsive={false}
-    wrap={false}
-  >
-    <EuiFlexItem
-      className="homAddData__cardDivider homAddData__flexItem"
-      grow={3}
-    >
-      <EuiSpacer
-        size="m"
-      />
-      <EuiFlexGroup
-        alignItems="center"
-        gutterSize="m"
-        responsive={false}
-      >
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiIcon
-            className="homAddData__logo"
-            size="xl"
-            type="logoObservability"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiTitle
-            size="s"
-          >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Observability"
-                id="home.addData.title.observability"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer />
-      <EuiFlexGroup
-        className="homeAddData__flexGroup"
-        gutterSize="l"
-        justifyContent="spaceAround"
-        responsive={false}
-        wrap={false}
-      >
-        <EuiFlexItem
-          className="homAddData__flexItem"
-          grow={1}
-        >
-          <EuiCard
-            className="homAddData__card"
-            description={
-              <span
-                id="aria-describedby.addLogDataButtonLabel"
-              >
-                Ingest logs from popular data sources and easily visualize in preconfigured dashboards.
-              </span>
-            }
-            footer={
-              <EuiButton
-                aria-describedby="aria-describedby.addLogDataButtonLabel"
-                className="homAddData__button"
-                data-test-subj="logsData"
-                href="#/tutorial_directory/logging"
-              >
-                <FormattedMessage
-                  defaultMessage="Add log data"
-                  id="home.addData.logging.addLogDataButtonLabel"
-                  values={Object {}}
-                />
-              </EuiButton>
-            }
-            textAlign="left"
-            title="Logs"
-            titleSize="xs"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          className="homAddData__flexItem"
-          grow={1}
-        >
-          <EuiCard
-            className="homAddData__card"
-            description={
-              <span
-                id="aria-describedby.addMetricsButtonLabel"
-              >
-                Collect metrics from the operating system and services running on your servers.
-              </span>
-            }
-            footer={
-              <EuiButton
-                aria-describedby="aria-describedby.addMetricsButtonLabel"
-                className="homAddData__button"
-                href="#/tutorial_directory/metrics"
-              >
-                <FormattedMessage
-                  defaultMessage="Add metric data"
-                  id="home.addData.metrics.addMetricsDataButtonLabel"
-                  values={Object {}}
-                />
-              </EuiButton>
-            }
-            textAlign="left"
-            title="Metrics"
-            titleSize="xs"
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="homAddData__flexItem"
-      grow={1}
-    >
-      <EuiFlexGroup
-        alignItems="center"
-        gutterSize="m"
-        responsive={false}
-      >
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiIcon
-            className="homAddData__logo"
-            size="xl"
-            type="logoSecurity"
-          />
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiTitle
-            size="s"
-          >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Security"
-                id="home.addData.title.security"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiCard
-        className="homAddData__card"
-        description={
-          <span
-            id="aria-describedby.addSiemButtonLabel"
-          >
-            Protect hosts, analyze security information and events, hunt threats, automate detections, and create cases.
-          </span>
-        }
-        footer={
-          <EuiButton
-            aria-describedby="aria-describedby.addSiemButtonLabel"
-            className="homAddData__button"
-            href="#/tutorial_directory/security"
-          >
-            <FormattedMessage
-              defaultMessage="Add events"
-              id="home.addData.securitySolution.addSecurityEventsButtonLabel"
-              values={Object {}}
-            />
-          </EuiButton>
-        }
-        textAlign="left"
-        title="SIEM + Endpoint Security"
-        titleSize="xs"
-      />
-    </EuiFlexItem>
-  </EuiFlexGroup>
-  <EuiHorizontalRule />
-  <EuiFlexGrid
-    columns={2}
-  >
-    <EuiFlexItem
-      className="homAddData__footerItem"
-    >
-      <EuiText
-        size="s"
-      >
-        <strong
-          style={
-            Object {
-              "height": 38,
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Add sample data"
-            id="home.addData.sampleDataTitle"
-            values={Object {}}
-          />
-        </strong>
-        <EuiLink
-          href="#/tutorial_directory/sampleData"
-          style={
-            Object {
-              "display": "block",
-              "textAlign": "center",
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Load a data set and a Kibana dashboard"
-            id="home.addData.sampleDataLink"
-            values={Object {}}
-          />
-        </EuiLink>
-      </EuiText>
-    </EuiFlexItem>
-    <EuiFlexItem
-      className="homAddData__footerItem"
-    >
-      <EuiText
-        size="s"
-      >
-        <strong
-          style={
-            Object {
-              "height": 38,
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Use Elasticsearch data"
-            id="home.addData.yourDataTitle"
-            values={Object {}}
-          />
-        </strong>
-        <EuiLink
-          href="path/app/management/kibana/indexPatterns"
-          style={
-            Object {
-              "display": "block",
-              "textAlign": "center",
-            }
-          }
-        >
-          <FormattedMessage
-            defaultMessage="Connect to your Elasticsearch index"
-            id="home.addData.yourDataLink"
-            values={Object {}}
-          />
-        </EuiLink>
-      </EuiText>
-    </EuiFlexItem>
-  </EuiFlexGrid>
-</EuiPanel>
-`;
diff --git a/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap b/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap
index 4fa04bb64b177..1b10756c2975c 100644
--- a/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap
+++ b/src/plugins/home/public/application/components/__snapshots__/home.test.js.snap
@@ -1,1066 +1,1615 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`home directories should not render directory entry when showOnHomePage is false 1`] = `
-<EuiPage
+exports[`home change home route should render a link to change the default route in advanced settings if advanced settings is enabled 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
   data-test-subj="homeApp"
-  restrictWidth={1200}
 >
-  <EuiPageBody
-    className="eui-displayBlock"
+  <header
+    className="homHeader homHeader--noSolutions"
   >
-    <EuiScreenReaderOnly>
-      <h1>
-        <FormattedMessage
-          defaultMessage="Kibana home"
-          id="home.welcomeHomePageHeader"
-          values={Object {}}
-        />
-      </h1>
-    </EuiScreenReaderOnly>
-    <InjectIntl(AddDataUi)
-      apmUiEnabled={true}
-      isNewKibanaInstance={false}
-      mlEnabled={true}
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
-        >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Visualize and Explore Data"
-                id="home.directories.visualize.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-            gutterSize="s"
-          />
-        </EuiPanel>
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
         >
-          <EuiTitle
-            size="s"
+          <EuiFlexGroup
+            className="homHeader__actions"
           >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Manage and Administer the Elastic Stack"
-                id="home.directories.manage.nameTitle"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-          />
-        </EuiPanel>
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
-    <EuiSpacer
-      size="l"
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
     />
-    <EuiFlexGroup
-      justifyContent="center"
+    <footer
+      className="homFooter"
     >
-      <EuiFlexItem
-        className="eui-textCenter"
-        grow={false}
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
       >
-        <EuiText
-          color="subdued"
-          size="s"
+        <EuiFlexItem
+          grow={false}
         >
-          <p>
+          <EuiButtonEmpty
+            iconType="home"
+            onClick={[Function]}
+            size="xs"
+          >
             <FormattedMessage
-              defaultMessage="Didn’t find what you were looking for?"
-              id="home.directories.notFound.description"
+              defaultMessage="Display a different page on log in"
+              id="home.changeHomeRouteLink"
               values={Object {}}
             />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiButton
-          data-test-subj="allPlugins"
-          href="#/feature_directory"
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
         >
-          <FormattedMessage
-            defaultMessage="View full directory of Kibana plugins"
-            id="home.directories.notFound.viewFullButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPageBody>
-</EuiPage>
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
+            <FormattedMessage
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
+              values={Object {}}
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
 `;
 
-exports[`home directories should render ADMIN directory entry in "Manage" panel 1`] = `
-<EuiPage
+exports[`home directories should not render directory entry when showOnHomePage is false 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
   data-test-subj="homeApp"
-  restrictWidth={1200}
 >
-  <EuiPageBody
-    className="eui-displayBlock"
+  <header
+    className="homHeader homHeader--noSolutions"
   >
-    <EuiScreenReaderOnly>
-      <h1>
-        <FormattedMessage
-          defaultMessage="Kibana home"
-          id="home.welcomeHomePageHeader"
-          values={Object {}}
-        />
-      </h1>
-    </EuiScreenReaderOnly>
-    <InjectIntl(AddDataUi)
-      apmUiEnabled={true}
-      isNewKibanaInstance={false}
-      mlEnabled={true}
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
-        >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Visualize and Explore Data"
-                id="home.directories.visualize.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-            gutterSize="s"
-          />
-        </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiFlexGroup
+            className="homHeader__actions"
+          >
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                iconType="gear"
+                onClick={[Function]}
+              >
+                Manage
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
       <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
+    />
+    <footer
+      className="homFooter"
+    >
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
+      >
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
+            <FormattedMessage
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
+              values={Object {}}
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
+`;
+
+exports[`home directories should render ADMIN directory entry in "Manage your data" panel 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
+  data-test-subj="homeApp"
+>
+  <header
+    className="homHeader homHeader--noSolutions"
+  >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Manage and Administer the Elastic Stack"
-                id="home.directories.manage.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiFlexGroup
+            className="homHeader__actions"
           >
             <EuiFlexItem
-              className="homHome__synopsisItem"
-              key="index_patterns"
+              className="homHeader__actionItem"
             >
-              <Synopsis
-                description="Manage the index patterns that help retrieve your data from Elasticsearch."
-                iconType="indexPatternApp"
-                isBeta={false}
-                onClick={[Function]}
-                title="Index Patterns"
-                url="base_path/index_management_landing_page"
-              />
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
             </EuiFlexItem>
-          </EuiFlexGrid>
-        </EuiPanel>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <ManageData
+          addBasePath={[Function]}
+          features={
+            Array [
+              Object {
+                "category": "admin",
+                "description": "Manage the index patterns that help retrieve your data from Elasticsearch.",
+                "icon": "indexPatternApp",
+                "id": "index_patterns",
+                "path": "index_management_landing_page",
+                "showOnHomePage": true,
+                "title": "Index Patterns",
+              },
+            ]
+          }
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
-    <EuiSpacer
-      size="l"
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
     />
-    <EuiFlexGroup
-      justifyContent="center"
+    <footer
+      className="homFooter"
     >
-      <EuiFlexItem
-        className="eui-textCenter"
-        grow={false}
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
       >
-        <EuiText
-          color="subdued"
-          size="s"
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
-          <p>
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
             <FormattedMessage
-              defaultMessage="Didn’t find what you were looking for?"
-              id="home.directories.notFound.description"
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
               values={Object {}}
             />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiButton
-          data-test-subj="allPlugins"
-          href="#/feature_directory"
-        >
-          <FormattedMessage
-            defaultMessage="View full directory of Kibana plugins"
-            id="home.directories.notFound.viewFullButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPageBody>
-</EuiPage>
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
 `;
 
-exports[`home directories should render DATA directory entry in "Explore Data" panel 1`] = `
-<EuiPage
+exports[`home directories should render DATA directory entry in "Ingest your data" panel 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
   data-test-subj="homeApp"
-  restrictWidth={1200}
 >
-  <EuiPageBody
-    className="eui-displayBlock"
+  <header
+    className="homHeader homHeader--noSolutions"
   >
-    <EuiScreenReaderOnly>
-      <h1>
-        <FormattedMessage
-          defaultMessage="Kibana home"
-          id="home.welcomeHomePageHeader"
-          values={Object {}}
-        />
-      </h1>
-    </EuiScreenReaderOnly>
-    <InjectIntl(AddDataUi)
-      apmUiEnabled={true}
-      isNewKibanaInstance={false}
-      mlEnabled={true}
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
-        >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Visualize and Explore Data"
-                id="home.directories.visualize.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-            gutterSize="s"
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiFlexGroup
+            className="homHeader__actions"
           >
             <EuiFlexItem
-              className="homHome__synopsisItem"
-              key="dashboard"
+              className="homHeader__actionItem"
             >
-              <Synopsis
-                description="Display and share a collection of visualizations and saved searches."
-                iconType="dashboardApp"
-                isBeta={false}
-                onClick={[Function]}
-                title="Dashboard"
-                url="base_path/dashboard_landing_page"
-              />
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
             </EuiFlexItem>
-          </EuiFlexGrid>
-        </EuiPanel>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={
+            Array [
+              Object {
+                "category": "data",
+                "description": "Display and share a collection of visualizations and saved searches.",
+                "icon": "dashboardApp",
+                "id": "dashboard",
+                "path": "dashboard_landing_page",
+                "showOnHomePage": true,
+                "title": "Dashboard",
+              },
+            ]
+          }
+        />
       </EuiFlexItem>
       <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
+    />
+    <footer
+      className="homFooter"
+    >
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
+      >
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
+            <FormattedMessage
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
+              values={Object {}}
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
+`;
+
+exports[`home directories should render solutions in the "solution section" 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
+  data-test-subj="homeApp"
+>
+  <header
+    className="homHeader homHeader--hasSolutions"
+  >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Manage and Administer the Elastic Stack"
-                id="home.directories.manage.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-          />
-        </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiFlexGroup
+            className="homHeader__actions"
+          >
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    <SolutionsSection
+      addBasePath={[Function]}
+      solutions={
+        Array [
+          Object {
+            "descriptions": Array [
+              "Analyze data in dashboards",
+            ],
+            "icon": "logoKibana",
+            "id": "kibana",
+            "order": 1,
+            "path": "kibana_landing_page",
+            "subtitle": "Visualize & analyze",
+            "title": "Kibana",
+          },
+          Object {
+            "descriptions": Array [
+              "Example use case",
+            ],
+            "icon": "empty",
+            "id": "solution-2",
+            "order": 2,
+            "path": "path-to-solution-two",
+            "subtitle": "Subtitle for solution two",
+            "title": "Solution two",
+          },
+          Object {
+            "descriptions": Array [
+              "Example use case",
+            ],
+            "icon": "empty",
+            "id": "solution-3",
+            "order": 3,
+            "path": "path-to-solution-three",
+            "subtitle": "Subtitle for solution three",
+            "title": "Solution three",
+          },
+          Object {
+            "descriptions": Array [
+              "Example use case",
+            ],
+            "icon": "empty",
+            "id": "solution-4",
+            "order": 4,
+            "path": "path-to-solution-four",
+            "subtitle": "Subtitle for solution four",
+            "title": "Solution four",
+          },
+        ]
+      }
+    />
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
-    <EuiSpacer
-      size="l"
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
     />
-    <EuiFlexGroup
-      justifyContent="center"
+    <footer
+      className="homFooter"
     >
-      <EuiFlexItem
-        className="eui-textCenter"
-        grow={false}
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
       >
-        <EuiText
-          color="subdued"
-          size="s"
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
-          <p>
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
             <FormattedMessage
-              defaultMessage="Didn’t find what you were looking for?"
-              id="home.directories.notFound.description"
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
               values={Object {}}
             />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiButton
-          data-test-subj="allPlugins"
-          href="#/feature_directory"
-        >
-          <FormattedMessage
-            defaultMessage="View full directory of Kibana plugins"
-            id="home.directories.notFound.viewFullButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPageBody>
-</EuiPage>
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
 `;
 
-exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
-<EuiPage
+exports[`home header render 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
   data-test-subj="homeApp"
-  restrictWidth={1200}
 >
-  <EuiPageBody
-    className="eui-displayBlock"
+  <header
+    className="homHeader homHeader--noSolutions"
   >
-    <EuiScreenReaderOnly>
-      <h1>
-        <FormattedMessage
-          defaultMessage="Kibana home"
-          id="home.welcomeHomePageHeader"
-          values={Object {}}
-        />
-      </h1>
-    </EuiScreenReaderOnly>
-    <InjectIntl(AddDataUi)
-      apmUiEnabled={true}
-      isNewKibanaInstance={false}
-      mlEnabled={true}
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
-        >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Visualize and Explore Data"
-                id="home.directories.visualize.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-            gutterSize="s"
-          />
-        </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiFlexGroup
+            className="homHeader__actions"
+          >
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
       <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
+    />
+    <footer
+      className="homFooter"
+    >
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
+      >
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
+            <FormattedMessage
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
+              values={Object {}}
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
+`;
+
+exports[`home header should show "Dev tools" link if console is available 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
+  data-test-subj="homeApp"
+>
+  <header
+    className="homHeader homHeader--noSolutions"
+  >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Manage and Administer the Elastic Stack"
-                id="home.directories.manage.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-          />
-        </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiFlexGroup
+            className="homHeader__actions"
+          >
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                iconType="wrench"
+                onClick={[Function]}
+              >
+                Dev tools
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <ManageData
+          addBasePath={[Function]}
+          features={
+            Array [
+              Object {
+                "category": "admin",
+                "description": "Skip cURL and use a JSON interface to work with your data in Console.",
+                "icon": "consoleApp",
+                "id": "console",
+                "path": "path-to-dev-tools",
+                "showOnHomePage": false,
+                "title": "Console",
+              },
+            ]
+          }
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
-    <EuiSpacer
-      size="l"
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
     />
-    <EuiFlexGroup
-      justifyContent="center"
+    <footer
+      className="homFooter"
     >
-      <EuiFlexItem
-        className="eui-textCenter"
-        grow={false}
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
       >
-        <EuiText
-          color="subdued"
-          size="s"
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
-          <p>
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
             <FormattedMessage
-              defaultMessage="Didn’t find what you were looking for?"
-              id="home.directories.notFound.description"
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
               values={Object {}}
             />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiButton
-          data-test-subj="allPlugins"
-          href="#/feature_directory"
-        >
-          <FormattedMessage
-            defaultMessage="View full directory of Kibana plugins"
-            id="home.directories.notFound.viewFullButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPageBody>
-</EuiPage>
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
 `;
 
-exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when there are index patterns 1`] = `
-<EuiPage
+exports[`home header should show "Manage" link if stack management is available 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
   data-test-subj="homeApp"
-  restrictWidth={1200}
 >
-  <EuiPageBody
-    className="eui-displayBlock"
+  <header
+    className="homHeader homHeader--noSolutions"
   >
-    <EuiScreenReaderOnly>
-      <h1>
-        <FormattedMessage
-          defaultMessage="Kibana home"
-          id="home.welcomeHomePageHeader"
-          values={Object {}}
-        />
-      </h1>
-    </EuiScreenReaderOnly>
-    <InjectIntl(AddDataUi)
-      apmUiEnabled={true}
-      isNewKibanaInstance={false}
-      mlEnabled={true}
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
-        >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Visualize and Explore Data"
-                id="home.directories.visualize.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-            gutterSize="s"
-          />
-        </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiFlexGroup
+            className="homHeader__actions"
+          >
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                iconType="gear"
+                onClick={[Function]}
+              >
+                Manage
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
       <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
+    />
+    <footer
+      className="homFooter"
+    >
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
+      >
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
+            <FormattedMessage
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
+              values={Object {}}
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
+`;
+
+exports[`home isNewKibanaInstance should safely handle execeptions 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
+  data-test-subj="homeApp"
+>
+  <header
+    className="homHeader homHeader--noSolutions"
+  >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Manage and Administer the Elastic Stack"
-                id="home.directories.manage.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-          />
-        </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiFlexGroup
+            className="homHeader__actions"
+          >
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
-    <EuiSpacer
-      size="l"
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
     />
-    <EuiFlexGroup
-      justifyContent="center"
+    <footer
+      className="homFooter"
     >
-      <EuiFlexItem
-        className="eui-textCenter"
-        grow={false}
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
       >
-        <EuiText
-          color="subdued"
-          size="s"
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
-          <p>
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
             <FormattedMessage
-              defaultMessage="Didn’t find what you were looking for?"
-              id="home.directories.notFound.description"
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
               values={Object {}}
             />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiButton
-          data-test-subj="allPlugins"
-          href="#/feature_directory"
-        >
-          <FormattedMessage
-            defaultMessage="View full directory of Kibana plugins"
-            id="home.directories.notFound.viewFullButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPageBody>
-</EuiPage>
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
 `;
 
-exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when there are no index patterns 1`] = `
-<EuiPage
+exports[`home isNewKibanaInstance should set isNewKibanaInstance to false when there are index patterns 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
   data-test-subj="homeApp"
-  restrictWidth={1200}
 >
-  <EuiPageBody
-    className="eui-displayBlock"
+  <header
+    className="homHeader homHeader--noSolutions"
   >
-    <EuiScreenReaderOnly>
-      <h1>
-        <FormattedMessage
-          defaultMessage="Kibana home"
-          id="home.welcomeHomePageHeader"
-          values={Object {}}
-        />
-      </h1>
-    </EuiScreenReaderOnly>
-    <InjectIntl(AddDataUi)
-      apmUiEnabled={true}
-      isNewKibanaInstance={true}
-      mlEnabled={true}
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
-        >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Visualize and Explore Data"
-                id="home.directories.visualize.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-            gutterSize="s"
-          />
-        </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiFlexGroup
+            className="homHeader__actions"
+          >
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
       <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
+    />
+    <footer
+      className="homFooter"
+    >
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
+      >
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
+            <FormattedMessage
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
+              values={Object {}}
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
+`;
+
+exports[`home isNewKibanaInstance should set isNewKibanaInstance to true when there are no index patterns 1`] = `
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
+  data-test-subj="homeApp"
+>
+  <header
+    className="homHeader homHeader--noSolutions"
+  >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Manage and Administer the Elastic Stack"
-                id="home.directories.manage.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-          />
-        </EuiPanel>
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiFlexGroup
+            className="homHeader__actions"
+          >
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
-    <EuiSpacer
-      size="l"
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
     />
-    <EuiFlexGroup
-      justifyContent="center"
+    <footer
+      className="homFooter"
     >
-      <EuiFlexItem
-        className="eui-textCenter"
-        grow={false}
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
       >
-        <EuiText
-          color="subdued"
-          size="s"
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
-          <p>
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
             <FormattedMessage
-              defaultMessage="Didn’t find what you were looking for?"
-              id="home.directories.notFound.description"
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
               values={Object {}}
             />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiButton
-          data-test-subj="allPlugins"
-          href="#/feature_directory"
-        >
-          <FormattedMessage
-            defaultMessage="View full directory of Kibana plugins"
-            id="home.directories.notFound.viewFullButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPageBody>
-</EuiPage>
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
 `;
 
 exports[`home should render home component 1`] = `
-<EuiPage
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
   data-test-subj="homeApp"
-  restrictWidth={1200}
 >
-  <EuiPageBody
-    className="eui-displayBlock"
+  <header
+    className="homHeader homHeader--noSolutions"
   >
-    <EuiScreenReaderOnly>
-      <h1>
-        <FormattedMessage
-          defaultMessage="Kibana home"
-          id="home.welcomeHomePageHeader"
-          values={Object {}}
-        />
-      </h1>
-    </EuiScreenReaderOnly>
-    <InjectIntl(AddDataUi)
-      apmUiEnabled={true}
-      isNewKibanaInstance={false}
-      mlEnabled={true}
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
-        >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Visualize and Explore Data"
-                id="home.directories.visualize.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-            gutterSize="s"
-          />
-        </EuiPanel>
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
         >
-          <EuiTitle
-            size="s"
+          <EuiFlexGroup
+            className="homHeader__actions"
           >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Manage and Administer the Elastic Stack"
-                id="home.directories.manage.nameTitle"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-          />
-        </EuiPanel>
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
-    <EuiSpacer
-      size="l"
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
     />
-    <EuiFlexGroup
-      justifyContent="center"
+    <footer
+      className="homFooter"
     >
-      <EuiFlexItem
-        className="eui-textCenter"
-        grow={false}
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
       >
-        <EuiText
-          color="subdued"
-          size="s"
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
-          <p>
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
             <FormattedMessage
-              defaultMessage="Didn’t find what you were looking for?"
-              id="home.directories.notFound.description"
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
               values={Object {}}
             />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiButton
-          data-test-subj="allPlugins"
-          href="#/feature_directory"
-        >
-          <FormattedMessage
-            defaultMessage="View full directory of Kibana plugins"
-            id="home.directories.notFound.viewFullButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPageBody>
-</EuiPage>
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
 `;
 
 exports[`home welcome should show the normal home page if loading fails 1`] = `
-<EuiPage
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
   data-test-subj="homeApp"
-  restrictWidth={1200}
 >
-  <EuiPageBody
-    className="eui-displayBlock"
+  <header
+    className="homHeader homHeader--noSolutions"
   >
-    <EuiScreenReaderOnly>
-      <h1>
-        <FormattedMessage
-          defaultMessage="Kibana home"
-          id="home.welcomeHomePageHeader"
-          values={Object {}}
-        />
-      </h1>
-    </EuiScreenReaderOnly>
-    <InjectIntl(AddDataUi)
-      apmUiEnabled={true}
-      isNewKibanaInstance={false}
-      mlEnabled={true}
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
-        >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Visualize and Explore Data"
-                id="home.directories.visualize.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-            gutterSize="s"
-          />
-        </EuiPanel>
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
         >
-          <EuiTitle
-            size="s"
+          <EuiFlexGroup
+            className="homHeader__actions"
           >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Manage and Administer the Elastic Stack"
-                id="home.directories.manage.nameTitle"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-          />
-        </EuiPanel>
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
-    <EuiSpacer
-      size="l"
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
     />
-    <EuiFlexGroup
-      justifyContent="center"
+    <footer
+      className="homFooter"
     >
-      <EuiFlexItem
-        className="eui-textCenter"
-        grow={false}
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
       >
-        <EuiText
-          color="subdued"
-          size="s"
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
-          <p>
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
             <FormattedMessage
-              defaultMessage="Didn’t find what you were looking for?"
-              id="home.directories.notFound.description"
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
               values={Object {}}
             />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiButton
-          data-test-subj="allPlugins"
-          href="#/feature_directory"
-        >
-          <FormattedMessage
-            defaultMessage="View full directory of Kibana plugins"
-            id="home.directories.notFound.viewFullButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPageBody>
-</EuiPage>
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
 `;
 
 exports[`home welcome should show the normal home page if welcome screen is disabled locally 1`] = `
-<EuiPage
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
   data-test-subj="homeApp"
-  restrictWidth={1200}
 >
-  <EuiPageBody
-    className="eui-displayBlock"
+  <header
+    className="homHeader homHeader--noSolutions"
   >
-    <EuiScreenReaderOnly>
-      <h1>
-        <FormattedMessage
-          defaultMessage="Kibana home"
-          id="home.welcomeHomePageHeader"
-          values={Object {}}
-        />
-      </h1>
-    </EuiScreenReaderOnly>
-    <InjectIntl(AddDataUi)
-      apmUiEnabled={true}
-      isNewKibanaInstance={false}
-      mlEnabled={true}
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
-        >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Visualize and Explore Data"
-                id="home.directories.visualize.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-            gutterSize="s"
-          />
-        </EuiPanel>
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
         >
-          <EuiTitle
-            size="s"
+          <EuiFlexGroup
+            className="homHeader__actions"
           >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Manage and Administer the Elastic Stack"
-                id="home.directories.manage.nameTitle"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-          />
-        </EuiPanel>
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
-    <EuiSpacer
-      size="l"
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
     />
-    <EuiFlexGroup
-      justifyContent="center"
+    <footer
+      className="homFooter"
     >
-      <EuiFlexItem
-        className="eui-textCenter"
-        grow={false}
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
       >
-        <EuiText
-          color="subdued"
-          size="s"
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
-          <p>
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
             <FormattedMessage
-              defaultMessage="Didn’t find what you were looking for?"
-              id="home.directories.notFound.description"
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
               values={Object {}}
             />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiButton
-          data-test-subj="allPlugins"
-          href="#/feature_directory"
-        >
-          <FormattedMessage
-            defaultMessage="View full directory of Kibana plugins"
-            id="home.directories.notFound.viewFullButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPageBody>
-</EuiPage>
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
 `;
 
 exports[`home welcome should show the welcome screen if enabled, and there are no index patterns defined 1`] = `
@@ -1071,116 +1620,107 @@ exports[`home welcome should show the welcome screen if enabled, and there are n
 `;
 
 exports[`home welcome stores skip welcome setting if skipped 1`] = `
-<EuiPage
+<main
+  aria-labelledby="homHeader__title"
+  className="homWrapper"
   data-test-subj="homeApp"
-  restrictWidth={1200}
 >
-  <EuiPageBody
-    className="eui-displayBlock"
+  <header
+    className="homHeader homHeader--noSolutions"
   >
-    <EuiScreenReaderOnly>
-      <h1>
-        <FormattedMessage
-          defaultMessage="Kibana home"
-          id="home.welcomeHomePageHeader"
-          values={Object {}}
-        />
-      </h1>
-    </EuiScreenReaderOnly>
-    <InjectIntl(AddDataUi)
-      apmUiEnabled={true}
-      isNewKibanaInstance={true}
-      mlEnabled={true}
-    />
-    <EuiSpacer
-      size="l"
-    />
-    <EuiFlexGroup>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
-        >
+    <div
+      className="homHeader__inner"
+    >
+      <EuiFlexGroup>
+        <EuiFlexItem>
           <EuiTitle
-            size="s"
+            size="m"
           >
-            <h2>
+            <h1
+              id="homHeader__title"
+            >
               <FormattedMessage
-                defaultMessage="Visualize and Explore Data"
-                id="home.directories.visualize.nameTitle"
+                defaultMessage="Home"
+                id="home.pageHeader.title"
                 values={Object {}}
               />
-            </h2>
+            </h1>
           </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-            gutterSize="s"
-          />
-        </EuiPanel>
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiPanel
-          paddingSize="l"
+        </EuiFlexItem>
+        <EuiFlexItem
+          grow={false}
         >
-          <EuiTitle
-            size="s"
+          <EuiFlexGroup
+            className="homHeader__actions"
           >
-            <h2>
-              <FormattedMessage
-                defaultMessage="Manage and Administer the Elastic Stack"
-                id="home.directories.manage.nameTitle"
-                values={Object {}}
-              />
-            </h2>
-          </EuiTitle>
-          <EuiSpacer
-            size="m"
-          />
-          <EuiFlexGrid
-            columns={2}
-          />
-        </EuiPanel>
+            <EuiFlexItem
+              className="homHeader__actionItem"
+            >
+              <EuiButtonEmpty
+                href="#/tutorial_directory"
+                iconType="indexOpen"
+              >
+                Add data
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </div>
+  </header>
+  <div
+    className="homContent"
+  >
+    0
+    <EuiFlexGroup
+      className="homData homData--expanded"
+    >
+      <EuiFlexItem>
+        <AddData
+          addBasePath={[Function]}
+          features={Array []}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <ManageData
+          addBasePath={[Function]}
+          features={Array []}
+        />
       </EuiFlexItem>
     </EuiFlexGroup>
-    <EuiSpacer
-      size="l"
+    <EuiHorizontalRule
+      aria-hidden="true"
+      margin="xl"
     />
-    <EuiFlexGroup
-      justifyContent="center"
+    <footer
+      className="homFooter"
     >
-      <EuiFlexItem
-        className="eui-textCenter"
-        grow={false}
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceBetween"
       >
-        <EuiText
-          color="subdued"
-          size="s"
+        <EuiFlexItem
+          grow={false}
+        />
+        <EuiFlexItem
+          grow={false}
         >
-          <p>
+          <EuiButtonEmpty
+            data-test-subj="allPlugins"
+            flush="right"
+            href="#/feature_directory"
+            iconType="apps"
+            size="xs"
+          >
             <FormattedMessage
-              defaultMessage="Didn’t find what you were looking for?"
-              id="home.directories.notFound.description"
+              defaultMessage="View app directory"
+              id="home.appDirectory.appDirectoryButtonLabel"
               values={Object {}}
             />
-          </p>
-        </EuiText>
-        <EuiSpacer
-          size="s"
-        />
-        <EuiButton
-          data-test-subj="allPlugins"
-          href="#/feature_directory"
-        >
-          <FormattedMessage
-            defaultMessage="View full directory of Kibana plugins"
-            id="home.directories.notFound.viewFullButtonLabel"
-            values={Object {}}
-          />
-        </EuiButton>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  </EuiPageBody>
-</EuiPage>
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </footer>
+  </div>
+</main>
 `;
diff --git a/src/plugins/home/public/application/components/__snapshots__/synopsis.test.js.snap b/src/plugins/home/public/application/components/__snapshots__/synopsis.test.js.snap
index d757d6a8b7305..190985f70659d 100644
--- a/src/plugins/home/public/application/components/__snapshots__/synopsis.test.js.snap
+++ b/src/plugins/home/public/application/components/__snapshots__/synopsis.test.js.snap
@@ -4,7 +4,7 @@ exports[`props iconType 1`] = `
 <EuiCard
   betaBadgeLabel={null}
   className="homSynopsis__card homSynopsis__card--noPanel"
-  data-test-subj="homeSynopsisLinkgreat tutorial"
+  data-test-subj="homeSynopsisLinktutorial"
   description="this is a great tutorial about..."
   href="link_to_item"
   icon={
@@ -16,6 +16,7 @@ exports[`props iconType 1`] = `
   }
   layout="horizontal"
   title="Great tutorial"
+  titleElement="h3"
   titleSize="xs"
 />
 `;
@@ -24,7 +25,7 @@ exports[`props iconUrl 1`] = `
 <EuiCard
   betaBadgeLabel={null}
   className="homSynopsis__card homSynopsis__card--noPanel"
-  data-test-subj="homeSynopsisLinkgreat tutorial"
+  data-test-subj="homeSynopsisLinktutorial"
   description="this is a great tutorial about..."
   href="link_to_item"
   icon={
@@ -36,6 +37,7 @@ exports[`props iconUrl 1`] = `
   }
   layout="horizontal"
   title="Great tutorial"
+  titleElement="h3"
   titleSize="xs"
 />
 `;
@@ -44,11 +46,12 @@ exports[`props isBeta 1`] = `
 <EuiCard
   betaBadgeLabel="Beta"
   className="homSynopsis__card homSynopsis__card--noPanel"
-  data-test-subj="homeSynopsisLinkgreat tutorial"
+  data-test-subj="homeSynopsisLinktutorial"
   description="this is a great tutorial about..."
   href="link_to_item"
   layout="horizontal"
   title="Great tutorial"
+  titleElement="h3"
   titleSize="xs"
 />
 `;
@@ -57,11 +60,12 @@ exports[`render 1`] = `
 <EuiCard
   betaBadgeLabel={null}
   className="homSynopsis__card homSynopsis__card--noPanel"
-  data-test-subj="homeSynopsisLinkgreat tutorial"
+  data-test-subj="homeSynopsisLinktutorial"
   description="this is a great tutorial about..."
   href="link_to_item"
   layout="horizontal"
   title="Great tutorial"
+  titleElement="h3"
   titleSize="xs"
 />
 `;
diff --git a/src/plugins/home/public/application/components/_add_data.scss b/src/plugins/home/public/application/components/_add_data.scss
index 836b34227a37c..e588edfe35240 100644
--- a/src/plugins/home/public/application/components/_add_data.scss
+++ b/src/plugins/home/public/application/components/_add_data.scss
@@ -1,63 +1,22 @@
-.homAddData__card {
-  border: none;
-  box-shadow: none;
-}
-
-.homAddData__cardDivider {
-  position: relative;
-
-  &:after {
-    position: absolute;
-    content: '';
-    width: 1px;
-    right: -$euiSizeS;
-    top: 0;
-    bottom: 0;
-    background: $euiBorderColor;
-  }
-}
-
-.homAddData__icon {
-  width: $euiSizeXL * 2;
-  height: $euiSizeXL * 2;
-}
-
-.homAddData__footerItem--highlight {
-  background-color: tintOrShade($euiColorPrimary, 90%, 70%);
-  padding: $euiSize;
-}
-
-.homAddData__footerItem {
-  text-align: center;
-}
-
-.homAddData__logo {
-  margin-left: $euiSize;
-}
-
-@include euiBreakpoint('xs', 's') {
-  .homeAddData__flexGroup {
-    flex-wrap: wrap;
-  }
-}
-
-@include euiBreakpoint('xs', 's', 'm') {
-  .homAddDat__flexTablet {
-    flex-direction: column;
-  }
-
-  .homAddData__cardDivider:after {
-    display: none;
-  }
-
-  .homAddData__cardDivider {
-    flex-grow: 0 !important;
-    flex-basis: 100% !important;
-  }
-}
-
-@include euiBreakpoint('l', 'xl') {
-  .homeAddData__flexGroup {
-    flex-wrap: nowrap;
-  }
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.homDataAdd__content .euiIcon__fillSecondary {
+  fill: $euiColorDarkestShade;
 }
diff --git a/src/plugins/home/public/application/components/_home.scss b/src/plugins/home/public/application/components/_home.scss
index 4101f6519829b..d9b7602971e8d 100644
--- a/src/plugins/home/public/application/components/_home.scss
+++ b/src/plugins/home/public/application/components/_home.scss
@@ -1,5 +1,73 @@
-@include euiBreakpoint('xs', 's', 'm') {
-  .homHome__synopsisItem {
-    flex-basis: 100% !important;
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// Local page variables
+$homePageWidth: 1200px;
+
+.homWrapper {
+  background-color: $euiColorEmptyShade;
+  display: flex;
+  flex-direction: column;
+  min-height: calc(100vh - #{$euiHeaderHeightCompensation});
+}
+
+.homHeader {
+  background-color: $euiPageBackgroundColor;
+  border-bottom: $euiBorderWidthThin solid $euiColorLightShade;
+}
+
+.homHeader__inner {
+  margin: 0 auto;
+  max-width: $homePageWidth;
+  padding: $euiSizeXL $euiSize;
+
+  .homHeader--hasSolutions & {
+    padding-bottom: $euiSizeXL + $euiSizeL;
+  }
+}
+
+#homHeader__title {
+  @include euiBreakpoint('xs', 's') {
+    text-align: center;
+  }
+}
+
+.homHeader__actionItem {
+  @include euiBreakpoint('xs', 's') {
+    margin-bottom: 0 !important;
+    margin-top: 0 !important;
+  }
+}
+
+.homContent {
+  margin: 0 auto;
+  max-width: $homePageWidth;
+  padding: $euiSizeXL $euiSize;
+  width: 100%;
+}
+
+.homData--expanded {
+  flex-direction: column;
+
+  &,
+  & > * {
+    margin-bottom: 0 !important;
+    margin-top: 0 !important;
   }
 }
diff --git a/src/plugins/home/public/application/components/_index.scss b/src/plugins/home/public/application/components/_index.scss
index 870099ffb350e..a0547a4588561 100644
--- a/src/plugins/home/public/application/components/_index.scss
+++ b/src/plugins/home/public/application/components/_index.scss
@@ -5,9 +5,11 @@
 //   homChart__legend--small
 //   homChart__legend-isLoading
 
-@import 'add_data';
 @import 'home';
+@import 'add_data';
+@import 'manage_data';
 @import 'sample_data_set_cards';
+@import 'solutions_section';
 @import 'synopsis';
 @import 'welcome';
 
diff --git a/src/plugins/home/public/application/components/_manage_data.scss b/src/plugins/home/public/application/components/_manage_data.scss
new file mode 100644
index 0000000000000..389d8c8b3bf0f
--- /dev/null
+++ b/src/plugins/home/public/application/components/_manage_data.scss
@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.homDataManage__content .euiIcon__fillSecondary {
+  fill: $euiColorDarkestShade;
+}
diff --git a/src/plugins/home/public/application/components/_solutions_section.scss b/src/plugins/home/public/application/components/_solutions_section.scss
new file mode 100644
index 0000000000000..be693707e06b4
--- /dev/null
+++ b/src/plugins/home/public/application/components/_solutions_section.scss
@@ -0,0 +1,122 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.homSolutions {
+  margin-top: -($euiSizeXL + $euiSizeL + $euiSizeM);
+}
+
+.homSolutions__content {
+  min-height: $euiSize * 16;
+
+  @include euiBreakpoint('xs', 's') {
+    flex-direction: column;
+  }
+}
+
+.homSolutions__group {
+  max-width: 50%;
+
+  @include euiBreakpoint('xs', 's') {
+    max-width: none;
+  }
+}
+
+.homSolutionPanel {
+  border-radius: $euiBorderRadius;
+  color: inherit;
+  flex: 1;
+  transition: all $euiAnimSpeedFast $euiAnimSlightResistance;
+
+  &:hover,
+  &:focus {
+    @include euiSlightShadowHover;
+    transform: translateY(-2px);
+
+    .euiTitle {
+      text-decoration: underline;
+    }
+  }
+
+  &,
+  .euiPanel {
+    display: flex;
+    flex-direction: column;
+  }
+
+  .euiPanel {
+    overflow: hidden;
+  }
+}
+
+.homSolutionPanel__header {
+  color: $euiColorEmptyShade;
+  padding: $euiSize;
+}
+
+.homSolutionPanel__icon {
+  background-color: $euiColorEmptyShade !important;
+  box-shadow: none !important;
+  margin: 0 auto $euiSizeS;
+  padding: $euiSizeS;
+}
+
+.homSolutionPanel__subtitle {
+  margin-top: $euiSizeXS;
+}
+
+.homSolutionPanel__content {
+  flex-direction: column;
+  justify-content: center;
+  padding: $euiSize;
+
+  @include euiBreakpoint('xs', 's') {
+    text-align: center;
+  }
+}
+
+.homSolutionPanel__header {
+  background-color: $euiColorPrimary;
+  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQYAAAFjCAYAAADfDKXVAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAfiSURBVHgB7d1JblRZGobh45SrhJiWGOQ6EENLSKyABTBmOcwRq2EnTKtUdInBuEln/OkMdB3HTTjiNqd5HinA3YBUSq++24UPUkq/J+jE+/fv09HRURrD27dv0+vXr1OLfksAG4QByAgDkBEGICMMQEYYgIwwABlhADLCAGSEAcgIA5ARBiAjDEBGGICMMAAZYQAywgBkhAHICAOQEQZg05/CAGy6FAYgIwzApnNhADLCAGy6EAZgkzAAGVclgIyTj0DGYgAyZ8IADP2ZLAZgw1n8IQzA0Hn8IQzA0EX8IQzAkEMJICMMwDURhcv44DDBlp4+fZrevHmTxvLq1av04cOHRDHO1h8IA1t7/PhxOjo6SjTrdP2BQwlg7ddiEAYgxGXK8/UnwgCEs+EnwgCEk+EnwgCE0+EnwgDEYcTF8AvCAJxufkEYgO+bXxAG6Nu1y5RrwgB9O7npi8IAfTu+6YvCAP3KrkasCQP06/i2bwgD9Ov0tm8IA/QpLlFe3PZNYYA+/bjrm8IA/YmTjqd3/YAwQH+O7/sBYYC+xHmFH/f9kDBAX/7Y5oeEAfqx1VoIwgD9+L7tDwoD9GHrtRCEAfoQ5xYutv1hYYD2PWgtBGGA9m11JWJIGKBtD14LQRigbf9POxAGaNedT1DeRRigTRGEb2lHwgBtetDlyU3CAO35mXY44TgkDNCWy9XrS9qTMEBb9jqEWBMGaEdchbj3TVi2IQzQhr2uQmwSBmjD5zTCIcSaMED94rzCaRqRMEDd4tLkaIcQa8IA9YpDh70vTd5EGKBOcb9CPCA12nmFIWGAOo16snGTMEB94mTjSZqQMEBdIgqjn2zcJAxQj7ircfIoBGGAOsTtzl/TTIQByhe/nXqSy5K3EQYoW0Rhp/dt3MdhAkoVdzV+Slf3LMxKGKBMcU5h1sOHIYcSUJ5FoxAsBijLLPcp3EcYoBxxOXKUd2DalzDA8uLk4sc08nsq7EMYYFnxINRkT0nuShhgOfEgVDwlOfvlyPsIAyyjmPMJNxEGmFccMsRKKOZ8wk2EAeZT7KHDJmGA6UUI4v6EYg8dNgkDTCued4i7GIu66nAfYYBpVLcShoQBxlflShgSBhhP1SthSBhgHNWvhCFhgP00sxKGhAF29OTJkyKfcxiDN2qBHb18+TIOH5qLQhAGICMMQEYYgIwwABlhADLCAGSEAcgIA5ARBiAjDEBGGICMMNCTy0ePHhX/RqwlEAZ6EQ88/e/Zs2dniXt57JrWNfl+CVMTBloW6+BTavTR6CkJA62KlfAtsRNhoDWxEr788zc7EgZaYiWMRBhogZUwMmGgdlbCBISBWlkJExIGamQlTEwYqImVMBNhoBZx5+LXxCyEgdLFXYufV6/TxGyEgZLFSojzCZ6InJkwUCIrYWHCQGmshAIIA6WwEgoiDJTASiiMMLCYw8NDK6FQ3tqNxbx79+5jEoUiCQOLef78uUOHQgkDkBEGICMMQEYYgIwwABlhADLCAGSEAcgIA5ARBiAjDEBGGNjWxYsXL/5IdOFg9fo9wd3+fr+Ey8vLf63+/k8az38PDg5m/RX1q/+G+Pf/O43j++rf/yU1yPsxcBfvl9ApYeA23lWpY8LAJisBYeAaK4G/CQMhQhAr4SRBEgauYhBRsBL4RRj6ZSVwK2Hok5XAnYShL1YCWxGGflgJbE0Y2mcl8GDC0DYrgZ0IQ5usBPYiDO35uXrFE3+zPrVIW4ShHbES4nbm4wR7EoY2WAmMShjqZiUwCWGol5XAZIShPlYCkxOGulgJzEIY6mAlMCthKJ+VwOyEoVxWAosRhjJZCSxKGMpiJVAEYSiHlUAxhGF5VgLFEYZlWQkUSRiWYSVQNGGYn5VA8YRhPlYC1RCGeVgJVEUYpmUlUCVhmI6VQLWEYXxWAtUThnFZCTRBGMZhJdAUYdiflUBzhGF3VgLNEobdnK1en5KVQKOE4eFiJXxL0DBh2F6shC///A1NE4btWAl0RRjuZiXQJWG4nZVAt4QhZyXQPWG4zkqAJAxrVgIMCMPVnYtfE/BLz2GIuxY/r16nCbim1zDESojzCZeJ3sTh4lj/389To3oLg5XQuYODA4eNW+gpDFYCbKmHMFgJ8ECth8FKgB20GgYrAfbQYhisBNhTS2GwEmAkrYTBSoAR1R4GKwEmUHMYrASYSI1hsBJgYrWFwUqAGdQSBisBZlRDGKwEmFnJYbASYCGlhsFKgAWVFgYrAQpQUhisBChECWGwEqAwS4fBSoACLRUGKwEKtkQYrAQo3JxhsBKgEnOFwUqAikwdhghBrISTBFRjyjBEDCIKVgJUZoowOJcAlRs7DM4lQAPGCsPP1etbshKgCfuGIQ4bYiH8SEAzdg1DHCrEQjhODhugOQ8NgyBAB7YNgyBAR+4LgyBAh24Lg6sM0LFhGGIRfE9XdywKAnQswrBeB2fJ4QKQrsLwMQEM/JYANggDkBEGICMMQEYYgIwwABlhADLCAGSEAcgIA5ARBiAjDEBGGICMMAAZYQAywgBkhAHICAOQEQYgIwxARhiAjDAAGWEAMg/9bdf0LX4h0XkCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACq8hdouPfUCk+KHQAAAABJRU5ErkJggg=='),
+    url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAWgAAAFKCAYAAAAwgcXoAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAjGSURBVHgB7d27ctRaFoDh1WBzsQ9wLkVsngHHfglSIOUdgJQiJSfmIUjhJUwGjiGaU7hmzoB7vLA1GPCt21vSlvR9Vao+5lAFbbf+EktbUgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABUaxYAEzCfz/NldX9biTK+zGaz/0aLSv1FAYbg6v52I8r4e39rNdCXAoAqCTRApQQaoFICDVApgQaolEADVEqgASol0ACVEmiASgk0QKUEGqBSAg1QKYEGqJRAA1RKoAEqJdAAlRJogEp5ogowJV/3t/9EGV8DAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFjELABOMZ/Po6TZrL/sDO29rATA6Vb3t/UoY29/+1f04DDO1w63Ev59uLVGoIGz5GHi9Sjja/QU6EPZvFLv5Uu07FIAUCWBBqiUQANUSqABKiXQAJUSaIBKCTRApQQaoFICDVApgQaolEADVEqgASol0ACVEmiASgl0ANRJoAEqJdAAlfJEFeAs+RSUv6OMsg8FXNw/Ue69/BMAAAAAAAAAAAAAAAAAAAAAQCdmAcBpspNn3flzL1q4EZRAA2PRhLR5vXz4683ryk+/7+j/ixO+vqiM9t6Rr78e899ffvq9za9/FWigdhnNbNVqfA/wyuHr5fgxxqMi0EDfMq4Z3ya4K4fbaMN7XgINdKGJ8OUjW/M1JxBooKSj4c3X5mhYa5bgmwYsoxlHXA0hbo1vJnCW5gRds10Jo4lOCDTws4xvRjiPjvOoeDXohUDDtB09Or4W31dTUAE/CJiWJshNjK8E1RJoGDdBHjCBhvHJCBtZjIAfHAxf7scZ46uHr/brkfCDhGFqVllcCWOL0RJoGIajs+S16Hjfnc3K/XHzefG7cp7b0N6HQEO9qhhdbG5uxosXL6KET58+xb1796IPGef79+/Ho0ePooSXL1/Gq1evok0rAdSkiXIeJVdxgm9tbS22traihJ2dnejTxsZGsffy+vXraJtAQ/+qizJ1EGjoRzNTvhGizAkEGrqVKy56OdHH8Ag0tC9vPpRBXg9RZgECDe3IEGeU82jZOmWWItBQlhEGxQg0XFyG+Lc4CLN9imJ8mGB5ebScc+W8kMTRMsUJNCzGbJnOCDScj5UYdE6g4XR5lHwjHC3TA4GGXx299FqY6Y1Aw3fNagxjDKog0CDMVEqgmbIcX+QY43pAhQSaKXLij0EQaKZEmJfU52OqShvSexFopkCYL2B7ezsePnwYJezu7kZfMsz5FJQPHz5ECe/evYu2OSHCmAkzgybQjJEwMwoCzZgIM6Mi0IxB3ifjZhxc/QejIdAMWX5+84h5PWCEBJohcuUfk+DDzdBklPOo2WeX0fMhZyjyxN/vcTBvhkkQaGq3GgcnAK3MYHIEmlo5AcjkCTQ1MmeGsANQlxxj5DhjNQCBpgr5ObwV7ssMPxBo+macASewU9AX982AMwg0XbM6A85JoOmSi01gAQJNF9xtDpYg0LTNSUBYkp2GtuRRc44znASEJQk0bXDUDAXYgSjJUTMUJNCU4qgZCrMzcVGOmqElAs1F5LK5jLPPEbTAjsUyXA0IHRBoFuVqQOiIQLOIPGr+LZic2axcKubzefSl5PtIbb+XSwFny6Plv0KcJ2lrayv29vaKbO/fv4++ZJyfPHlS7L08fvw42rYScDonAqEnAs1JnAiEngk0x8mRxh/h2YDQK4HmZ2txcGtQIw3omUBzVIbZSAMqIdAkIw2okEDjwhOolEBPW44zbgZQJYGepjwBeGt/ux5AtQR6epqrAo00oHICPS05b/4zLKGDQRDo6TBvhoER6GmwvhkGSKDHzfpmGDCBHi8nA2HgBHqcnAyEERDo8XEyEEZCoMfFI6loRZ+PqSptSO/FP4HHI++n4cpAWrGxsRGl7OzsRF/W1tbi9u3bUcLHjx9jd3c32iTQw5c/wzwZaKUGjIxAD5uVGjBiAj1c4gwjJ9DDlOOMjLOfH4yYHXx4PDMQJsJOPiwZ51sBTIJAD4c1zjAxAj0M4gwTJND1E2eYKIGum/s4w4QJdL1cug0TJ9B1EmdAoCskzsA3Al0XcQb+T6DrIc7ADwS6DuIM/EKg+yfOwLEEul/iDJxIoPsjzsCpLgV9yCsExRk4lUB3L++t4fJt4ExGHN1y4yPg3AS6O+IMLESguyHOwMLMoNuXj6kSZ2BhAt2ua+EZgsCSBLo9q3Gw1hlgKStBGy7vb3+EGT8jsL6+Hpubm1HK27dvoy8bGxvfthJ2dna+bW0S6PIyzn8dvsLg3b17N968eRMlZNDu3LkTfZjNZvHgwYN49uxZlPD06dN4/vx5tMmIo6w8YhZnoAiBLuvPEGegEIEuJ++vcSUAChHoMtxfAyhOoC8uw+xCFKA4gb6YXOt8MwBaINDLa9Y6A7RCoJdjOR3QOoFeTl7CLc5AqwR6cbli41oAtEygF2PFBtAZgT4/KzaATgn0+VixAXROoM8n4+ykINApgT5bjjVWA6BjAn269XCPDaAnAn2yHGk4KQj8Yj6fRxc8UeV4zVNRYPJ2d3dje3s7Smj7EVFn+fz5c5H3koHO70vbPDPveHlS0MUoQK+MOH7lSkGgCgL9o3wiiisFgSoI9Hc5d/49ACoh0N+5Qx1QFYE+kHNnD3wFqiLQ5s5ApaYeaHNnoFpTD3SONsydgSpNOdB5j43rAVCpqQbafTaA6k010O6zAVRvioE2dwYGYWqBtqQOGIwpBdqSOmBQphRoow1gUKYS6OthSR0wMFMIdB413wiAgZlCoI02gEEae6CNNoDBGnOgjTaAQRtzoI02gEEba6CNNoDBG2OgZ2G0AYzA/wBP5hsF50HhogAAAABJRU5ErkJggg==');
+  background-repeat: no-repeat;
+  background-position: top 0 left 0, bottom 0 right 0;
+  background-size: $euiSizeXL * 4, $euiSizeXL * 6;
+
+  .homSolutionPanel--enterpriseSearch & {
+    background-color: $euiColorSecondary;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAABKCAYAAADJwhY8AAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAANMSURBVHgBzZp7buIwEMYHKC1QuqsF7Up7Hs4Al+Ff4DCcAonrtPuAPjcL1B/YyA0p2JkZK580SuQm6Y+xx4+xiSqumrG+d7/z/rYx9t+WZdZ2lFhXxq4jngfkP2Ov9qquq8jnm9Zu6eBNgD6TImwsoC80ibY1NIe1sRcSVsPYHfFVN9Yy1jG2pUPbFZEUoJMP+kYHWJakAZ0AemuvrPZZJ10B8jsdHFFKWh70BSe07X1GkUoBCCHib+w1qsq1qzivLkU6JDUgTSaT7m63C4ZMCmjgaDwe4zYYMhmgB+cEyPal95IAFsA5fTGQZ4dbdcAzcO7/9wxk7bMH8AfMTvJDUsO+fG2tSfJwvp5qtdqKPgEMEYABekeBo0IEnNODgTzpI0MBfaFhnwUtAQdlBvA+X1gG0Kmw0y0J57QykE9+ASdIHo3hF29cARMO6uYDhhvFGPwfjG0E4BxPxy/gVPFR8/m8MRwOsTosPa3y9KEtigBCpmoAJwV5jGixjtp8EG3xD8noOASKjiT2V6+Jr5YLFo2hDuvkDfEErqa7EZXx4naxWKyIr9b+e6QkU0U/iBcw+2jWnM08E09NtMMqA0JNNUC0ReInlRraE9bodXBOzaoD1rQBuVku9SpmZ7eSL9wjVa864LbqgOpVzJ4bagNyv7/RBozZgymSOuAN8bRTA7RrFM4+DJRpepBbvZAqIDf3jQmrThXbxCS3i5FdduYksXOAjUp5QJt75npvK75whwwclopd4uvV3YgB2m7lG8nouK0rAojkEcnlZTZ+plUCsDEajfom9SYBB31InXA/is64h+8sl0vKsowGgwExBO/99QvKDkXISHQpFxCz2Wx/nU6nVFIniacyHkTOpGevJ2J48sR7UKgHnceCRoiSnvxVVOj2P6C6ZyjHVKljwb7a54KDKtKT2MgpPDECD/ZJSYGedEdaCqW+437BkzgcdG/zOIVKciTgDOTawL2dezfVmYUiyHV+V6lIyQAhDxJwjyHvoPv4SWmFgAiCg1JnFqLgIO6qK1SIVowS0afjUgCin/tNJZOZ2oCIUlRr6aOlWoDwFjZz2CczpQHhKXjsYv8WKilAeAwBgL0R0ZPCHECAvFirzCFb/5hyknPV7zL4DLH0CVGgAAAAAElFTkSuQmCC'),
+      url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAA+CAYAAACbQR1vAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAACBSURBVHgB7dpBDcAwDMVQdyzGH9xojEQjtbIfBEu5fGUx62WPjyEPcgVArgDIFQC5AiBXAOQKgFwBkCsAcgVATh9gsW+4vFIngFwBkCsAcgVArgDIFQC5AiBXAORahJjVm9zpCoBcAZArAHIFQK4AyBUAuQIgVwDkCoBcAZDTB/gBLrgCk8OhuvYAAAAASUVORK5CYII=');
+    background-position: top $euiSizeS left 0, bottom $euiSizeS right $euiSizeS;
+    background-size: $euiSize * 1.25, $euiSizeXL;
+  }
+
+  .homSolutionPanel--observability & {
+    background-color: $euiColorAccent;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABICAYAAABV7bNHAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADNSURBVHgB7duxCcIAEEDR08IFrGyz/0pZwVYEIcYF/FWKwHtwXP/hyrvMQbZtu+3rPid3Hf4SKAgUBAoCBYGCQEGgIFAQKAgUBAoCBYGCQEGgIFAQKAgUBAoCBYGCQEGgIFAQKAgUBAoCBYGCQEGgIFAQKAgUBAoCBYGCQEGgIFAQKAgUBAoCBYGCQEGgcJmDnt6WZfms6/qak/sFeswx3vs85+ScWBAoCBQECgIFgYJAQaAgUBAoCBQECgIFgYJAQaAgUBAoCBQECgKFLx4KCqcIFEJnAAAAAElFTkSuQmCC');
+    background-position: top $euiSizeS right $euiSizeS;
+    background-size: $euiSizeL * 1.5;
+  }
+
+  .homSolutionPanel--securitySolution & {
+    background-color: $euiColorDarkestShade;
+    background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGIAAABiCAYAAACrpQYOAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAKRSURBVHgB7d3tSgMxEIXhMeqPQoWC9f4vte5Z3dLvTbKZzCQ5LyxqKwg+tNjdUxQR+RJmXpiOvRDDvPD/kRjGhYvPgbETZlK4+fogxDApPLiNGAaFJ7cD40NYtcKL+76FGNUKK/cRo1Ih4n5gvAtTbQ1i+R5iKBcDgYBADMViIRAxFEuBQMRQKhUCEUOhHAi0YLwJK1IuBCJGwbZAoE8hRpG2QqAFg22oBAQCxkFYdqUgEE6dEyOzkhCIGJmVhkDA4PXvxDQgEMcIiWlBIGIkpAmBiBGZNgQiRkQ1IBAxVqoFgThge1FNCMTN1JNqQyBiPMgCAnHAdpMVBOJm6iJLCA7YLrKEWH4+r3+LPYQIMeY8QKDhlyFeINDQGJ4g0LAY3iDQkBgeIdBwmymvEGgoDM8QaJgBm3cINMSArQUI1P2ArRUI1PVmqiUI1C1GaxCoywFbixCouzFCqxCIyxBPnU6nLjBafkQs7YExHdJyPUCg+WmqZYxeIBAwmv3TticItJseFYcWHxm9QaD5RV9rGD1CIGAcJ4xmztr2CoHms7atYPQMgc4Y3p+qeodAwPiZjnfPGCNAoPMgwSvGKBDINcZIEMgtxmgQyCXGiBDIHcaoEAgYx+n48IAxMgQ6v1nGGmN0COQCgxB/4feAF307KwxCXDe/9dgCgxD3mWAQ4nHAqHrplRDPq3odnBCvq4ZBiPWqYBAiLnUMQsSnikGItObtlAYGIdJTmesQIq/iGITIr+h2ihDbKradIsT2imynCFGmzdspQpRr03VwQpQtG4MQ5cvCIIROyRiE0CsJgxC6RW+nCKFf1FyHEHVaxSBEvV5upwhRv4dzHULYdIdBCLuutlOEsO18HZz/u8E+YMgvrbKfmp8y7IEAAAAASUVORK5CYII=');
+    background-position: top $euiSizeS left $euiSizeS;
+    background-size: $euiSizeL * 2;
+  }
+}
diff --git a/src/plugins/home/public/application/components/_synopsis.scss b/src/plugins/home/public/application/components/_synopsis.scss
index 49e71f159fe6f..3eac2bc9705e0 100644
--- a/src/plugins/home/public/application/components/_synopsis.scss
+++ b/src/plugins/home/public/application/components/_synopsis.scss
@@ -5,6 +5,10 @@
     box-shadow: none;
   }
 
+  .homSynopsis__cardTitle {
+    display: flex;
+  }
+
   // SASSTODO: Fix in EUI
   .euiCard__content {
     padding-top: 0 !important;
diff --git a/src/plugins/home/public/application/components/add_data.js b/src/plugins/home/public/application/components/add_data.js
deleted file mode 100644
index c35b7b04932fb..0000000000000
--- a/src/plugins/home/public/application/components/add_data.js
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
-import { getServices } from '../kibana_services';
-
-import {
-  EuiButton,
-  EuiLink,
-  EuiPanel,
-  EuiTitle,
-  EuiSpacer,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiText,
-  EuiCard,
-  EuiIcon,
-  EuiHorizontalRule,
-  EuiFlexGrid,
-} from '@elastic/eui';
-
-const AddDataUi = ({ apmUiEnabled, isNewKibanaInstance, intl, mlEnabled }) => {
-  const basePath = getServices().getBasePath();
-
-  const renderCards = () => {
-    const apmData = {
-      title: intl.formatMessage({
-        id: 'home.addData.apm.nameTitle',
-        defaultMessage: 'APM',
-      }),
-      description: intl.formatMessage({
-        id: 'home.addData.apm.nameDescription',
-        defaultMessage:
-          'APM automatically collects in-depth performance metrics and errors from inside your applications.',
-      }),
-      ariaDescribedby: 'aria-describedby.addAmpButtonLabel',
-    };
-    const loggingData = {
-      title: intl.formatMessage({
-        id: 'home.addData.logging.nameTitle',
-        defaultMessage: 'Logs',
-      }),
-      description: intl.formatMessage({
-        id: 'home.addData.logging.nameDescription',
-        defaultMessage:
-          'Ingest logs from popular data sources and easily visualize in preconfigured dashboards.',
-      }),
-      ariaDescribedby: 'aria-describedby.addLogDataButtonLabel',
-    };
-    const metricsData = {
-      title: intl.formatMessage({
-        id: 'home.addData.metrics.nameTitle',
-        defaultMessage: 'Metrics',
-      }),
-      description: intl.formatMessage({
-        id: 'home.addData.metrics.nameDescription',
-        defaultMessage:
-          'Collect metrics from the operating system and services running on your servers.',
-      }),
-      ariaDescribedby: 'aria-describedby.addMetricsButtonLabel',
-    };
-    const siemData = {
-      title: intl.formatMessage({
-        id: 'home.addData.securitySolution.nameTitle',
-        defaultMessage: 'SIEM + Endpoint Security',
-      }),
-      description: intl.formatMessage({
-        id: 'home.addData.securitySolution.nameDescription',
-        defaultMessage:
-          'Protect hosts, analyze security information and events, hunt threats, automate detections, and create cases.',
-      }),
-      ariaDescribedby: 'aria-describedby.addSiemButtonLabel',
-    };
-
-    const getApmCard = () => (
-      <EuiFlexItem grow={1} className="homAddData__flexItem">
-        <EuiCard
-          textAlign="left"
-          className="homAddData__card"
-          titleSize="xs"
-          title={apmData.title}
-          description={<span id={apmData.ariaDescribedby}>{apmData.description}</span>}
-          footer={
-            <EuiButton
-              className="homAddData__button"
-              href="#/tutorial/apm"
-              aria-describedby={apmData.ariaDescribedby}
-            >
-              <FormattedMessage id="home.addData.apm.addApmButtonLabel" defaultMessage="Add APM" />
-            </EuiButton>
-          }
-        />
-      </EuiFlexItem>
-    );
-
-    return (
-      <EuiFlexGroup
-        className="homeAddData__flexGroup homAddData__flexTablet"
-        wrap={apmUiEnabled}
-        gutterSize="l"
-        justifyContent="spaceAround"
-        responsive={false}
-      >
-        <EuiFlexItem className="homAddData__cardDivider homAddData__flexItem" grow={3}>
-          <EuiSpacer size="m" />
-          <EuiFlexGroup alignItems="center" gutterSize="m" responsive={false}>
-            <EuiFlexItem grow={false}>
-              <EuiIcon size="xl" type="logoObservability" className="homAddData__logo" />
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiTitle size="s">
-                <h2>
-                  <FormattedMessage
-                    id="home.addData.title.observability"
-                    defaultMessage="Observability"
-                  />
-                </h2>
-              </EuiTitle>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiSpacer />
-          <EuiFlexGroup
-            className="homeAddData__flexGroup"
-            wrap={apmUiEnabled}
-            gutterSize="l"
-            justifyContent="spaceAround"
-            responsive={false}
-          >
-            {apmUiEnabled !== false && getApmCard()}
-
-            <EuiFlexItem grow={1} className="homAddData__flexItem">
-              <EuiCard
-                textAlign="left"
-                className="homAddData__card"
-                title={loggingData.title}
-                titleSize="xs"
-                description={
-                  <span id={loggingData.ariaDescribedby}>{loggingData.description}</span>
-                }
-                footer={
-                  <EuiButton
-                    className="homAddData__button"
-                    data-test-subj="logsData"
-                    href="#/tutorial_directory/logging"
-                    aria-describedby={loggingData.ariaDescribedby}
-                  >
-                    <FormattedMessage
-                      id="home.addData.logging.addLogDataButtonLabel"
-                      defaultMessage="Add log data"
-                    />
-                  </EuiButton>
-                }
-              />
-            </EuiFlexItem>
-
-            <EuiFlexItem grow={1} className="homAddData__flexItem">
-              <EuiCard
-                textAlign="left"
-                className="homAddData__card"
-                title={metricsData.title}
-                titleSize="xs"
-                description={
-                  <span id={metricsData.ariaDescribedby}>{metricsData.description}</span>
-                }
-                footer={
-                  <EuiButton
-                    className="homAddData__button"
-                    href="#/tutorial_directory/metrics"
-                    aria-describedby={metricsData.ariaDescribedby}
-                  >
-                    <FormattedMessage
-                      id="home.addData.metrics.addMetricsDataButtonLabel"
-                      defaultMessage="Add metric data"
-                    />
-                  </EuiButton>
-                }
-              />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-
-        <EuiFlexItem grow={1} className="homAddData__flexItem">
-          <EuiFlexGroup alignItems="center" gutterSize="m" responsive={false}>
-            <EuiFlexItem grow={false}>
-              <EuiIcon size="xl" type="logoSecurity" className="homAddData__logo" />
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiTitle size="s">
-                <h2>
-                  <FormattedMessage id="home.addData.title.security" defaultMessage="Security" />
-                </h2>
-              </EuiTitle>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiSpacer size="s" />
-          <EuiCard
-            textAlign="left"
-            titleSize="xs"
-            className="homAddData__card"
-            title={siemData.title}
-            description={<span id={siemData.ariaDescribedby}>{siemData.description}</span>}
-            footer={
-              <EuiButton
-                className="homAddData__button"
-                href="#/tutorial_directory/security"
-                aria-describedby={siemData.ariaDescribedby}
-              >
-                <FormattedMessage
-                  id="home.addData.securitySolution.addSecurityEventsButtonLabel"
-                  defaultMessage="Add events"
-                />
-              </EuiButton>
-            }
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    );
-  };
-
-  const footerItemClasses = classNames('homAddData__footerItem', {
-    'homAddData__footerItem--highlight': isNewKibanaInstance,
-  });
-
-  return (
-    <EuiPanel paddingSize="l">
-      {renderCards()}
-
-      <EuiHorizontalRule />
-
-      <EuiFlexGrid columns={mlEnabled !== false ? 3 : 2}>
-        <EuiFlexItem className={footerItemClasses}>
-          <EuiText size="s">
-            <strong style={{ height: 38 }}>
-              <FormattedMessage
-                id="home.addData.sampleDataTitle"
-                defaultMessage="Add sample data"
-              />
-            </strong>
-            <EuiLink
-              style={{ display: 'block', textAlign: 'center' }}
-              href="#/tutorial_directory/sampleData"
-            >
-              <FormattedMessage
-                id="home.addData.sampleDataLink"
-                defaultMessage="Load a data set and a Kibana dashboard"
-              />
-            </EuiLink>
-          </EuiText>
-        </EuiFlexItem>
-        {mlEnabled !== false ? (
-          <EuiFlexItem className={footerItemClasses}>
-            <EuiText size="s">
-              <strong style={{ height: 38 }}>
-                <FormattedMessage
-                  id="home.addData.uploadFileTitle"
-                  defaultMessage="Upload data from log file"
-                />
-              </strong>
-              <EuiLink
-                style={{ display: 'block', textAlign: 'center' }}
-                href={`${basePath}/app/ml#/filedatavisualizer`}
-              >
-                <FormattedMessage
-                  id="home.addData.uploadFileLink"
-                  defaultMessage="Import a CSV, NDJSON, or log file"
-                />
-              </EuiLink>
-            </EuiText>
-          </EuiFlexItem>
-        ) : null}
-        <EuiFlexItem className={footerItemClasses}>
-          <EuiText size="s">
-            <strong style={{ height: 38 }}>
-              <FormattedMessage
-                id="home.addData.yourDataTitle"
-                defaultMessage="Use Elasticsearch data"
-              />
-            </strong>
-            <EuiLink
-              style={{ display: 'block', textAlign: 'center' }}
-              href={`${basePath}/app/management/kibana/indexPatterns`}
-            >
-              <FormattedMessage
-                id="home.addData.yourDataLink"
-                defaultMessage="Connect to your Elasticsearch index"
-              />
-            </EuiLink>
-          </EuiText>
-        </EuiFlexItem>
-      </EuiFlexGrid>
-    </EuiPanel>
-  );
-};
-
-AddDataUi.propTypes = {
-  apmUiEnabled: PropTypes.bool.isRequired,
-  mlEnabled: PropTypes.bool.isRequired,
-  isNewKibanaInstance: PropTypes.bool.isRequired,
-};
-
-export const AddData = injectI18n(AddDataUi);
diff --git a/src/plugins/home/public/application/components/add_data.test.js b/src/plugins/home/public/application/components/add_data.test.js
deleted file mode 100644
index 9457f766409b8..0000000000000
--- a/src/plugins/home/public/application/components/add_data.test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import React from 'react';
-import { AddData } from './add_data';
-import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { getServices } from '../kibana_services';
-
-jest.mock('../kibana_services', () => {
-  const mock = {
-    getBasePath: jest.fn(() => 'path'),
-  };
-  return {
-    getServices: () => mock,
-  };
-});
-
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
-test('render', () => {
-  const component = shallowWithIntl(
-    <AddData.WrappedComponent apmUiEnabled={false} mlEnabled={false} isNewKibanaInstance={false} />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-  expect(getServices().getBasePath).toHaveBeenCalledTimes(1);
-});
-
-test('mlEnabled', () => {
-  const component = shallowWithIntl(
-    <AddData.WrappedComponent apmUiEnabled={true} mlEnabled={true} isNewKibanaInstance={false} />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-  expect(getServices().getBasePath).toHaveBeenCalledTimes(1);
-});
-
-test('apmUiEnabled', () => {
-  const component = shallowWithIntl(
-    <AddData.WrappedComponent apmUiEnabled={true} mlEnabled={false} isNewKibanaInstance={false} />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-  expect(getServices().getBasePath).toHaveBeenCalledTimes(1);
-});
-
-test('isNewKibanaInstance', () => {
-  const component = shallowWithIntl(
-    <AddData.WrappedComponent apmUiEnabled={false} mlEnabled={false} isNewKibanaInstance={true} />
-  );
-  expect(component).toMatchSnapshot(); // eslint-disable-line
-  expect(getServices().getBasePath).toHaveBeenCalledTimes(1);
-});
diff --git a/src/plugins/home/public/application/components/add_data/__snapshots__/add_data.test.tsx.snap b/src/plugins/home/public/application/components/add_data/__snapshots__/add_data.test.tsx.snap
new file mode 100644
index 0000000000000..787802e508ca7
--- /dev/null
+++ b/src/plugins/home/public/application/components/add_data/__snapshots__/add_data.test.tsx.snap
@@ -0,0 +1,96 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AddData render 1`] = `
+<section
+  aria-labelledby="homDataAdd__title"
+  className="homDataAdd"
+>
+  <EuiFlexGroup
+    alignItems="center"
+    responsive={false}
+  >
+    <EuiFlexItem
+      grow={1}
+    >
+      <EuiTitle
+        size="s"
+      >
+        <h2
+          id="homDataAdd__title"
+        >
+          <FormattedMessage
+            defaultMessage="Ingest your data"
+            id="home.addData.sectionTitle"
+            values={Object {}}
+          />
+        </h2>
+      </EuiTitle>
+    </EuiFlexItem>
+    <EuiFlexItem
+      grow={false}
+    >
+      <EuiButtonEmpty
+        flush="right"
+        href="#/tutorial_directory/sampleData"
+        iconType="visTable"
+        size="xs"
+      >
+        <FormattedMessage
+          defaultMessage="Try our sample data"
+          id="home.addData.sampleDataButtonLabel"
+          values={Object {}}
+        />
+      </EuiButtonEmpty>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiSpacer
+    size="m"
+  />
+  <EuiFlexGroup
+    className="homDataAdd__content"
+  >
+    <EuiFlexItem
+      key="home_tutorial_directory"
+    >
+      <Synopsis
+        description="Ingest data from popular apps and services."
+        iconType="indexOpen"
+        id="home_tutorial_directory"
+        isBeta={false}
+        onClick={[Function]}
+        title="Ingest data"
+        url="/app/home#/tutorial_directory"
+        wrapInPanel={true}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem
+      key="ingestManager"
+    >
+      <Synopsis
+        description="Add and manage your fleet of Elastic Agents and integrations."
+        iconType="indexManagementApp"
+        id="ingestManager"
+        isBeta={false}
+        onClick={[Function]}
+        title="Add Elastic Agent"
+        url="/app/ingestManager"
+        wrapInPanel={true}
+      />
+    </EuiFlexItem>
+    <EuiFlexItem
+      key="ml_file_data_visualizer"
+    >
+      <Synopsis
+        description="Import your own CSV, NDJSON, or log file"
+        iconType="document"
+        id="ml_file_data_visualizer"
+        isBeta={false}
+        onClick={[Function]}
+        title="Upload a file"
+        url="/app/ml#/filedatavisualizer"
+        wrapInPanel={true}
+      />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+</section>
+`;
diff --git a/src/plugins/home/public/application/components/add_data/add_data.test.tsx b/src/plugins/home/public/application/components/add_data/add_data.test.tsx
new file mode 100644
index 0000000000000..e76e834802284
--- /dev/null
+++ b/src/plugins/home/public/application/components/add_data/add_data.test.tsx
@@ -0,0 +1,95 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { AddData } from './add_data';
+import { shallowWithIntl } from 'test_utils/enzyme_helpers';
+
+jest.mock('../app_navigation_handler', () => {
+  return {
+    createAppNavigationHandler: jest.fn(() => () => {}),
+  };
+});
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+const addBasePathMock = jest.fn((path: string) => (path ? path : 'path'));
+
+const mockFeatures = [
+  {
+    category: 'data',
+    description: 'Ingest data from popular apps and services.',
+    homePageSection: 'add_data',
+    icon: 'indexOpen',
+    id: 'home_tutorial_directory',
+    order: 500,
+    path: '/app/home#/tutorial_directory',
+    title: 'Ingest data',
+  },
+  {
+    category: 'admin',
+    description: 'Add and manage your fleet of Elastic Agents and integrations.',
+    homePageSection: 'add_data',
+    icon: 'indexManagementApp',
+    id: 'ingestManager',
+    order: 510,
+    path: '/app/ingestManager',
+    title: 'Add Elastic Agent',
+  },
+  {
+    category: 'data',
+    description: 'Import your own CSV, NDJSON, or log file',
+    homePageSection: 'add_data',
+    icon: 'document',
+    id: 'ml_file_data_visualizer',
+    order: 520,
+    path: '/app/ml#/filedatavisualizer',
+    title: 'Upload a file',
+  },
+];
+
+describe('AddData', () => {
+  test('render', () => {
+    const component = shallowWithIntl(
+      <AddData addBasePath={addBasePathMock} features={mockFeatures} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/home/public/application/components/add_data/add_data.tsx b/src/plugins/home/public/application/components/add_data/add_data.tsx
new file mode 100644
index 0000000000000..82f0020b1b389
--- /dev/null
+++ b/src/plugins/home/public/application/components/add_data/add_data.tsx
@@ -0,0 +1,95 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { FC } from 'react';
+import PropTypes from 'prop-types';
+import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+// @ts-expect-error untyped service
+import { FeatureCatalogueEntry } from '../../services';
+import { createAppNavigationHandler } from '../app_navigation_handler';
+// @ts-expect-error untyped component
+import { Synopsis } from '../synopsis';
+
+interface Props {
+  addBasePath: (path: string) => string;
+  features: FeatureCatalogueEntry[];
+}
+
+export const AddData: FC<Props> = ({ addBasePath, features }) => (
+  <section className="homDataAdd" aria-labelledby="homDataAdd__title">
+    <EuiFlexGroup alignItems="center" responsive={false}>
+      <EuiFlexItem grow={1}>
+        <EuiTitle size="s">
+          <h2 id="homDataAdd__title">
+            <FormattedMessage id="home.addData.sectionTitle" defaultMessage="Ingest your data" />
+          </h2>
+        </EuiTitle>
+      </EuiFlexItem>
+
+      <EuiFlexItem grow={false}>
+        <EuiButtonEmpty
+          iconType="visTable"
+          href="#/tutorial_directory/sampleData"
+          size="xs"
+          flush="right"
+        >
+          <FormattedMessage
+            id="home.addData.sampleDataButtonLabel"
+            defaultMessage="Try our sample data"
+          />
+        </EuiButtonEmpty>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+
+    <EuiSpacer size="m" />
+
+    <EuiFlexGroup className="homDataAdd__content">
+      {features.map((feature) => (
+        <EuiFlexItem key={feature.id}>
+          <Synopsis
+            id={feature.id}
+            onClick={createAppNavigationHandler(feature.path)}
+            description={feature.description}
+            iconType={feature.icon}
+            title={feature.title}
+            url={addBasePath(feature.path)}
+            wrapInPanel
+          />
+        </EuiFlexItem>
+      ))}
+    </EuiFlexGroup>
+  </section>
+);
+
+AddData.propTypes = {
+  addBasePath: PropTypes.func.isRequired,
+  features: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      title: PropTypes.string.isRequired,
+      description: PropTypes.string.isRequired,
+      icon: PropTypes.string.isRequired,
+      path: PropTypes.string.isRequired,
+      showOnHomePage: PropTypes.bool.isRequired,
+      category: PropTypes.string.isRequired,
+      order: PropTypes.number,
+    })
+  ),
+};
diff --git a/src/plugins/home/public/application/components/add_data/index.ts b/src/plugins/home/public/application/components/add_data/index.ts
new file mode 100644
index 0000000000000..a7d465d177636
--- /dev/null
+++ b/src/plugins/home/public/application/components/add_data/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './add_data';
diff --git a/src/plugins/home/public/application/components/app_navigation_handler.ts b/src/plugins/home/public/application/components/app_navigation_handler.ts
index 6e78af7f42f52..61d85c033b544 100644
--- a/src/plugins/home/public/application/components/app_navigation_handler.ts
+++ b/src/plugins/home/public/application/components/app_navigation_handler.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { MouseEvent } from 'react';
 import { getServices } from '../kibana_services';
 
 export const createAppNavigationHandler = (targetUrl: string) => (event: MouseEvent) => {
diff --git a/src/plugins/home/public/application/components/feature_directory.js b/src/plugins/home/public/application/components/feature_directory.js
index e9ab348f164c7..36ececcdfd8df 100644
--- a/src/plugins/home/public/application/components/feature_directory.js
+++ b/src/plugins/home/public/application/components/feature_directory.js
@@ -115,6 +115,7 @@ export class FeatureDirectory extends React.Component {
         return (
           <EuiFlexItem key={directory.id}>
             <Synopsis
+              id={directory.id}
               onClick={createAppNavigationHandler(directory.path)}
               description={directory.description}
               iconType={directory.icon}
@@ -157,6 +158,7 @@ FeatureDirectory.propTypes = {
       path: PropTypes.string.isRequired,
       showOnHomePage: PropTypes.bool.isRequired,
       category: PropTypes.string.isRequired,
+      order: PropTypes.number,
     })
   ),
 };
diff --git a/src/plugins/home/public/application/components/home.js b/src/plugins/home/public/application/components/home.js
index f8769bfd0d618..6c44c15faf4bf 100644
--- a/src/plugins/home/public/application/components/home.js
+++ b/src/plugins/home/public/application/components/home.js
@@ -19,29 +19,22 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Synopsis } from './synopsis';
-import { AddData } from './add_data';
 import { FormattedMessage } from '@kbn/i18n/react';
-
 import {
-  EuiButton,
-  EuiPage,
-  EuiPanel,
+  EuiButtonEmpty,
   EuiTitle,
-  EuiSpacer,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiFlexGrid,
-  EuiText,
-  EuiPageBody,
-  EuiScreenReaderOnly,
+  EuiHorizontalRule,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-
-import { Welcome } from './welcome';
-import { getServices } from '../kibana_services';
 import { FeatureCatalogueCategory } from '../../services';
+import { getServices } from '../kibana_services';
+import { AddData } from './add_data';
 import { createAppNavigationHandler } from './app_navigation_handler';
+import { ManageData } from './manage_data';
+import { SolutionsSection } from './solutions_section';
+import { Welcome } from './welcome';
 
 const KEY_ENABLE_WELCOME = 'home:welcome:show';
 
@@ -53,6 +46,10 @@ export class Home extends Component {
       getServices().homeConfig.disableWelcomeScreen ||
       props.localStorage.getItem(KEY_ENABLE_WELCOME) === 'false'
     );
+
+    const body = document.querySelector('body');
+    body.classList.add('isHomPage');
+
     this.state = {
       // If welcome is enabled, we wait for loading to complete
       // before rendering. This prevents an annoying flickering
@@ -116,105 +113,144 @@ export class Home extends Component {
     this._isMounted && this.setState({ isWelcomeEnabled: false });
   };
 
-  renderDirectories = (category) => {
-    const { addBasePath, directories } = this.props;
-    return directories
-      .filter((directory) => {
-        return directory.showOnHomePage && directory.category === category;
-      })
-      .map((directory) => {
-        return (
-          <EuiFlexItem className="homHome__synopsisItem" key={directory.id}>
-            <Synopsis
-              onClick={createAppNavigationHandler(directory.path)}
-              description={directory.description}
-              iconType={directory.icon}
-              title={directory.title}
-              url={addBasePath(directory.path)}
-            />
-          </EuiFlexItem>
-        );
-      });
-  };
+  findDirectoryById = (id) => this.props.directories.find((directory) => directory.id === id);
+
+  getFeaturesByCategory = (category) =>
+    this.props.directories
+      .filter((directory) => directory.showOnHomePage && directory.category === category)
+      .sort((directoryA, directoryB) => directoryA.order - directoryB.order);
 
   renderNormal() {
-    const { apmUiEnabled, mlEnabled } = this.props;
+    const { addBasePath, solutions } = this.props;
+
+    const devTools = this.findDirectoryById('console');
+    const stackManagement = this.findDirectoryById('stack-management');
+    const advancedSettings = this.findDirectoryById('advanced_settings');
+
+    const addDataFeatures = this.getFeaturesByCategory(FeatureCatalogueCategory.DATA);
+    const manageDataFeatures = this.getFeaturesByCategory(FeatureCatalogueCategory.ADMIN);
+
+    // Show card for console if none of the manage data plugins are available, most likely in OSS
+    if (manageDataFeatures.length < 1 && devTools) {
+      manageDataFeatures.push(devTools);
+    }
 
     return (
-      <EuiPage restrictWidth={1200} data-test-subj="homeApp">
-        <EuiPageBody className="eui-displayBlock">
-          <EuiScreenReaderOnly>
-            <h1>
-              <FormattedMessage id="home.welcomeHomePageHeader" defaultMessage="Kibana home" />
-            </h1>
-          </EuiScreenReaderOnly>
-
-          <AddData
-            apmUiEnabled={apmUiEnabled}
-            mlEnabled={mlEnabled}
-            isNewKibanaInstance={this.state.isNewKibanaInstance}
-          />
-
-          <EuiSpacer size="l" />
-
-          <EuiFlexGroup>
-            <EuiFlexItem>
-              <EuiPanel paddingSize="l">
-                <EuiTitle size="s">
-                  <h2>
-                    <FormattedMessage
-                      id="home.directories.visualize.nameTitle"
-                      defaultMessage="Visualize and Explore Data"
-                    />
-                  </h2>
+      <main aria-labelledby="homHeader__title" className="homWrapper" data-test-subj="homeApp">
+        <header
+          className={`homHeader ${
+            solutions.length ? 'homHeader--hasSolutions' : 'homHeader--noSolutions'
+          }`}
+        >
+          <div className="homHeader__inner">
+            <EuiFlexGroup>
+              <EuiFlexItem>
+                <EuiTitle size="m">
+                  <h1 id="homHeader__title">
+                    <FormattedMessage id="home.pageHeader.title" defaultMessage="Home" />
+                  </h1>
                 </EuiTitle>
-                <EuiSpacer size="m" />
-                <EuiFlexGrid columns={2} gutterSize="s">
-                  {this.renderDirectories(FeatureCatalogueCategory.DATA)}
-                </EuiFlexGrid>
-              </EuiPanel>
+              </EuiFlexItem>
+
+              <EuiFlexItem grow={false}>
+                <EuiFlexGroup className="homHeader__actions">
+                  <EuiFlexItem className="homHeader__actionItem">
+                    <EuiButtonEmpty href="#/tutorial_directory" iconType="indexOpen">
+                      {i18n.translate('home.pageHeader.addDataButtonLabel', {
+                        defaultMessage: 'Add data',
+                      })}
+                    </EuiButtonEmpty>
+                  </EuiFlexItem>
+
+                  {stackManagement ? (
+                    <EuiFlexItem className="homHeader__actionItem">
+                      <EuiButtonEmpty
+                        onClick={createAppNavigationHandler(stackManagement.path)}
+                        iconType="gear"
+                      >
+                        {i18n.translate('home.pageHeader.stackManagementButtonLabel', {
+                          defaultMessage: 'Manage',
+                        })}
+                      </EuiButtonEmpty>
+                    </EuiFlexItem>
+                  ) : null}
+
+                  {devTools ? (
+                    <EuiFlexItem className="homHeader__actionItem">
+                      <EuiButtonEmpty
+                        onClick={createAppNavigationHandler(devTools.path)}
+                        iconType="wrench"
+                      >
+                        {i18n.translate('home.pageHeader.devToolsButtonLabel', {
+                          defaultMessage: 'Dev tools',
+                        })}
+                      </EuiButtonEmpty>
+                    </EuiFlexItem>
+                  ) : null}
+                </EuiFlexGroup>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </div>
+        </header>
+
+        <div className="homContent">
+          {solutions.length && <SolutionsSection addBasePath={addBasePath} solutions={solutions} />}
+
+          <EuiFlexGroup
+            className={`homData ${
+              addDataFeatures.length === 1 && manageDataFeatures.length === 1
+                ? 'homData--compressed'
+                : 'homData--expanded'
+            }`}
+          >
+            <EuiFlexItem>
+              <AddData addBasePath={addBasePath} features={addDataFeatures} />
             </EuiFlexItem>
+
             <EuiFlexItem>
-              <EuiPanel paddingSize="l">
-                <EuiTitle size="s">
-                  <h2>
-                    <FormattedMessage
-                      id="home.directories.manage.nameTitle"
-                      defaultMessage="Manage and Administer the Elastic Stack"
-                    />
-                  </h2>
-                </EuiTitle>
-                <EuiSpacer size="m" />
-                <EuiFlexGrid columns={2}>
-                  {this.renderDirectories(FeatureCatalogueCategory.ADMIN)}
-                </EuiFlexGrid>
-              </EuiPanel>
+              <ManageData addBasePath={addBasePath} features={manageDataFeatures} />
             </EuiFlexItem>
           </EuiFlexGroup>
 
-          <EuiSpacer size="l" />
+          <EuiHorizontalRule margin="xl" aria-hidden="true" />
 
-          <EuiFlexGroup justifyContent="center">
-            <EuiFlexItem grow={false} className="eui-textCenter">
-              <EuiText size="s" color="subdued">
-                <p>
+          <footer className="homFooter">
+            <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
+              <EuiFlexItem grow={false}>
+                {advancedSettings && (
+                  <EuiButtonEmpty
+                    iconType="home"
+                    onClick={createAppNavigationHandler(
+                      '/app/management/kibana/settings#defaultRoute'
+                    )}
+                    size="xs"
+                  >
+                    <FormattedMessage
+                      id="home.changeHomeRouteLink"
+                      defaultMessage="Display a different page on log in"
+                    />
+                  </EuiButtonEmpty>
+                )}
+              </EuiFlexItem>
+
+              <EuiFlexItem grow={false}>
+                <EuiButtonEmpty
+                  data-test-subj="allPlugins"
+                  href="#/feature_directory"
+                  size="xs"
+                  flush="right"
+                  iconType="apps"
+                >
                   <FormattedMessage
-                    id="home.directories.notFound.description"
-                    defaultMessage="Didn’t find what you were looking for?"
+                    id="home.appDirectory.appDirectoryButtonLabel"
+                    defaultMessage="View app directory"
                   />
-                </p>
-              </EuiText>
-              <EuiSpacer size="s" />
-              <EuiButton data-test-subj="allPlugins" href="#/feature_directory">
-                <FormattedMessage
-                  id="home.directories.notFound.viewFullButtonLabel"
-                  defaultMessage="View full directory of Kibana plugins"
-                />
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiPageBody>
-      </EuiPage>
+                </EuiButtonEmpty>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </footer>
+        </div>
+      </main>
     );
   }
 
@@ -260,13 +296,23 @@ Home.propTypes = {
       path: PropTypes.string.isRequired,
       showOnHomePage: PropTypes.bool.isRequired,
       category: PropTypes.string.isRequired,
+      order: PropTypes.number,
+    })
+  ),
+  solutions: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      title: PropTypes.string.isRequired,
+      subtitle: PropTypes.string.isRequired,
+      descriptions: PropTypes.arrayOf(PropTypes.string).isRequired,
+      icon: PropTypes.string.isRequired,
+      path: PropTypes.string.isRequired,
+      order: PropTypes.number,
     })
   ),
-  apmUiEnabled: PropTypes.bool.isRequired,
   find: PropTypes.func.isRequired,
   localStorage: PropTypes.object.isRequired,
   urlBasePath: PropTypes.string.isRequired,
-  mlEnabled: PropTypes.bool.isRequired,
   telemetry: PropTypes.shape({
     telemetryService: PropTypes.any,
     telemetryNotifications: PropTypes.any,
diff --git a/src/plugins/home/public/application/components/home.test.js b/src/plugins/home/public/application/components/home.test.js
index 3bcfce513cb12..0d7596d92a5a1 100644
--- a/src/plugins/home/public/application/components/home.test.js
+++ b/src/plugins/home/public/application/components/home.test.js
@@ -41,6 +41,7 @@ describe('home', () => {
   beforeEach(() => {
     defaultProps = {
       directories: [],
+      solutions: [],
       apmUiEnabled: true,
       mlEnabled: true,
       kibanaVersion: '99.2.1',
@@ -92,8 +93,96 @@ describe('home', () => {
     expect(component).toMatchSnapshot();
   });
 
+  describe('header', () => {
+    test('render', async () => {
+      const component = await renderHome();
+      expect(component).toMatchSnapshot();
+    });
+
+    test('should show "Manage" link if stack management is available', async () => {
+      const directoryEntry = {
+        id: 'stack-management',
+        title: 'Management',
+        description: 'Your center console for managing the Elastic Stack.',
+        icon: 'managementApp',
+        path: 'management_landing_page',
+        category: FeatureCatalogueCategory.ADMIN,
+        showOnHomePage: false,
+      };
+
+      const component = await renderHome({
+        directories: [directoryEntry],
+      });
+
+      expect(component).toMatchSnapshot();
+    });
+
+    test('should show "Dev tools" link if console is available', async () => {
+      const directoryEntry = {
+        id: 'console',
+        title: 'Console',
+        description: 'Skip cURL and use a JSON interface to work with your data in Console.',
+        icon: 'consoleApp',
+        path: 'path-to-dev-tools',
+        category: FeatureCatalogueCategory.ADMIN,
+        showOnHomePage: false,
+      };
+
+      const component = await renderHome({
+        directories: [directoryEntry],
+      });
+
+      expect(component).toMatchSnapshot();
+    });
+  });
+
   describe('directories', () => {
-    test('should render DATA directory entry in "Explore Data" panel', async () => {
+    test('should render solutions in the "solution section"', async () => {
+      const solutionEntry1 = {
+        id: 'kibana',
+        title: 'Kibana',
+        subtitle: 'Visualize & analyze',
+        descriptions: ['Analyze data in dashboards'],
+        icon: 'logoKibana',
+        path: 'kibana_landing_page',
+        order: 1,
+      };
+      const solutionEntry2 = {
+        id: 'solution-2',
+        title: 'Solution two',
+        subtitle: 'Subtitle for solution two',
+        descriptions: ['Example use case'],
+        icon: 'empty',
+        path: 'path-to-solution-two',
+        order: 2,
+      };
+      const solutionEntry3 = {
+        id: 'solution-3',
+        title: 'Solution three',
+        subtitle: 'Subtitle for solution three',
+        descriptions: ['Example use case'],
+        icon: 'empty',
+        path: 'path-to-solution-three',
+        order: 3,
+      };
+      const solutionEntry4 = {
+        id: 'solution-4',
+        title: 'Solution four',
+        subtitle: 'Subtitle for solution four',
+        descriptions: ['Example use case'],
+        icon: 'empty',
+        path: 'path-to-solution-four',
+        order: 4,
+      };
+
+      const component = await renderHome({
+        solutions: [solutionEntry1, solutionEntry2, solutionEntry3, solutionEntry4],
+      });
+
+      expect(component).toMatchSnapshot();
+    });
+
+    test('should render DATA directory entry in "Ingest your data" panel', async () => {
       const directoryEntry = {
         id: 'dashboard',
         title: 'Dashboard',
@@ -111,7 +200,7 @@ describe('home', () => {
       expect(component).toMatchSnapshot();
     });
 
-    test('should render ADMIN directory entry in "Manage" panel', async () => {
+    test('should render ADMIN directory entry in "Manage your data" panel', async () => {
       const directoryEntry = {
         id: 'index_patterns',
         title: 'Index Patterns',
@@ -148,6 +237,26 @@ describe('home', () => {
     });
   });
 
+  describe('change home route', () => {
+    test('should render a link to change the default route in advanced settings if advanced settings is enabled', async () => {
+      const component = await renderHome({
+        directories: [
+          {
+            description: 'Change your settings',
+            icon: 'gear',
+            id: 'advanced_settings',
+            path: 'path-to-advanced_settings',
+            showOnHomePage: false,
+            title: 'Advanced settings',
+            category: FeatureCatalogueCategory.ADMIN,
+          },
+        ],
+      });
+
+      expect(component).toMatchSnapshot();
+    });
+  });
+
   describe('welcome', () => {
     test('should show the welcome screen if enabled, and there are no index patterns defined', async () => {
       defaultProps.localStorage.getItem = sinon.spy(() => 'true');
diff --git a/src/plugins/home/public/application/components/home_app.js b/src/plugins/home/public/application/components/home_app.js
index 648915b6dae0c..90e549c873436 100644
--- a/src/plugins/home/public/application/components/home_app.js
+++ b/src/plugins/home/public/application/components/home_app.js
@@ -38,7 +38,7 @@ const RedirectToDefaultApp = () => {
   return null;
 };
 
-export function HomeApp({ directories }) {
+export function HomeApp({ directories, solutions }) {
   const {
     savedObjectsClient,
     getBasePath,
@@ -48,8 +48,6 @@ export function HomeApp({ directories }) {
   } = getServices();
   const environment = environmentService.getEnvironment();
   const isCloudEnabled = environment.cloud;
-  const mlEnabled = environment.ml;
-  const apmUiEnabled = environment.apmUi;
 
   const renderTutorialDirectory = (props) => {
     return (
@@ -87,8 +85,7 @@ export function HomeApp({ directories }) {
             <Home
               addBasePath={addBasePath}
               directories={directories}
-              apmUiEnabled={apmUiEnabled}
-              mlEnabled={mlEnabled}
+              solutions={solutions}
               find={savedObjectsClient.find}
               localStorage={localStorage}
               urlBasePath={getBasePath()}
@@ -112,6 +109,18 @@ HomeApp.propTypes = {
       path: PropTypes.string.isRequired,
       showOnHomePage: PropTypes.bool.isRequired,
       category: PropTypes.string.isRequired,
+      order: PropTypes.number,
+    })
+  ),
+  solutions: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      title: PropTypes.string.isRequired,
+      subtitle: PropTypes.string.isRequired,
+      descriptions: PropTypes.arrayOf(PropTypes.string).isRequired,
+      icon: PropTypes.string.isRequired,
+      path: PropTypes.string.isRequired,
+      order: PropTypes.number,
     })
   ),
 };
diff --git a/src/plugins/home/public/application/components/manage_data/__snapshots__/manage_data.test.tsx.snap b/src/plugins/home/public/application/components/manage_data/__snapshots__/manage_data.test.tsx.snap
new file mode 100644
index 0000000000000..de620271243d1
--- /dev/null
+++ b/src/plugins/home/public/application/components/manage_data/__snapshots__/manage_data.test.tsx.snap
@@ -0,0 +1,91 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ManageData render 1`] = `
+<Fragment>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+  <section
+    aria-labelledby="homDataManage__title"
+    className="homDataManage"
+  >
+    <EuiTitle
+      size="s"
+    >
+      <h2
+        id="homDataManage__title"
+      >
+        <FormattedMessage
+          defaultMessage="Manage your data"
+          id="home.manageData.sectionTitle"
+          values={Object {}}
+        />
+      </h2>
+    </EuiTitle>
+    <EuiSpacer
+      size="m"
+    />
+    <EuiFlexGroup
+      className="homDataManage__content"
+    >
+      <EuiFlexItem
+        key="security"
+      >
+        <Synopsis
+          description="Control who has access and what tasks they can perform."
+          iconType="securityApp"
+          id="security"
+          isBeta={false}
+          onClick={[Function]}
+          title="Protect your data"
+          url="path-to-security-roles"
+          wrapInPanel={true}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem
+        key="monitoring"
+      >
+        <Synopsis
+          description="Track the real-time health and performance of your deployment."
+          iconType="monitoringApp"
+          id="monitoring"
+          isBeta={false}
+          onClick={[Function]}
+          title="Monitor the stack"
+          url="path-to-monitoring"
+          wrapInPanel={true}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem
+        key="snapshot_restore"
+      >
+        <Synopsis
+          description="Save snapshots to a backup repository, and restore to recover index and cluster state."
+          iconType="storage"
+          id="snapshot_restore"
+          isBeta={false}
+          onClick={[Function]}
+          title="Store & recover backups"
+          url="path-to-snapshot-restore"
+          wrapInPanel={true}
+        />
+      </EuiFlexItem>
+      <EuiFlexItem
+        key="index_lifecycle_management"
+      >
+        <Synopsis
+          description="Define lifecycle policies to automatically perform operations as an index ages."
+          iconType="indexSettings"
+          id="index_lifecycle_management"
+          isBeta={false}
+          onClick={[Function]}
+          title="Manage index lifecycles"
+          url="path-to-index-lifecycle-management"
+          wrapInPanel={true}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </section>
+</Fragment>
+`;
diff --git a/src/plugins/home/public/application/components/manage_data/index.tsx b/src/plugins/home/public/application/components/manage_data/index.tsx
new file mode 100644
index 0000000000000..2845e3bd12023
--- /dev/null
+++ b/src/plugins/home/public/application/components/manage_data/index.tsx
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './manage_data';
diff --git a/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx b/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx
new file mode 100644
index 0000000000000..5d00370caf2cc
--- /dev/null
+++ b/src/plugins/home/public/application/components/manage_data/manage_data.test.tsx
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { ManageData } from './manage_data';
+import { shallowWithIntl } from 'test_utils/enzyme_helpers';
+
+jest.mock('../app_navigation_handler', () => {
+  return {
+    createAppNavigationHandler: jest.fn(() => () => {}),
+  };
+});
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+const addBasePathMock = jest.fn((path: string) => (path ? path : 'path'));
+
+const mockFeatures = [
+  {
+    category: 'admin',
+    description: 'Control who has access and what tasks they can perform.',
+    homePageSection: 'manage_data',
+    icon: 'securityApp',
+    id: 'security',
+    order: 600,
+    path: 'path-to-security-roles',
+    title: 'Protect your data',
+    showOnHomePage: true,
+  },
+  {
+    category: 'admin',
+    description: 'Track the real-time health and performance of your deployment.',
+    homePageSection: 'manage_data',
+    icon: 'monitoringApp',
+    id: 'monitoring',
+    order: 610,
+    path: 'path-to-monitoring',
+    title: 'Monitor the stack',
+    showOnHomePage: true,
+  },
+  {
+    category: 'admin',
+    description:
+      'Save snapshots to a backup repository, and restore to recover index and cluster state.',
+    homePageSection: 'manage_data',
+    icon: 'storage',
+    id: 'snapshot_restore',
+    order: 630,
+    path: 'path-to-snapshot-restore',
+    title: 'Store & recover backups',
+    showOnHomePage: true,
+  },
+  {
+    category: 'admin',
+    description: 'Define lifecycle policies to automatically perform operations as an index ages.',
+    homePageSection: 'manage_data',
+    icon: 'indexSettings',
+    id: 'index_lifecycle_management',
+    order: 640,
+    path: 'path-to-index-lifecycle-management',
+    title: 'Manage index lifecycles',
+    showOnHomePage: true,
+  },
+];
+
+describe('ManageData', () => {
+  test('render', () => {
+    const component = shallowWithIntl(
+      <ManageData addBasePath={addBasePathMock} features={mockFeatures} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/home/public/application/components/manage_data/manage_data.tsx b/src/plugins/home/public/application/components/manage_data/manage_data.tsx
new file mode 100644
index 0000000000000..0dfb4f949f0c7
--- /dev/null
+++ b/src/plugins/home/public/application/components/manage_data/manage_data.tsx
@@ -0,0 +1,81 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { FC } from 'react';
+import PropTypes from 'prop-types';
+import { EuiFlexGroup, EuiHorizontalRule, EuiSpacer, EuiTitle, EuiFlexItem } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+// @ts-expect-error untyped service
+import { FeatureCatalogueEntry } from '../../services';
+import { createAppNavigationHandler } from '../app_navigation_handler';
+// @ts-expect-error untyped component
+import { Synopsis } from '../synopsis';
+
+interface Props {
+  addBasePath: (path: string) => string;
+  features: FeatureCatalogueEntry[];
+}
+
+export const ManageData: FC<Props> = ({ addBasePath, features }) => (
+  <>
+    {features.length > 1 && <EuiHorizontalRule margin="xl" aria-hidden="true" />}
+
+    <section className="homDataManage" aria-labelledby="homDataManage__title">
+      <EuiTitle size="s">
+        <h2 id="homDataManage__title">
+          <FormattedMessage id="home.manageData.sectionTitle" defaultMessage="Manage your data" />
+        </h2>
+      </EuiTitle>
+
+      <EuiSpacer size="m" />
+
+      <EuiFlexGroup className="homDataManage__content">
+        {features.map((feature) => (
+          <EuiFlexItem key={feature.id}>
+            <Synopsis
+              id={feature.id}
+              onClick={createAppNavigationHandler(feature.path)}
+              description={feature.description}
+              iconType={feature.icon}
+              title={feature.title}
+              url={addBasePath(feature.path)}
+              wrapInPanel
+            />
+          </EuiFlexItem>
+        ))}
+      </EuiFlexGroup>
+    </section>
+  </>
+);
+
+ManageData.propTypes = {
+  addBasePath: PropTypes.func.isRequired,
+  features: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      title: PropTypes.string.isRequired,
+      description: PropTypes.string.isRequired,
+      icon: PropTypes.string.isRequired,
+      path: PropTypes.string.isRequired,
+      showOnHomePage: PropTypes.bool.isRequired,
+      category: PropTypes.string.isRequired,
+      order: PropTypes.number,
+    })
+  ),
+};
diff --git a/src/plugins/home/public/application/components/solutions_section/__snapshots__/solution_panel.test.tsx.snap b/src/plugins/home/public/application/components/solutions_section/__snapshots__/solution_panel.test.tsx.snap
new file mode 100644
index 0000000000000..4e8441bd64b11
--- /dev/null
+++ b/src/plugins/home/public/application/components/solutions_section/__snapshots__/solution_panel.test.tsx.snap
@@ -0,0 +1,47 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SolutionPanel renders the solution panel for the given solution 1`] = `
+<EuiFlexItem
+  className="homSolutions__group homSolutions__group--single homSolutions__item"
+  grow={1}
+  key="kibana"
+>
+  <a
+    className="homSolutionPanel homSolutionPanel--kibana"
+    href="kibana_landing_page"
+    onClick={[Function]}
+  >
+    <EuiPanel
+      paddingSize="none"
+    >
+      <EuiFlexGroup
+        gutterSize="none"
+      >
+        <EuiFlexItem
+          className="homSolutionPanel__header"
+          grow={1}
+        >
+          <SolutionTitle
+            iconType="logoKibana"
+            subtitle="Visualize & analyze"
+            title="Kibana"
+          />
+        </EuiFlexItem>
+        <EuiFlexItem
+          className="homSolutionPanel__content"
+          grow={1}
+        >
+          <EuiText
+            key="Analyze data in dashboards"
+            size="s"
+          >
+            <p>
+              Analyze data in dashboards
+            </p>
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  </a>
+</EuiFlexItem>
+`;
diff --git a/src/plugins/home/public/application/components/solutions_section/__snapshots__/solution_title.test.tsx.snap b/src/plugins/home/public/application/components/solutions_section/__snapshots__/solution_title.test.tsx.snap
new file mode 100644
index 0000000000000..88db2f82984c1
--- /dev/null
+++ b/src/plugins/home/public/application/components/solutions_section/__snapshots__/solution_title.test.tsx.snap
@@ -0,0 +1,41 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SolutionTitle renders the title section of the solution panel 1`] = `
+<EuiFlexGroup
+  alignItems="center"
+  gutterSize="none"
+>
+  <EuiFlexItem
+    className="eui-textCenter"
+  >
+    <EuiToken
+      className="homSolutionPanel__icon"
+      fill="light"
+      iconType="logoKibana"
+      shape="circle"
+      size="l"
+    />
+    <EuiTitle
+      className="eui-textInheritColor"
+      size="s"
+    >
+      <h3>
+        Kibana
+      </h3>
+    </EuiTitle>
+    <EuiText
+      size="s"
+    >
+      <p
+        className="homSolutionPanel__subtitle"
+      >
+        Visualize & analyze
+         
+        <EuiIcon
+          type="sortRight"
+        />
+      </p>
+    </EuiText>
+  </EuiFlexItem>
+</EuiFlexGroup>
+`;
diff --git a/src/plugins/home/public/application/components/solutions_section/__snapshots__/solutions_section.test.tsx.snap b/src/plugins/home/public/application/components/solutions_section/__snapshots__/solutions_section.test.tsx.snap
new file mode 100644
index 0000000000000..7015ebb40a71d
--- /dev/null
+++ b/src/plugins/home/public/application/components/solutions_section/__snapshots__/solutions_section.test.tsx.snap
@@ -0,0 +1,288 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`SolutionsSection only renders a spacer if no solutions are available 1`] = `
+<Fragment>
+  <section
+    aria-labelledby="homSolutions__title"
+    className="homSolutions"
+  >
+    <EuiScreenReaderOnly>
+      <EuiTitle
+        size="s"
+      >
+        <h2
+          id="homSolutions__title"
+        >
+          <FormattedMessage
+            defaultMessage="Pick your solution"
+            id="home.solutionsSection.sectionTitle"
+            values={Object {}}
+          />
+        </h2>
+      </EuiTitle>
+    </EuiScreenReaderOnly>
+    <EuiFlexGroup
+      className="homSolutions__content"
+      justifyContent="spaceAround"
+    />
+  </section>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+</Fragment>
+`;
+
+exports[`SolutionsSection renders a single solution 1`] = `
+<Fragment>
+  <section
+    aria-labelledby="homSolutions__title"
+    className="homSolutions"
+  >
+    <EuiScreenReaderOnly>
+      <EuiTitle
+        size="s"
+      >
+        <h2
+          id="homSolutions__title"
+        >
+          <FormattedMessage
+            defaultMessage="Pick your solution"
+            id="home.solutionsSection.sectionTitle"
+            values={Object {}}
+          />
+        </h2>
+      </EuiTitle>
+    </EuiScreenReaderOnly>
+    <EuiFlexGroup
+      className="homSolutions__content"
+      justifyContent="spaceAround"
+    >
+      <SolutionPanel
+        addBasePath={[Function]}
+        solution={
+          Object {
+            "descriptions": Array [
+              "Analyze data in dashboards",
+            ],
+            "icon": "logoKibana",
+            "id": "kibana",
+            "order": 1,
+            "path": "kibana_landing_page",
+            "subtitle": "Visualize & analyze",
+            "title": "Kibana",
+          }
+        }
+      />
+    </EuiFlexGroup>
+  </section>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+</Fragment>
+`;
+
+exports[`SolutionsSection renders multiple solutions in a single column when Kibana apps are not enabled 1`] = `
+<Fragment>
+  <section
+    aria-labelledby="homSolutions__title"
+    className="homSolutions"
+  >
+    <EuiScreenReaderOnly>
+      <EuiTitle
+        size="s"
+      >
+        <h2
+          id="homSolutions__title"
+        >
+          <FormattedMessage
+            defaultMessage="Pick your solution"
+            id="home.solutionsSection.sectionTitle"
+            values={Object {}}
+          />
+        </h2>
+      </EuiTitle>
+    </EuiScreenReaderOnly>
+    <EuiFlexGroup
+      className="homSolutions__content"
+      justifyContent="spaceAround"
+    >
+      <EuiFlexItem
+        className="homSolutions__group homSolutions__group--multiple"
+        grow={1}
+      >
+        <EuiFlexGroup
+          direction="column"
+        >
+          <SolutionPanel
+            addBasePath={[Function]}
+            key="solution-2"
+            solution={
+              Object {
+                "descriptions": Array [
+                  "Example use case",
+                ],
+                "icon": "empty",
+                "id": "solution-2",
+                "order": 2,
+                "path": "path-to-solution-two",
+                "subtitle": "Subtitle for solution two",
+                "title": "Solution two",
+              }
+            }
+          />
+          <SolutionPanel
+            addBasePath={[Function]}
+            key="solution-3"
+            solution={
+              Object {
+                "descriptions": Array [
+                  "Example use case",
+                ],
+                "icon": "empty",
+                "id": "solution-3",
+                "order": 3,
+                "path": "path-to-solution-three",
+                "subtitle": "Subtitle for solution three",
+                "title": "Solution three",
+              }
+            }
+          />
+          <SolutionPanel
+            addBasePath={[Function]}
+            key="solution-4"
+            solution={
+              Object {
+                "descriptions": Array [
+                  "Example use case",
+                ],
+                "icon": "empty",
+                "id": "solution-4",
+                "order": 4,
+                "path": "path-to-solution-four",
+                "subtitle": "Subtitle for solution four",
+                "title": "Solution four",
+              }
+            }
+          />
+        </EuiFlexGroup>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </section>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+</Fragment>
+`;
+
+exports[`SolutionsSection renders multiple solutions in two columns with Kibana in its own column 1`] = `
+<Fragment>
+  <section
+    aria-labelledby="homSolutions__title"
+    className="homSolutions"
+  >
+    <EuiScreenReaderOnly>
+      <EuiTitle
+        size="s"
+      >
+        <h2
+          id="homSolutions__title"
+        >
+          <FormattedMessage
+            defaultMessage="Pick your solution"
+            id="home.solutionsSection.sectionTitle"
+            values={Object {}}
+          />
+        </h2>
+      </EuiTitle>
+    </EuiScreenReaderOnly>
+    <EuiFlexGroup
+      className="homSolutions__content"
+      justifyContent="spaceAround"
+    >
+      <EuiFlexItem
+        className="homSolutions__group homSolutions__group--multiple"
+        grow={1}
+      >
+        <EuiFlexGroup
+          direction="column"
+        >
+          <SolutionPanel
+            addBasePath={[Function]}
+            key="solution-2"
+            solution={
+              Object {
+                "descriptions": Array [
+                  "Example use case",
+                ],
+                "icon": "empty",
+                "id": "solution-2",
+                "order": 2,
+                "path": "path-to-solution-two",
+                "subtitle": "Subtitle for solution two",
+                "title": "Solution two",
+              }
+            }
+          />
+          <SolutionPanel
+            addBasePath={[Function]}
+            key="solution-3"
+            solution={
+              Object {
+                "descriptions": Array [
+                  "Example use case",
+                ],
+                "icon": "empty",
+                "id": "solution-3",
+                "order": 3,
+                "path": "path-to-solution-three",
+                "subtitle": "Subtitle for solution three",
+                "title": "Solution three",
+              }
+            }
+          />
+          <SolutionPanel
+            addBasePath={[Function]}
+            key="solution-4"
+            solution={
+              Object {
+                "descriptions": Array [
+                  "Example use case",
+                ],
+                "icon": "empty",
+                "id": "solution-4",
+                "order": 4,
+                "path": "path-to-solution-four",
+                "subtitle": "Subtitle for solution four",
+                "title": "Solution four",
+              }
+            }
+          />
+        </EuiFlexGroup>
+      </EuiFlexItem>
+      <SolutionPanel
+        addBasePath={[Function]}
+        solution={
+          Object {
+            "descriptions": Array [
+              "Analyze data in dashboards",
+            ],
+            "icon": "logoKibana",
+            "id": "kibana",
+            "order": 1,
+            "path": "kibana_landing_page",
+            "subtitle": "Visualize & analyze",
+            "title": "Kibana",
+          }
+        }
+      />
+    </EuiFlexGroup>
+  </section>
+  <EuiHorizontalRule
+    aria-hidden="true"
+    margin="xl"
+  />
+</Fragment>
+`;
diff --git a/src/plugins/home/public/application/components/solutions_section/index.ts b/src/plugins/home/public/application/components/solutions_section/index.ts
new file mode 100644
index 0000000000000..6ef3cfc8ec1a2
--- /dev/null
+++ b/src/plugins/home/public/application/components/solutions_section/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './solutions_section';
diff --git a/src/plugins/home/public/application/components/solutions_section/solution_panel.test.tsx b/src/plugins/home/public/application/components/solutions_section/solution_panel.test.tsx
new file mode 100644
index 0000000000000..3a66c29649b3f
--- /dev/null
+++ b/src/plugins/home/public/application/components/solutions_section/solution_panel.test.tsx
@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { SolutionPanel } from './solution_panel';
+
+const solutionEntry = {
+  id: 'kibana',
+  title: 'Kibana',
+  subtitle: 'Visualize & analyze',
+  descriptions: ['Analyze data in dashboards'],
+  icon: 'logoKibana',
+  path: 'kibana_landing_page',
+  order: 1,
+};
+
+const addBasePathMock = (path: string) => (path ? path : 'path');
+
+describe('SolutionPanel', () => {
+  test('renders the solution panel for the given solution', () => {
+    const component = shallow(
+      <SolutionPanel addBasePath={addBasePathMock} solution={solutionEntry} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx b/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx
new file mode 100644
index 0000000000000..c2ae2f82eaa46
--- /dev/null
+++ b/src/plugins/home/public/application/components/solutions_section/solution_panel.tsx
@@ -0,0 +1,83 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { FC } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiSpacer, EuiText } from '@elastic/eui';
+import { FeatureCatalogueSolution } from '../../../';
+import { createAppNavigationHandler } from '../app_navigation_handler';
+import { SolutionTitle } from './solution_title';
+
+const getDescriptionText = (description: string): JSX.Element => (
+  <EuiText size="s" key={`${description}`}>
+    <p>{description}</p>
+  </EuiText>
+);
+
+const addSpacersBetweenElementsReducer = (
+  acc: JSX.Element[],
+  element: JSX.Element,
+  index: number,
+  elements: JSX.Element[]
+) => {
+  acc.push(element);
+  if (index < elements.length - 1) {
+    acc.push(<EuiSpacer key={`homeSolutionsPanel__UseCaseSpacer${index}`} size="m" />);
+  }
+  return acc;
+};
+
+const getDescriptions = (descriptions: string[]) =>
+  descriptions.map(getDescriptionText).reduce<JSX.Element[]>(addSpacersBetweenElementsReducer, []);
+
+interface Props {
+  addBasePath: (path: string) => string;
+  solution: FeatureCatalogueSolution;
+}
+
+export const SolutionPanel: FC<Props> = ({ addBasePath, solution }) => (
+  <EuiFlexItem
+    key={solution.id}
+    className={`${
+      solution.id === 'kibana' ? 'homSolutions__group homSolutions__group--single' : ''
+    } homSolutions__item`}
+    grow={1}
+  >
+    <a
+      className={`homSolutionPanel homSolutionPanel--${solution.id}`}
+      href={addBasePath(solution.path)}
+      onClick={createAppNavigationHandler(solution.path)}
+    >
+      <EuiPanel paddingSize="none">
+        <EuiFlexGroup gutterSize="none">
+          <EuiFlexItem grow={1} className={`homSolutionPanel__header`}>
+            <SolutionTitle
+              iconType={solution.icon}
+              title={solution.title}
+              subtitle={solution.subtitle}
+            />
+          </EuiFlexItem>
+
+          <EuiFlexItem grow={1} className="homSolutionPanel__content">
+            {getDescriptions(solution.descriptions)}
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiPanel>
+    </a>
+  </EuiFlexItem>
+);
diff --git a/src/plugins/home/public/application/components/solutions_section/solution_title.test.tsx b/src/plugins/home/public/application/components/solutions_section/solution_title.test.tsx
new file mode 100644
index 0000000000000..d933e100eabc6
--- /dev/null
+++ b/src/plugins/home/public/application/components/solutions_section/solution_title.test.tsx
@@ -0,0 +1,45 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { SolutionTitle } from './solution_title';
+
+const solutionEntry = {
+  id: 'kibana',
+  title: 'Kibana',
+  subtitle: 'Visualize & analyze',
+  descriptions: ['Analyze data in dashboards'],
+  icon: 'logoKibana',
+  path: 'kibana_landing_page',
+  order: 1,
+};
+
+describe('SolutionTitle', () => {
+  test('renders the title section of the solution panel', () => {
+    const component = shallow(
+      <SolutionTitle
+        title={solutionEntry.title}
+        subtitle={solutionEntry.subtitle}
+        iconType={solutionEntry.icon}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/home/public/application/components/solutions_section/solution_title.tsx b/src/plugins/home/public/application/components/solutions_section/solution_title.tsx
new file mode 100644
index 0000000000000..fb833a40807d2
--- /dev/null
+++ b/src/plugins/home/public/application/components/solutions_section/solution_title.tsx
@@ -0,0 +1,59 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { FC } from 'react';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiToken,
+  EuiTitle,
+  EuiText,
+  EuiIcon,
+  IconType,
+} from '@elastic/eui';
+
+interface Props {
+  title: string;
+  subtitle: string;
+  iconType: IconType;
+}
+
+export const SolutionTitle: FC<Props> = ({ title, subtitle, iconType }) => (
+  <EuiFlexGroup gutterSize="none" alignItems="center">
+    <EuiFlexItem className="eui-textCenter">
+      <EuiToken
+        iconType={iconType}
+        shape="circle"
+        fill="light"
+        size="l"
+        className="homSolutionPanel__icon"
+      />
+
+      <EuiTitle className="eui-textInheritColor" size="s">
+        <h3>{title}</h3>
+      </EuiTitle>
+
+      <EuiText size="s">
+        <p className="homSolutionPanel__subtitle">
+          {subtitle} <EuiIcon type="sortRight" />
+        </p>
+      </EuiText>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
diff --git a/src/plugins/home/public/application/components/solutions_section/solutions_section.test.tsx b/src/plugins/home/public/application/components/solutions_section/solutions_section.test.tsx
new file mode 100644
index 0000000000000..17d721cc96c02
--- /dev/null
+++ b/src/plugins/home/public/application/components/solutions_section/solutions_section.test.tsx
@@ -0,0 +1,94 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { SolutionsSection } from './solutions_section';
+
+const solutionEntry1 = {
+  id: 'kibana',
+  title: 'Kibana',
+  subtitle: 'Visualize & analyze',
+  descriptions: ['Analyze data in dashboards'],
+  icon: 'logoKibana',
+  path: 'kibana_landing_page',
+  order: 1,
+};
+const solutionEntry2 = {
+  id: 'solution-2',
+  title: 'Solution two',
+  subtitle: 'Subtitle for solution two',
+  descriptions: ['Example use case'],
+  icon: 'empty',
+  path: 'path-to-solution-two',
+  order: 2,
+};
+const solutionEntry3 = {
+  id: 'solution-3',
+  title: 'Solution three',
+  subtitle: 'Subtitle for solution three',
+  descriptions: ['Example use case'],
+  icon: 'empty',
+  path: 'path-to-solution-three',
+  order: 3,
+};
+const solutionEntry4 = {
+  id: 'solution-4',
+  title: 'Solution four',
+  subtitle: 'Subtitle for solution four',
+  descriptions: ['Example use case'],
+  icon: 'empty',
+  path: 'path-to-solution-four',
+  order: 4,
+};
+
+const addBasePathMock = (path: string) => (path ? path : 'path');
+
+describe('SolutionsSection', () => {
+  test('only renders a spacer if no solutions are available', () => {
+    const component = shallow(<SolutionsSection addBasePath={addBasePathMock} solutions={[]} />);
+    expect(component).toMatchSnapshot();
+  });
+
+  test('renders a single solution', () => {
+    const component = shallow(
+      <SolutionsSection addBasePath={addBasePathMock} solutions={[solutionEntry1]} />
+    );
+    expect(component).toMatchSnapshot();
+  });
+
+  test('renders multiple solutions in two columns with Kibana in its own column', () => {
+    const component = shallow(
+      <SolutionsSection
+        addBasePath={addBasePathMock}
+        solutions={[solutionEntry1, solutionEntry2, solutionEntry3, solutionEntry4]}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+  test('renders multiple solutions in a single column when Kibana apps are not enabled', () => {
+    const component = shallow(
+      <SolutionsSection
+        addBasePath={addBasePathMock}
+        solutions={[solutionEntry2, solutionEntry3, solutionEntry4]}
+      />
+    );
+    expect(component).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx b/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx
new file mode 100644
index 0000000000000..1a78a6c71030a
--- /dev/null
+++ b/src/plugins/home/public/application/components/solutions_section/solutions_section.tsx
@@ -0,0 +1,93 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { FC } from 'react';
+import PropTypes from 'prop-types';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
+  EuiScreenReaderOnly,
+  EuiTitle,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { SolutionPanel } from './solution_panel';
+import { FeatureCatalogueSolution } from '../../../';
+
+const sortByOrder = (
+  { order: orderA = 0 }: FeatureCatalogueSolution,
+  { order: orderB = 0 }: FeatureCatalogueSolution
+) => orderA - orderB;
+
+interface Props {
+  addBasePath: (path: string) => string;
+  solutions: FeatureCatalogueSolution[];
+}
+
+export const SolutionsSection: FC<Props> = ({ addBasePath, solutions }) => {
+  // Separate Kibana from other solutions
+  const kibana = solutions.find(({ id }) => id === 'kibana');
+  solutions = solutions.sort(sortByOrder).filter(({ id }) => id !== 'kibana');
+
+  return (
+    <>
+      <section aria-labelledby="homSolutions__title" className="homSolutions">
+        <EuiScreenReaderOnly>
+          <EuiTitle size="s">
+            <h2 id="homSolutions__title">
+              <FormattedMessage
+                id="home.solutionsSection.sectionTitle"
+                defaultMessage="Pick your solution"
+              />
+            </h2>
+          </EuiTitle>
+        </EuiScreenReaderOnly>
+
+        <EuiFlexGroup className="homSolutions__content" justifyContent="spaceAround">
+          {solutions.length ? (
+            <EuiFlexItem grow={1} className="homSolutions__group homSolutions__group--multiple">
+              <EuiFlexGroup direction="column">
+                {solutions.map((solution) => (
+                  <SolutionPanel key={solution.id} solution={solution} addBasePath={addBasePath} />
+                ))}
+              </EuiFlexGroup>
+            </EuiFlexItem>
+          ) : null}
+          {kibana ? <SolutionPanel solution={kibana} addBasePath={addBasePath} /> : null}
+        </EuiFlexGroup>
+      </section>
+
+      <EuiHorizontalRule margin="xl" aria-hidden="true" />
+    </>
+  );
+};
+
+SolutionsSection.propTypes = {
+  solutions: PropTypes.arrayOf(
+    PropTypes.shape({
+      id: PropTypes.string.isRequired,
+      title: PropTypes.string.isRequired,
+      subtitle: PropTypes.string.isRequired,
+      descriptions: PropTypes.arrayOf(PropTypes.string).isRequired,
+      icon: PropTypes.string.isRequired,
+      path: PropTypes.string.isRequired,
+      order: PropTypes.number,
+    })
+  ),
+};
diff --git a/src/plugins/home/public/application/components/synopsis.js b/src/plugins/home/public/application/components/synopsis.js
index b6fa85db2bfe9..fbe3bb3ed6769 100644
--- a/src/plugins/home/public/application/components/synopsis.js
+++ b/src/plugins/home/public/application/components/synopsis.js
@@ -24,6 +24,7 @@ import classNames from 'classnames';
 import { EuiCard, EuiIcon } from '@elastic/eui';
 
 export function Synopsis({
+  id,
   description,
   iconUrl,
   iconType,
@@ -54,8 +55,9 @@ export function Synopsis({
       description={description}
       onClick={onClick}
       href={url}
-      data-test-subj={`homeSynopsisLink${title.toLowerCase()}`}
+      data-test-subj={`homeSynopsisLink${id.toLowerCase()}`}
       betaBadgeLabel={isBeta ? 'Beta' : null}
+      titleElement="h3"
     />
   );
 }
diff --git a/src/plugins/home/public/application/components/synopsis.test.js b/src/plugins/home/public/application/components/synopsis.test.js
index 89b7a0a2fbce0..3d9e1809c7cd5 100644
--- a/src/plugins/home/public/application/components/synopsis.test.js
+++ b/src/plugins/home/public/application/components/synopsis.test.js
@@ -25,6 +25,7 @@ import { Synopsis } from './synopsis';
 test('render', () => {
   const component = shallow(
     <Synopsis
+      id={'tutorial'}
       description="this is a great tutorial about..."
       title="Great tutorial"
       url="link_to_item"
@@ -37,6 +38,7 @@ describe('props', () => {
   test('iconType', () => {
     const component = shallow(
       <Synopsis
+        id={'tutorial'}
         description="this is a great tutorial about..."
         title="Great tutorial"
         url="link_to_item"
@@ -49,6 +51,7 @@ describe('props', () => {
   test('iconUrl', () => {
     const component = shallow(
       <Synopsis
+        id={'tutorial'}
         description="this is a great tutorial about..."
         title="Great tutorial"
         url="link_to_item"
@@ -61,6 +64,7 @@ describe('props', () => {
   test('isBeta', () => {
     const component = shallow(
       <Synopsis
+        id={'tutorial'}
         description="this is a great tutorial about..."
         title="Great tutorial"
         url="link_to_item"
diff --git a/src/plugins/home/public/application/components/tutorial_directory.js b/src/plugins/home/public/application/components/tutorial_directory.js
index 948024ae85dda..49a4c92a24ebd 100644
--- a/src/plugins/home/public/application/components/tutorial_directory.js
+++ b/src/plugins/home/public/application/components/tutorial_directory.js
@@ -136,6 +136,7 @@ class TutorialDirectoryUi extends React.Component {
       }
 
       return {
+        id: tutorialConfig.id,
         category: tutorialConfig.category,
         icon: icon,
         name: tutorialConfig.name,
@@ -149,6 +150,7 @@ class TutorialDirectoryUi extends React.Component {
 
     // Add card for sample data that only gets show in "all" tab
     tutorialCards.push({
+      id: 'sample_data',
       name: this.props.intl.formatMessage({
         id: 'home.tutorial.card.sampleDataTitle',
         defaultMessage: 'Sample Data',
@@ -214,6 +216,7 @@ class TutorialDirectoryUi extends React.Component {
             return (
               <EuiFlexItem key={tutorial.name}>
                 <Synopsis
+                  id={tutorial.id}
                   iconType={tutorial.icon}
                   description={tutorial.description}
                   title={tutorial.name}
diff --git a/src/plugins/home/public/index.ts b/src/plugins/home/public/index.ts
index dc48332e052de..4459d187eead7 100644
--- a/src/plugins/home/public/index.ts
+++ b/src/plugins/home/public/index.ts
@@ -27,6 +27,7 @@ export {
 } from './plugin';
 export {
   FeatureCatalogueEntry,
+  FeatureCatalogueSolution,
   FeatureCatalogueCategory,
   Environment,
   TutorialVariables,
diff --git a/src/plugins/home/public/plugin.test.ts b/src/plugins/home/public/plugin.test.ts
index 0b83c4caf1b30..0ebba06e6bea9 100644
--- a/src/plugins/home/public/plugin.test.ts
+++ b/src/plugins/home/public/plugin.test.ts
@@ -33,6 +33,42 @@ describe('HomePublicPlugin', () => {
   });
 
   describe('setup', () => {
+    test('registers tutorial directory to feature catalogue', async () => {
+      const setup = await new HomePublicPlugin(mockInitializerContext).setup(
+        coreMock.createSetup() as any,
+        {
+          kibanaLegacy: kibanaLegacyPluginMock.createSetupContract(),
+        }
+      );
+      expect(setup).toHaveProperty('featureCatalogue');
+      expect(setup.featureCatalogue.register).toHaveBeenCalledTimes(1);
+      expect(setup.featureCatalogue.register).toHaveBeenCalledWith(
+        expect.objectContaining({
+          category: 'data',
+          icon: 'indexOpen',
+          id: 'home_tutorial_directory',
+          showOnHomePage: true,
+        })
+      );
+    });
+
+    test('registers kibana solution to feature catalogue', async () => {
+      const setup = await new HomePublicPlugin(mockInitializerContext).setup(
+        coreMock.createSetup() as any,
+        {
+          kibanaLegacy: kibanaLegacyPluginMock.createSetupContract(),
+        }
+      );
+      expect(setup).toHaveProperty('featureCatalogue');
+      expect(setup.featureCatalogue.registerSolution).toHaveBeenCalledTimes(1);
+      expect(setup.featureCatalogue.registerSolution).toHaveBeenCalledWith(
+        expect.objectContaining({
+          icon: 'logoKibana',
+          id: 'kibana',
+        })
+      );
+    });
+
     test('wires up and returns registry', async () => {
       const setup = await new HomePublicPlugin(mockInitializerContext).setup(
         coreMock.createSetup() as any,
diff --git a/src/plugins/home/public/plugin.ts b/src/plugins/home/public/plugin.ts
index 6859d916a61af..ba2f537e7c5de 100644
--- a/src/plugins/home/public/plugin.ts
+++ b/src/plugins/home/public/plugin.ts
@@ -30,6 +30,7 @@ import { first } from 'rxjs/operators';
 import {
   EnvironmentService,
   EnvironmentServiceSetup,
+  FeatureCatalogueCategory,
   FeatureCatalogueRegistry,
   FeatureCatalogueRegistrySetup,
   TutorialService,
@@ -42,6 +43,7 @@ import { TelemetryPluginStart } from '../../telemetry/public';
 import { UsageCollectionSetup } from '../../usage_collection/public';
 import { KibanaLegacySetup, KibanaLegacyStart } from '../../kibana_legacy/public';
 import { AppNavLinkStatus } from '../../../core/public';
+import { PLUGIN_ID, HOME_APP_BASE_PATH } from '../common/constants';
 
 export interface HomePluginStartDependencies {
   data: DataPublicPluginStart;
@@ -68,7 +70,7 @@ export class HomePublicPlugin
     { kibanaLegacy, usageCollection }: HomePluginSetupDependencies
   ): HomePublicPluginSetup {
     core.application.register({
-      id: 'home',
+      id: PLUGIN_ID,
       title: 'Home',
       navLinkStatus: AppNavLinkStatus.hidden,
       mount: async (params: AppMountParameters) => {
@@ -109,8 +111,58 @@ export class HomePublicPlugin
     });
     kibanaLegacy.forwardApp('home', 'home');
 
+    const featureCatalogue = { ...this.featuresCatalogueRegistry.setup() };
+
+    featureCatalogue.register({
+      id: 'home_tutorial_directory',
+      title: i18n.translate('home.tutorialDirectory.featureCatalogueTitle', {
+        defaultMessage: 'Add data',
+      }),
+      description: i18n.translate('home.tutorialDirectory.featureCatalogueDescription', {
+        defaultMessage: 'Ingest data from popular apps and services.',
+      }),
+      icon: 'indexOpen',
+      showOnHomePage: true,
+      path: `${HOME_APP_BASE_PATH}#/tutorial_directory`,
+      category: 'data' as FeatureCatalogueCategory.DATA,
+      order: 500,
+    });
+
+    featureCatalogue.registerSolution({
+      id: 'kibana',
+      title: i18n.translate('home.kibana.featureCatalogue.title', {
+        defaultMessage: 'Kibana',
+      }),
+      subtitle: i18n.translate('home.kibana.featureCatalogue.subtitle', {
+        defaultMessage: 'Visualize & analyze',
+      }),
+      descriptions: [
+        i18n.translate('home.kibana.featureCatalogueDescription1', {
+          defaultMessage: 'Analyze data in dashboards.',
+        }),
+        i18n.translate('home.kibana.featureCatalogueDescription2', {
+          defaultMessage: 'Search and find insights.',
+        }),
+        i18n.translate('home.kibana.featureCatalogueDescription3', {
+          defaultMessage: 'Design pixel-perfect reports.',
+        }),
+        i18n.translate('home.kibana.featureCatalogueDescription4', {
+          defaultMessage: 'Plot geographic data.',
+        }),
+        i18n.translate('home.kibana.featureCatalogueDescription5', {
+          defaultMessage: 'Model, predict, and detect.',
+        }),
+        i18n.translate('home.kibana.featureCatalogueDescription6', {
+          defaultMessage: 'Reveal patterns and relationships.',
+        }),
+      ],
+      icon: 'logoKibana',
+      path: '/app/dashboards',
+      order: 400,
+    });
+
     return {
-      featureCatalogue: { ...this.featuresCatalogueRegistry.setup() },
+      featureCatalogue,
       environment: { ...this.environmentService.setup() },
       tutorials: { ...this.tutorialService.setup() },
     };
@@ -124,7 +176,7 @@ export class HomePublicPlugin
 
     // If the home app is the initial location when loading Kibana...
     if (
-      window.location.pathname === http.basePath.prepend(`/app/home`) &&
+      window.location.pathname === http.basePath.prepend(HOME_APP_BASE_PATH) &&
       window.location.hash === ''
     ) {
       // ...wait for the app to mount initially and then...
@@ -157,5 +209,6 @@ export interface HomePublicPluginSetup {
    * be replaced by display specific extension points.
    * @deprecated
    */
+
   environment: EnvironmentSetup;
 }
diff --git a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.mock.ts b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.mock.ts
index d7b87adfff78b..23f36cef89ee6 100644
--- a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.mock.ts
+++ b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.mock.ts
@@ -25,6 +25,7 @@ import {
 const createSetupMock = (): jest.Mocked<FeatureCatalogueRegistrySetup> => {
   const setup = {
     register: jest.fn(),
+    registerSolution: jest.fn(),
   };
   return setup;
 };
@@ -34,6 +35,7 @@ const createMock = (): jest.Mocked<PublicMethodsOf<FeatureCatalogueRegistry>> =>
     setup: jest.fn(),
     start: jest.fn(),
     get: jest.fn(() => []),
+    getSolutions: jest.fn(() => []),
   };
   service.setup.mockImplementation(createSetupMock);
   return service;
diff --git a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts
index 34095848dbd2c..52c0ac9a50026 100644
--- a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts
+++ b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.test.ts
@@ -21,6 +21,7 @@ import {
   FeatureCatalogueRegistry,
   FeatureCatalogueCategory,
   FeatureCatalogueEntry,
+  FeatureCatalogueSolution,
 } from './feature_catalogue_registry';
 
 const DASHBOARD_FEATURE: FeatureCatalogueEntry = {
@@ -33,15 +34,32 @@ const DASHBOARD_FEATURE: FeatureCatalogueEntry = {
   category: FeatureCatalogueCategory.DATA,
 };
 
+const KIBANA_SOLUTION: FeatureCatalogueSolution = {
+  id: 'kibana',
+  title: 'Kibana',
+  subtitle: 'Visualize & analyze',
+  descriptions: ['Analyze data in dashboards.', 'Search and find insights.'],
+  icon: 'kibanaApp',
+  path: `/app/home`,
+};
+
 describe('FeatureCatalogueRegistry', () => {
   describe('setup', () => {
-    test('throws when registering duplicate id', () => {
+    test('throws when registering a feature with a duplicate id', () => {
       const setup = new FeatureCatalogueRegistry().setup();
       setup.register(DASHBOARD_FEATURE);
       expect(() => setup.register(DASHBOARD_FEATURE)).toThrowErrorMatchingInlineSnapshot(
         `"Feature with id [dashboard] has already been registered. Use a unique id."`
       );
     });
+
+    test('throws when registering a solution with a duplicate id', () => {
+      const setup = new FeatureCatalogueRegistry().setup();
+      setup.registerSolution(KIBANA_SOLUTION);
+      expect(() => setup.registerSolution(KIBANA_SOLUTION)).toThrowErrorMatchingInlineSnapshot(
+        `"Solution with id [kibana] has already been registered. Use a unique id."`
+      );
+    });
   });
 
   describe('start', () => {
diff --git a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts
index c70fc0464b131..766afb11a87c0 100644
--- a/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts
+++ b/src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts
@@ -43,11 +43,32 @@ export interface FeatureCatalogueEntry {
   readonly path: string;
   /** Whether or not this link should be shown on the front page of Kibana. */
   readonly showOnHomePage: boolean;
+  /** An ordinal used to sort features relative to one another for display on the home page */
+  readonly order?: number;
+}
+
+/** @public */
+export interface FeatureCatalogueSolution {
+  /** Unique string identifier for this solution. */
+  readonly id: string;
+  /** Title of solution displayed to the user. */
+  readonly title: string;
+  /** The tagline of the solution displayed to the user. */
+  readonly subtitle: string;
+  /** A list of use cases for this solution displayed to the user. */
+  readonly descriptions: string[];
+  /** EUI `IconType` for icon to be displayed to the user. EUI supports any known EUI icon, SVG URL, or ReactElement. */
+  readonly icon: IconType;
+  /** URL path to link to this future. Should not include the basePath. */
+  readonly path: string;
+  /** An ordinal used to sort solutions relative to one another for display on the home page */
+  readonly order?: number;
 }
 
 export class FeatureCatalogueRegistry {
   private capabilities: Capabilities | null = null;
   private readonly features = new Map<string, FeatureCatalogueEntry>();
+  private readonly solutions = new Map<string, FeatureCatalogueSolution>();
 
   public setup() {
     return {
@@ -60,6 +81,15 @@ export class FeatureCatalogueRegistry {
 
         this.features.set(feature.id, feature);
       },
+      registerSolution: (solution: FeatureCatalogueSolution) => {
+        if (this.solutions.has(solution.id)) {
+          throw new Error(
+            `Solution with id [${solution.id}] has already been registered. Use a unique id.`
+          );
+        }
+
+        this.solutions.set(solution.id, solution);
+      },
     };
   }
 
@@ -76,6 +106,16 @@ export class FeatureCatalogueRegistry {
       .filter((entry) => capabilities.catalogue[entry.id] !== false)
       .sort(compareByKey('title'));
   }
+
+  public getSolutions(): readonly FeatureCatalogueSolution[] {
+    if (this.capabilities === null) {
+      throw new Error('Catalogue entries are only available after start phase');
+    }
+    const capabilities = this.capabilities;
+    return [...this.solutions.values()]
+      .filter((solution) => capabilities.catalogue[solution.id] !== false)
+      .sort(compareByKey('title'));
+  }
 }
 
 export type FeatureCatalogueRegistrySetup = ReturnType<FeatureCatalogueRegistry['setup']>;
diff --git a/src/plugins/home/public/services/feature_catalogue/index.ts b/src/plugins/home/public/services/feature_catalogue/index.ts
index 1e5021a3ad0be..ddefab90c0a36 100644
--- a/src/plugins/home/public/services/feature_catalogue/index.ts
+++ b/src/plugins/home/public/services/feature_catalogue/index.ts
@@ -20,6 +20,7 @@
 export {
   FeatureCatalogueCategory,
   FeatureCatalogueEntry,
+  FeatureCatalogueSolution,
   FeatureCatalogueRegistry,
   FeatureCatalogueRegistrySetup,
 } from './feature_catalogue_registry';
diff --git a/src/plugins/management/kibana.json b/src/plugins/management/kibana.json
index 308e006b5aba0..1a9e6be46bd55 100644
--- a/src/plugins/management/kibana.json
+++ b/src/plugins/management/kibana.json
@@ -3,6 +3,7 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["kibanaLegacy", "home"],
-  "requiredBundles": ["kibanaReact", "kibanaUtils"]
+  "requiredPlugins": ["kibanaLegacy"],
+  "optionalPlugins": ["home"],
+  "requiredBundles": ["kibanaReact", "kibanaUtils", "home"]
 }
diff --git a/src/plugins/management/public/plugin.ts b/src/plugins/management/public/plugin.ts
index 8be130b4028c6..cd65b7adfeadd 100644
--- a/src/plugins/management/public/plugin.ts
+++ b/src/plugins/management/public/plugin.ts
@@ -35,7 +35,7 @@ import {
 } from './management_sections_service';
 
 interface ManagementSetupDependencies {
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
 }
 
 export class ManagementPlugin implements Plugin<ManagementSetup, ManagementStart> {
@@ -46,19 +46,21 @@ export class ManagementPlugin implements Plugin<ManagementSetup, ManagementStart
   public setup(core: CoreSetup, { home }: ManagementSetupDependencies) {
     const kibanaVersion = this.initializerContext.env.packageInfo.version;
 
-    home.featureCatalogue.register({
-      id: 'stack-management',
-      title: i18n.translate('management.stackManagement.managementLabel', {
-        defaultMessage: 'Stack Management',
-      }),
-      description: i18n.translate('management.stackManagement.managementDescription', {
-        defaultMessage: 'Your center console for managing the Elastic Stack.',
-      }),
-      icon: 'managementApp',
-      path: '/app/management',
-      showOnHomePage: false,
-      category: FeatureCatalogueCategory.ADMIN,
-    });
+    if (home) {
+      home.featureCatalogue.register({
+        id: 'stack-management',
+        title: i18n.translate('management.stackManagement.managementLabel', {
+          defaultMessage: 'Stack Management',
+        }),
+        description: i18n.translate('management.stackManagement.managementDescription', {
+          defaultMessage: 'Your center console for managing the Elastic Stack.',
+        }),
+        icon: 'managementApp',
+        path: '/app/management',
+        showOnHomePage: false,
+        category: FeatureCatalogueCategory.ADMIN,
+      });
+    }
 
     core.application.register({
       id: 'management',
diff --git a/src/plugins/saved_objects_management/kibana.json b/src/plugins/saved_objects_management/kibana.json
index 0270c1d8f5d39..a7a8f11034b7d 100644
--- a/src/plugins/saved_objects_management/kibana.json
+++ b/src/plugins/saved_objects_management/kibana.json
@@ -3,8 +3,8 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["home", "management", "data"],
-  "optionalPlugins": ["dashboard", "visualizations", "discover"],
+  "requiredPlugins": ["management", "data"],
+  "optionalPlugins": ["dashboard", "visualizations", "discover", "home"],
   "extraPublicDirs": ["public/lib"],
-  "requiredBundles": ["kibanaReact"]
+  "requiredBundles": ["kibanaReact", "home"]
 }
diff --git a/src/plugins/saved_objects_management/public/plugin.ts b/src/plugins/saved_objects_management/public/plugin.ts
index 47d445e63b942..ac30c63409760 100644
--- a/src/plugins/saved_objects_management/public/plugin.ts
+++ b/src/plugins/saved_objects_management/public/plugin.ts
@@ -45,7 +45,7 @@ export interface SavedObjectsManagementPluginStart {
 
 export interface SetupDependencies {
   management: ManagementSetup;
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
 }
 
 export interface StartDependencies {
@@ -72,20 +72,22 @@ export class SavedObjectsManagementPlugin
   ): SavedObjectsManagementPluginSetup {
     const actionSetup = this.actionService.setup();
 
-    home.featureCatalogue.register({
-      id: 'saved_objects',
-      title: i18n.translate('savedObjectsManagement.objects.savedObjectsTitle', {
-        defaultMessage: 'Saved Objects',
-      }),
-      description: i18n.translate('savedObjectsManagement.objects.savedObjectsDescription', {
-        defaultMessage:
-          'Import, export, and manage your saved searches, visualizations, and dashboards.',
-      }),
-      icon: 'savedObjectsApp',
-      path: '/app/management/kibana/objects',
-      showOnHomePage: true,
-      category: FeatureCatalogueCategory.ADMIN,
-    });
+    if (home) {
+      home.featureCatalogue.register({
+        id: 'saved_objects',
+        title: i18n.translate('savedObjectsManagement.objects.savedObjectsTitle', {
+          defaultMessage: 'Saved Objects',
+        }),
+        description: i18n.translate('savedObjectsManagement.objects.savedObjectsDescription', {
+          defaultMessage:
+            'Import, export, and manage your saved searches, visualizations, and dashboards.',
+        }),
+        icon: 'savedObjectsApp',
+        path: '/app/management/kibana/objects',
+        showOnHomePage: false,
+        category: FeatureCatalogueCategory.ADMIN,
+      });
+    }
 
     const kibanaSection = management.sections.section.kibana;
     kibanaSection.registerApp({
diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
index 29d6f978bd05e..7e5cafd3ceecc 100644
--- a/src/plugins/visualize/public/plugin.ts
+++ b/src/plugins/visualize/public/plugin.ts
@@ -221,7 +221,7 @@ export class VisualizePlugin
         }),
         icon: 'visualizeApp',
         path: `/app/visualize#${VisualizeConstants.LANDING_PAGE_PATH}`,
-        showOnHomePage: true,
+        showOnHomePage: false,
         category: FeatureCatalogueCategory.DATA,
       });
     }
diff --git a/test/functional/page_objects/home_page.ts b/test/functional/page_objects/home_page.ts
index bf0e0dd7f56f2..e8f8982d7163c 100644
--- a/test/functional/page_objects/home_page.ts
+++ b/test/functional/page_objects/home_page.ts
@@ -98,19 +98,19 @@ export function HomePageProvider({ getService, getPageObjects }: FtrProviderCont
     }
 
     async clickOnConsole() {
-      await testSubjects.click('homeSynopsisLinkconsole');
+      await this.clickSynopsis('console');
     }
     async clickOnLogo() {
       await testSubjects.click('logo');
     }
 
-    async ClickOnLogsData() {
-      await testSubjects.click('logsData');
+    async clickOnAddData() {
+      await this.clickSynopsis('home_tutorial_directory');
     }
 
     // clicks on Active MQ logs
     async clickOnLogsTutorial() {
-      await testSubjects.click('homeSynopsisLinkactivemq logs');
+      await this.clickSynopsis('activemqlogs');
     }
 
     // clicks on cloud tutorial link
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
index ee89abf59ee23..6cc3bb2a2c7e1 100644
--- a/x-pack/plugins/apm/kibana.json
+++ b/x-pack/plugins/apm/kibana.json
@@ -6,7 +6,6 @@
     "features",
     "apmOss",
     "data",
-    "home",
     "licensing",
     "triggers_actions_ui"
   ],
@@ -18,7 +17,8 @@
     "alerts",
     "observability",
     "security",
-    "ml"
+    "ml",
+    "home"
   ],
   "server": true,
   "ui": true,
@@ -32,6 +32,7 @@
   "requiredBundles": [
     "kibanaReact",
     "kibanaUtils",
-    "observability"
+    "observability",
+    "home"
   ]
 }
diff --git a/x-pack/plugins/apm/public/featureCatalogueEntry.ts b/x-pack/plugins/apm/public/featureCatalogueEntry.ts
index dd07f5958d666..8b95c412e4c1c 100644
--- a/x-pack/plugins/apm/public/featureCatalogueEntry.ts
+++ b/x-pack/plugins/apm/public/featureCatalogueEntry.ts
@@ -17,6 +17,6 @@ export const featureCatalogueEntry = {
   }),
   icon: 'apmApp',
   path: '/app/apm',
-  showOnHomePage: true,
+  showOnHomePage: false,
   category: FeatureCatalogueCategory.DATA,
 };
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index cf729fe0ff301..27662585d01fa 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -45,7 +45,7 @@ export interface ApmPluginSetupDeps {
   alerts?: AlertingPluginPublicSetup;
   data: DataPublicPluginSetup;
   features: FeaturesPluginSetup;
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
   licensing: LicensingPluginSetup;
   triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
   observability?: ObservabilityPluginSetup;
@@ -69,8 +69,10 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
     const config = this.initializerContext.config.get();
     const pluginSetupDeps = plugins;
 
-    pluginSetupDeps.home.environment.update({ apmUi: true });
-    pluginSetupDeps.home.featureCatalogue.register(featureCatalogueEntry);
+    if (pluginSetupDeps.home) {
+      pluginSetupDeps.home.environment.update({ apmUi: true });
+      pluginSetupDeps.home.featureCatalogue.register(featureCatalogueEntry);
+    }
 
     if (plugins.observability) {
       const getApmDataHelper = async () => {
diff --git a/x-pack/plugins/canvas/kibana.json b/x-pack/plugins/canvas/kibana.json
index 68fbec3e8429d..dbd93de6b50e0 100644
--- a/x-pack/plugins/canvas/kibana.json
+++ b/x-pack/plugins/canvas/kibana.json
@@ -5,7 +5,7 @@
     "configPath": ["xpack", "canvas"],
     "server": true,
     "ui": true,
-    "requiredPlugins": ["bfetch", "data", "embeddable", "expressions", "features", "home", "inspector", "uiActions"],
-    "optionalPlugins": ["usageCollection"],
-    "requiredBundles": ["kibanaReact", "maps", "lens", "visualizations", "kibanaUtils", "kibanaLegacy", "discover", "savedObjects", "reporting"]
+    "requiredPlugins": ["bfetch", "data", "embeddable", "expressions", "features", "inspector", "uiActions"],
+    "optionalPlugins": ["usageCollection", "home"],
+    "requiredBundles": ["kibanaReact", "maps", "lens", "visualizations", "kibanaUtils", "kibanaLegacy", "discover", "savedObjects", "reporting", "home"]
   }
diff --git a/x-pack/plugins/canvas/public/feature_catalogue_entry.ts b/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
index 41506bdd71e3c..82237a5ddffed 100644
--- a/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
+++ b/x-pack/plugins/canvas/public/feature_catalogue_entry.ts
@@ -15,6 +15,6 @@ export const featureCatalogueEntry = {
   }),
   icon: 'canvasApp',
   path: '/app/canvas',
-  showOnHomePage: true,
+  showOnHomePage: false,
   category: FeatureCatalogueCategory.DATA,
 };
diff --git a/x-pack/plugins/canvas/public/plugin.tsx b/x-pack/plugins/canvas/public/plugin.tsx
index 0269774a446c1..b02fb9db28612 100644
--- a/x-pack/plugins/canvas/public/plugin.tsx
+++ b/x-pack/plugins/canvas/public/plugin.tsx
@@ -40,7 +40,7 @@ export { CoreStart, CoreSetup };
 export interface CanvasSetupDeps {
   data: DataPublicPluginSetup;
   expressions: ExpressionsSetup;
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
   usageCollection?: UsageCollectionSetup;
   bfetch: BfetchPublicSetup;
 }
@@ -116,7 +116,9 @@ export class CanvasPlugin
       },
     });
 
-    plugins.home.featureCatalogue.register(featureCatalogueEntry);
+    if (plugins.home) {
+      plugins.home.featureCatalogue.register(featureCatalogueEntry);
+    }
 
     canvasApi.addArgumentUIs(argTypeSpecs);
     canvasApi.addTransitions(transitions);
diff --git a/x-pack/plugins/enterprise_search/kibana.json b/x-pack/plugins/enterprise_search/kibana.json
index 9a2daefcd8c6e..063c7a6a1fa19 100644
--- a/x-pack/plugins/enterprise_search/kibana.json
+++ b/x-pack/plugins/enterprise_search/kibana.json
@@ -2,9 +2,10 @@
   "id": "enterpriseSearch",
   "version": "kibana",
   "kibanaVersion": "kibana",
-  "requiredPlugins": ["home", "features", "licensing"],
+  "requiredPlugins": ["features", "licensing"],
   "configPath": ["enterpriseSearch"],
-  "optionalPlugins": ["usageCollection", "security"],
+  "optionalPlugins": ["usageCollection", "security", "home"],
   "server": true,
-  "ui": true
+  "ui": true,
+  "requiredBundles": ["home"]
 }
diff --git a/x-pack/plugins/enterprise_search/public/plugin.ts b/x-pack/plugins/enterprise_search/public/plugin.ts
index 881fe02af5b09..1ce6bae8ff603 100644
--- a/x-pack/plugins/enterprise_search/public/plugin.ts
+++ b/x-pack/plugins/enterprise_search/public/plugin.ts
@@ -12,7 +12,7 @@ import {
   AppMountParameters,
   HttpSetup,
 } from 'src/core/public';
-
+import { i18n } from '@kbn/i18n';
 import {
   FeatureCatalogueCategory,
   HomePublicPluginSetup,
@@ -21,7 +21,11 @@ import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
 import { LicensingPluginSetup } from '../../licensing/public';
 
 import { IInitialAppData } from '../common/types';
-import { APP_SEARCH_PLUGIN, WORKPLACE_SEARCH_PLUGIN } from '../common/constants';
+import {
+  ENTERPRISE_SEARCH_PLUGIN,
+  APP_SEARCH_PLUGIN,
+  WORKPLACE_SEARCH_PLUGIN,
+} from '../common/constants';
 import { ExternalUrl, IExternalUrl } from './applications/shared/enterprise_search_url';
 import AppSearchLogo from './applications/app_search/assets/logo.svg';
 import WorkplaceSearchLogo from './applications/workplace_search/assets/logo.svg';
@@ -35,7 +39,7 @@ export interface ClientData extends IInitialAppData {
 }
 
 export interface PluginsSetup {
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
   licensing: LicensingPluginSetup;
 }
 
@@ -88,25 +92,48 @@ export class EnterpriseSearchPlugin implements Plugin {
       },
     });
 
-    plugins.home.featureCatalogue.register({
-      id: APP_SEARCH_PLUGIN.ID,
-      title: APP_SEARCH_PLUGIN.NAME,
-      icon: AppSearchLogo,
-      description: APP_SEARCH_PLUGIN.DESCRIPTION,
-      path: APP_SEARCH_PLUGIN.URL,
-      category: FeatureCatalogueCategory.DATA,
-      showOnHomePage: true,
-    });
-
-    plugins.home.featureCatalogue.register({
-      id: WORKPLACE_SEARCH_PLUGIN.ID,
-      title: WORKPLACE_SEARCH_PLUGIN.NAME,
-      icon: WorkplaceSearchLogo,
-      description: WORKPLACE_SEARCH_PLUGIN.DESCRIPTION,
-      path: WORKPLACE_SEARCH_PLUGIN.URL,
-      category: FeatureCatalogueCategory.DATA,
-      showOnHomePage: true,
-    });
+    if (plugins.home) {
+      plugins.home.featureCatalogue.registerSolution({
+        id: ENTERPRISE_SEARCH_PLUGIN.ID,
+        title: ENTERPRISE_SEARCH_PLUGIN.NAME,
+        subtitle: i18n.translate('xpack.enterpriseSearch.featureCatalogue.subtitle', {
+          defaultMessage: 'Search everything',
+        }),
+        icon: 'logoEnterpriseSearch',
+        descriptions: [
+          i18n.translate('xpack.enterpriseSearch.featureCatalogueDescription1', {
+            defaultMessage: 'Build a powerful search experience.',
+          }),
+          i18n.translate('xpack.enterpriseSearch.featureCatalogueDescription2', {
+            defaultMessage: 'Connect your users to relevant data.',
+          }),
+          i18n.translate('xpack.enterpriseSearch.featureCatalogueDescription3', {
+            defaultMessage: 'Unify your team content.',
+          }),
+        ],
+        path: APP_SEARCH_PLUGIN.URL, // TODO: Change this to enterprise search overview page once available
+      });
+
+      plugins.home.featureCatalogue.register({
+        id: APP_SEARCH_PLUGIN.ID,
+        title: APP_SEARCH_PLUGIN.NAME,
+        icon: AppSearchLogo,
+        description: APP_SEARCH_PLUGIN.DESCRIPTION,
+        path: APP_SEARCH_PLUGIN.URL,
+        category: FeatureCatalogueCategory.DATA,
+        showOnHomePage: false,
+      });
+
+      plugins.home.featureCatalogue.register({
+        id: WORKPLACE_SEARCH_PLUGIN.ID,
+        title: WORKPLACE_SEARCH_PLUGIN.NAME,
+        icon: WorkplaceSearchLogo,
+        description: WORKPLACE_SEARCH_PLUGIN.DESCRIPTION,
+        path: WORKPLACE_SEARCH_PLUGIN.URL,
+        category: FeatureCatalogueCategory.DATA,
+        showOnHomePage: false,
+      });
+    }
   }
 
   public start(core: CoreStart) {}
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
index 770ea8d420c20..a0d3a57eabb7a 100644
--- a/x-pack/plugins/enterprise_search/server/plugin.ts
+++ b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -75,7 +75,7 @@ export class EnterpriseSearchPlugin implements Plugin {
       icon: 'logoEnterpriseSearch',
       navLinkId: APP_SEARCH_PLUGIN.ID, // TODO - remove this once functional tests no longer rely on navLinkId
       app: ['kibana', APP_SEARCH_PLUGIN.ID, WORKPLACE_SEARCH_PLUGIN.ID],
-      catalogue: [APP_SEARCH_PLUGIN.ID, WORKPLACE_SEARCH_PLUGIN.ID],
+      catalogue: [ENTERPRISE_SEARCH_PLUGIN.ID, APP_SEARCH_PLUGIN.ID, WORKPLACE_SEARCH_PLUGIN.ID],
       privileges: null,
     });
 
@@ -93,6 +93,7 @@ export class EnterpriseSearchPlugin implements Plugin {
           workplaceSearch: hasWorkplaceSearchAccess,
         },
         catalogue: {
+          enterpriseSearch: hasAppSearchAccess || hasWorkplaceSearchAccess,
           appSearch: hasAppSearchAccess,
           workplaceSearch: hasWorkplaceSearchAccess,
         },
diff --git a/x-pack/plugins/graph/public/plugin.ts b/x-pack/plugins/graph/public/plugin.ts
index 5b2566ffab7c0..e452b74ab35e8 100644
--- a/x-pack/plugins/graph/public/plugin.ts
+++ b/x-pack/plugins/graph/public/plugin.ts
@@ -61,7 +61,7 @@ export class GraphPlugin
         }),
         icon: 'graphApp',
         path: '/app/graph',
-        showOnHomePage: true,
+        showOnHomePage: false,
         category: FeatureCatalogueCategory.DATA,
       });
     }
@@ -113,7 +113,8 @@ export class GraphPlugin
       throw new Error('Start called before setup');
     }
     this.licensing.license$.subscribe((license) => {
-      toggleNavLink(checkLicense(license), core.chrome.navLinks);
+      const licenseInformation = checkLicense(license);
+      toggleNavLink(licenseInformation, core.chrome.navLinks);
     });
   }
 
diff --git a/x-pack/plugins/index_lifecycle_management/kibana.json b/x-pack/plugins/index_lifecycle_management/kibana.json
index 1a9f133b846fb..f899287642786 100644
--- a/x-pack/plugins/index_lifecycle_management/kibana.json
+++ b/x-pack/plugins/index_lifecycle_management/kibana.json
@@ -4,18 +4,19 @@
   "server": true,
   "ui": true,
   "requiredPlugins": [
-    "home",
     "licensing",
     "management"
   ],
   "optionalPlugins": [
     "usageCollection",
-    "indexManagement"
+    "indexManagement",
+    "home"
   ],
   "configPath": ["xpack", "ilm"],
   "requiredBundles": [
     "indexManagement",
     "kibanaReact",
-    "esUiShared"
+    "esUiShared",
+    "home"
   ]
 }
diff --git a/x-pack/plugins/index_lifecycle_management/public/plugin.tsx b/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
index 0ca62c10f55f3..645a78bfc99b8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/plugin.tsx
@@ -4,8 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { i18n } from '@kbn/i18n';
 import { CoreSetup, PluginInitializerContext } from 'src/core/public';
-
+import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
 import { PLUGIN } from '../common/constants';
 import { init as initHttp } from './application/services/http';
 import { init as initDocumentation } from './application/services/documentation';
@@ -30,7 +31,7 @@ export class IndexLifecycleManagementPlugin {
         getStartServices,
       } = coreSetup;
 
-      const { usageCollection, management, indexManagement } = plugins;
+      const { usageCollection, management, indexManagement, home } = plugins;
 
       // Initialize services even if the app isn't mounted, because they're used by index management extensions.
       initHttp(http);
@@ -74,6 +75,24 @@ export class IndexLifecycleManagementPlugin {
         },
       });
 
+      if (home) {
+        home.featureCatalogue.register({
+          id: PLUGIN.ID,
+          title: i18n.translate('xpack.indexLifecycleMgmt.featureCatalogueTitle', {
+            defaultMessage: 'Manage index lifecycles',
+          }),
+          description: i18n.translate('xpack.indexLifecycleMgmt.featureCatalogueDescription', {
+            defaultMessage:
+              'Define lifecycle policies to automatically perform operations as an index ages.',
+          }),
+          icon: 'indexSettings',
+          path: '/app/management/data/index_lifecycle_management',
+          showOnHomePage: true,
+          category: FeatureCatalogueCategory.ADMIN,
+          order: 640,
+        });
+      }
+
       if (indexManagement) {
         addAllExtensions(indexManagement.extensionsService);
       }
diff --git a/x-pack/plugins/index_lifecycle_management/public/types.ts b/x-pack/plugins/index_lifecycle_management/public/types.ts
index 178884a7ee679..65db00f1e68c1 100644
--- a/x-pack/plugins/index_lifecycle_management/public/types.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/types.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
 import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 import { ManagementSetup } from '../../../../src/plugins/management/public';
 import { IndexManagementPluginSetup } from '../../index_management/public';
@@ -12,6 +13,7 @@ export interface PluginsDependencies {
   usageCollection?: UsageCollectionSetup;
   management: ManagementSetup;
   indexManagement?: IndexManagementPluginSetup;
+  home?: HomePublicPluginSetup;
 }
 
 export interface ClientConfigType {
diff --git a/x-pack/plugins/infra/kibana.json b/x-pack/plugins/infra/kibana.json
index 06394c2aa916c..08ffe520e53d5 100644
--- a/x-pack/plugins/infra/kibana.json
+++ b/x-pack/plugins/infra/kibana.json
@@ -6,14 +6,14 @@
     "features",
     "usageCollection",
     "spaces",
-    "home",
+    
     "data",
     "dataEnhanced",
     "visTypeTimeseries",
     "alerts",
     "triggers_actions_ui"
   ],
-  "optionalPlugins": ["ml", "observability"],
+  "optionalPlugins": ["ml", "observability", "home"],
   "server": true,
   "ui": true,
   "configPath": ["xpack", "infra"],
@@ -22,6 +22,7 @@
     "licenseManagement",
     "kibanaUtils",
     "kibanaReact",
-    "apm"
+    "apm",
+    "home"
   ]
 }
diff --git a/x-pack/plugins/infra/public/plugin.ts b/x-pack/plugins/infra/public/plugin.ts
index 2dda664a7f675..8a1264d254e40 100644
--- a/x-pack/plugins/infra/public/plugin.ts
+++ b/x-pack/plugins/infra/public/plugin.ts
@@ -25,7 +25,9 @@ export class Plugin implements InfraClientPluginClass {
   constructor(_context: PluginInitializerContext) {}
 
   setup(core: InfraClientCoreSetup, pluginsSetup: InfraClientSetupDeps) {
-    registerFeatures(pluginsSetup.home);
+    if (pluginsSetup.home) {
+      registerFeatures(pluginsSetup.home);
+    }
 
     pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(createInventoryMetricAlertType());
     pluginsSetup.triggers_actions_ui.alertTypeRegistry.register(getLogsAlertType());
diff --git a/x-pack/plugins/infra/public/register_feature.ts b/x-pack/plugins/infra/public/register_feature.ts
index 37217eaeaab2a..0e6e208df8a53 100644
--- a/x-pack/plugins/infra/public/register_feature.ts
+++ b/x-pack/plugins/infra/public/register_feature.ts
@@ -22,7 +22,7 @@ export const registerFeatures = (homePlugin: HomePublicPluginSetup) => {
     }),
     icon: 'metricsApp',
     path: `/app/metrics`,
-    showOnHomePage: true,
+    showOnHomePage: false,
     category: FeatureCatalogueCategory.DATA,
   });
 
@@ -37,7 +37,7 @@ export const registerFeatures = (homePlugin: HomePublicPluginSetup) => {
     }),
     icon: 'logsApp',
     path: `/app/logs`,
-    showOnHomePage: true,
+    showOnHomePage: false,
     category: FeatureCatalogueCategory.DATA,
   });
 };
diff --git a/x-pack/plugins/infra/public/types.ts b/x-pack/plugins/infra/public/types.ts
index a1494a023201f..20a276dbb4f41 100644
--- a/x-pack/plugins/infra/public/types.ts
+++ b/x-pack/plugins/infra/public/types.ts
@@ -25,7 +25,7 @@ export type InfraClientStartExports = void;
 
 export interface InfraClientSetupDeps {
   dataEnhanced: DataEnhancedSetup;
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
   observability: ObservabilityPluginSetup;
   triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
   usageCollection: UsageCollectionSetup;
diff --git a/x-pack/plugins/infra/server/features.ts b/x-pack/plugins/infra/server/features.ts
index 3e32cebf19ac2..b75e831ac875c 100644
--- a/x-pack/plugins/infra/server/features.ts
+++ b/x-pack/plugins/infra/server/features.ts
@@ -18,7 +18,7 @@ export const METRICS_FEATURE = {
   icon: 'metricsApp',
   navLinkId: 'metrics',
   app: ['infra', 'metrics', 'kibana'],
-  catalogue: ['infraops'],
+  catalogue: ['infraops', 'metrics'],
   management: {
     insightsAndAlerting: ['triggersActions'],
   },
@@ -26,7 +26,7 @@ export const METRICS_FEATURE = {
   privileges: {
     all: {
       app: ['infra', 'metrics', 'kibana'],
-      catalogue: ['infraops'],
+      catalogue: ['infraops', 'metrics'],
       api: ['infra'],
       savedObject: {
         all: ['infrastructure-ui-source'],
@@ -42,7 +42,7 @@ export const METRICS_FEATURE = {
     },
     read: {
       app: ['infra', 'metrics', 'kibana'],
-      catalogue: ['infraops'],
+      catalogue: ['infraops', 'metrics'],
       api: ['infra'],
       savedObject: {
         all: [],
@@ -68,12 +68,12 @@ export const LOGS_FEATURE = {
   icon: 'logsApp',
   navLinkId: 'logs',
   app: ['infra', 'logs', 'kibana'],
-  catalogue: ['infralogging'],
+  catalogue: ['infralogging', 'logs'],
   alerting: [LOG_DOCUMENT_COUNT_ALERT_TYPE_ID],
   privileges: {
     all: {
       app: ['infra', 'logs', 'kibana'],
-      catalogue: ['infralogging'],
+      catalogue: ['infralogging', 'logs'],
       api: ['infra'],
       savedObject: {
         all: ['infrastructure-ui-source'],
@@ -86,7 +86,7 @@ export const LOGS_FEATURE = {
     },
     read: {
       app: ['infra', 'logs', 'kibana'],
-      catalogue: ['infralogging'],
+      catalogue: ['infralogging', 'logs'],
       api: ['infra'],
       alerting: {
         all: [LOG_DOCUMENT_COUNT_ALERT_TYPE_ID],
diff --git a/x-pack/plugins/ingest_manager/kibana.json b/x-pack/plugins/ingest_manager/kibana.json
index ab0a2ba24ba66..3a47da9fee01f 100644
--- a/x-pack/plugins/ingest_manager/kibana.json
+++ b/x-pack/plugins/ingest_manager/kibana.json
@@ -7,5 +7,5 @@
   "requiredPlugins": ["licensing", "data", "encryptedSavedObjects"],
   "optionalPlugins": ["security", "features", "cloud", "usageCollection", "home"],
   "extraPublicDirs": ["common"],
-  "requiredBundles": ["kibanaReact", "esUiShared"]
+  "requiredBundles": ["kibanaReact", "esUiShared", "home"]
 }
diff --git a/x-pack/plugins/ingest_manager/public/plugin.ts b/x-pack/plugins/ingest_manager/public/plugin.ts
index a8cc7b72eb17f..9f4aa2e18000d 100644
--- a/x-pack/plugins/ingest_manager/public/plugin.ts
+++ b/x-pack/plugins/ingest_manager/public/plugin.ts
@@ -13,9 +13,13 @@ import {
 import { i18n } from '@kbn/i18n';
 import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
 import { DataPublicPluginSetup, DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
+import {
+  HomePublicPluginSetup,
+  FeatureCatalogueCategory,
+} from '../../../../src/plugins/home/public';
 import { LicensingPluginSetup } from '../../licensing/public';
 import { PLUGIN_ID, CheckPermissionsResponse, PostIngestSetupResponse } from '../common';
+import { BASE_PATH } from './applications/ingest_manager/constants';
 
 import { IngestManagerConfigType } from '../common/types';
 import { setupRouteService, appRoutesService } from '../common';
@@ -95,6 +99,21 @@ export class IngestManagerPlugin
       deps.home.tutorials.registerDirectoryNotice(PLUGIN_ID, TutorialDirectoryNotice);
       deps.home.tutorials.registerDirectoryHeaderLink(PLUGIN_ID, TutorialDirectoryHeaderLink);
       deps.home.tutorials.registerModuleNotice(PLUGIN_ID, TutorialModuleNotice);
+
+      deps.home.featureCatalogue.register({
+        id: 'ingestManager',
+        title: i18n.translate('xpack.ingestManager.featureCatalogueTitle', {
+          defaultMessage: 'Add Elastic Agent',
+        }),
+        description: i18n.translate('xpack.ingestManager.featureCatalogueDescription', {
+          defaultMessage: 'Add and manage your fleet of Elastic Agents and integrations.',
+        }),
+        icon: 'indexManagementApp',
+        showOnHomePage: true,
+        path: BASE_PATH,
+        category: FeatureCatalogueCategory.DATA,
+        order: 510,
+      });
     }
 
     return {};
diff --git a/x-pack/plugins/ingest_manager/server/plugin.ts b/x-pack/plugins/ingest_manager/server/plugin.ts
index ce1659176faaf..4321dca7102a1 100644
--- a/x-pack/plugins/ingest_manager/server/plugin.ts
+++ b/x-pack/plugins/ingest_manager/server/plugin.ts
@@ -179,10 +179,12 @@ export class IngestManagerPlugin
         icon: 'savedObjectsApp',
         navLinkId: PLUGIN_ID,
         app: [PLUGIN_ID, 'kibana'],
+        catalogue: ['ingestManager'],
         privileges: {
           all: {
             api: [`${PLUGIN_ID}-read`, `${PLUGIN_ID}-all`],
             app: [PLUGIN_ID, 'kibana'],
+            catalogue: ['ingestManager'],
             savedObject: {
               all: allSavedObjectTypes,
               read: [],
@@ -192,6 +194,7 @@ export class IngestManagerPlugin
           read: {
             api: [`${PLUGIN_ID}-read`],
             app: [PLUGIN_ID, 'kibana'],
+            catalogue: ['ingestManager'], // TODO: check if this is actually available to read user
             savedObject: {
               all: [],
               read: allSavedObjectTypes,
diff --git a/x-pack/plugins/logstash/public/plugin.ts b/x-pack/plugins/logstash/public/plugin.ts
index 59f92ee0a7ffc..3cd73d90bdd16 100644
--- a/x-pack/plugins/logstash/public/plugin.ts
+++ b/x-pack/plugins/logstash/public/plugin.ts
@@ -70,7 +70,7 @@ export class LogstashPlugin implements Plugin<void, void, SetupDeps> {
             }),
             icon: 'pipelineApp',
             path: '/app/management/ingest/pipelines',
-            showOnHomePage: true,
+            showOnHomePage: false,
             category: FeatureCatalogueCategory.ADMIN,
           });
         });
diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json
index d554d159a196f..b30c155d43cbe 100644
--- a/x-pack/plugins/maps/kibana.json
+++ b/x-pack/plugins/maps/kibana.json
@@ -7,7 +7,6 @@
     "licensing",
     "features",
     "inspector",
-    "home",
     "data",
     "fileUpload",
     "uiActions",
@@ -18,12 +17,14 @@
     "usageCollection",
     "share"
   ],
+  "optionalPlugins": ["home"],
   "ui": true,
   "server": true,
   "extraPublicDirs": ["common/constants"],
   "requiredBundles": [
     "kibanaReact",
     "kibanaUtils",
-    "savedObjects"
+    "savedObjects",
+    "home"
   ]
 }
diff --git a/x-pack/plugins/maps/public/feature_catalogue_entry.ts b/x-pack/plugins/maps/public/feature_catalogue_entry.ts
index 6c2579bd3e4e2..ca71101864fda 100644
--- a/x-pack/plugins/maps/public/feature_catalogue_entry.ts
+++ b/x-pack/plugins/maps/public/feature_catalogue_entry.ts
@@ -12,10 +12,10 @@ export const featureCatalogueEntry = {
   id: APP_ID,
   title: getAppTitle(),
   description: i18n.translate('xpack.maps.feature.appDescription', {
-    defaultMessage: 'Explore geospatial data from Elasticsearch and the Elastic Maps Service',
+    defaultMessage: 'Explore geospatial data from Elasticsearch and the Elastic Maps Service.',
   }),
   icon: APP_ICON,
   path: '/app/maps',
-  showOnHomePage: true,
+  showOnHomePage: false,
   category: FeatureCatalogueCategory.DATA,
 };
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index 9bb79f2937c68..e03a085e9bc88 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -51,7 +51,7 @@ import { StartContract as FileUploadStartContract } from '../../file_upload/publ
 
 export interface MapsPluginSetupDependencies {
   inspector: InspectorSetupContract;
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
   visualizations: VisualizationsSetup;
   embeddable: EmbeddableSetup;
   mapsLegacy: { config: MapsLegacyConfigType };
@@ -108,7 +108,9 @@ export class MapsPlugin
     );
 
     plugins.inspector.registerView(MapView);
-    plugins.home.featureCatalogue.register(featureCatalogueEntry);
+    if (plugins.home) {
+      plugins.home.featureCatalogue.register(featureCatalogueEntry);
+    }
     plugins.visualizations.registerAlias(
       getMapsVisTypeAlias(plugins.visualizations, config.showMapVisualizationTypes)
     );
diff --git a/x-pack/plugins/ml/common/types/capabilities.ts b/x-pack/plugins/ml/common/types/capabilities.ts
index 58a2043502d27..8f29365fdca1b 100644
--- a/x-pack/plugins/ml/common/types/capabilities.ts
+++ b/x-pack/plugins/ml/common/types/capabilities.ts
@@ -91,6 +91,7 @@ export function getPluginPrivileges() {
     admin: {
       ...privilege,
       api: allMlCapabilitiesKeys.map((k) => `ml:${k}`),
+      catalogue: [PLUGIN_ID, `${PLUGIN_ID}_file_data_visualizer`],
       ui: allMlCapabilitiesKeys,
       savedObject: {
         all: savedObjects,
@@ -100,6 +101,7 @@ export function getPluginPrivileges() {
     user: {
       ...privilege,
       api: userMlCapabilitiesKeys.map((k) => `ml:${k}`),
+      catalogue: [PLUGIN_ID],
       ui: userMlCapabilitiesKeys,
       savedObject: {
         all: [],
diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
index 7b4ea5458f4a6..fc673397ef177 100644
--- a/x-pack/plugins/ml/kibana.json
+++ b/x-pack/plugins/ml/kibana.json
@@ -10,7 +10,6 @@
     "data",
     "cloud",
     "features",
-    "home",
     "licensing",
     "usageCollection",
     "share",
@@ -20,6 +19,7 @@
     "indexPatternManagement"
   ],
   "optionalPlugins": [
+    "home",
     "security",
     "spaces",
     "management",
@@ -32,6 +32,7 @@
     "kibanaUtils",
     "kibanaReact",
     "dashboard",
-    "savedObjects"
+    "savedObjects",
+    "home"
   ]
 }
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index ff59d46de758d..4f8ceb8effe98 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -50,7 +50,7 @@ export interface MlSetupDependencies {
   management?: ManagementSetup;
   usageCollection: UsageCollectionSetup;
   licenseManagement?: LicenseManagementUIPluginSetup;
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
   embeddable: EmbeddableSetup;
   uiActions: UiActionsSetup;
   kibanaVersion: string;
@@ -111,7 +111,9 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
       const [coreStart] = await core.getStartServices();
       if (isMlEnabled(license)) {
         // add ML to home page
-        registerFeature(pluginsSetup.home);
+        if (pluginsSetup.home) {
+          registerFeature(pluginsSetup.home);
+        }
 
         // register ML for the index pattern management no data screen.
         pluginsSetup.indexPatternManagement.environment.update({
diff --git a/x-pack/plugins/ml/public/register_feature.ts b/x-pack/plugins/ml/public/register_feature.ts
index ca60de612c3d5..942e9b7f33a40 100644
--- a/x-pack/plugins/ml/public/register_feature.ts
+++ b/x-pack/plugins/ml/public/register_feature.ts
@@ -6,8 +6,8 @@
 
 import { i18n } from '@kbn/i18n';
 import {
-  HomePublicPluginSetup,
   FeatureCatalogueCategory,
+  HomePublicPluginSetup,
 } from '../../../../src/plugins/home/public';
 import { PLUGIN_ID } from '../common/constants/app';
 
@@ -28,7 +28,22 @@ export const registerFeature = (home: HomePublicPluginSetup) => {
     }),
     icon: 'machineLearningApp',
     path: '/app/ml',
+    showOnHomePage: false,
+    category: FeatureCatalogueCategory.DATA,
+  });
+
+  home.featureCatalogue.register({
+    id: `${PLUGIN_ID}_file_data_visualizer`,
+    title: i18n.translate('xpack.ml.fileDataVisualizerTitle', {
+      defaultMessage: 'Upload a file',
+    }),
+    description: i18n.translate('xpack.ml.fileDataVisualizerDescription', {
+      defaultMessage: 'Import your own CSV, NDJSON, or log file.',
+    }),
+    icon: 'document',
+    path: '/app/ml#/filedatavisualizer',
     showOnHomePage: true,
     category: FeatureCatalogueCategory.DATA,
+    order: 520,
   });
 };
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
index f6d47639ef7c5..76128341e6ddc 100644
--- a/x-pack/plugins/ml/server/plugin.ts
+++ b/x-pack/plugins/ml/server/plugin.ts
@@ -87,7 +87,7 @@ export class MlServerPlugin implements Plugin<MlPluginSetup, MlPluginStart, Plug
       order: 500,
       navLinkId: PLUGIN_ID,
       app: [PLUGIN_ID, 'kibana'],
-      catalogue: [PLUGIN_ID],
+      catalogue: [PLUGIN_ID, `${PLUGIN_ID}_file_data_visualizer`],
       management: {
         insightsAndAlerting: ['jobsListLink'],
       },
diff --git a/x-pack/plugins/monitoring/public/plugin.ts b/x-pack/plugins/monitoring/public/plugin.ts
index 88b36b9572fc7..05aa75f586241 100644
--- a/x-pack/plugins/monitoring/public/plugin.ts
+++ b/x-pack/plugins/monitoring/public/plugin.ts
@@ -54,14 +54,17 @@ export class MonitoringPlugin
     if (home) {
       home.featureCatalogue.register({
         id,
-        title,
+        title: i18n.translate('xpack.monitoring.featureCatalogueTitle', {
+          defaultMessage: 'Monitor the stack',
+        }),
         icon,
         path: '/app/monitoring',
         showOnHomePage: true,
         category: FeatureCatalogueCategory.ADMIN,
-        description: i18n.translate('xpack.monitoring.monitoringDescription', {
-          defaultMessage: 'Track the real-time health and performance of your Elastic Stack.',
+        description: i18n.translate('xpack.monitoring.featureCatalogueDescription', {
+          defaultMessage: 'Track the real-time health and performance of your deployment.',
         }),
+        order: 610,
       });
     }
 
diff --git a/x-pack/plugins/observability/kibana.json b/x-pack/plugins/observability/kibana.json
index 2a04a35830a47..834982009b9d0 100644
--- a/x-pack/plugins/observability/kibana.json
+++ b/x-pack/plugins/observability/kibana.json
@@ -7,7 +7,8 @@
     "observability"
   ],
   "optionalPlugins": [
-    "licensing"
+    "licensing",
+    "home"
   ],
   "ui": true,
   "server": true,
diff --git a/x-pack/plugins/observability/public/plugin.ts b/x-pack/plugins/observability/public/plugin.ts
index 335ce897dce7b..aead711f2d73e 100644
--- a/x-pack/plugins/observability/public/plugin.ts
+++ b/x-pack/plugins/observability/public/plugin.ts
@@ -3,6 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
+import { i18n } from '@kbn/i18n';
 import {
   AppMountParameters,
   CoreSetup,
@@ -11,6 +13,7 @@ import {
   PluginInitializerContext,
   CoreStart,
 } from '../../../../src/core/public';
+import { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
 import { registerDataHandler } from './data_handler';
 import { toggleOverviewLinkInNav } from './toggle_overview_link_in_nav';
 
@@ -18,12 +21,16 @@ export interface ObservabilityPluginSetup {
   dashboard: { register: typeof registerDataHandler };
 }
 
+interface SetupPlugins {
+  home?: HomePublicPluginSetup;
+}
+
 export type ObservabilityPluginStart = void;
 
 export class Plugin implements PluginClass<ObservabilityPluginSetup, ObservabilityPluginStart> {
   constructor(context: PluginInitializerContext) {}
 
-  public setup(core: CoreSetup) {
+  public setup(core: CoreSetup, plugins: SetupPlugins) {
     core.application.register({
       id: 'observability-overview',
       title: 'Overview',
@@ -41,6 +48,32 @@ export class Plugin implements PluginClass<ObservabilityPluginSetup, Observabili
       },
     });
 
+    if (plugins.home) {
+      plugins.home.featureCatalogue.registerSolution({
+        id: 'observability',
+        title: i18n.translate('xpack.observability.featureCatalogueTitle', {
+          defaultMessage: 'Observability',
+        }),
+        subtitle: i18n.translate('xpack.observability.featureCatalogueSubtitle', {
+          defaultMessage: 'Centralize & monitor',
+        }),
+        descriptions: [
+          i18n.translate('xpack.observability.featureCatalogueDescription1', {
+            defaultMessage: 'Monitor infrastructure metrics.',
+          }),
+          i18n.translate('xpack.observability.featureCatalogueDescription2', {
+            defaultMessage: 'Trace application requests.',
+          }),
+          i18n.translate('xpack.observability.featureCatalogueDescription3', {
+            defaultMessage: 'Measure SLAs and react to issues.',
+          }),
+        ],
+        icon: 'logoObservability',
+        path: '/app/observability',
+        order: 200,
+      });
+    }
+
     return {
       dashboard: { register: registerDataHandler },
     };
diff --git a/x-pack/plugins/painless_lab/public/plugin.tsx b/x-pack/plugins/painless_lab/public/plugin.tsx
index a5e88c8eb7fde..6401276203faa 100644
--- a/x-pack/plugins/painless_lab/public/plugin.tsx
+++ b/x-pack/plugins/painless_lab/public/plugin.tsx
@@ -39,7 +39,7 @@ export class PainlessLabUIPlugin implements Plugin<void, void, PluginDependencie
       description: i18n.translate('xpack.painlessLab.registryProviderDescription', {
         defaultMessage: 'Simulate and debug painless code.',
       }),
-      icon: '',
+      icon: 'empty',
       path: '/app/dev_tools#/painless_lab',
       showOnHomePage: false,
       category: FeatureCatalogueCategory.ADMIN,
diff --git a/x-pack/plugins/rollup/public/plugin.ts b/x-pack/plugins/rollup/public/plugin.ts
index 49545f090d923..f42878ffac501 100644
--- a/x-pack/plugins/rollup/public/plugin.ts
+++ b/x-pack/plugins/rollup/public/plugin.ts
@@ -70,7 +70,7 @@ export class RollupPlugin implements Plugin {
         }),
         icon: 'indexRollupApp',
         path: `/app/management/data/rollup_jobs/job_list`,
-        showOnHomePage: true,
+        showOnHomePage: false,
         category: FeatureCatalogueCategory.ADMIN,
       });
     }
diff --git a/x-pack/plugins/security/public/plugin.tsx b/x-pack/plugins/security/public/plugin.tsx
index c9afb9d4c1fb7..e3905dc2acf45 100644
--- a/x-pack/plugins/security/public/plugin.tsx
+++ b/x-pack/plugins/security/public/plugin.tsx
@@ -116,16 +116,16 @@ export class SecurityPlugin
       home.featureCatalogue.register({
         id: 'security',
         title: i18n.translate('xpack.security.registerFeature.securitySettingsTitle', {
-          defaultMessage: 'Security Settings',
+          defaultMessage: 'Manage permissions',
         }),
         description: i18n.translate('xpack.security.registerFeature.securitySettingsDescription', {
-          defaultMessage:
-            'Protect your data and easily manage who has access to what with users and roles.',
+          defaultMessage: 'Control who has access and what tasks they can perform.',
         }),
         icon: 'securityApp',
-        path: '/app/management/security/users',
+        path: '/app/management/security/roles',
         showOnHomePage: true,
         category: FeatureCatalogueCategory.ADMIN,
+        order: 600,
       });
     }
 
diff --git a/x-pack/plugins/security_solution/cypress/screens/kibana_navigation.ts b/x-pack/plugins/security_solution/cypress/screens/kibana_navigation.ts
index 68352c6e584cc..6127d22110e78 100644
--- a/x-pack/plugins/security_solution/cypress/screens/kibana_navigation.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/kibana_navigation.ts
@@ -5,19 +5,22 @@
  */
 
 export const DETECTIONS_PAGE =
-  '[data-test-subj="collapsibleNavGroup-security"] [title="Detections"]';
+  '[data-test-subj="collapsibleNavGroup-securitySolution"] [title="Detections"]';
 
-export const CASES_PAGE = '[data-test-subj="collapsibleNavGroup-security"] [title="Cases"]';
+export const CASES_PAGE = '[data-test-subj="collapsibleNavGroup-securitySolution"] [title="Cases"]';
 
-export const HOSTS_PAGE = '[data-test-subj="collapsibleNavGroup-security"] [title="Hosts"]';
+export const HOSTS_PAGE = '[data-test-subj="collapsibleNavGroup-securitySolution"] [title="Hosts"]';
 
 export const KIBANA_NAVIGATION_TOGGLE = '[data-test-subj="toggleNavButton"]';
 
 export const ADMINISTRATION_PAGE =
-  '[data-test-subj="collapsibleNavGroup-security"] [title="Administration"]';
+  '[data-test-subj="collapsibleNavGroup-securitySolution"] [title="Administration"]';
 
-export const NETWORK_PAGE = '[data-test-subj="collapsibleNavGroup-security"] [title="Network"]';
+export const NETWORK_PAGE =
+  '[data-test-subj="collapsibleNavGroup-securitySolution"] [title="Network"]';
 
-export const OVERVIEW_PAGE = '[data-test-subj="collapsibleNavGroup-security"] [title="Overview"]';
+export const OVERVIEW_PAGE =
+  '[data-test-subj="collapsibleNavGroup-securitySolution"] [title="Overview"]';
 
-export const TIMELINES_PAGE = '[data-test-subj="collapsibleNavGroup-security"] [title="Timelines"]';
+export const TIMELINES_PAGE =
+  '[data-test-subj="collapsibleNavGroup-securitySolution"] [title="Timelines"]';
diff --git a/x-pack/plugins/security_solution/cypress/tasks/login.ts b/x-pack/plugins/security_solution/cypress/tasks/login.ts
index f46d2c65c565f..40bea852cd59c 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/login.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/login.ts
@@ -126,7 +126,7 @@ const loginViaConfig = () => {
 
 /**
  * Authenticates with Kibana, visits the specified `url`, and waits for the
- * Kibana logo to be displayed before continuing
+ * Kibana global nav to be displayed before continuing
  */
 export const loginAndWaitForPage = (url: string) => {
   login();
@@ -134,12 +134,12 @@ export const loginAndWaitForPage = (url: string) => {
   cy.visit(
     `${url}?timerange=(global:(linkTo:!(timeline),timerange:(from:1547914976217,fromStr:'2019-01-19T16:22:56.217Z',kind:relative,to:1579537385745,toStr:now)),timeline:(linkTo:!(global),timerange:(from:1547914976217,fromStr:'2019-01-19T16:22:56.217Z',kind:relative,to:1579537385745,toStr:now)))`
   );
-  cy.contains('a', 'Security');
+  cy.get('#headerGlobalNav');
 };
 
 export const loginAndWaitForPageWithoutDateRange = (url: string) => {
   login();
   cy.viewport('macbook-15');
   cy.visit(url);
-  cy.contains('a', 'Security', { timeout: 120000 });
+  cy.get('#headerGlobalNav', { timeout: 120000 });
 };
diff --git a/x-pack/plugins/security_solution/kibana.json b/x-pack/plugins/security_solution/kibana.json
index 92fc93453b9f1..7b5c3b5337c02 100644
--- a/x-pack/plugins/security_solution/kibana.json
+++ b/x-pack/plugins/security_solution/kibana.json
@@ -11,7 +11,6 @@
     "dataEnhanced",
     "embeddable",
     "features",
-    "home",
     "taskManager",
     "inspector",
     "licensing",
@@ -27,7 +26,8 @@
     "security",
     "spaces",
     "usageCollection",
-    "lists"
+    "lists",
+    "home"
   ],
   "server": true,
   "ui": true,
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
index a691dd98e7081..1017cbb6a2c61 100644
--- a/x-pack/plugins/security_solution/public/plugin.tsx
+++ b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -19,7 +19,6 @@ import {
   AppNavLinkStatus,
 } from '../../../../src/core/public';
 import { Storage } from '../../../../src/plugins/kibana_utils/public';
-import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
 import { initTelemetry } from './common/lib/telemetry';
 import { KibanaServices } from './common/lib/kibana/services';
 import { jiraActionType, resilientActionType } from './common/lib/connectors';
@@ -67,21 +66,35 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
   }
 
   public setup(core: CoreSetup<StartPlugins, PluginStart>, plugins: SetupPlugins): PluginSetup {
+    const APP_NAME = i18n.translate('xpack.securitySolution.security.title', {
+      defaultMessage: 'Security',
+    });
+
     initTelemetry(plugins.usageCollection, APP_ID);
 
-    plugins.home.featureCatalogue.register({
-      id: APP_ID,
-      title: i18n.translate('xpack.securitySolution.featureCatalogue.title', {
-        defaultMessage: 'Security',
-      }),
-      description: i18n.translate('xpack.securitySolution.featureCatalogue.description', {
-        defaultMessage: 'Explore security metrics and logs for events and alerts',
-      }),
-      icon: APP_ICON,
-      path: APP_OVERVIEW_PATH,
-      showOnHomePage: true,
-      category: FeatureCatalogueCategory.DATA,
-    });
+    if (plugins.home) {
+      plugins.home.featureCatalogue.registerSolution({
+        id: APP_ID,
+        title: APP_NAME,
+        subtitle: i18n.translate('xpack.securitySolution.featureCatalogue.subtitle', {
+          defaultMessage: 'SIEM & Endpoint Security',
+        }),
+        descriptions: [
+          i18n.translate('xpack.securitySolution.featureCatalogueDescription1', {
+            defaultMessage: 'Prevent threats autonomously.',
+          }),
+          i18n.translate('xpack.securitySolution.featureCatalogueDescription2', {
+            defaultMessage: 'Detect and respond.',
+          }),
+          i18n.translate('xpack.securitySolution.featureCatalogueDescription3', {
+            defaultMessage: 'Investigate incidents.',
+          }),
+        ],
+        icon: 'logoSecurity',
+        path: APP_OVERVIEW_PATH,
+        order: 300,
+      });
+    }
 
     plugins.triggers_actions_ui.actionTypeRegistry.register(jiraActionType());
     plugins.triggers_actions_ui.actionTypeRegistry.register(resilientActionType());
@@ -105,9 +118,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     core.application.register({
       exactRoute: true,
       id: APP_ID,
-      title: i18n.translate('xpack.securitySolution.security.title', {
-        defaultMessage: 'Security',
-      }),
+      title: APP_NAME,
       appRoute: APP_PATH,
       navLinkStatus: AppNavLinkStatus.hidden,
       mount: async () => {
diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
index fd1ff566a7719..d2b66207d8602 100644
--- a/x-pack/plugins/security_solution/public/types.ts
+++ b/x-pack/plugins/security_solution/public/types.ts
@@ -24,7 +24,7 @@ import { AppFrontendLibs } from './common/lib/lib';
 import { ResolverPluginSetup } from './resolver/types';
 
 export interface SetupPlugins {
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
   security: SecurityPluginSetup;
   triggers_actions_ui: TriggersActionsSetup;
   usageCollection?: UsageCollectionSetup;
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index 25ca89ce9186e..1f08210aa41f3 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -44,7 +44,6 @@ import { createConfig$, ConfigType } from './config';
 import { initUiSettings } from './ui_settings';
 import {
   APP_ID,
-  APP_ICON,
   SERVER_APP_ID,
   SecurityPageName,
   SIGNALS_ID,
@@ -175,7 +174,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
         defaultMessage: 'Security',
       }),
       order: 1100,
-      icon: APP_ICON,
+      icon: 'logoSecurity',
       navLinkId: APP_ID,
       app: [...securitySubPlugins, 'kibana'],
       catalogue: ['securitySolution'],
diff --git a/x-pack/plugins/snapshot_restore/kibana.json b/x-pack/plugins/snapshot_restore/kibana.json
index 92f3e27d6d5b8..e0a29581ea076 100644
--- a/x-pack/plugins/snapshot_restore/kibana.json
+++ b/x-pack/plugins/snapshot_restore/kibana.json
@@ -4,18 +4,19 @@
   "server": true,
   "ui": true,
   "requiredPlugins": [
-    "home",
     "licensing",
     "management"
   ],
   "optionalPlugins": [
     "usageCollection",
     "security",
-    "cloud"
+    "cloud",
+    "home"
   ],
   "configPath": ["xpack", "snapshot_restore"],
   "requiredBundles": [
     "esUiShared",
-    "kibanaReact"
+    "kibanaReact",
+    "home"
   ]
 }
diff --git a/x-pack/plugins/snapshot_restore/public/plugin.ts b/x-pack/plugins/snapshot_restore/public/plugin.ts
index b864e70708652..510fc33dd8024 100644
--- a/x-pack/plugins/snapshot_restore/public/plugin.ts
+++ b/x-pack/plugins/snapshot_restore/public/plugin.ts
@@ -8,6 +8,10 @@ import { CoreSetup, PluginInitializerContext } from 'src/core/public';
 
 import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public';
 import { ManagementSetup } from '../../../../src/plugins/management/public';
+import {
+  FeatureCatalogueCategory,
+  HomePublicPluginSetup,
+} from '../../../../src/plugins/home/public';
 import { PLUGIN } from '../common/constants';
 
 import { ClientConfigType } from './types';
@@ -20,6 +24,7 @@ import { UIM_APP_NAME } from './application/constants';
 interface PluginsDependencies {
   usageCollection: UsageCollectionSetup;
   management: ManagementSetup;
+  home?: HomePublicPluginSetup;
 }
 
 export class SnapshotRestoreUIPlugin {
@@ -33,7 +38,7 @@ export class SnapshotRestoreUIPlugin {
   public setup(coreSetup: CoreSetup, plugins: PluginsDependencies): void {
     const config = this.initializerContext.config.get<ClientConfigType>();
     const { http } = coreSetup;
-    const { management, usageCollection } = plugins;
+    const { home, management, usageCollection } = plugins;
 
     // Initialize services
     this.uiMetricService.setup(usageCollection);
@@ -54,6 +59,24 @@ export class SnapshotRestoreUIPlugin {
         return await mountManagementSection(coreSetup, services, config, params);
       },
     });
+
+    if (home) {
+      home.featureCatalogue.register({
+        id: PLUGIN.id,
+        title: i18n.translate('xpack.snapshotRestore.featureCatalogueTitle', {
+          defaultMessage: 'Back up and restore',
+        }),
+        description: i18n.translate('xpack.snapshotRestore.featureCatalogueDescription', {
+          defaultMessage:
+            'Save snapshots to a backup repository, and restore to recover index and cluster state.',
+        }),
+        icon: 'storage',
+        path: '/app/management/data/snapshot_restore',
+        showOnHomePage: true,
+        category: FeatureCatalogueCategory.ADMIN,
+        order: 630,
+      });
+    }
   }
 
   public start() {}
diff --git a/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts b/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts
index 15d141ccc328e..c18a8279ce321 100644
--- a/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts
+++ b/x-pack/plugins/spaces/public/create_feature_catalogue_entry.ts
@@ -20,7 +20,7 @@ export const createSpacesFeatureCatalogueEntry = (): FeatureCatalogueEntry => {
     description: getSpacesFeatureDescription(),
     icon: 'spacesApp',
     path: '/app/management/kibana/spaces',
-    showOnHomePage: true,
+    showOnHomePage: false,
     category: FeatureCatalogueCategory.ADMIN,
   };
 };
diff --git a/x-pack/plugins/spaces/public/plugin.test.ts b/x-pack/plugins/spaces/public/plugin.test.ts
index d8eecb9c7e606..c1282aef8b343 100644
--- a/x-pack/plugins/spaces/public/plugin.test.ts
+++ b/x-pack/plugins/spaces/public/plugin.test.ts
@@ -57,7 +57,7 @@ describe('Spaces plugin', () => {
           category: 'admin',
           icon: 'spacesApp',
           id: 'spaces',
-          showOnHomePage: true,
+          showOnHomePage: false,
         })
       );
     });
diff --git a/x-pack/plugins/transform/public/register_feature.ts b/x-pack/plugins/transform/public/register_feature.ts
index 796fa370dab25..4ed16824cc3a6 100644
--- a/x-pack/plugins/transform/public/register_feature.ts
+++ b/x-pack/plugins/transform/public/register_feature.ts
@@ -23,7 +23,7 @@ export const registerFeature = (home: HomePublicPluginSetup) => {
     }),
     icon: 'managementApp', // there is currently no Transforms icon, so using the general management app icon
     path: '/app/management/data/transform',
-    showOnHomePage: true,
+    showOnHomePage: false,
     category: FeatureCatalogueCategory.ADMIN,
   });
 };
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 0b51c00475d7e..92cc35e9e78ca 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1651,26 +1651,6 @@
     "expressions.functions.varset.name.help": "変数の名前を指定",
     "expressions.functions.varset.val.help": "変数の値を指定指定がない場合、インプットコンテキストが使用されます",
     "expressions.types.number.fromStringConversionErrorMessage": "\"{string}\" ストリンクを数字に変換できません",
-    "home.addData.apm.addApmButtonLabel": "APM を追加",
-    "home.addData.apm.nameDescription": "APM は、集約内から自動的に詳細なパフォーマンスメトリックやエラーを収集します。",
-    "home.addData.apm.nameTitle": "APM",
-    "home.addData.logging.addLogDataButtonLabel": "ログデータを追加",
-    "home.addData.logging.nameDescription": "頻繁に使用するデータソースからログを投入し、構成済みのダッシュボードで簡単に可視化できます。",
-    "home.addData.logging.nameTitle": "ログ",
-    "home.addData.metrics.addMetricsDataButtonLabel": "メトリックデータを追加",
-    "home.addData.metrics.nameDescription": "サーバーのオペレーティングシステムと実行中のサービスからメトリックを収集します。",
-    "home.addData.metrics.nameTitle": "メトリック",
-    "home.addData.sampleDataLink": "データセットと Kibana ダッシュボードを読み込む",
-    "home.addData.sampleDataTitle": "サンプルデータの追加",
-    "home.addData.securitySolution.addSecurityEventsButtonLabel": "イベントを追加",
-    "home.addData.securitySolution.nameDescription": "即利用可能なビジュアライゼーションで、セキュリティイベントをまとめてインタラクティブな調査を可能にします。",
-    "home.addData.securitySolution.nameTitle": "セキュリティ",
-    "home.addData.title.observability": "オブザーバビリティ",
-    "home.addData.title.security": "セキュリティ",
-    "home.addData.uploadFileLink": "CSV、NDJSON、またはログファイルをインポート",
-    "home.addData.uploadFileTitle": "ログファイルからデータをアップロード",
-    "home.addData.yourDataLink": "Elasticsearch インデックスに接続",
-    "home.addData.yourDataTitle": "Elasticsearch データの使用",
     "home.breadcrumbs.addDataTitle": "データの追加",
     "home.breadcrumbs.homeTitle": "ホーム",
     "home.dataManagementDisableCollection": " 収集を停止するには、] ",
@@ -1679,10 +1659,6 @@
     "home.dataManagementDisclaimerPrivacyLink": "プライバシーポリシーをご覧ください。",
     "home.dataManagementEnableCollection": " 収集を開始するには、 ",
     "home.dataManagementEnableCollectionLink": "ここで使用状況データを有効にします。",
-    "home.directories.manage.nameTitle": "Elastic Stack の管理",
-    "home.directories.notFound.description": "お探しのものが見つかりませんでしたか？",
-    "home.directories.notFound.viewFullButtonLabel": "Kibana プラグインの完全なディレクトリを表示",
-    "home.directories.visualize.nameTitle": "データの可視化と閲覧",
     "home.directory.directoryTitle": "ディレクトリ",
     "home.directory.tabs.administrativeTitle": "管理",
     "home.directory.tabs.allTitle": "すべて",
@@ -2405,7 +2381,6 @@
     "home.tutorials.zookeeperMetrics.longDescription": "「{moduleName}」Metricbeat モジュールは、Zookeeper サーバーから内部メトリックを取得します。 [詳細]({learnMoreLink})。",
     "home.tutorials.zookeeperMetrics.nameTitle": "Zookeeper メトリック",
     "home.tutorials.zookeeperMetrics.shortDescription": "Zookeeper サーバーから内部メトリックを取得します。",
-    "home.welcomeHomePageHeader": "Kibana ホーム",
     "home.welcomeTitle": "Elasticへようこそ",
     "indexPatternManagement.actions.cancelButton": "キャンセル",
     "indexPatternManagement.actions.createButton": "フィールドを作成",
@@ -13892,7 +13867,6 @@
     "xpack.monitoring.metrics.logstashInstance.systemLoad.last1MinuteLabel": "1m",
     "xpack.monitoring.metrics.logstashInstance.systemLoad.last5MinutesDescription": "過去 5 分間の平均負荷です。",
     "xpack.monitoring.metrics.logstashInstance.systemLoad.last5MinutesLabel": "5m",
-    "xpack.monitoring.monitoringDescription": "Elastic Stack のリアルタイムのヘルスとパフォーマンスをトラッキングします。",
     "xpack.monitoring.monLabel": "月",
     "xpack.monitoring.noData.blurbs.changesNeededDescription": "監視を実行するには、次の手順に従います",
     "xpack.monitoring.noData.blurbs.changesNeededTitle": "調整が必要です",
@@ -16471,8 +16445,6 @@
     "xpack.securitySolution.exceptions.viewer.fetchingListError": "例外の取得エラー",
     "xpack.securitySolution.exceptions.viewer.searchDefaultPlaceholder": "検索フィールド（例：host.name）",
     "xpack.securitySolution.exitFullScreenButton": "全画面を終了",
-    "xpack.securitySolution.featureCatalogue.description": "セキュリティメトリクスとログのイベントとアラートを確認します",
-    "xpack.securitySolution.featureCatalogue.title": "セキュリティ",
     "xpack.securitySolution.featureRegistry.linkSecuritySolutionTitle": "セキュリティ",
     "xpack.securitySolution.fieldBrowser.categoriesCountTitle": "{totalCount} {totalCount, plural, =1 {カテゴリ} other {カテゴリ}}",
     "xpack.securitySolution.fieldBrowser.categoriesTitle": "カテゴリー",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index d520f63fe7484..59d0e63ef2d4a 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1652,26 +1652,6 @@
     "expressions.functions.varset.name.help": "指定变量的名称",
     "expressions.functions.varset.val.help": "为变量指定值。如果未提供，将使用输入上下文",
     "expressions.types.number.fromStringConversionErrorMessage": "无法将“{string}”字符串的类型转换为数字",
-    "home.addData.apm.addApmButtonLabel": "添加 APM",
-    "home.addData.apm.nameDescription": "APM 自动从您的应用程序内收集深入全面的性能指标和错误。",
-    "home.addData.apm.nameTitle": "APM",
-    "home.addData.logging.addLogDataButtonLabel": "添加日志数据",
-    "home.addData.logging.nameDescription": "从常见的数据源采集日志，并在预配置的仪表板中轻松实现可视化。",
-    "home.addData.logging.nameTitle": "日志",
-    "home.addData.metrics.addMetricsDataButtonLabel": "添加指标数据",
-    "home.addData.metrics.nameDescription": "从您的服务器上运行的操作系统和服务收集指标。",
-    "home.addData.metrics.nameTitle": "指标",
-    "home.addData.sampleDataLink": "加载数据集和 Kibana 仪表板",
-    "home.addData.sampleDataTitle": "添加样例数据",
-    "home.addData.securitySolution.addSecurityEventsButtonLabel": "添加事件",
-    "home.addData.securitySolution.nameDescription": "集中安全事件，以通过即用型可视化实现交互式调查。",
-    "home.addData.securitySolution.nameTitle": "安全",
-    "home.addData.title.observability": "可观测性",
-    "home.addData.title.security": "安全",
-    "home.addData.uploadFileLink": "导入 CSV、NDJSON 或日志文件",
-    "home.addData.uploadFileTitle": "从日志文件上传数据",
-    "home.addData.yourDataLink": "连接到您的 Elasticsearch 索引",
-    "home.addData.yourDataTitle": "使用 Elasticsearch 数据",
     "home.breadcrumbs.addDataTitle": "添加数据",
     "home.breadcrumbs.homeTitle": "主页",
     "home.dataManagementDisableCollection": " 要停止收集， ",
@@ -1680,10 +1660,6 @@
     "home.dataManagementDisclaimerPrivacyLink": "隐私声明。",
     "home.dataManagementEnableCollection": " 要启动收集， ",
     "home.dataManagementEnableCollectionLink": "请在此处启用使用情况数据。",
-    "home.directories.manage.nameTitle": "管理 Elastic Stack",
-    "home.directories.notFound.description": "未找到要寻找的内容？",
-    "home.directories.notFound.viewFullButtonLabel": "查看 Kibana 插件的完整目录",
-    "home.directories.visualize.nameTitle": "可视化和浏览数据",
     "home.directory.directoryTitle": "目录",
     "home.directory.tabs.administrativeTitle": "管理",
     "home.directory.tabs.allTitle": "全部",
@@ -2406,7 +2382,6 @@
     "home.tutorials.zookeeperMetrics.longDescription": "Metricbeat 模块 `{moduleName}` 从 Zookeeper 服务器提取内部指标。[了解详情]({learnMoreLink})。",
     "home.tutorials.zookeeperMetrics.nameTitle": "Zookeeper 指标",
     "home.tutorials.zookeeperMetrics.shortDescription": "从 Zookeeper 服务器提取内部指标。",
-    "home.welcomeHomePageHeader": "Kibana 主页",
     "home.welcomeTitle": "欢迎使用 Elastic",
     "indexPatternManagement.actions.cancelButton": "取消",
     "indexPatternManagement.actions.createButton": "创建字段",
@@ -13898,7 +13873,6 @@
     "xpack.monitoring.metrics.logstashInstance.systemLoad.last1MinuteLabel": "1 分钟",
     "xpack.monitoring.metrics.logstashInstance.systemLoad.last5MinutesDescription": "过去 5 分钟的负载平均值。",
     "xpack.monitoring.metrics.logstashInstance.systemLoad.last5MinutesLabel": "5 分钟",
-    "xpack.monitoring.monitoringDescription": "跟踪 Elastic Stack 的实时运行状况和性能。",
     "xpack.monitoring.monLabel": "周一",
     "xpack.monitoring.noData.blurbs.changesNeededDescription": "要运行 Monitoring，请执行以下步骤",
     "xpack.monitoring.noData.blurbs.changesNeededTitle": "您需要做些调整",
@@ -16478,8 +16452,6 @@
     "xpack.securitySolution.exceptions.viewer.fetchingListError": "提取例外时出错",
     "xpack.securitySolution.exceptions.viewer.searchDefaultPlaceholder": "搜索字段（例如：host.name）",
     "xpack.securitySolution.exitFullScreenButton": "退出全屏",
-    "xpack.securitySolution.featureCatalogue.description": "浏览安全指标和日志以了解事件和告警",
-    "xpack.securitySolution.featureCatalogue.title": "安全",
     "xpack.securitySolution.featureRegistry.linkSecuritySolutionTitle": "安全",
     "xpack.securitySolution.fieldBrowser.categoriesCountTitle": "{totalCount} 个{totalCount, plural, =1 {类别} other {类别}}",
     "xpack.securitySolution.fieldBrowser.categoriesTitle": "类别",
diff --git a/x-pack/plugins/uptime/public/apps/plugin.ts b/x-pack/plugins/uptime/public/apps/plugin.ts
index cf750434ab324..9f7907ec39187 100644
--- a/x-pack/plugins/uptime/public/apps/plugin.ts
+++ b/x-pack/plugins/uptime/public/apps/plugin.ts
@@ -12,7 +12,6 @@ import {
   AppMountParameters,
 } from 'kibana/public';
 import { DEFAULT_APP_CATEGORIES } from '../../../../../src/core/public';
-
 import {
   FeatureCatalogueCategory,
   HomePublicPluginSetup,
@@ -32,7 +31,7 @@ import { PLUGIN } from '../../common/constants/plugin';
 
 export interface ClientPluginsSetup {
   data: DataPublicPluginSetup;
-  home: HomePublicPluginSetup;
+  home?: HomePublicPluginSetup;
   observability: ObservabilityPluginSetup;
   triggers_actions_ui: TriggersAndActionsUIPublicPluginSetup;
 }
@@ -61,7 +60,7 @@ export class UptimePlugin
         description: PLUGIN.DESCRIPTION,
         icon: 'uptimeApp',
         path: '/app/uptime#/',
-        showOnHomePage: true,
+        showOnHomePage: false,
         category: FeatureCatalogueCategory.DATA,
       });
     }
diff --git a/x-pack/plugins/watcher/public/plugin.ts b/x-pack/plugins/watcher/public/plugin.ts
index 98b49af15019b..0b552613ad1d7 100644
--- a/x-pack/plugins/watcher/public/plugin.ts
+++ b/x-pack/plugins/watcher/public/plugin.ts
@@ -105,7 +105,6 @@ export class WatcherUIPlugin implements Plugin<void, void, Dependencies, any> {
       // which is a less frustrating UX.
       if (valid) {
         watcherESApp.enable();
-        watcherHome.showOnHomePage = true;
       } else {
         watcherESApp.disable();
       }
diff --git a/x-pack/test/accessibility/apps/home.ts b/x-pack/test/accessibility/apps/home.ts
index 6018c4da2ddff..a03050bd76a71 100644
--- a/x-pack/test/accessibility/apps/home.ts
+++ b/x-pack/test/accessibility/apps/home.ts
@@ -55,7 +55,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     // Extra clickon logo step here will be removed after preceding test is fixed.
     it('click on Add logs panel to open all log examples page meets a11y requirements ', async () => {
       await PageObjects.home.clickOnLogo();
-      await PageObjects.home.ClickOnLogsData();
+      await PageObjects.home.clickOnAddData();
       await a11y.testAppSnapshot();
     });
 
diff --git a/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts b/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts
index 0d5c553a786fa..d9c27d67ae329 100644
--- a/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts
+++ b/x-pack/test/ui_capabilities/security_and_spaces/tests/catalogue.ts
@@ -38,7 +38,10 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
             // everything except ml and monitoring is enabled
             const expected = mapValues(
               uiCapabilities.value!.catalogue,
-              (enabled, catalogueId) => catalogueId !== 'ml' && catalogueId !== 'monitoring'
+              (enabled, catalogueId) =>
+                catalogueId !== 'ml' &&
+                catalogueId !== 'ml_file_data_visualizer' &&
+                catalogueId !== 'monitoring'
             );
             expect(uiCapabilities.value!.catalogue).to.eql(expected);
             break;
@@ -50,7 +53,14 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
             expect(uiCapabilities.success).to.be(true);
             expect(uiCapabilities.value).to.have.property('catalogue');
             // everything except ml and monitoring and enterprise search is enabled
-            const exceptions = ['ml', 'monitoring', 'appSearch', 'workplaceSearch'];
+            const exceptions = [
+              'ml',
+              'ml_file_data_visualizer',
+              'monitoring',
+              'enterpriseSearch',
+              'appSearch',
+              'workplaceSearch',
+            ];
             const expected = mapValues(
               uiCapabilities.value!.catalogue,
               (enabled, catalogueId) => !exceptions.includes(catalogueId)
diff --git a/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts b/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts
index 9ed1c890bf57f..7852167fcc1cb 100644
--- a/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts
+++ b/x-pack/test/ui_capabilities/security_only/tests/catalogue.ts
@@ -38,7 +38,10 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
             // everything except ml and monitoring is enabled
             const expected = mapValues(
               uiCapabilities.value!.catalogue,
-              (enabled, catalogueId) => catalogueId !== 'ml' && catalogueId !== 'monitoring'
+              (enabled, catalogueId) =>
+                catalogueId !== 'ml' &&
+                catalogueId !== 'ml_file_data_visualizer' &&
+                catalogueId !== 'monitoring'
             );
             expect(uiCapabilities.value!.catalogue).to.eql(expected);
             break;
@@ -48,7 +51,14 @@ export default function catalogueTests({ getService }: FtrProviderContext) {
             expect(uiCapabilities.success).to.be(true);
             expect(uiCapabilities.value).to.have.property('catalogue');
             // everything except ml and monitoring and enterprise search is enabled
-            const exceptions = ['ml', 'monitoring', 'appSearch', 'workplaceSearch'];
+            const exceptions = [
+              'ml',
+              'ml_file_data_visualizer',
+              'monitoring',
+              'enterpriseSearch',
+              'appSearch',
+              'workplaceSearch',
+            ];
             const expected = mapValues(
               uiCapabilities.value!.catalogue,
               (enabled, catalogueId) => !exceptions.includes(catalogueId)

From 9873df8ee0ee88584db70debc3316126ba3205af Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Wed, 26 Aug 2020 16:02:37 -0400
Subject: [PATCH 072/148] [SECURITY_SOLUTION][ENDPOINT] Trusted Apps List API
 (#75476)

* Trusted Apps initial setup for route registration

* Added types for TrustedApp entries

* trusted apps list API returns results

* use methods and const from latest PR merge to lists

* a quick generator for trusted apps entries

* support cli options for trusted app data loader

* Add mocked `createTrustedAppsList()` method to `ExceptionListClientMock`

* tests fro trusted apps route handlers

* tests for trusted apps schema

* Correct name of mock method

* Fix service to ensure return value of `getExceptionList` service throws if service not available

* Fix types

* Refactor TrustedApp type + code review feedback
---
 .../response/exception_list_schema.mock.ts    |  14 +++
 .../exception_list_client.mock.ts             |   6 +-
 .../common/endpoint/constants.ts              |   2 +
 .../endpoint/schema/trusted_apps.test.ts      |  71 ++++++++++++
 .../common/endpoint/schema/trusted_apps.ts    |  14 +++
 .../endpoint/{types.ts => types/index.ts}     |   6 +-
 .../common/endpoint/types/trusted_apps.ts     |  52 +++++++++
 .../scripts/endpoint/load_trusted_apps.js     |   9 ++
 .../scripts/endpoint/trusted_apps/index.ts    |  91 +++++++++++++++
 .../endpoint/endpoint_app_context_services.ts |  11 ++
 .../server/endpoint/mocks.ts                  |   2 +
 .../endpoint/routes/trusted_apps/handlers.ts  |  49 ++++++++
 .../endpoint/routes/trusted_apps/index.ts     |  26 +++++
 .../routes/trusted_apps/trusted_apps.test.ts  | 108 ++++++++++++++++++
 .../endpoint/routes/trusted_apps/utils.ts     |  42 +++++++
 .../security_solution/server/plugin.ts        |   3 +
 16 files changed, 503 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.test.ts
 create mode 100644 x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
 rename x-pack/plugins/security_solution/common/endpoint/{types.ts => types/index.ts} (99%)
 create mode 100644 x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
 create mode 100755 x-pack/plugins/security_solution/scripts/endpoint/load_trusted_apps.js
 create mode 100644 x-pack/plugins/security_solution/scripts/endpoint/trusted_apps/index.ts
 create mode 100644 x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/handlers.ts
 create mode 100644 x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/index.ts
 create mode 100644 x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/trusted_apps.test.ts
 create mode 100644 x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/utils.ts

diff --git a/x-pack/plugins/lists/common/schemas/response/exception_list_schema.mock.ts b/x-pack/plugins/lists/common/schemas/response/exception_list_schema.mock.ts
index e2f0a7c06b400..6df051e83b97c 100644
--- a/x-pack/plugins/lists/common/schemas/response/exception_list_schema.mock.ts
+++ b/x-pack/plugins/lists/common/schemas/response/exception_list_schema.mock.ts
@@ -19,6 +19,11 @@ import {
   _VERSION,
 } from '../../constants.mock';
 import { ENDPOINT_LIST_ID } from '../..';
+import {
+  ENDPOINT_TRUSTED_APPS_LIST_DESCRIPTION,
+  ENDPOINT_TRUSTED_APPS_LIST_ID,
+  ENDPOINT_TRUSTED_APPS_LIST_NAME,
+} from '../../constants';
 
 import { ExceptionListSchema } from './exception_list_schema';
 
@@ -42,6 +47,15 @@ export const getExceptionListSchemaMock = (): ExceptionListSchema => ({
   version: VERSION,
 });
 
+export const getTrustedAppsListSchemaMock = (): ExceptionListSchema => {
+  return {
+    ...getExceptionListSchemaMock(),
+    description: ENDPOINT_TRUSTED_APPS_LIST_DESCRIPTION,
+    list_id: ENDPOINT_TRUSTED_APPS_LIST_ID,
+    name: ENDPOINT_TRUSTED_APPS_LIST_NAME,
+  };
+};
+
 /**
  * This is useful for end to end tests where we remove the auto generated parts for comparisons
  * such as created_at, updated_at, and id.
diff --git a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
index d0e238f8c5c40..4354c735747be 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
@@ -9,7 +9,10 @@ import { savedObjectsClientMock } from 'src/core/server/mocks';
 import { getFoundExceptionListSchemaMock } from '../../../common/schemas/response/found_exception_list_schema.mock';
 import { getFoundExceptionListItemSchemaMock } from '../../../common/schemas/response/found_exception_list_item_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
-import { getExceptionListSchemaMock } from '../../../common/schemas/response/exception_list_schema.mock';
+import {
+  getExceptionListSchemaMock,
+  getTrustedAppsListSchemaMock,
+} from '../../../common/schemas/response/exception_list_schema.mock';
 
 import { ExceptionListClient } from './exception_list_client';
 
@@ -24,6 +27,7 @@ export class ExceptionListClientMock extends ExceptionListClient {
   public deleteExceptionListItem = jest.fn().mockResolvedValue(getExceptionListItemSchemaMock());
   public findExceptionListItem = jest.fn().mockResolvedValue(getFoundExceptionListItemSchemaMock());
   public findExceptionList = jest.fn().mockResolvedValue(getFoundExceptionListSchemaMock());
+  public createTrustedAppsList = jest.fn().mockResolvedValue(getTrustedAppsListSchemaMock());
 }
 
 export const getExceptionListClientMock = (): ExceptionListClient => {
diff --git a/x-pack/plugins/security_solution/common/endpoint/constants.ts b/x-pack/plugins/security_solution/common/endpoint/constants.ts
index 6ea0c36328eed..507ce63c7b815 100644
--- a/x-pack/plugins/security_solution/common/endpoint/constants.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/constants.ts
@@ -11,3 +11,5 @@ export const policyIndexPattern = 'metrics-endpoint.policy-*';
 export const telemetryIndexPattern = 'metrics-endpoint.telemetry-*';
 export const LIMITED_CONCURRENCY_ENDPOINT_ROUTE_TAG = 'endpoint:limited-concurrency';
 export const LIMITED_CONCURRENCY_ENDPOINT_COUNT = 100;
+
+export const TRUSTED_APPS_LIST_API = '/api/endpoint/trusted_apps';
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.test.ts b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.test.ts
new file mode 100644
index 0000000000000..7aec8e15c317c
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.test.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { GetTrustedAppsRequestSchema } from './trusted_apps';
+
+describe('When invoking Trusted Apps Schema', () => {
+  describe('for GET List', () => {
+    const getListQueryParams = (page: unknown = 1, perPage: unknown = 20) => ({
+      page,
+      per_page: perPage,
+    });
+    const query = GetTrustedAppsRequestSchema.query;
+
+    describe('query param validation', () => {
+      it('should return query params if valid', () => {
+        expect(query.validate(getListQueryParams())).toEqual({
+          page: 1,
+          per_page: 20,
+        });
+      });
+
+      it('should use default values', () => {
+        expect(query.validate(getListQueryParams(undefined, undefined))).toEqual({
+          page: 1,
+          per_page: 20,
+        });
+        expect(query.validate(getListQueryParams(undefined, 100))).toEqual({
+          page: 1,
+          per_page: 100,
+        });
+        expect(query.validate(getListQueryParams(10, undefined))).toEqual({
+          page: 10,
+          per_page: 20,
+        });
+      });
+
+      it('should throw if `page` param is not a number', () => {
+        expect(() => {
+          query.validate(getListQueryParams('one'));
+        }).toThrowError();
+      });
+
+      it('should throw if `page` param is less than 1', () => {
+        expect(() => {
+          query.validate(getListQueryParams(0));
+        }).toThrowError();
+        expect(() => {
+          query.validate(getListQueryParams(-1));
+        }).toThrowError();
+      });
+
+      it('should throw if `per_page` param is not a number', () => {
+        expect(() => {
+          query.validate(getListQueryParams(1, 'twenty'));
+        }).toThrowError();
+      });
+
+      it('should throw if `per_page` param is less than 1', () => {
+        expect(() => {
+          query.validate(getListQueryParams(1, 0));
+        }).toThrowError();
+        expect(() => {
+          query.validate(getListQueryParams(1, -1));
+        }).toThrowError();
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
new file mode 100644
index 0000000000000..20fab93aaf304
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+export const GetTrustedAppsRequestSchema = {
+  query: schema.object({
+    page: schema.maybe(schema.number({ defaultValue: 1, min: 1 })),
+    per_page: schema.maybe(schema.number({ defaultValue: 20, min: 1 })),
+  }),
+};
diff --git a/x-pack/plugins/security_solution/common/endpoint/types.ts b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
similarity index 99%
rename from x-pack/plugins/security_solution/common/endpoint/types.ts
rename to x-pack/plugins/security_solution/common/endpoint/types/index.ts
index 2b8de7ed16b08..8e507cbc921a2 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -5,8 +5,10 @@
  */
 
 import { ApplicationStart } from 'kibana/public';
-import { NewPackagePolicy, PackagePolicy } from '../../../ingest_manager/common';
-import { ManifestSchema } from './schema/manifest';
+import { NewPackagePolicy, PackagePolicy } from '../../../../ingest_manager/common';
+import { ManifestSchema } from '../schema/manifest';
+
+export * from './trusted_apps';
 
 /**
  * Supported React-Router state for the Policy Details page
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts b/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
new file mode 100644
index 0000000000000..2905274bef1cb
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { TypeOf } from '@kbn/config-schema';
+import { GetTrustedAppsRequestSchema } from '../schema/trusted_apps';
+
+/** API request params for retrieving a list of Trusted Apps */
+export type GetTrustedAppsListRequest = TypeOf<typeof GetTrustedAppsRequestSchema.query>;
+export interface GetTrustedListAppsResponse {
+  per_page: number;
+  page: number;
+  total: number;
+  data: TrustedApp[];
+}
+
+interface MacosLinuxConditionEntry {
+  field: 'hash' | 'path';
+  type: 'match';
+  operator: 'included';
+  value: string;
+}
+
+type WindowsConditionEntry =
+  | MacosLinuxConditionEntry
+  | (Omit<MacosLinuxConditionEntry, 'field'> & {
+      field: 'signer';
+    });
+
+/** Type for a new Trusted App Entry */
+export type NewTrustedApp = {
+  name: string;
+  description?: string;
+} & (
+  | {
+      os: 'linux' | 'macos';
+      entries: MacosLinuxConditionEntry[];
+    }
+  | {
+      os: 'windows';
+      entries: WindowsConditionEntry[];
+    }
+);
+
+/** A trusted app entry */
+export type TrustedApp = NewTrustedApp & {
+  id: string;
+  created_at: string;
+  created_by: string;
+};
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/load_trusted_apps.js b/x-pack/plugins/security_solution/scripts/endpoint/load_trusted_apps.js
new file mode 100755
index 0000000000000..872639dd9fb7e
--- /dev/null
+++ b/x-pack/plugins/security_solution/scripts/endpoint/load_trusted_apps.js
@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+require('../../../../../src/setup_node_env');
+require('./trusted_apps').cli();
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/trusted_apps/index.ts b/x-pack/plugins/security_solution/scripts/endpoint/trusted_apps/index.ts
new file mode 100644
index 0000000000000..3bd27259ad80c
--- /dev/null
+++ b/x-pack/plugins/security_solution/scripts/endpoint/trusted_apps/index.ts
@@ -0,0 +1,91 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { v4 as generateUUID } from 'uuid';
+// @ts-ignore
+import minimist from 'minimist';
+import { KbnClient, ToolingLog } from '@kbn/dev-utils';
+import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '../../../../lists/common/constants';
+import { TRUSTED_APPS_LIST_API } from '../../../common/endpoint/constants';
+import { ExceptionListItemSchema } from '../../../../lists/common/schemas/response';
+
+interface RunOptions {
+  count?: number;
+}
+
+const logger = new ToolingLog({ level: 'info', writeTo: process.stdout });
+const separator = '----------------------------------------';
+
+export const cli = async () => {
+  const options: RunOptions = minimist(process.argv.slice(2), {
+    default: {
+      count: 10,
+    },
+  });
+  logger.write(`${separator}
+Loading ${options.count} Trusted App Entries`);
+  await run(options);
+  logger.write(`Done!
+${separator}`);
+};
+
+export const run: (options?: RunOptions) => Promise<ExceptionListItemSchema[]> = async ({
+  count = 10,
+}: RunOptions = {}) => {
+  const kbnClient = new KbnClient(logger, { url: 'http://elastic:changeme@localhost:5601' });
+
+  // touch the Trusted Apps List so it can be created
+  await kbnClient.request({
+    method: 'GET',
+    path: TRUSTED_APPS_LIST_API,
+  });
+
+  return Promise.all(
+    Array.from({ length: count }, () => {
+      return kbnClient
+        .request({
+          method: 'POST',
+          path: '/api/exception_lists/items',
+          body: generateTrustedAppEntry(),
+        })
+        .then<ExceptionListItemSchema>((item) => (item as unknown) as ExceptionListItemSchema);
+    })
+  );
+};
+
+interface GenerateTrustedAppEntryOptions {
+  os?: 'windows' | 'macos' | 'linux';
+  name?: string;
+}
+
+const generateTrustedAppEntry: (options?: GenerateTrustedAppEntryOptions) => object = ({
+  os = 'windows',
+  name = `Sample Endpoint Trusted App Entry ${Date.now()}`,
+} = {}) => {
+  return {
+    list_id: ENDPOINT_TRUSTED_APPS_LIST_ID,
+    item_id: `generator_endpoint_trusted_apps_${generateUUID()}`,
+    _tags: ['endpoint', `os:${os}`],
+    tags: ['user added string for a tag', 'malware'],
+    type: 'simple',
+    description: 'This is a sample agnostic endpoint trusted app entry',
+    name,
+    namespace_type: 'agnostic',
+    entries: [
+      {
+        field: 'actingProcess.file.signer',
+        operator: 'included',
+        type: 'match',
+        value: 'Elastic, N.V.',
+      },
+      {
+        field: 'actingProcess.file.path',
+        operator: 'included',
+        type: 'match',
+        value: '/one/two/three',
+      },
+    ],
+  };
+};
diff --git a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
index 0ec0db9f32776..6a8d56ff41a04 100644
--- a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
@@ -12,10 +12,12 @@ import {
 import { AgentService, IngestManagerStartContract } from '../../../ingest_manager/server';
 import { getPackagePolicyCreateCallback } from './ingest_integration';
 import { ManifestManager } from './services/artifacts';
+import { ExceptionListClient } from '../../../lists/server';
 
 export type EndpointAppContextServiceStartContract = Partial<
   Pick<IngestManagerStartContract, 'agentService'>
 > & {
+  exceptionsListService: ExceptionListClient;
   logger: Logger;
   manifestManager?: ManifestManager;
   registerIngestCallback?: IngestManagerStartContract['registerExternalCallback'];
@@ -30,9 +32,11 @@ export class EndpointAppContextService {
   private agentService: AgentService | undefined;
   private manifestManager: ManifestManager | undefined;
   private savedObjectsStart: SavedObjectsServiceStart | undefined;
+  private exceptionsListService: ExceptionListClient | undefined;
 
   public start(dependencies: EndpointAppContextServiceStartContract) {
     this.agentService = dependencies.agentService;
+    this.exceptionsListService = dependencies.exceptionsListService;
     this.manifestManager = dependencies.manifestManager;
     this.savedObjectsStart = dependencies.savedObjectsStart;
 
@@ -50,6 +54,13 @@ export class EndpointAppContextService {
     return this.agentService;
   }
 
+  public getExceptionsList() {
+    if (!this.exceptionsListService) {
+      throw new Error('exceptionsListService not set');
+    }
+    return this.exceptionsListService;
+  }
+
   public getManifestManager(): ManifestManager | undefined {
     return this.manifestManager;
   }
diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
index b5f35a198fa9e..03754c7be7a5d 100644
--- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
@@ -21,6 +21,7 @@ import {
 import { ManifestManager } from './services/artifacts/manifest_manager/manifest_manager';
 import { getManifestManagerMock } from './services/artifacts/manifest_manager/manifest_manager.mock';
 import { EndpointAppContext } from './types';
+import { listMock } from '../../../lists/server/mocks';
 
 /**
  * Creates a mocked EndpointAppContext.
@@ -58,6 +59,7 @@ export const createMockEndpointAppContextServiceStartContract = (): jest.Mocked<
 > => {
   return {
     agentService: createMockAgentService(),
+    exceptionsListService: listMock.getExceptionListClient(),
     logger: loggingSystemMock.create().get('mock_endpoint_app_context'),
     savedObjectsStart: savedObjectsServiceMock.createStartContract(),
     manifestManager: getManifestManagerMock(),
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/handlers.ts b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/handlers.ts
new file mode 100644
index 0000000000000..6c29a2244c203
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/handlers.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RequestHandler } from 'kibana/server';
+import {
+  GetTrustedAppsListRequest,
+  GetTrustedListAppsResponse,
+} from '../../../../common/endpoint/types';
+import { EndpointAppContext } from '../../types';
+import { exceptionItemToTrustedAppItem } from './utils';
+import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '../../../../../lists/common/constants';
+
+export const getTrustedAppsListRouteHandler = (
+  endpointAppContext: EndpointAppContext
+): RequestHandler<undefined, GetTrustedAppsListRequest> => {
+  const logger = endpointAppContext.logFactory.get('trusted_apps');
+
+  return async (context, req, res) => {
+    const exceptionsListService = endpointAppContext.service.getExceptionsList();
+    const { page, per_page: perPage } = req.query;
+
+    try {
+      // Ensure list is created if it does not exist
+      await exceptionsListService?.createTrustedAppsList();
+      const results = await exceptionsListService.findExceptionListItem({
+        listId: ENDPOINT_TRUSTED_APPS_LIST_ID,
+        page,
+        perPage,
+        filter: undefined,
+        namespaceType: 'agnostic',
+        sortField: 'name',
+        sortOrder: 'asc',
+      });
+      const body: GetTrustedListAppsResponse = {
+        data: results?.data.map(exceptionItemToTrustedAppItem) ?? [],
+        total: results?.total ?? 0,
+        page: results?.page ?? 1,
+        per_page: results?.per_page ?? perPage!,
+      };
+      return res.ok({ body });
+    } catch (error) {
+      logger.error(error);
+      return res.internalError({ body: error });
+    }
+  };
+};
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/index.ts b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/index.ts
new file mode 100644
index 0000000000000..178aa06eee877
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/index.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IRouter } from 'kibana/server';
+import { GetTrustedAppsRequestSchema } from '../../../../common/endpoint/schema/trusted_apps';
+import { TRUSTED_APPS_LIST_API } from '../../../../common/endpoint/constants';
+import { getTrustedAppsListRouteHandler } from './handlers';
+import { EndpointAppContext } from '../../types';
+
+export const registerTrustedAppsRoutes = (
+  router: IRouter,
+  endpointAppContext: EndpointAppContext
+) => {
+  // GET list
+  router.get(
+    {
+      path: TRUSTED_APPS_LIST_API,
+      validate: GetTrustedAppsRequestSchema,
+      options: { authRequired: true },
+    },
+    getTrustedAppsListRouteHandler(endpointAppContext)
+  );
+};
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/trusted_apps.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/trusted_apps.test.ts
new file mode 100644
index 0000000000000..1d4a7919b89f5
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/trusted_apps.test.ts
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EndpointAppContextService } from '../../endpoint_app_context_services';
+import {
+  createMockEndpointAppContext,
+  createMockEndpointAppContextServiceStartContract,
+} from '../../mocks';
+import { IRouter, RequestHandler } from 'kibana/server';
+import { httpServerMock, httpServiceMock } from '../../../../../../../src/core/server/mocks';
+import { registerTrustedAppsRoutes } from './index';
+import { TRUSTED_APPS_LIST_API } from '../../../../common/endpoint/constants';
+import { GetTrustedAppsListRequest } from '../../../../common/endpoint/types';
+import { xpackMocks } from '../../../../../../mocks';
+import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '../../../../../lists/common/constants';
+import { EndpointAppContext } from '../../types';
+import { ExceptionListClient } from '../../../../../lists/server';
+
+describe('when invoking endpoint trusted apps route handlers', () => {
+  let routerMock: jest.Mocked<IRouter>;
+  let endpointAppContextService: EndpointAppContextService;
+  let context: ReturnType<typeof xpackMocks.createRequestHandlerContext>;
+  let response: ReturnType<typeof httpServerMock.createResponseFactory>;
+  let exceptionsListClient: jest.Mocked<ExceptionListClient>;
+  let endpointAppContext: EndpointAppContext;
+
+  beforeEach(() => {
+    routerMock = httpServiceMock.createRouter();
+    endpointAppContextService = new EndpointAppContextService();
+    const startContract = createMockEndpointAppContextServiceStartContract();
+    exceptionsListClient = startContract.exceptionsListService as jest.Mocked<ExceptionListClient>;
+    endpointAppContextService.start(startContract);
+    endpointAppContext = {
+      ...createMockEndpointAppContext(),
+      service: endpointAppContextService,
+    };
+    registerTrustedAppsRoutes(routerMock, endpointAppContext);
+
+    // For use in individual API calls
+    context = xpackMocks.createRequestHandlerContext();
+    response = httpServerMock.createResponseFactory();
+  });
+
+  describe('when fetching list of trusted apps', () => {
+    let routeHandler: RequestHandler<undefined, GetTrustedAppsListRequest>;
+    const createListRequest = (page: number = 1, perPage: number = 20) => {
+      return httpServerMock.createKibanaRequest<undefined, GetTrustedAppsListRequest>({
+        path: TRUSTED_APPS_LIST_API,
+        method: 'get',
+        query: {
+          page,
+          per_page: perPage,
+        },
+      });
+    };
+
+    beforeEach(() => {
+      // Get the registered List handler from the IRouter instance
+      [, routeHandler] = routerMock.get.mock.calls.find(([{ path }]) =>
+        path.startsWith(TRUSTED_APPS_LIST_API)
+      )!;
+    });
+
+    it('should create the Trusted Apps List first', async () => {
+      const request = createListRequest();
+      await routeHandler(context, request, response);
+      expect(exceptionsListClient.createTrustedAppsList).toHaveBeenCalled();
+      expect(response.ok).toHaveBeenCalled();
+    });
+
+    it('should pass pagination query params to exception list service', async () => {
+      const request = createListRequest(10, 100);
+      const emptyResponse = {
+        data: [],
+        page: 10,
+        per_page: 100,
+        total: 0,
+      };
+
+      exceptionsListClient.findExceptionListItem.mockResolvedValue(emptyResponse);
+      await routeHandler(context, request, response);
+
+      expect(response.ok).toHaveBeenCalledWith({ body: emptyResponse });
+      expect(exceptionsListClient.findExceptionListItem).toHaveBeenCalledWith({
+        listId: ENDPOINT_TRUSTED_APPS_LIST_ID,
+        page: 10,
+        perPage: 100,
+        filter: undefined,
+        namespaceType: 'agnostic',
+        sortField: 'name',
+        sortOrder: 'asc',
+      });
+    });
+
+    it('should log unexpected error if one occurs', async () => {
+      exceptionsListClient.findExceptionListItem.mockImplementation(() => {
+        throw new Error('expected error');
+      });
+      const request = createListRequest(10, 100);
+      await routeHandler(context, request, response);
+      expect(response.internalError).toHaveBeenCalled();
+      expect(endpointAppContext.logFactory.get('trusted_apps').error).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/utils.ts b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/utils.ts
new file mode 100644
index 0000000000000..2b417a4c6a8e1
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/utils.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ExceptionListItemSchema } from '../../../../../lists/common/shared_exports';
+import { TrustedApp } from '../../../../common/endpoint/types';
+
+/**
+ * Map an ExcptionListItem to a TrustedApp item
+ * @param exceptionListItem
+ */
+export const exceptionItemToTrustedAppItem = (
+  exceptionListItem: ExceptionListItemSchema
+): TrustedApp => {
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  const { entries, description, created_by, created_at, name, _tags, id } = exceptionListItem;
+  const os = osFromTagsList(_tags);
+  return {
+    entries,
+    description,
+    created_at,
+    created_by,
+    name,
+    os,
+    id,
+  } as TrustedApp;
+};
+
+/**
+ * Retrieves the OS entry from a list of tags (property returned with ExcptionListItem).
+ * For Trusted Apps each entry must have at MOST 1 OS.
+ * */
+const osFromTagsList = (tags: string[]): TrustedApp['os'] | 'unknown' => {
+  for (const tag of tags) {
+    if (tag.startsWith('os:')) {
+      return tag.substr(3) as TrustedApp['os'];
+    }
+  }
+  return 'unknown';
+};
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index 1f08210aa41f3..38120bf42fbba 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -59,6 +59,7 @@ import { EndpointAppContext } from './endpoint/types';
 import { registerDownloadExceptionListRoute } from './endpoint/routes/artifacts';
 import { initUsageCollectors } from './usage';
 import { AppRequestContext } from './types';
+import { registerTrustedAppsRoutes } from './endpoint/routes/trusted_apps';
 import { securitySolutionSearchStrategyProvider } from './search_strategy/security_solution';
 
 export interface SetupPlugins {
@@ -166,6 +167,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     registerLimitedConcurrencyRoutes(core);
     registerResolverRoutes(router, endpointContext);
     registerPolicyRoutes(router, endpointContext);
+    registerTrustedAppsRoutes(router, endpointContext);
     registerDownloadExceptionListRoute(router, endpointContext, this.exceptionsCache);
 
     plugins.features.registerFeature({
@@ -305,6 +307,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
 
     this.endpointAppContextService.start({
       agentService: plugins.ingestManager?.agentService,
+      exceptionsListService: this.lists!.getExceptionListClient(savedObjectsClient, 'kibana'),
       logger: this.logger,
       manifestManager,
       registerIngestCallback,

From 6627d7d9afa0f52981d6df43a63cec141f219ef4 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Wed, 26 Aug 2020 16:52:29 -0400
Subject: [PATCH 073/148] Sharing saved-objects phase 1.5 (#75444)

Added UI for sharing saved objects, and updated UI for importing and copying too
---
 docs/api/saved-objects/find.asciidoc          |   5 +-
 docs/api/saved-objects/import.asciidoc        | 238 ++++-
 .../resolve_import_errors.asciidoc            | 167 ++-
 .../copy_saved_objects.asciidoc               | 353 ++++++-
 ...olve_copy_saved_objects_conflicts.asciidoc | 191 +++-
 .../core/public/kibana-plugin-core-public.md  |   4 +
 ...na-plugin-core-public.savedobject.error.md |   5 +-
 .../kibana-plugin-core-public.savedobject.md  |   3 +-
 ...plugin-core-public.savedobject.originid.md |  13 +
 ...ugin-core-public.savedobjecterror.error.md |  11 +
 ...ana-plugin-core-public.savedobjecterror.md |  21 +
 ...in-core-public.savedobjecterror.message.md |  11 +
 ...n-core-public.savedobjecterror.metadata.md |  11 +
 ...core-public.savedobjecterror.statuscode.md |  11 +
 ...gin-core-public.savedobjectsfindoptions.md |   1 +
 ...avedobjectsfindoptions.rootsearchfields.md |  13 +
 ...portambiguousconflicterror.destinations.md |  15 +
 ...avedobjectsimportambiguousconflicterror.md |  21 +
 ...bjectsimportambiguousconflicterror.type.md |  11 +
 ...bjectsimportconflicterror.destinationid.md |  11 +
 ...-public.savedobjectsimportconflicterror.md |   1 +
 ...re-public.savedobjectsimporterror.error.md |   2 +-
 ...gin-core-public.savedobjectsimporterror.md |   4 +-
 ...ore-public.savedobjectsimporterror.meta.md |  14 +
 ...ublic.savedobjectsimporterror.overwrite.md |  13 +
 ...re-public.savedobjectsimporterror.title.md |   5 +
 ...tsimportmissingreferenceserror.blocking.md |  14 -
 ...avedobjectsimportmissingreferenceserror.md |   1 -
 ...-core-public.savedobjectsimportresponse.md |   1 +
 ...vedobjectsimportresponse.successresults.md |  11 +
 ...c.savedobjectsimportretry.createnewcopy.md |  13 +
 ...c.savedobjectsimportretry.destinationid.md |  13 +
 ...ectsimportretry.ignoremissingreferences.md |  13 +
 ...gin-core-public.savedobjectsimportretry.md |   3 +
 ...savedobjectsimportsuccess.createnewcopy.md |  16 +
 ...savedobjectsimportsuccess.destinationid.md |  13 +
 ...ore-public.savedobjectsimportsuccess.id.md |  11 +
 ...n-core-public.savedobjectsimportsuccess.md |  25 +
 ...e-public.savedobjectsimportsuccess.meta.md |  14 +
 ...lic.savedobjectsimportsuccess.overwrite.md |  13 +
 ...e-public.savedobjectsimportsuccess.type.md |  11 +
 ...n-core-public.savedobjectsnamespacetype.md |  13 +
 ...ore-server.importsavedobjectsfromstream.md |   4 +-
 .../core/server/kibana-plugin-core-server.md  |  10 +-
 ...-server.resolvesavedobjectsimporterrors.md |   4 +-
 ...na-plugin-core-server.savedobject.error.md |   5 +-
 .../kibana-plugin-core-server.savedobject.md  |   3 +-
 ...plugin-core-server.savedobject.originid.md |  13 +
 ...ore-server.savedobjectsbulkcreateobject.md |   1 +
 ...r.savedobjectsbulkcreateobject.originid.md |  13 +
 ...ver.savedobjectscheckconflictsobject.id.md |  11 +
 ...server.savedobjectscheckconflictsobject.md |  20 +
 ...r.savedobjectscheckconflictsobject.type.md |  11 +
 ...vedobjectscheckconflictsresponse.errors.md |  15 +
 ...rver.savedobjectscheckconflictsresponse.md |  19 +
 ...erver.savedobjectsclient.checkconflicts.md |  25 +
 ...a-plugin-core-server.savedobjectsclient.md |   1 +
 ...n-core-server.savedobjectscreateoptions.md |   1 +
 ...rver.savedobjectscreateoptions.originid.md |  13 +
 ...gin-core-server.savedobjectsfindoptions.md |   1 +
 ...avedobjectsfindoptions.rootsearchfields.md |  13 +
 ...portambiguousconflicterror.destinations.md |  15 +
 ...avedobjectsimportambiguousconflicterror.md |  21 +
 ...bjectsimportambiguousconflicterror.type.md |  11 +
 ...bjectsimportconflicterror.destinationid.md |  11 +
 ...-server.savedobjectsimportconflicterror.md |   1 +
 ...re-server.savedobjectsimporterror.error.md |   2 +-
 ...gin-core-server.savedobjectsimporterror.md |   4 +-
 ...ore-server.savedobjectsimporterror.meta.md |  14 +
 ...erver.savedobjectsimporterror.overwrite.md |  13 +
 ...re-server.savedobjectsimporterror.title.md |   5 +
 ...tsimportmissingreferenceserror.blocking.md |  14 -
 ...avedobjectsimportmissingreferenceserror.md |   1 -
 ...vedobjectsimportoptions.createnewcopies.md |  13 +
 ...n-core-server.savedobjectsimportoptions.md |   5 +-
 ...ver.savedobjectsimportoptions.overwrite.md |   2 +-
 ...avedobjectsimportoptions.supportedtypes.md |  13 -
 ....savedobjectsimportoptions.typeregistry.md |  13 +
 ...-core-server.savedobjectsimportresponse.md |   1 +
 ...vedobjectsimportresponse.successresults.md |  11 +
 ...r.savedobjectsimportretry.createnewcopy.md |  13 +
 ...r.savedobjectsimportretry.destinationid.md |  13 +
 ...ectsimportretry.ignoremissingreferences.md |  13 +
 ...gin-core-server.savedobjectsimportretry.md |   3 +
 ...savedobjectsimportsuccess.createnewcopy.md |  16 +
 ...savedobjectsimportsuccess.destinationid.md |  13 +
 ...ore-server.savedobjectsimportsuccess.id.md |  11 +
 ...n-core-server.savedobjectsimportsuccess.md |  25 +
 ...e-server.savedobjectsimportsuccess.meta.md |  14 +
 ...ver.savedobjectsimportsuccess.overwrite.md |  13 +
 ...e-server.savedobjectsimportsuccess.type.md |  11 +
 ...n-core-server.savedobjectsnamespacetype.md |   2 -
 ...r.savedobjectsrepository.checkconflicts.md |  25 +
 ...core-server.savedobjectsrepository.find.md |   4 +-
 ...savedobjectsrepository.incrementcounter.md |  18 +-
 ...ugin-core-server.savedobjectsrepository.md |   3 +-
 ...olveimporterrorsoptions.createnewcopies.md |  13 +
 ....savedobjectsresolveimporterrorsoptions.md |   3 +-
 ...esolveimporterrorsoptions.typeregistry.md} |   8 +-
 package.json                                  |   1 +
 src/core/public/index.ts                      |   4 +
 src/core/public/public.api.md                 |  73 +-
 src/core/public/saved_objects/index.ts        |   4 +
 .../saved_objects/saved_objects_client.ts     |   5 +-
 src/core/server/index.ts                      |   4 +
 .../get_sorted_objects_for_export.test.ts     |  27 +
 .../export/get_sorted_objects_for_export.ts   |   2 +-
 .../inject_nested_depdendencies.test.ts       |   7 +-
 .../saved_objects/import/__mocks__/index.ts   |  25 +
 .../import/check_conflicts.test.ts            | 222 ++++
 .../saved_objects/import/check_conflicts.ts   | 105 ++
 .../import/check_origin_conflicts.test.ts     | 584 +++++++++++
 .../import/check_origin_conflicts.ts          | 246 +++++
 .../import/collect_saved_objects.test.ts      | 267 +++--
 .../import/collect_saved_objects.ts           |  22 +-
 .../import/create_saved_objects.test.ts       | 309 ++++++
 .../import/create_saved_objects.ts            | 111 ++
 .../import/extract_errors.test.ts             |  53 +-
 .../saved_objects/import/extract_errors.ts    |  13 +-
 .../import/get_non_unique_entries.test.ts     |  38 +
 .../import/get_non_unique_entries.ts          |  35 +
 .../import/import_saved_objects.test.ts       | 970 +++++++----------
 .../import/import_saved_objects.ts            | 111 +-
 src/core/server/saved_objects/import/index.ts |   2 +
 .../import/regenerate_ids.test.ts             |  53 +
 .../saved_objects/import/regenerate_ids.ts    |  33 +
 .../import/resolve_import_errors.test.ts      | 983 ++++++++----------
 .../import/resolve_import_errors.ts           | 125 ++-
 .../saved_objects/import/split_overwrites.ts  |   9 +-
 src/core/server/saved_objects/import/types.ts |  89 +-
 .../import/validate_references.test.ts        | 255 ++---
 .../import/validate_references.ts             |  76 +-
 .../import/validate_retries.test.ts           |  97 ++
 .../saved_objects/import/validate_retries.ts  |  41 +
 .../build_active_mappings.test.ts.snap        |   8 +
 .../migrations/core/build_active_mappings.ts  |   3 +
 .../migrations/core/index_migrator.test.ts    |   6 +
 .../kibana_migrator.test.ts.snap              |   4 +
 .../server/saved_objects/routes/import.ts     |  25 +-
 .../routes/integration_tests/import.test.ts   | 464 ++++++---
 .../resolve_import_errors.test.ts             | 412 ++++----
 .../routes/resolve_import_errors.ts           |  13 +-
 .../serialization/serializer.test.ts          |  43 +
 .../saved_objects/serialization/serializer.ts |   5 +-
 .../saved_objects/serialization/types.ts      |   2 +
 .../service/lib/included_fields.test.ts       |  30 +-
 .../service/lib/included_fields.ts            |   1 +
 .../service/lib/repository.mock.ts            |   1 +
 .../service/lib/repository.test.js            | 253 ++++-
 .../saved_objects/service/lib/repository.ts   | 143 ++-
 .../lib/search_dsl/query_params.test.ts       |  60 +-
 .../service/lib/search_dsl/query_params.ts    |  22 +-
 .../service/lib/search_dsl/search_dsl.test.ts |   4 +-
 .../service/lib/search_dsl/search_dsl.ts      |   3 +
 .../lib/search_dsl/sorting_params.test.ts     |  14 +
 .../service/lib/search_dsl/sorting_params.ts  |  11 +-
 .../service/saved_objects_client.mock.ts      |   1 +
 .../service/saved_objects_client.test.js      |  15 +
 .../service/saved_objects_client.ts           |  40 +
 src/core/server/saved_objects/types.ts        |  11 +-
 src/core/server/server.api.md                 | 101 +-
 src/core/types/saved_objects.ts               |  19 +-
 .../saved_objects_management/common/types.ts  |   2 +
 .../saved_objects_management/public/index.ts  |   5 +-
 .../public/lib/find_objects.ts                |  10 +
 .../public/lib/import_file.ts                 |  12 +-
 .../public/lib/index.ts                       |   2 +-
 .../lib/process_import_response.test.ts       |  95 +-
 .../public/lib/process_import_response.ts     |  33 +-
 .../public/lib/resolve_import_errors.test.ts  | 370 +++----
 .../public/lib/resolve_import_errors.ts       | 241 +++--
 .../management_section/mount_section.tsx      |   1 +
 .../saved_objects_table.test.tsx.snap         |   7 +
 .../__snapshots__/flyout.test.tsx.snap        | 100 +-
 .../__snapshots__/table.test.tsx.snap         |   2 +
 .../objects_table/components/flyout.test.tsx  | 113 +-
 .../objects_table/components/flyout.tsx       | 216 ++--
 .../components/import_mode_control.test.tsx   |  91 ++
 .../components/import_mode_control.tsx        | 160 +++
 .../components/import_summary.scss            |  20 +
 .../components/import_summary.test.tsx        | 152 +++
 .../components/import_summary.tsx             | 237 +++++
 .../components/overwrite_modal.test.tsx       | 107 ++
 .../components/overwrite_modal.tsx            | 139 +++
 .../components/relationships.test.tsx         |   8 +-
 .../components/relationships.tsx              |   4 +-
 .../objects_table/components/table.test.tsx   |  32 +
 .../objects_table/components/table.tsx        |  28 +
 .../saved_objects_table.test.tsx              |   2 +
 .../objects_table/saved_objects_table.tsx     |  66 +-
 .../saved_objects_table_page.tsx              |   4 +
 .../saved_objects_management/public/mocks.ts  |   3 +
 .../saved_objects_management/public/plugin.ts |  10 +
 .../public/services/column_service.mock.ts    |  57 +
 .../public/services/column_service.test.ts    |  66 ++
 .../public/services/column_service.ts         |  55 +
 .../public/services/index.ts                  |  11 +-
 .../services/{types.ts => types/action.ts}    |  15 +-
 .../public/services/types/column.ts           |  29 +
 .../public/services/types/index.ts            |  22 +
 .../public/services/types/record.ts           |  32 +
 .../server/lib/inject_meta_attributes.test.ts |   2 +
 .../server/lib/inject_meta_attributes.ts      |   1 +
 .../server/routes/get.ts                      |  51 +
 .../server/routes/index.test.ts               |   8 +-
 .../server/routes/index.ts                    |   2 +
 .../server/services/management.mock.ts        |   1 +
 .../server/services/management.test.ts        |  24 +
 .../server/services/management.ts             |   4 +
 .../apis/saved_objects/import.js              |  82 +-
 .../saved_objects/resolve_import_errors.js    |  52 +-
 .../apis/saved_objects_management/find.ts     |   6 +
 .../apis/saved_objects_management/get.ts      |  69 ++
 .../apis/saved_objects_management/index.ts    |   1 +
 .../saved_objects_management/relationships.ts |  15 +
 .../management/saved_objects_page.ts          |   8 +-
 ...ypted_saved_objects_client_wrapper.test.ts |  13 +
 .../encrypted_saved_objects_client_wrapper.ts |   8 +
 .../__snapshots__/oss_features.test.ts.snap   |   1 +
 .../plugins/features/server/oss_features.ts   |   2 +-
 .../services/epm/kibana/assets/install.ts     |   2 +-
 ...ecure_saved_objects_client_wrapper.test.ts |  42 +-
 .../secure_saved_objects_client_wrapper.ts    |  13 +
 x-pack/plugins/spaces/common/model/types.ts   |   6 +-
 .../components/copy_mode_control.test.tsx     |  66 ++
 .../components/copy_mode_control.tsx          | 174 ++++
 .../components/copy_status_indicator.tsx      | 117 ++-
 .../copy_status_summary_indicator.scss        |   7 +
 .../copy_status_summary_indicator.tsx         | 104 +-
 .../components/copy_to_space_flyout.test.tsx  | 200 +++-
 .../components/copy_to_space_flyout.tsx       |  92 +-
 .../copy_to_space_flyout_footer.tsx           | 137 ++-
 .../components/copy_to_space_form.tsx         |  68 +-
 .../components/processing_copy_to_space.tsx   | 111 +-
 .../components/resolve_all_conflicts.scss     |   4 +
 .../components/resolve_all_conflicts.test.tsx | 158 +++
 .../components/resolve_all_conflicts.tsx      | 135 +++
 .../components/selectable_spaces_control.tsx  |  63 +-
 .../components/space_result.tsx               |  54 +-
 .../components/space_result_details.scss      |  25 +
 .../components/space_result_details.tsx       | 237 +++--
 .../copy_saved_objects_to_space_action.tsx    |   7 +-
 .../summarize_copy_result.test.ts             | 439 +++++---
 .../summarize_copy_result.ts                  | 129 ++-
 .../copy_saved_objects_to_space/types.ts      |   1 +
 x-pack/plugins/spaces/public/plugin.tsx       |   7 +
 .../components/index.ts                       |   7 +
 .../components/selectable_spaces_control.scss |   3 +
 .../components/selectable_spaces_control.tsx  |  76 ++
 .../components/share_to_space_flyout.test.tsx | 371 +++++++
 .../components/share_to_space_flyout.tsx      | 268 +++++
 .../components/share_to_space_form.scss}      |   4 +-
 .../components/share_to_space_form.tsx        |  94 ++
 .../share_saved_objects_to_space/index.ts     |   7 +
 .../share_saved_objects_to_space_action.tsx   |  66 ++
 .../share_saved_objects_to_space_column.tsx   | 142 +++
 ...are_saved_objects_to_space_service.test.ts |  38 +
 .../share_saved_objects_to_space_service.ts   |  27 +
 .../share_saved_objects_to_space/types.ts     |  22 +
 .../spaces_manager/spaces_manager.mock.ts     |   2 +
 .../public/spaces_manager/spaces_manager.ts   |  25 +-
 .../lib/copy_to_spaces/copy_to_spaces.test.ts | 418 +++-----
 .../lib/copy_to_spaces/copy_to_spaces.ts      |  14 +-
 .../copy_to_spaces/lib/get_eligible_types.ts  |  16 -
 .../lib/get_ineligible_types.ts               |  24 +
 .../resolve_copy_conflicts.test.ts            | 448 +++-----
 .../copy_to_spaces/resolve_copy_conflicts.ts  |  27 +-
 .../spaces/server/lib/copy_to_spaces/types.ts |  11 +-
 .../__snapshots__/spaces_client.test.ts.snap  |   2 +
 .../lib/spaces_client/spaces_client.test.ts   |   5 +
 .../server/lib/spaces_client/spaces_client.ts |   4 +
 .../__fixtures__/create_mock_so_service.ts    |  35 -
 .../routes/api/external/copy_to_space.test.ts | 103 +-
 .../routes/api/external/copy_to_space.ts      |  92 +-
 .../routes/api/external/get_all.test.ts       |  16 +
 .../server/routes/api/external/get_all.ts     |   6 +-
 .../spaces_saved_objects_client.test.ts       |  54 +-
 .../spaces_saved_objects_client.ts            |  20 +
 .../translations/translations/ja-JP.json      |  22 -
 .../translations/translations/zh-CN.json      |  22 -
 .../apps/spaces/copy_saved_objects.ts         |  16 +-
 .../copy_saved_objects_to_space_page.ts       |  28 +-
 .../saved_objects/spaces/data.json            |  88 ++
 .../saved_objects/spaces/mappings.json        |   3 +
 .../saved_object_test_plugin/server/plugin.ts |   1 +
 .../common/lib/saved_object_test_utils.ts     |   4 +-
 .../common/suites/bulk_create.ts              |  11 +
 .../common/suites/export.ts                   |  64 +-
 .../common/suites/find.ts                     |  38 +-
 .../common/suites/import.ts                   | 164 ++-
 .../common/suites/resolve_import_errors.ts    | 178 +++-
 .../security_and_spaces/apis/bulk_create.ts   |  15 +-
 .../security_and_spaces/apis/export.ts        |   9 +-
 .../security_and_spaces/apis/import.ts        | 151 ++-
 .../apis/resolve_import_errors.ts             | 165 ++-
 .../security_only/apis/bulk_create.ts         |   5 +-
 .../security_only/apis/export.ts              |   9 +-
 .../security_only/apis/import.ts              | 129 ++-
 .../apis/resolve_import_errors.ts             |  99 +-
 .../spaces_only/apis/bulk_create.ts           |  15 +-
 .../spaces_only/apis/import.ts                | 111 +-
 .../spaces_only/apis/resolve_import_errors.ts |  97 +-
 .../saved_objects/spaces/data.json            | 133 ++-
 .../saved_objects/spaces/mappings.json        |   3 +
 .../spaces_test_plugin/server/plugin.ts       |   7 +
 .../common/lib/saved_object_test_cases.ts     |   4 +-
 .../common/suites/copy_to_space.ts            | 673 +++++++-----
 .../common/suites/delete.ts                   |  17 +-
 .../common/suites/get_all.ts                  |  12 +
 .../suites/resolve_copy_to_space_conflicts.ts | 391 ++++---
 .../security_and_spaces/apis/copy_to_space.ts | 384 ++-----
 .../security_and_spaces/apis/get_all.ts       |  76 ++
 .../apis/resolve_copy_to_space_conflicts.ts   | 232 ++---
 .../security_and_spaces/apis/share_add.ts     |   4 +-
 .../security_and_spaces/apis/share_remove.ts  |   2 +-
 .../spaces_only/apis/copy_to_space.ts         |  10 +-
 .../spaces_only/apis/get_all.ts               |   4 +
 .../apis/resolve_copy_to_space_conflicts.ts   |   2 +
 .../spaces_only/apis/share_add.ts             |   4 +-
 .../spaces_only/apis/share_remove.ts          |   4 +-
 320 files changed, 14394 insertions(+), 5395 deletions(-)
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobject.originid.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjecterror.error.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjecterror.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjecterror.message.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjecterror.metadata.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjecterror.statuscode.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.rootsearchfields.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.destinations.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.type.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportconflicterror.destinationid.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.meta.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.overwrite.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.blocking.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportresponse.successresults.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.createnewcopy.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.destinationid.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.ignoremissingreferences.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.createnewcopy.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.destinationid.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.id.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.meta.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.overwrite.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.type.md
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.savedobjectsnamespacetype.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobject.originid.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.originid.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.id.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.type.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsresponse.errors.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsresponse.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.checkconflicts.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.originid.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.rootsearchfields.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.destinations.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.type.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportconflicterror.destinationid.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.meta.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.overwrite.md
 delete mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.blocking.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.createnewcopies.md
 delete mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.supportedtypes.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.typeregistry.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportresponse.successresults.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.createnewcopy.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.destinationid.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.ignoremissingreferences.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.createnewcopy.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.destinationid.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.id.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.meta.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.overwrite.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.type.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.checkconflicts.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.createnewcopies.md
 rename docs/development/core/server/{kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md => kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.typeregistry.md} (54%)
 create mode 100644 src/core/server/saved_objects/import/__mocks__/index.ts
 create mode 100644 src/core/server/saved_objects/import/check_conflicts.test.ts
 create mode 100644 src/core/server/saved_objects/import/check_conflicts.ts
 create mode 100644 src/core/server/saved_objects/import/check_origin_conflicts.test.ts
 create mode 100644 src/core/server/saved_objects/import/check_origin_conflicts.ts
 create mode 100644 src/core/server/saved_objects/import/create_saved_objects.test.ts
 create mode 100644 src/core/server/saved_objects/import/create_saved_objects.ts
 create mode 100644 src/core/server/saved_objects/import/get_non_unique_entries.test.ts
 create mode 100644 src/core/server/saved_objects/import/get_non_unique_entries.ts
 create mode 100644 src/core/server/saved_objects/import/regenerate_ids.test.ts
 create mode 100644 src/core/server/saved_objects/import/regenerate_ids.ts
 create mode 100644 src/core/server/saved_objects/import/validate_retries.test.ts
 create mode 100644 src/core/server/saved_objects/import/validate_retries.ts
 create mode 100644 src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.test.tsx
 create mode 100644 src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx
 create mode 100644 src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss
 create mode 100644 src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx
 create mode 100644 src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx
 create mode 100644 src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.test.tsx
 create mode 100644 src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx
 create mode 100644 src/plugins/saved_objects_management/public/services/column_service.mock.ts
 create mode 100644 src/plugins/saved_objects_management/public/services/column_service.test.ts
 create mode 100644 src/plugins/saved_objects_management/public/services/column_service.ts
 rename src/plugins/saved_objects_management/public/services/{types.ts => types/action.ts} (86%)
 create mode 100644 src/plugins/saved_objects_management/public/services/types/column.ts
 create mode 100644 src/plugins/saved_objects_management/public/services/types/index.ts
 create mode 100644 src/plugins/saved_objects_management/public/services/types/record.ts
 create mode 100644 src/plugins/saved_objects_management/server/routes/get.ts
 create mode 100644 test/api_integration/apis/saved_objects_management/get.ts
 create mode 100644 x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.test.tsx
 create mode 100644 x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.tsx
 create mode 100644 x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.scss
 create mode 100644 x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.scss
 create mode 100644 x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.test.tsx
 create mode 100644 x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.tsx
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/components/index.ts
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.scss
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.test.tsx
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.tsx
 rename x-pack/plugins/spaces/public/{copy_saved_objects_to_space/components/copy_to_space_form.scss => share_saved_objects_to_space/components/share_to_space_form.scss} (74%)
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/index.ts
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_action.tsx
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_column.tsx
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.test.ts
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.ts
 create mode 100644 x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts
 delete mode 100644 x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_eligible_types.ts
 create mode 100644 x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts

diff --git a/docs/api/saved-objects/find.asciidoc b/docs/api/saved-objects/find.asciidoc
index ad07112567479..c43b58d3aa989 100644
--- a/docs/api/saved-objects/find.asciidoc
+++ b/docs/api/saved-objects/find.asciidoc
@@ -44,7 +44,10 @@ experimental[] Retrieve a paginated set of {kib} saved objects by various condit
   (Optional, array|string) The fields to return in the `attributes` key of the response.
 
 `sort_field`::
-  (Optional, string) The field that sorts the response.
+  (Optional, string) Sorts the response. Includes "root" and "type" fields. "root" fields exist for all saved objects, such as "updated_at".
+  "type" fields are specific to an object type, such as fields returned in the `attributes` key of the response. When a single type is
+  defined in the `type` parameter, the "root" and "type" fields are allowed, and validity checks are made in that order. When multiple types
+  are defined in the `type` parameter, only "root" fields are allowed.
 
 `has_reference`::
   (Optional, object) Filters to objects that have a relationship with the type and ID combination.
diff --git a/docs/api/saved-objects/import.asciidoc b/docs/api/saved-objects/import.asciidoc
index abf20b44cd17f..4df2f07bfcf41 100644
--- a/docs/api/saved-objects/import.asciidoc
+++ b/docs/api/saved-objects/import.asciidoc
@@ -17,13 +17,22 @@ experimental[] Create sets of {kib} saved objects from a file created by the exp
 ==== Path parameters
 
 `space_id`::
-  (Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
+  (Optional, string) An identifier for the <<xpack-spaces,space>>. If `space_id` is not provided in the URL, the default space is used.
 
 [[saved-objects-api-import-query-params]]
 ==== Query parameters
 
+`createNewCopies`::
+  (Optional, boolean) Creates copies of saved objects, regenerates each object ID, and resets the origin. When used, potential conflict
+  errors are avoided.
++
+NOTE: This cannot be used with the `overwrite` option.
+
 `overwrite`::
-  (Optional, boolean) Overwrites saved objects.
+  (Optional, boolean) Overwrites saved objects when they already exist. When used, potential conflict errors are automatically resolved by
+  overwriting the destination object.
++
+NOTE: This cannot be used with the `createNewCopies` option.
 
 [[saved-objects-api-import-request-body]]
 ==== Request body
@@ -37,13 +46,23 @@ The request body must include the multipart/form-data type.
 ==== Response body
 
 `success`::
-  Top-level property that indicates if the import was successful.
+  (boolean) Indicates when the import was successfully completed. When set to `false`, some objects may not have been created. For
+  additional information, refer to the `errors` and `successResults` properties.
 
 `successCount`::
-  Indicates the number of successfully imported records.
+  (number) Indicates the number of successfully imported records.
 
 `errors`::
-  (array) Indicates the import was unsuccessful and specifies the objects that failed to import.
+  (Optional, array) Indicates the import was unsuccessful and specifies the objects that failed to import.
++
+NOTE: One object may result in multiple errors, which requires separate steps to resolve. For instance, a `missing_references` error and
+`conflict` error).
+
+`successResults`::
+  (Optional, array) Indicates the objects that are successfully imported, with any metadata if applicable.
++
+NOTE: Objects are only created when all resolvable errors are addressed, including conflicts and missing references. For information on how
+to resolve errors, refer to the <<saved-objects-api-import-example,examples>>.
 
 [[saved-objects-api-import-codes]]
 ==== Response code
@@ -51,8 +70,64 @@ The request body must include the multipart/form-data type.
 `200`::
     Indicates a successful call.
 
+[[saved-objects-api-import-example]]
 ==== Examples
 
+[[saved-objects-api-import-example-1]]
+===== Successful import with `createNewCopies` enabled
+
+Import an index pattern and dashboard:
+
+[source,sh]
+--------------------------------------------------
+$ curl -X POST api/saved_objects/_import?createNewCopies=true -H "kbn-xsrf: true" --form file=@file.ndjson
+--------------------------------------------------
+// KIBANA
+
+The `file.ndjson` file contains the following:
+
+[source,sh]
+--------------------------------------------------
+{"type":"index-pattern","id":"my-pattern","attributes":{"title":"my-pattern-*"}}
+{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"}}
+--------------------------------------------------
+
+The API returns the following:
+
+[source,sh]
+--------------------------------------------------
+{
+  "success": true,
+  "successCount": 2,
+  "successResults": [
+    {
+      "id": "my-pattern",
+      "type": "index-pattern",
+      "destinationId": "4aba3770-0d04-45e1-9e34-4cf0fd2165ae",
+      "meta": {
+        "icon": "indexPatternApp",
+        "title": "my-pattern-*"
+      }
+    },
+    {
+      "id": "my-dashboard",
+      "type": "dashboard",
+      "destinationId": "c31d1eca-9bc0-4a81-b5f9-30c442824c48",
+      "meta": {
+        "icon": "dashboardApp",
+        "title": "Look at my dashboard"
+      }
+    }
+  ]
+}
+--------------------------------------------------
+
+The result indicates a successful import, and both objects are created. Since these objects are created as new copies, each entry in the
+`successResults` array includes a `destinationId` attribute.
+
+[[saved-objects-api-import-example-2]]
+===== Successful import with `createNewCopies` disabled
+
 Import an index pattern and dashboard:
 
 [source,sh]
@@ -75,11 +150,34 @@ The API returns the following:
 --------------------------------------------------
 {
   "success": true,
-  "successCount": 2
+  "successCount": 2,
+  "successResults": [
+    {
+      "id": "my-pattern",
+      "type": "index-pattern",
+      "meta": {
+        "icon": "indexPatternApp",
+        "title": "my-pattern-*"
+      }
+    },
+    {
+      "id": "my-dashboard",
+      "type": "dashboard",
+      "meta": {
+        "icon": "dashboardApp",
+        "title": "Look at my dashboard"
+      }
+    }
+  ]
 }
 --------------------------------------------------
 
-Import an index pattern and dashboard that includes a conflict on the index pattern:
+The result indicates a successful import, and both objects are created.
+
+[[saved-objects-api-import-example-3]]
+===== Failed import with conflict errors
+
+Import an index pattern, visualization, *Canvas* workpad, and dashboard that include saved objects:
 
 [source,sh]
 --------------------------------------------------
@@ -92,6 +190,8 @@ The `file.ndjson` file contains the following:
 [source,sh]
 --------------------------------------------------
 {"type":"index-pattern","id":"my-pattern","attributes":{"title":"my-pattern-*"}}
+{"type":"visualization","id":"my-vis","attributes":{"title":"Look at my visualization"}}
+{"type":"canvas-workpad","id":"my-canvas","attributes":{"name":"Look at my canvas"}}
 {"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"}}
 --------------------------------------------------
 
@@ -110,12 +210,85 @@ The API returns the following:
       "error": {
         "type": "conflict"
       },
+      "meta": {
+        "icon": "indexPatternApp",
+        "title": "my-pattern-*"
+      }
+    },
+    {
+      "id": "my-visualization",
+      "type": "my-vis",
+      "title": "Look at my visualization",
+      "error": {
+        "type": "conflict",
+        "destinationId": "another-vis"
+      },
+      "meta": {
+        "icon": "visualizeApp",
+        "title": "Look at my visualization"
+      }
     },
+    {
+      "id": "my-canvas",
+      "type": "canvas-workpad",
+      "title": "Look at my canvas",
+      "error": {
+        "type": "ambiguous_conflict",
+        "destinations": [
+          {
+            "id": "another-canvas",
+            "title": "Look at another canvas",
+            "updatedAt": "2020-07-08T16:36:32.377Z"
+          },
+          {
+            "id": "yet-another-canvas",
+            "title": "Look at yet another canvas",
+            "updatedAt": "2020-07-05T12:29:54.849Z"
+          }
+        ]
+      },
+      "meta": {
+        "icon": "canvasApp",
+        "title": "Look at my canvas"
+      }
+    }
   ],
+  "successResults": [
+    {
+      "id": "my-dashboard",
+      "type": "dashboard",
+      "meta": {
+        "icon": "dashboardApp",
+        "title": "Look at my dashboard"
+      }
+    }
+  ]
 }
 --------------------------------------------------
 
-Import a visualization and dashboard with an index pattern for the visualization reference that doesn't exist:
+The result indicates an unsuccessful import because the index pattern, visualization, *Canvas* workpad, and dashboard resulted in a conflict
+error:
+
+* An index pattern with the same ID already exists, which resulted in a conflict error. To resolve the error, overwrite the existing object,
+or skip the object.
+
+* A visualization with a different ID, but the same origin already exists, which resulted in a conflict error. The `destinationId` field
+contains the `id` of the other visualization, which caused the conflict. The behavior is added to make sure that new objects that can be
+shared between <<xpack-spaces,spaces>> behave in a similar way as legacy non-shareable objects. When a shareable object is exported and then
+imported into a new space, it retains its origin so that the conflicts are encountered as expected. To resolve, overwrite the specified
+destination object, or skip the object.
+
+* Two *Canvas* workpads with different IDs, but the same origin, already exist, which resulted in a conflict error. The `destinations` array
+describes the other workpads which caused the conflict. When a shareable object is exported, imported into a new space, then shared to
+another space where an object of the same origin exists, the conflict error occurs. To resolve, pick a destination object to overwrite, or
+skip the object.
+
+Objects are created when the error is resolved using the <<saved-objects-api-resolve-import-errors-example-1,Resolve import errors API>>.
+
+[[saved-objects-api-import-example-4]]
+===== Failed import with missing reference errors
+
+Import a visualization and dashboard when the index pattern for the visualization doesn't exist:
 
 [source,sh]
 --------------------------------------------------
@@ -127,21 +300,23 @@ The `file.ndjson` file contains the following:
 
 [source,sh]
 --------------------------------------------------
-{"type":"visualization","id":"my-vis","attributes":{"title":"my-vis"},"references":[{"name":"ref_0","type":"index-pattern","id":"my-pattern-*"}]}
-{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"},"references":[{"name":"ref_0","type":"visualization","id":"my-vis"}]}
+{"type":"visualization","id":"my-vis","attributes":{"title":"Look at my visualization"},"references":[{"name":"ref_0","type":"index-pattern","id":"my-pattern-*"}]}
+{"type":"search","id":"my-search","attributes":{"title":"Look at my search"},"references":[{"name":"ref_0","type":"index-pattern","id":"another-pattern-*"}]}
+{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"},"references":[{"name":"ref_0","type":"visualization","id":"my-vis"},{"name":"ref_1","type":"search","id":"my-search"}]}
 --------------------------------------------------
 
 The API returns the following:
 
 [source,sh]
 --------------------------------------------------
+{
   "success": false,
-  "successCount": 0,
+  "successCount": 1,
   "errors": [
     {
       "id": "my-vis",
       "type": "visualization",
-      "title": "my-vis",
+      "title": "Look at my visualization",
       "error": {
         "type": "missing_references",
         "references": [
@@ -149,14 +324,45 @@ The API returns the following:
             "type": "index-pattern",
             "id": "my-pattern-*"
           }
-        ],
-        "blocking": [
+        ]
+      },
+      "meta": {
+        "icon": "visualizeApp",
+        "title": "Look at my visualization"
+      }
+    },
+    {
+      "id": "my-search",
+      "type": "search",
+      "title": "Look at my search",
+      "error": {
+        "type": "missing_references",
+        "references": [
           {
-            "type": "dashboard",
-            "id": "my-dashboard"
+            "type": "index-pattern",
+            "id": "another-pattern-*"
           }
         ]
+      },
+      "meta": {
+        "icon": "searchApp",
+        "title": "Look at my search"
+      }
+    }
+  ],
+  "successResults": [
+    {
+      "id": "my-dashboard",
+      "type": "dashboard",
+      "meta": {
+        "icon": "dashboardApp",
+        "title": "Look at my dashboard"
       }
     }
   ]
+}
 --------------------------------------------------
+
+The result indicates an unsuccessful import because the visualization and search resulted in a missing references error.
+
+Objects are created when the errors are resolved using the <<saved-objects-api-resolve-import-errors-example-2,Resolve import errors API>>.
diff --git a/docs/api/saved-objects/resolve_import_errors.asciidoc b/docs/api/saved-objects/resolve_import_errors.asciidoc
index 03c116c39dd80..13d4ac9bbf7d0 100644
--- a/docs/api/saved-objects/resolve_import_errors.asciidoc
+++ b/docs/api/saved-objects/resolve_import_errors.asciidoc
@@ -4,7 +4,7 @@
 <titleabbrev>Resolve import errors</titleabbrev>
 ++++
 
-experimental[] Resolve errors from the import API.
+experimental[] Resolve errors from the <<saved-objects-api-import,Import objects API>>.
 
 To resolve errors, you can:
 
@@ -25,7 +25,14 @@ To resolve errors, you can:
 ==== Path parameters
 
 `space_id`::
-  (Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
+  (Optional, string) An identifier for the <<xpack-spaces,space>>. When `space_id` is unspecfied in the URL, the default space is used.
+
+[[saved-objects-api-resolve-import-errors-query-params]]
+==== Query parameters
+
+`createNewCopies`::
+  (Optional, boolean) Creates copies of the saved objects, regenerates each object ID, and resets the origin. When enabled during the
+  initial import, also enable when resolving import errors.
 
 [[saved-objects-api-resolve-import-errors-request-body]]
 ==== Request body
@@ -36,19 +43,47 @@ The request body must include the multipart/form-data type.
   The same file given to the import API.
 
 `retries`::
-  (array) A list of `type`, `id`, `replaceReferences`, and `overwrite` objects to retry. The property `replaceReferences` is a list of `type`, `from`, and `to` used to change the object references.
+  (Required, array) The retry operations, which can specify how to resolve different types of errors.
++
+.Properties of `<retries>`
+[%collapsible%open]
+=====
+    `type`:::
+    (Required, string) The saved object type.
+    `id`:::
+    (Required, string) The saved object ID.
+    `overwrite`:::
+    (Optional, boolean) When set to `true`, the source object overwrites the conflicting destination object. When set to `false`, does
+    nothing.
+    `destinationId`:::
+    (Optional, string) Specifies the destination ID that the imported object should have, if different from the current ID.
+    `replaceReferences`:::
+    (Optional, array) A list of `type`, `from`, and `to` used to change the object references.
+    `ignoreMissingReferences`:::
+    (Optional, boolean) When set to `true`, ignores missing reference errors. When set to `false`, does nothing.
+=====
 
 [[saved-objects-api-resolve-import-errors-response-body]]
 ==== Response body
 
 `success`::
-  Top-level property that indicates if the errors successfully resolved.
+  (boolean) Indicates a successful import. When set to `false`, some objects may not have been created. For additional information, refer to
+  the `errors` and `successResults` properties.
 
 `successCount`::
-  Indicates the number of successfully resolved records.
+  (number) Indicates the number of successfully resolved records.
 
 `errors`::
-  (array) Specifies the objects that failed to resolve.
+  (Optional, array) Specifies the objects that failed to resolve.
++
+NOTE: One object can result in multiple errors, which requires separate steps to resolve. For instance, a `missing_references` error and a
+`conflict` error.
+
+`successResults`::
+  (Optional, array) Indicates the objects that are successfully imported, with any metadata if applicable.
++
+NOTE: Objects are only created when all resolvable errors are addressed, including conflict and missing references. To resolve errors, refer
+to the <<saved-objects-api-resolve-import-errors-example, examples>>.
 
 [[saved-objects-api-resolve-import-errors-codes]]
 ==== Response code
@@ -59,11 +94,16 @@ The request body must include the multipart/form-data type.
 [[saved-objects-api-resolve-import-errors-example]]
 ==== Examples
 
-Retry a dashboard import:
+[[saved-objects-api-resolve-import-errors-example-1]]
+===== Resolve conflict errors
+
+This example builds upon the <<saved-objects-api-import-example-3,Import objects API example with conflict errors>>.
+
+Resolve conflict errors for an index pattern, visualization, and *Canvas* workpad by overwriting the existing saved objects:
 
 [source,sh]
 --------------------------------------------------
-$ curl -X POST api/saved_objects/_resolve_import_errors -H "kbn-xsrf: true" --form file=@file.ndjson --form retries='[{"type":"dashboard","id":"my-dashboard"}]'
+$ curl -X POST api/saved_objects/_resolve_import_errors -H "kbn-xsrf: true" --form file=@file.ndjson --form retries='[{"type":"index-pattern","id":"my-pattern","overwrite":true},{"type":"visualization","id":"my-vis","overwrite":true,"destinationId":"another-vis"},{"type":"canvas","id":"my-canvas","overwrite":true,"destinationId":"yet-another-canvas"},{"type":"dashboard","id":"my-dashboard"}]'
 --------------------------------------------------
 // KIBANA
 
@@ -71,6 +111,9 @@ The `file.ndjson` file contains the following:
 
 [source,sh]
 --------------------------------------------------
+{"type":"index-pattern","id":"my-pattern","attributes":{"title":"my-pattern-*"}}
+{"type":"visualization","id":"my-vis","attributes":{"title":"Look at my visualization"}}
+{"type":"canvas-workpad","id":"my-canvas","attributes":{"name":"Look at my canvas"}}
 {"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"}}
 --------------------------------------------------
 
@@ -80,41 +123,62 @@ The API returns the following:
 --------------------------------------------------
 {
   "success": true,
-  "successCount": 1
+  "successCount": 4,
+  "successResults": [
+    {
+      "id": "my-pattern",
+      "type": "index-pattern",
+      "meta": {
+        "icon": "indexPatternApp",
+        "title": "my-pattern-*"
+      }
+    },
+    {
+      "id": "my-vis",
+      "type": "visualization",
+      "destinationId": "another-vis",
+      "meta": {
+        "icon": "visualizeApp",
+        "title": "Look at my visualization"
+      }
+    },
+    {
+      "id": "my-canvas",
+      "type": "canvas-workpad",
+      "destinationId": "yet-another-canvas",
+      "meta": {
+        "icon": "canvasApp",
+        "title": "Look at my canvas"
+      }
+    },
+    {
+      "id": "my-dashboard",
+      "type": "dashboard",
+      "meta": {
+        "icon": "dashboardApp",
+        "title": "Look at my dashboard"
+      }
+    }
+  ]
 }
 --------------------------------------------------
 
-Resolve errors for a dashboard and overwrite the existing saved object:
+The result indicates a successful import, and all four objects were created.
 
-[source,sh]
---------------------------------------------------
-$ curl -X POST api/saved_objects/_resolve_import_errors -H "kbn-xsrf: true" --form file=@file.ndjson --form retries='[{"type":"dashboard","id":"my-dashboard","overwrite":true}]'
---------------------------------------------------
-// KIBANA
+TIP: If a prior import attempt resulted in resolvable errors, you must include a retry for each object you want to import, including any
+that were returned in the `successResults` array. In this example, we retried importing the dashboard accordingly.
 
-The `file.ndjson` file contains the following:
+[[saved-objects-api-resolve-import-errors-example-2]]
+===== Resolve missing reference errors
 
-[source,sh]
---------------------------------------------------
-{"type":"index-pattern","id":"my-pattern","attributes":{"title":"my-pattern-*"}}
-{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"}}
---------------------------------------------------
+This example builds upon the <<saved-objects-api-import-example-4,Import objects API example with missing reference errors>>.
 
-The API returns the following:
+Resolve a missing reference error for a visualization by replacing the index pattern with another, and resolve a missing reference error for
+a search by ignoring it:
 
 [source,sh]
 --------------------------------------------------
-{
-  "success": true,
-  "successCount": 1
-}
---------------------------------------------------
-
-Resolve errors for a visualization by replacing the index pattern with another:
-
-[source,sh]
---------------------------------------------------
-$ curl -X POST api/saved_objects/_resolve_import_errors -H "kbn-xsrf: true" --form file=@file.ndjson --form retries='[{"type":"visualization","id":"my-vis","replaceReferences":[{"type":"index-pattern","from":"missing","to":"existing"}]}]'
+$ curl -X POST api/saved_objects/_resolve_import_errors -H "kbn-xsrf: true" --form file=@file.ndjson --form retries='[{"type":"visualization","id":"my-vis","replaceReferences":[{"type":"index-pattern","from":"my-pattern-*","to":"existing-pattern"}]},{"type":"search","id":"my-search","ignoreMissingReferences":true},{"type":"dashboard","id":"my-dashboard"}]'
 --------------------------------------------------
 // KIBANA
 
@@ -122,7 +186,9 @@ The `file.ndjson` file contains the following:
 
 [source,sh]
 --------------------------------------------------
-{"type":"visualization","id":"my-vis","attributes":{"title":"Look at my visualization"},"references":[{"name":"ref_0","type":"index-pattern","id":"missing"}]}
+{"type":"visualization","id":"my-vis","attributes":{"title":"Look at my visualization"},"references":[{"name":"ref_0","type":"index-pattern","id":"my-pattern-*"}]}
+{"type":"search","id":"my-search","attributes":{"title":"Look at my search"},"references":[{"name":"ref_0","type":"index-pattern","id":"another-pattern-*"}]}
+{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"},"references":[{"name":"ref_0","type":"visualization","id":"my-vis"}]}
 --------------------------------------------------
 
 The API returns the following:
@@ -131,6 +197,37 @@ The API returns the following:
 --------------------------------------------------
 {
   "success": true,
-  "successCount": 1
+  "successCount": 3,
+  "successResults": [
+    {
+      "id": "my-vis",
+      "type": "visualization",
+      "meta": {
+        "icon": "visualizeApp",
+        "title": "Look at my visualization"
+      }
+    },
+    {
+      "id": "my-search",
+      "type": "search",
+      "meta": {
+        "icon": "searchApp",
+        "title": "Look at my search"
+      }
+    },
+    {
+      "id": "my-dashboard",
+      "type": "dashboard",
+      "meta": {
+        "icon": "dashboardApp",
+        "title": "Look at my dashboard"
+      }
+    }
+  ]
 }
 --------------------------------------------------
+
+The result indicates a successful import, and all three objects were created.
+
+TIP: If a prior import attempt resulted in resolvable errors, you must include a retry for each object you want to import, including any
+that were returned in the `successResults` array. In this example, we retried importing the dashboard accordingly.
diff --git a/docs/api/spaces-management/copy_saved_objects.asciidoc b/docs/api/spaces-management/copy_saved_objects.asciidoc
index d39b1e134c9dc..853cca035a291 100644
--- a/docs/api/spaces-management/copy_saved_objects.asciidoc
+++ b/docs/api/spaces-management/copy_saved_objects.asciidoc
@@ -24,7 +24,8 @@ You can request to overwrite any objects that already exist in the target space
 ==== {api-path-parms-title}
 
 `space_id`::
-(Optional, string) The ID of the space that contains the saved objects you want to copy. When `space_id` is unspecified in the URL, the default space is used.
+  (Optional, string) The ID of the space that contains the saved objects you want to copy. When `space_id` is unspecified in the URL, the
+  default space is used.
 
 [role="child_attributes"]
 [[spaces-api-copy-saved-objects-request-body]]
@@ -47,10 +48,12 @@ You can request to overwrite any objects that already exist in the target space
 =====
 
 `includeReferences`::
-  (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`.
+  (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`.
 
 `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`.
+  (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`.
 
 [role="child_attributes"]
 [[spaces-api-copy-saved-objects-response-body]]
@@ -63,7 +66,8 @@ You can request to overwrite any objects that already exist in the target space
 [%collapsible%open]
 =====
   `success`:::
-    (boolean) The copy operation was successful. When set to `false`, some objects may have been copied. For additional information, refer to the `successCount` and `errors` properties.
+    (boolean) The copy operation was successful. When set to `false`, some objects may have been copied. For additional information, refer
+    to the `errors` and `successResults` properties.
 
   `successCount`:::
     (number) The number of objects that successfully copied.
@@ -71,6 +75,9 @@ You can request to overwrite any objects that already exist in the target space
   `errors`:::
     (Optional, array) The errors that occurred during the copy operation. When errors are reported, the `success` flag is set to `false`.
 +
+NOTE: One object may result in multiple errors, which requires separate steps to resolve. For instance, a `missing_references` error and a
+`conflict` error.
++
 .Properties of `errors`
 [%collapsible%open]
 ======
@@ -84,15 +91,159 @@ You can request to overwrite any objects that already exist in the target space
 .Properties of `error`
 [%collapsible%open]
 =======
-      `type`:::::
-        (string) The type of error. For example, `unsupported_type`, `missing_references`, or `unknown`. Errors marked as `conflict` may be resolved by using the <<spaces-api-resolve-copy-saved-objects-conflicts, Resolve copy saved objects conflicts API>>.
+      `type`::::
+        (string) The type of error. For example, `conflict`, `ambiguous_conflict`, `missing_references`, `unsupported_type`, or `unknown`.
+        Errors marked as `conflict` or `ambiguous_conflict` may be resolved by using the <<spaces-api-resolve-copy-saved-objects-conflicts,
+        Resolve copy saved objects conflicts API>>.
+      `destinationId`::::
+        (Optional, string) The destination ID that was used during the copy attempt. This is only present on `conflict` error types.
+      `destinations`::::
+        (Optional, array) A list of possible object destinations with `id`, `title`, and `updatedAt` fields to describe each one. This is
+        only present on `ambiguous_conflict` error types.
 =======
 ======
+
+  `successResults`:::
+    (Optional, array) Indicates successfully copied objects, with any applicable metadata.
++
+NOTE: Objects are created when all resolvable errors are addressed, including conflict and missing references errors. For more information,
+refer to the <<spaces-api-copy-saved-objects-example,examples>>.
+
 =====
 [[spaces-api-copy-saved-objects-example]]
 ==== {api-examples-title}
 
-Copy a dashboard with the `my-dashboard` ID, including all references from the `default` space to the `marketing` and `sales` spaces:
+[[spaces-api-copy-saved-objects-example-1]]
+===== Successful copy (with `createNewCopies` enabled)
+
+Copy a dashboard with the `my-dashboard` ID, including all references from the `default` space to the `marketing` space. In this example,
+the dashboard has a reference to a visualization, and that has a reference to an index pattern:
+
+[source,sh]
+----
+$ curl -X POST api/spaces/_copy_saved_objects
+{
+  "objects": [{
+    "type": "dashboard",
+    "id": "my-dashboard"
+  }],
+  "spaces": ["marketing"],
+  "includeReferences": true,
+  "createNewcopies": true
+}
+----
+// KIBANA
+
+The API returns the following:
+
+[source,sh]
+----
+{
+  "marketing": {
+    "success": true,
+    "successCount": 3,
+    "successResults": [
+      {
+        "id": "my-dashboard",
+        "type": "dashboard",
+        "destinationId": "1e127098-5b80-417f-b0f1-c60c8395358f",
+        "meta": {
+          "icon": "dashboardApp",
+          "title": "Look at my dashboard"
+        }
+      },
+      {
+        "id": "my-vis",
+        "type": "visualization",
+        "destinationId": "a610ed80-1c73-4507-9e13-d3af736c8e04",
+        "meta": {
+          "icon": "visualizeApp",
+          "title": "Look at my visualization"
+        }
+      },
+      {
+        "id": "my-index-pattern",
+        "type": "index-pattern",
+        "destinationId": "bc3c9c70-bf6f-4bec-b4ce-f4189aa9e26b",
+        "meta": {
+          "icon": "indexPatternApp",
+          "title": "my-pattern-*"
+        }
+      }
+    ]
+  }
+}
+----
+
+The result indicates a successful copy, and all three objects are created. Since these objects were created as new copies, each entry in the
+`successResults` array includes a `destinationId` attribute.
+
+[[spaces-api-copy-saved-objects-example-2]]
+===== Successful copy (with `createNewCopies` disabled)
+
+Copy a dashboard with the `my-dashboard` ID, including all references from the `default` space to the `marketing` space. In this example,
+the dashboard has a reference to a visualization, and that has a reference to an index pattern:
+
+[source,sh]
+----
+$ curl -X POST api/spaces/_copy_saved_objects
+{
+  "objects": [{
+    "type": "dashboard",
+    "id": "my-dashboard"
+  }],
+  "spaces": ["marketing"],
+  "includeReferences": true
+}
+----
+// KIBANA
+
+The API returns the following:
+
+[source,sh]
+----
+{
+  "marketing": {
+    "success": true,
+    "successCount": 3,
+    "successResults": [
+      {
+        "id": "my-dashboard",
+        "type": "dashboard",
+        "meta": {
+          "icon": "dashboardApp",
+          "title": "Look at my dashboard"
+        }
+      },
+      {
+        "id": "my-vis",
+        "type": "visualization",
+        "meta": {
+          "icon": "visualizeApp",
+          "title": "Look at my visualization"
+        }
+      },
+      {
+        "id": "my-index-pattern",
+        "type": "index-pattern",
+        "meta": {
+          "icon": "indexPatternApp",
+          "title": "my-pattern-*"
+        }
+      }
+    ]
+  }
+}
+----
+
+The result indicates a successful copy, and all three objects are created.
+
+[[spaces-api-copy-saved-objects-example-3]]
+===== Failed copy (with conflict errors)
+
+Copy a dashboard with the `my-dashboard` ID, including all references from the `default` space to the `marketing` and `sales` spaces. In
+this example, the dashboard has a reference to a visualization and a *Canvas* workpad, and the visualization has a reference to an index
+pattern:
 
 [source,sh]
 ----
@@ -115,35 +266,146 @@ The API returns the following:
 {
   "marketing": {
     "success": true,
-    "successCount": 5
+    "successCount": 4,
+    "successResults": [
+      {
+        "id": "my-dashboard",
+        "type": "dashboard",
+        "meta": {
+          "icon": "dashboardApp",
+          "title": "Look at my dashboard"
+        }
+      },
+      {
+        "id": "my-vis",
+        "type": "visualization",
+        "meta": {
+          "icon": "visualizeApp",
+          "title": "Look at my visualization"
+        }
+      },
+      {
+        "id": "my-canvas",
+        "type": "canvas-workpad",
+        "meta": {
+          "icon": "canvasApp",
+          "title": "Look at my canvas"
+        }
+      },
+      {
+        "id": "my-index-pattern",
+        "type": "index-pattern",
+        "meta": {
+          "icon": "indexPatternApp",
+          "title": "my-pattern-*"
+        }
+      }
+    ]
   },
   "sales": {
     "success": false,
-    "successCount": 4,
-    "errors": [{
-      "id": "my-index-pattern",
-      "type": "index-pattern",
-      "error": {
-        "type": "conflict"
+    "successCount": 1,
+    "errors": [
+      {
+        "id": "my-pattern",
+        "type": "index-pattern",
+        "title": "my-pattern-*",
+        "error": {
+          "type": "conflict"
+        },
+        "meta": {
+          "icon": "indexPatternApp",
+          "title": "my-pattern-*"
+        }
+      },
+      {
+        "id": "my-visualization",
+        "type": "my-vis",
+        "title": "Look at my visualization",
+        "error": {
+          "type": "conflict",
+          "destinationId": "another-vis"
+        },
+        "meta": {
+          "icon": "visualizeApp",
+          "title": "Look at my visualization"
+        }
+      },
+      {
+        "id": "my-canvas",
+        "type": "canvas-workpad",
+        "title": "Look at my canvas",
+        "error": {
+          "type": "ambiguous_conflict",
+          "destinations": [
+            {
+              "id": "another-canvas",
+              "title": "Look at another canvas",
+              "updatedAt": "2020-07-08T16:36:32.377Z"
+            },
+            {
+              "id": "yet-another-canvas",
+              "title": "Look at yet another canvas",
+              "updatedAt": "2020-07-05T12:29:54.849Z"
+            }
+          ]
+        },
+        "meta": {
+          "icon": "canvasApp",
+          "title": "Look at my canvas"
+        }
       }
-    }]
+    ],
+    "successResults": [
+      {
+        "id": "my-dashboard",
+        "type": "dashboard",
+        "meta": {
+          "icon": "dashboardApp",
+          "title": "Look at my dashboard"
+        }
+      }
+    ]
   }
 }
 ----
 
-The `marketing` space succeeds, but the `sales` space fails due to a conflict in the index pattern.
+The result indicates a successful copy for the `marketing` space, and an unsuccessful copy for the `sales` space because the index pattern,
+visualization, and *Canvas* workpad each resulted in a conflict error:
+
+* An index pattern with the same ID already exists, which resulted in a conflict error. To resolve the error, overwrite the existing object,
+or skip the object.
 
-Copy a visualization with the `my-viz` ID from the `marketing` space to the `default` space:
+* A visualization with a different ID, but the same origin already exists, which resulted in a conflict error. The `destinationId` field
+contains the `id` of the other visualization, which caused the conflict. The behavior is added to make sure that new objects that can be
+shared between spaces behave in a similar way as legacy non-shareable objects. When a shareable object is copied into a new space, it
+retains its origin so that the conflicts are encountered as expected. To resolve, overwrite the specified destination object, or skip the
+object.
+
+* Two *Canvas* workpads with different IDs, but the same origin, already exist, which resulted in a conflict error. The `destinations` array
+describes the other workpads which caused the conflict. When a shareable object is copied into a new space, then shared to another space
+where an object of the same origin exists, the conflict error occurs. To resolve, pick a destination object to overwrite, or skip the
+object.
+
+Objects are created when the error is resolved using the <<spaces-api-resolve-copy-saved-objects-conflicts-example-1,Resolve copy conflicts
+API>>.
+
+[[spaces-api-copy-saved-objects-example-4]]
+===== Failed copy (with missing reference errors)
+
+Copy a dashboard with the `my-dashboard` ID, including all references from the `default` space to the `marketing` space. In this example,
+the dashboard has a reference to a visualization and a *Canvas* workpad, and the visualization has a reference to an index pattern:
 
 [source,sh]
 ----
-$ curl -X POST s/marketing/api/spaces/_copy_saved_objects
+$ curl -X POST api/spaces/_copy_saved_objects
 {
   "objects": [{
-    "type": "visualization",
-    "id": "my-viz"
+    "type": "dashboard",
+    "id": "my-dashboard"
   }],
-  "spaces": ["default"]
+  "spaces": ["marketing"],
+  "includeReferences": true
 }
 ----
 // KIBANA
@@ -153,9 +415,52 @@ The API returns the following:
 [source,sh]
 ----
 {
-  "default": {
-    "success": true,
-    "successCount": 1
+  "marketing": {
+    "success": false,
+    "successCount": 2,
+    "errors": [
+      {
+        "id": "my-vis",
+        "type": "visualization",
+        "title": "Look at my visualization",
+        "error": {
+          "type": "missing_references",
+          "references": [
+            {
+              "type": "index-pattern",
+              "id": "my-pattern-*"
+            }
+          ]
+        },
+        "meta": {
+          "icon": "visualizeApp",
+          "title": "Look at my visualization"
+        }
+      },
+    ]
+    "successResults": [
+      {
+        "id": "my-dashboard",
+        "type": "dashboard",
+        "meta": {
+          "icon": "dashboardApp",
+          "title": "Look at my dashboard"
+        }
+      },
+      {
+        "id": "my-canvas",
+        "type": "canvas-workpad",
+        "meta": {
+          "icon": "canvasApp",
+          "title": "Look at my canvas"
+        }
+      }
+    ],
   }
 }
 ----
+
+The result indicates an unsuccessful copy because the visualization resulted in a missing references error.
+
+Objects are created when the errors are resolved using the <<spaces-api-resolve-copy-saved-objects-conflicts-example-2,Resolve copy
+conflicts API>>.
diff --git a/docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc b/docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc
index 6c10ae9046cab..6d799ebb0014e 100644
--- a/docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc
+++ b/docs/api/spaces-management/resolve_copy_saved_objects_conflicts.asciidoc
@@ -46,7 +46,8 @@ Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, w
   (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`.
 
 `retries`::
-  (Required, object) The retry operations to attempt. Object keys represent the target space IDs.
+  (Required, object) The retry operations to attempt, which can specify how to resolve different types of errors. Object keys represent the
+  target space IDs.
 +
 .Properties of `retries`
 [%collapsible%open]
@@ -64,6 +65,10 @@ Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, w
     (Required, string) The saved object ID.
     `overwrite`::::
     (Required, boolean) When set to `true`, the saved object from the source space (desigated by the <<spaces-api-resolve-copy-saved-objects-conflicts-path-params, `space_id` path parameter>>) overwrites the conflicting object in the destination space. When set to `false`, this does nothing.
+    `destinationId`::::
+    (Optional, string) Specifies the destination ID that the copied object should have, if different from the current ID.
+    `ignoreMissingReferences`:::
+    (Optional, boolean) When set to `true`, any missing references errors are ignored. When set to `false`, does nothing.
 ======
 =====
 
@@ -86,6 +91,9 @@ Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, w
   `errors`:::
     (Optional, array) The errors that occurred during the copy operation. When errors are reported, the `success` flag is set to `false`.
 +
+NOTE: One object may result in multiple errors, which requires separate steps to resolve. For instance, a `missing_references` error and a
+`conflict` error.
++
 
 .Properties of `errors`
 [%collapsible%open]
@@ -104,15 +112,32 @@ Execute the <<spaces-api-copy-saved-objects,copy saved objects to space API>>, w
 [%collapsible%open]
 =======
       `type`::::
-        (string) The type of error. For example, `unsupported_type`, `missing_references`, or `unknown`.
+        (string) The type of error. For example, `conflict`, `ambiguous_conflict`, `missing_references`, `unsupported_type`, or `unknown`.
+      `destinationId`::::
+        (Optional, string) The destination ID that was used during the copy attempt. This is only present on `conflict` errors types.
+      `destinations`::::
+        (Optional, array) A list of possible object destinations with `id`, `title`, and `updatedAt` fields to describe each one. This is
+        only present on `ambiguous_conflict` error types.
 =======
 ======
+
+`successResults`:::
+  (Optional, array) Indicates successfully copied objects, with any applicable metadata.
++
+NOTE: Objects are created when all resolvable errors are addressed, including conflict and missing references errors. For more information,
+refer to the <<spaces-api-resolve-copy-saved-objects-conflicts-example,examples>>.
+
 =====
 
 [[spaces-api-resolve-copy-saved-objects-conflicts-example]]
 ==== {api-examples-title}
 
-Overwrite an index pattern in the `marketing` space, and a visualization in the `sales` space:
+[[spaces-api-resolve-copy-saved-objects-conflicts-example-1]]
+===== Resolve conflict errors
+
+This example builds upon the <<spaces-api-copy-saved-objects-example-3,Copy objects API example with conflict errors>>.
+
+Resolve conflict errors for an index pattern, visualization, and *Canvas* workpad by overwriting the existing saved objects:
 
 [source,sh]
 ----
@@ -124,16 +149,29 @@ $ curl -X POST api/spaces/_resolve_copy_saved_objects_errors
   }],
   "includeReferences": true,
   "retries": {
-    "marketing": [{
-      "type": "index-pattern",
-      "id": "my-pattern",
-      "overwrite": true
-    }],
-    "sales": [{
-      "type": "visualization",
-      "id": "my-viz",
-      "overwrite": true
-    }]
+    "sales": [
+      {
+        "type": "index-pattern",
+        "id": "my-pattern",
+        "overwrite": true
+      },
+      {
+        "type": "visualization",
+        "id": "my-vis",
+        "overwrite": true,
+        "destinationId": "another-vis"
+      },
+      {
+        "type": "canvas",
+        "id": "my-canvas",
+        "overwrite": true,
+        "destinationId": "yet-another-canvas"
+      },
+      {
+        "type": "dashboard",
+        "id": "my-dashboard"
+      }
+    ]
   }
 }
 ----
@@ -144,13 +182,130 @@ The API returns the following:
 [source,sh]
 ----
 {
-  "marketing": {
-    "success": true,
-    "successCount": 1
-  },
   "sales": {
     "success": true,
-    "successCount": 1
+    "successCount": 4,
+    "successResults": [
+      {
+        "id": "my-pattern",
+        "type": "index-pattern",
+        "meta": {
+          "icon": "indexPatternApp",
+          "title": "my-pattern-*"
+        }
+      },
+      {
+        "id": "my-vis",
+        "type": "visualization",
+        "destinationId": "another-vis",
+        "meta": {
+          "icon": "visualizeApp",
+          "title": "Look at my visualization"
+        }
+      },
+      {
+        "id": "my-canvas",
+        "type": "canvas-workpad",
+        "destinationId": "yet-another-canvas",
+        "meta": {
+          "icon": "canvasApp",
+          "title": "Look at my canvas"
+        }
+      },
+      {
+        "id": "my-dashboard",
+        "type": "dashboard",
+        "meta": {
+          "icon": "dashboardApp",
+          "title": "Look at my dashboard"
+        }
+      }
+    ]
   }
 }
 ----
+
+The result indicates a successful copy, and all four objects are created.
+
+TIP: If a prior copy attempt resulted in resolvable errors, you must include a retry for each object you want to copy, including any that
+were returned in the `successResults` array. In this example, we retried copying the dashboard accordingly.
+
+[[spaces-api-resolve-copy-saved-objects-conflicts-example-2]]
+===== Resolve missing reference errors
+
+This example builds upon the <<spaces-api-copy-saved-objects-example-4,Copy objects API example with missing reference errors>>.
+
+Resolve missing reference errors for a visualization by ignoring the error:
+
+[source,sh]
+----
+$ curl -X POST api/spaces/_resolve_copy_saved_objects_errors
+{
+  "objects": [{
+    "type": "dashboard",
+    "id": "my-dashboard"
+  }],
+  "includeReferences": true,
+  "retries": {
+    "marketing": [
+      {
+        "type": "visualization",
+        "id": "my-vis",
+        "ignoreMissingReferences": true
+      },
+      {
+        "type": "canvas",
+        "id": "my-canvas"
+      },
+      {
+        "type": "dashboard",
+        "id": "my-dashboard"
+      }
+    ]
+  }
+}
+----
+// KIBANA
+
+The API returns the following:
+
+[source,sh]
+----
+{
+  "marketing": {
+    "success": true,
+    "successCount": 3,
+    "successResults": [
+      {
+        "id": "my-vis",
+        "type": "visualization",
+        "meta": {
+          "icon": "visualizeApp",
+          "title": "Look at my visualization"
+        }
+      },
+      {
+        "id": "my-canvas",
+        "type": "canvas-workpad",
+        "meta": {
+          "icon": "canvasApp",
+          "title": "Look at my canvas"
+        }
+      },
+      {
+        "id": "my-dashboard",
+        "type": "dashboard",
+        "meta": {
+          "icon": "dashboardApp",
+          "title": "Look at my dashboard"
+        }
+      }
+    ]
+  }
+}
+----
+
+The result indicates a successful copy and all three objects are created.
+
+TIP: If a prior copy attempt resulted in resolvable errors, you must include a retry for each object you want to copy, including any that
+were returned in the `successResults` array. In this example, we retried copying the dashboard and canvas accordingly.
diff --git a/docs/development/core/public/kibana-plugin-core-public.md b/docs/development/core/public/kibana-plugin-core-public.md
index 8f2bde3856019..c931ce544f5d5 100644
--- a/docs/development/core/public/kibana-plugin-core-public.md
+++ b/docs/development/core/public/kibana-plugin-core-public.md
@@ -105,6 +105,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [PluginInitializerContext](./kibana-plugin-core-public.plugininitializercontext.md) | The available core services passed to a <code>PluginInitializer</code> |
 |  [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) |  |
 |  [SavedObjectReference](./kibana-plugin-core-public.savedobjectreference.md) | A reference to another saved object. |
 |  [SavedObjectsBaseOptions](./kibana-plugin-core-public.savedobjectsbaseoptions.md) |  |
 |  [SavedObjectsBatchResponse](./kibana-plugin-core-public.savedobjectsbatchresponse.md) |  |
@@ -115,11 +116,13 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsCreateOptions](./kibana-plugin-core-public.savedobjectscreateoptions.md) |  |
 |  [SavedObjectsFindOptions](./kibana-plugin-core-public.savedobjectsfindoptions.md) |  |
 |  [SavedObjectsFindResponsePublic](./kibana-plugin-core-public.savedobjectsfindresponsepublic.md) | Return type of the Saved Objects <code>find()</code> method.<!-- -->\*Note\*: this type is different between the Public and Server Saved Objects clients. |
+|  [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md) | Represents a failure to import due to a conflict, which can be resolved in different ways with an overwrite. |
 |  [SavedObjectsImportConflictError](./kibana-plugin-core-public.savedobjectsimportconflicterror.md) | Represents a failure to import due to a conflict. |
 |  [SavedObjectsImportError](./kibana-plugin-core-public.savedobjectsimporterror.md) | Represents a failure to import. |
 |  [SavedObjectsImportMissingReferencesError](./kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.md) | Represents a failure to import due to missing references. |
 |  [SavedObjectsImportResponse](./kibana-plugin-core-public.savedobjectsimportresponse.md) | The response describing the result of an import. |
 |  [SavedObjectsImportRetry](./kibana-plugin-core-public.savedobjectsimportretry.md) | Describes a retry operation for importing a saved object. |
+|  [SavedObjectsImportSuccess](./kibana-plugin-core-public.savedobjectsimportsuccess.md) | Represents a successful import. |
 |  [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. |
@@ -175,6 +178,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectAttribute](./kibana-plugin-core-public.savedobjectattribute.md) | Type definition for a Saved Object attribute value |
 |  [SavedObjectAttributeSingle](./kibana-plugin-core-public.savedobjectattributesingle.md) | Don't use this type, it's simply a helper type for [SavedObjectAttribute](./kibana-plugin-core-public.savedobjectattribute.md) |
 |  [SavedObjectsClientContract](./kibana-plugin-core-public.savedobjectsclientcontract.md) | SavedObjectsClientContract as implemented by the [SavedObjectsClient](./kibana-plugin-core-public.savedobjectsclient.md) |
+|  [SavedObjectsNamespaceType](./kibana-plugin-core-public.savedobjectsnamespacetype.md) | The namespace type dictates how a saved object can be interacted in relation to namespaces. Each type is mutually exclusive: \* single (default): this type of saved object is namespace-isolated, e.g., it exists in only one namespace. \* multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces. \* agnostic: this type of saved object is global. |
 |  [StartServicesAccessor](./kibana-plugin-core-public.startservicesaccessor.md) | Allows plugins to get access to APIs available in start inside async handlers, such as [App.mount](./kibana-plugin-core-public.app.mount.md)<!-- -->. Promise will not resolve until Core and plugin dependencies have completed <code>start</code>. |
 |  [StringValidation](./kibana-plugin-core-public.stringvalidation.md) | Allows regex objects or a regex string |
 |  [Toast](./kibana-plugin-core-public.toast.md) |  |
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobject.error.md b/docs/development/core/public/kibana-plugin-core-public.savedobject.error.md
index f6ffa49c2e6b2..ab9a611fc3a5c 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobject.error.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobject.error.md
@@ -7,8 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-error?: {
-        message: string;
-        statusCode: number;
-    };
+error?: SavedObjectError;
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobject.md b/docs/development/core/public/kibana-plugin-core-public.savedobject.md
index b67d0536fb336..eb6059747426d 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobject.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobject.md
@@ -15,10 +15,11 @@ export interface SavedObject<T = unknown>
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [attributes](./kibana-plugin-core-public.savedobject.attributes.md) | <code>T</code> | The data for a Saved Object is stored as an object in the <code>attributes</code> property. |
-|  [error](./kibana-plugin-core-public.savedobject.error.md) | <code>{</code><br/><code>        message: string;</code><br/><code>        statusCode: number;</code><br/><code>    }</code> |  |
+|  [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. |
+|  [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. |
 |  [updated\_at](./kibana-plugin-core-public.savedobject.updated_at.md) | <code>string</code> | Timestamp of the last time this document had been updated. |
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobject.originid.md b/docs/development/core/public/kibana-plugin-core-public.savedobject.originid.md
new file mode 100644
index 0000000000000..f5bab09b9bcc0
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobject.originid.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; [SavedObject](./kibana-plugin-core-public.savedobject.md) &gt; [originId](./kibana-plugin-core-public.savedobject.originid.md)
+
+## SavedObject.originId property
+
+The ID of the saved object this originated from. This is set if this object's `id` 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.
+
+<b>Signature:</b>
+
+```typescript
+originId?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.error.md b/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.error.md
new file mode 100644
index 0000000000000..87180a520090f
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.error.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectError](./kibana-plugin-core-public.savedobjecterror.md) &gt; [error](./kibana-plugin-core-public.savedobjecterror.error.md)
+
+## SavedObjectError.error property
+
+<b>Signature:</b>
+
+```typescript
+error: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.md b/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.md
new file mode 100644
index 0000000000000..2117cea433b5c
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.md
@@ -0,0 +1,21 @@
+<!-- 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; [SavedObjectError](./kibana-plugin-core-public.savedobjecterror.md)
+
+## SavedObjectError interface
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectError 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [error](./kibana-plugin-core-public.savedobjecterror.error.md) | <code>string</code> |  |
+|  [message](./kibana-plugin-core-public.savedobjecterror.message.md) | <code>string</code> |  |
+|  [metadata](./kibana-plugin-core-public.savedobjecterror.metadata.md) | <code>Record&lt;string, unknown&gt;</code> |  |
+|  [statusCode](./kibana-plugin-core-public.savedobjecterror.statuscode.md) | <code>number</code> |  |
+
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.message.md b/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.message.md
new file mode 100644
index 0000000000000..2a51d4d1a514d
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.message.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectError](./kibana-plugin-core-public.savedobjecterror.md) &gt; [message](./kibana-plugin-core-public.savedobjecterror.message.md)
+
+## SavedObjectError.message property
+
+<b>Signature:</b>
+
+```typescript
+message: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.metadata.md b/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.metadata.md
new file mode 100644
index 0000000000000..a2725f0206655
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.metadata.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectError](./kibana-plugin-core-public.savedobjecterror.md) &gt; [metadata](./kibana-plugin-core-public.savedobjecterror.metadata.md)
+
+## SavedObjectError.metadata property
+
+<b>Signature:</b>
+
+```typescript
+metadata?: Record<string, unknown>;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.statuscode.md b/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.statuscode.md
new file mode 100644
index 0000000000000..75a57e98fece2
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjecterror.statuscode.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectError](./kibana-plugin-core-public.savedobjecterror.md) &gt; [statusCode](./kibana-plugin-core-public.savedobjecterror.statuscode.md)
+
+## SavedObjectError.statusCode property
+
+<b>Signature:</b>
+
+```typescript
+statusCode: number;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
index 70ad235fb8971..ebd0a99531755 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
@@ -23,6 +23,7 @@ export interface SavedObjectsFindOptions
 |  [page](./kibana-plugin-core-public.savedobjectsfindoptions.page.md) | <code>number</code> |  |
 |  [perPage](./kibana-plugin-core-public.savedobjectsfindoptions.perpage.md) | <code>number</code> |  |
 |  [preference](./kibana-plugin-core-public.savedobjectsfindoptions.preference.md) | <code>string</code> | An optional ES preference value to be used for the query \* |
+|  [rootSearchFields](./kibana-plugin-core-public.savedobjectsfindoptions.rootsearchfields.md) | <code>string[]</code> | The fields to perform the parsed query against. Unlike the <code>searchFields</code> argument, these are expected to be root fields and will not be modified. If used in conjunction with <code>searchFields</code>, both are concatenated together. |
 |  [search](./kibana-plugin-core-public.savedobjectsfindoptions.search.md) | <code>string</code> | Search documents using the Elasticsearch Simple Query String syntax. See Elasticsearch Simple Query String <code>query</code> argument for more information |
 |  [searchFields](./kibana-plugin-core-public.savedobjectsfindoptions.searchfields.md) | <code>string[]</code> | The fields to perform the parsed query against. See Elasticsearch Simple Query String <code>fields</code> argument for more information |
 |  [sortField](./kibana-plugin-core-public.savedobjectsfindoptions.sortfield.md) | <code>string</code> |  |
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.rootsearchfields.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.rootsearchfields.md
new file mode 100644
index 0000000000000..faa971509eca2
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.rootsearchfields.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; [SavedObjectsFindOptions](./kibana-plugin-core-public.savedobjectsfindoptions.md) &gt; [rootSearchFields](./kibana-plugin-core-public.savedobjectsfindoptions.rootsearchfields.md)
+
+## SavedObjectsFindOptions.rootSearchFields property
+
+The fields to perform the parsed query against. Unlike the `searchFields` argument, these are expected to be root fields and will not be modified. If used in conjunction with `searchFields`<!-- -->, both are concatenated together.
+
+<b>Signature:</b>
+
+```typescript
+rootSearchFields?: string[];
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.destinations.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.destinations.md
new file mode 100644
index 0000000000000..59ce43c4bea62
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.destinations.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; [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md) &gt; [destinations](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.destinations.md)
+
+## SavedObjectsImportAmbiguousConflictError.destinations property
+
+<b>Signature:</b>
+
+```typescript
+destinations: Array<{
+        id: string;
+        title?: string;
+        updatedAt?: string;
+    }>;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md
new file mode 100644
index 0000000000000..76dfacf132f0a
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md
@@ -0,0 +1,21 @@
+<!-- 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; [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md)
+
+## SavedObjectsImportAmbiguousConflictError interface
+
+Represents a failure to import due to a conflict, which can be resolved in different ways with an overwrite.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportAmbiguousConflictError 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [destinations](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.destinations.md) | <code>Array&lt;{</code><br/><code>        id: string;</code><br/><code>        title?: string;</code><br/><code>        updatedAt?: string;</code><br/><code>    }&gt;</code> |  |
+|  [type](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.type.md) | <code>'ambiguous_conflict'</code> |  |
+
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.type.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.type.md
new file mode 100644
index 0000000000000..600c56988ac75
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.type.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.md) &gt; [type](./kibana-plugin-core-public.savedobjectsimportambiguousconflicterror.type.md)
+
+## SavedObjectsImportAmbiguousConflictError.type property
+
+<b>Signature:</b>
+
+```typescript
+type: 'ambiguous_conflict';
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportconflicterror.destinationid.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportconflicterror.destinationid.md
new file mode 100644
index 0000000000000..ba4002d932f57
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportconflicterror.destinationid.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsImportConflictError](./kibana-plugin-core-public.savedobjectsimportconflicterror.md) &gt; [destinationId](./kibana-plugin-core-public.savedobjectsimportconflicterror.destinationid.md)
+
+## SavedObjectsImportConflictError.destinationId property
+
+<b>Signature:</b>
+
+```typescript
+destinationId?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportconflicterror.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportconflicterror.md
index a54cdac56c218..b0320b05ecadc 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportconflicterror.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportconflicterror.md
@@ -16,5 +16,6 @@ export interface SavedObjectsImportConflictError
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [destinationId](./kibana-plugin-core-public.savedobjectsimportconflicterror.destinationid.md) | <code>string</code> |  |
 |  [type](./kibana-plugin-core-public.savedobjectsimportconflicterror.type.md) | <code>'conflict'</code> |  |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.error.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.error.md
index a76ab8e5c926a..201f56bf925d1 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.error.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.error.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-error: SavedObjectsImportConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
+error: SavedObjectsImportConflictError | SavedObjectsImportAmbiguousConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.md
index 5703c613adbd7..e12396e9fa7b9 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.md
@@ -16,8 +16,10 @@ export interface SavedObjectsImportError
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [error](./kibana-plugin-core-public.savedobjectsimporterror.error.md) | <code>SavedObjectsImportConflictError &#124; SavedObjectsImportUnsupportedTypeError &#124; SavedObjectsImportMissingReferencesError &#124; SavedObjectsImportUnknownError</code> |  |
+|  [error](./kibana-plugin-core-public.savedobjectsimporterror.error.md) | <code>SavedObjectsImportConflictError &#124; SavedObjectsImportAmbiguousConflictError &#124; SavedObjectsImportUnsupportedTypeError &#124; SavedObjectsImportMissingReferencesError &#124; SavedObjectsImportUnknownError</code> |  |
 |  [id](./kibana-plugin-core-public.savedobjectsimporterror.id.md) | <code>string</code> |  |
+|  [meta](./kibana-plugin-core-public.savedobjectsimporterror.meta.md) | <code>{</code><br/><code>        title?: string;</code><br/><code>        icon?: string;</code><br/><code>    }</code> |  |
+|  [overwrite](./kibana-plugin-core-public.savedobjectsimporterror.overwrite.md) | <code>boolean</code> | If <code>overwrite</code> is specified, an attempt was made to overwrite an existing object. |
 |  [title](./kibana-plugin-core-public.savedobjectsimporterror.title.md) | <code>string</code> |  |
 |  [type](./kibana-plugin-core-public.savedobjectsimporterror.type.md) | <code>string</code> |  |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.meta.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.meta.md
new file mode 100644
index 0000000000000..97bf3c4cff8eb
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.meta.md
@@ -0,0 +1,14 @@
+<!-- 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; [SavedObjectsImportError](./kibana-plugin-core-public.savedobjectsimporterror.md) &gt; [meta](./kibana-plugin-core-public.savedobjectsimporterror.meta.md)
+
+## SavedObjectsImportError.meta property
+
+<b>Signature:</b>
+
+```typescript
+meta: {
+        title?: string;
+        icon?: string;
+    };
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.overwrite.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.overwrite.md
new file mode 100644
index 0000000000000..69a8726b0588a
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.overwrite.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; [SavedObjectsImportError](./kibana-plugin-core-public.savedobjectsimporterror.md) &gt; [overwrite](./kibana-plugin-core-public.savedobjectsimporterror.overwrite.md)
+
+## SavedObjectsImportError.overwrite property
+
+If `overwrite` is specified, an attempt was made to overwrite an existing object.
+
+<b>Signature:</b>
+
+```typescript
+overwrite?: boolean;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.title.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.title.md
index 40e5814d30fb3..95eeaaedf94c5 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.title.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimporterror.title.md
@@ -4,6 +4,11 @@
 
 ## SavedObjectsImportError.title property
 
+> Warning: This API is now obsolete.
+> 
+> Use `meta.title` instead
+> 
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.blocking.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.blocking.md
deleted file mode 100644
index 5b6862fa21bbc..0000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.blocking.md
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- 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; [SavedObjectsImportMissingReferencesError](./kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.md) &gt; [blocking](./kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.blocking.md)
-
-## SavedObjectsImportMissingReferencesError.blocking property
-
-<b>Signature:</b>
-
-```typescript
-blocking: Array<{
-        type: string;
-        id: string;
-    }>;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.md
index 4417a19b28792..1fea85ea239d5 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.md
@@ -16,7 +16,6 @@ export interface SavedObjectsImportMissingReferencesError
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [blocking](./kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.blocking.md) | <code>Array&lt;{</code><br/><code>        type: string;</code><br/><code>        id: string;</code><br/><code>    }&gt;</code> |  |
 |  [references](./kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.references.md) | <code>Array&lt;{</code><br/><code>        type: string;</code><br/><code>        id: string;</code><br/><code>    }&gt;</code> |  |
 |  [type](./kibana-plugin-core-public.savedobjectsimportmissingreferenceserror.type.md) | <code>'missing_references'</code> |  |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportresponse.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportresponse.md
index 910de33c30e62..0aba4d517e43a 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportresponse.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportresponse.md
@@ -19,4 +19,5 @@ export interface SavedObjectsImportResponse
 |  [errors](./kibana-plugin-core-public.savedobjectsimportresponse.errors.md) | <code>SavedObjectsImportError[]</code> |  |
 |  [success](./kibana-plugin-core-public.savedobjectsimportresponse.success.md) | <code>boolean</code> |  |
 |  [successCount](./kibana-plugin-core-public.savedobjectsimportresponse.successcount.md) | <code>number</code> |  |
+|  [successResults](./kibana-plugin-core-public.savedobjectsimportresponse.successresults.md) | <code>SavedObjectsImportSuccess[]</code> |  |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportresponse.successresults.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportresponse.successresults.md
new file mode 100644
index 0000000000000..51a47b6c2d953
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportresponse.successresults.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsImportResponse](./kibana-plugin-core-public.savedobjectsimportresponse.md) &gt; [successResults](./kibana-plugin-core-public.savedobjectsimportresponse.successresults.md)
+
+## SavedObjectsImportResponse.successResults property
+
+<b>Signature:</b>
+
+```typescript
+successResults?: SavedObjectsImportSuccess[];
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.createnewcopy.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.createnewcopy.md
new file mode 100644
index 0000000000000..f60c713973d58
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.createnewcopy.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; [SavedObjectsImportRetry](./kibana-plugin-core-public.savedobjectsimportretry.md) &gt; [createNewCopy](./kibana-plugin-core-public.savedobjectsimportretry.createnewcopy.md)
+
+## SavedObjectsImportRetry.createNewCopy property
+
+If `createNewCopy` is specified, the new object has a new (undefined) origin ID. This is only needed for the case where `createNewCopies` mode is disabled and ambiguous source conflicts are detected.
+
+<b>Signature:</b>
+
+```typescript
+createNewCopy?: boolean;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.destinationid.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.destinationid.md
new file mode 100644
index 0000000000000..5131d1d01ff02
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.destinationid.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; [SavedObjectsImportRetry](./kibana-plugin-core-public.savedobjectsimportretry.md) &gt; [destinationId](./kibana-plugin-core-public.savedobjectsimportretry.destinationid.md)
+
+## SavedObjectsImportRetry.destinationId property
+
+The object ID that will be created or overwritten. If not specified, the `id` field will be used.
+
+<b>Signature:</b>
+
+```typescript
+destinationId?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.ignoremissingreferences.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.ignoremissingreferences.md
new file mode 100644
index 0000000000000..4ce833f2966cc
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.ignoremissingreferences.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; [SavedObjectsImportRetry](./kibana-plugin-core-public.savedobjectsimportretry.md) &gt; [ignoreMissingReferences](./kibana-plugin-core-public.savedobjectsimportretry.ignoremissingreferences.md)
+
+## SavedObjectsImportRetry.ignoreMissingReferences property
+
+If `ignoreMissingReferences` is specified, reference validation will be skipped for this object.
+
+<b>Signature:</b>
+
+```typescript
+ignoreMissingReferences?: boolean;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.md
index d625302d97eed..b0bda93ef8b72 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportretry.md
@@ -16,7 +16,10 @@ export interface SavedObjectsImportRetry
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [createNewCopy](./kibana-plugin-core-public.savedobjectsimportretry.createnewcopy.md) | <code>boolean</code> | If <code>createNewCopy</code> is specified, the new object has a new (undefined) origin ID. This is only needed for the case where <code>createNewCopies</code> mode is disabled and ambiguous source conflicts are detected. |
+|  [destinationId](./kibana-plugin-core-public.savedobjectsimportretry.destinationid.md) | <code>string</code> | The object ID that will be created or overwritten. If not specified, the <code>id</code> field will be used. |
 |  [id](./kibana-plugin-core-public.savedobjectsimportretry.id.md) | <code>string</code> |  |
+|  [ignoreMissingReferences](./kibana-plugin-core-public.savedobjectsimportretry.ignoremissingreferences.md) | <code>boolean</code> | If <code>ignoreMissingReferences</code> is specified, reference validation will be skipped for this object. |
 |  [overwrite](./kibana-plugin-core-public.savedobjectsimportretry.overwrite.md) | <code>boolean</code> |  |
 |  [replaceReferences](./kibana-plugin-core-public.savedobjectsimportretry.replacereferences.md) | <code>Array&lt;{</code><br/><code>        type: string;</code><br/><code>        from: string;</code><br/><code>        to: string;</code><br/><code>    }&gt;</code> |  |
 |  [type](./kibana-plugin-core-public.savedobjectsimportretry.type.md) | <code>string</code> |  |
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.createnewcopy.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.createnewcopy.md
new file mode 100644
index 0000000000000..0598691fbd525
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.createnewcopy.md
@@ -0,0 +1,16 @@
+<!-- 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; [SavedObjectsImportSuccess](./kibana-plugin-core-public.savedobjectsimportsuccess.md) &gt; [createNewCopy](./kibana-plugin-core-public.savedobjectsimportsuccess.createnewcopy.md)
+
+## SavedObjectsImportSuccess.createNewCopy property
+
+> Warning: This API is now obsolete.
+> 
+> If `createNewCopy` is specified, the new object has a new (undefined) origin ID. This is only needed for the case where `createNewCopies` mode is disabled and ambiguous source conflicts are detected. When `createNewCopies` mode is permanently enabled, this field will be redundant and can be removed.
+> 
+
+<b>Signature:</b>
+
+```typescript
+createNewCopy?: boolean;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.destinationid.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.destinationid.md
new file mode 100644
index 0000000000000..55611a77aeb67
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.destinationid.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; [SavedObjectsImportSuccess](./kibana-plugin-core-public.savedobjectsimportsuccess.md) &gt; [destinationId](./kibana-plugin-core-public.savedobjectsimportsuccess.destinationid.md)
+
+## SavedObjectsImportSuccess.destinationId property
+
+If `destinationId` is specified, the new object has a new ID that is different from the import ID.
+
+<b>Signature:</b>
+
+```typescript
+destinationId?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.id.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.id.md
new file mode 100644
index 0000000000000..6d6271e37dffe
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.id.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsImportSuccess](./kibana-plugin-core-public.savedobjectsimportsuccess.md) &gt; [id](./kibana-plugin-core-public.savedobjectsimportsuccess.id.md)
+
+## SavedObjectsImportSuccess.id property
+
+<b>Signature:</b>
+
+```typescript
+id: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.md
new file mode 100644
index 0000000000000..4872deb5ee0db
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.md
@@ -0,0 +1,25 @@
+<!-- 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; [SavedObjectsImportSuccess](./kibana-plugin-core-public.savedobjectsimportsuccess.md)
+
+## SavedObjectsImportSuccess interface
+
+Represents a successful import.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportSuccess 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [createNewCopy](./kibana-plugin-core-public.savedobjectsimportsuccess.createnewcopy.md) | <code>boolean</code> |  |
+|  [destinationId](./kibana-plugin-core-public.savedobjectsimportsuccess.destinationid.md) | <code>string</code> | If <code>destinationId</code> is specified, the new object has a new ID that is different from the import ID. |
+|  [id](./kibana-plugin-core-public.savedobjectsimportsuccess.id.md) | <code>string</code> |  |
+|  [meta](./kibana-plugin-core-public.savedobjectsimportsuccess.meta.md) | <code>{</code><br/><code>        title?: string;</code><br/><code>        icon?: string;</code><br/><code>    }</code> |  |
+|  [overwrite](./kibana-plugin-core-public.savedobjectsimportsuccess.overwrite.md) | <code>boolean</code> | If <code>overwrite</code> is specified, this object overwrote an existing one (or will do so, in the case of a pending resolution). |
+|  [type](./kibana-plugin-core-public.savedobjectsimportsuccess.type.md) | <code>string</code> |  |
+
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.meta.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.meta.md
new file mode 100644
index 0000000000000..d1c7bc92b5cbf
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.meta.md
@@ -0,0 +1,14 @@
+<!-- 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; [SavedObjectsImportSuccess](./kibana-plugin-core-public.savedobjectsimportsuccess.md) &gt; [meta](./kibana-plugin-core-public.savedobjectsimportsuccess.meta.md)
+
+## SavedObjectsImportSuccess.meta property
+
+<b>Signature:</b>
+
+```typescript
+meta: {
+        title?: string;
+        icon?: string;
+    };
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.overwrite.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.overwrite.md
new file mode 100644
index 0000000000000..18ae2ca9bee3d
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.overwrite.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; [SavedObjectsImportSuccess](./kibana-plugin-core-public.savedobjectsimportsuccess.md) &gt; [overwrite](./kibana-plugin-core-public.savedobjectsimportsuccess.overwrite.md)
+
+## SavedObjectsImportSuccess.overwrite property
+
+If `overwrite` is specified, this object overwrote an existing one (or will do so, in the case of a pending resolution).
+
+<b>Signature:</b>
+
+```typescript
+overwrite?: boolean;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.type.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.type.md
new file mode 100644
index 0000000000000..6ac14455d281f
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsimportsuccess.type.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsImportSuccess](./kibana-plugin-core-public.savedobjectsimportsuccess.md) &gt; [type](./kibana-plugin-core-public.savedobjectsimportsuccess.type.md)
+
+## SavedObjectsImportSuccess.type property
+
+<b>Signature:</b>
+
+```typescript
+type: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsnamespacetype.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsnamespacetype.md
new file mode 100644
index 0000000000000..f2205d2cee424
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsnamespacetype.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; [SavedObjectsNamespaceType](./kibana-plugin-core-public.savedobjectsnamespacetype.md)
+
+## SavedObjectsNamespaceType type
+
+The namespace type dictates how a saved object can be interacted in relation to namespaces. Each type is mutually exclusive: \* single (default): this type of saved object is namespace-isolated, e.g., it exists in only one namespace. \* multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces. \* agnostic: this type of saved object is global.
+
+<b>Signature:</b>
+
+```typescript
+export declare type SavedObjectsNamespaceType = 'single' | 'multiple' | 'agnostic';
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.importsavedobjectsfromstream.md b/docs/development/core/server/kibana-plugin-core-server.importsavedobjectsfromstream.md
index 6fabfb7a321ae..cebebbaf94fe6 100644
--- a/docs/development/core/server/kibana-plugin-core-server.importsavedobjectsfromstream.md
+++ b/docs/development/core/server/kibana-plugin-core-server.importsavedobjectsfromstream.md
@@ -9,14 +9,14 @@ Import saved objects from given stream. See the [options](./kibana-plugin-core-s
 <b>Signature:</b>
 
 ```typescript
-export declare function importSavedObjectsFromStream({ readStream, objectLimit, overwrite, savedObjectsClient, supportedTypes, namespace, }: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
+export declare function importSavedObjectsFromStream({ readStream, objectLimit, overwrite, createNewCopies, savedObjectsClient, typeRegistry, namespace, }: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  { readStream, objectLimit, overwrite, savedObjectsClient, supportedTypes, namespace, } | <code>SavedObjectsImportOptions</code> |  |
+|  { readStream, objectLimit, overwrite, createNewCopies, savedObjectsClient, typeRegistry, namespace, } | <code>SavedObjectsImportOptions</code> |  |
 
 <b>Returns:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index e9bc19e9c92a9..89330d2a86f76 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -45,10 +45,10 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [deepFreeze(object)](./kibana-plugin-core-server.deepfreeze.md) | Apply Object.freeze to a value recursively and convert the return type to Readonly variant recursively |
 |  [exportSavedObjectsToStream({ types, objects, search, savedObjectsClient, exportSizeLimit, includeReferencesDeep, excludeExportDetails, namespace, })](./kibana-plugin-core-server.exportsavedobjectstostream.md) | Generates sorted saved object stream to be used for export. See the [options](./kibana-plugin-core-server.savedobjectsexportoptions.md) for more detailed information. |
 |  [getFlattenedObject(rootValue)](./kibana-plugin-core-server.getflattenedobject.md) | Flattens a deeply nested object to a map of dot-separated paths pointing to all primitive values \*\*and arrays\*\* from <code>rootValue</code>.<!-- -->example: getFlattenedObject(<!-- -->{ a: { b: 1, c: \[2,3\] } }<!-- -->) // =<!-- -->&gt; { 'a.b': 1, 'a.c': \[2,3\] } |
-|  [importSavedObjectsFromStream({ readStream, objectLimit, overwrite, savedObjectsClient, supportedTypes, namespace, })](./kibana-plugin-core-server.importsavedobjectsfromstream.md) | Import saved objects from given stream. See the [options](./kibana-plugin-core-server.savedobjectsimportoptions.md) for more detailed information. |
+|  [importSavedObjectsFromStream({ readStream, objectLimit, overwrite, createNewCopies, savedObjectsClient, typeRegistry, namespace, })](./kibana-plugin-core-server.importsavedobjectsfromstream.md) | Import saved objects from given stream. See the [options](./kibana-plugin-core-server.savedobjectsimportoptions.md) for more detailed information. |
 |  [isRelativeUrl(candidatePath)](./kibana-plugin-core-server.isrelativeurl.md) | Determine if a url is relative. Any url including a protocol, hostname, or port is not considered relative. This means that absolute \*paths\* are considered to be relative \*urls\* |
 |  [modifyUrl(url, urlModifier)](./kibana-plugin-core-server.modifyurl.md) | Takes a URL and a function that takes the meaningful parts of the URL as a key-value object, modifies some or all of the parts, and returns the modified parts formatted again as a url.<!-- -->Url Parts sent: - protocol - slashes (does the url have the //) - auth - hostname (just the name of the host, no port or auth information) - port - pathname (the path after the hostname, no query or hash, starts with a slash if there was a path) - query (always an object, even when no query on original url) - hash<!-- -->Why? - The default url library in node produces several conflicting properties on the "parsed" output. Modifying any of these might lead to the modifications being ignored (depending on which property was modified) - It's not always clear whether to use path/pathname, host/hostname, so this tries to add helpful constraints |
-|  [resolveSavedObjectsImportErrors({ readStream, objectLimit, retries, savedObjectsClient, supportedTypes, namespace, })](./kibana-plugin-core-server.resolvesavedobjectsimporterrors.md) | Resolve and return saved object import errors. See the [options](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.md) for more detailed informations. |
+|  [resolveSavedObjectsImportErrors({ readStream, objectLimit, retries, savedObjectsClient, typeRegistry, namespace, createNewCopies, })](./kibana-plugin-core-server.resolvesavedobjectsimporterrors.md) | Resolve and return saved object import errors. See the [options](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.md) for more detailed informations. |
 
 ## Interfaces
 
@@ -161,6 +161,8 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsBulkUpdateObject](./kibana-plugin-core-server.savedobjectsbulkupdateobject.md) |  |
 |  [SavedObjectsBulkUpdateOptions](./kibana-plugin-core-server.savedobjectsbulkupdateoptions.md) |  |
 |  [SavedObjectsBulkUpdateResponse](./kibana-plugin-core-server.savedobjectsbulkupdateresponse.md) |  |
+|  [SavedObjectsCheckConflictsObject](./kibana-plugin-core-server.savedobjectscheckconflictsobject.md) |  |
+|  [SavedObjectsCheckConflictsResponse](./kibana-plugin-core-server.savedobjectscheckconflictsresponse.md) |  |
 |  [SavedObjectsClientProviderOptions](./kibana-plugin-core-server.savedobjectsclientprovideroptions.md) | Options to control the creation of the Saved Objects Client. |
 |  [SavedObjectsClientWrapperOptions](./kibana-plugin-core-server.savedobjectsclientwrapperoptions.md) | Options passed to each SavedObjectsClientWrapperFactory to aid in creating the wrapper instance. |
 |  [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation. |
@@ -175,12 +177,14 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsFindOptions](./kibana-plugin-core-server.savedobjectsfindoptions.md) |  |
 |  [SavedObjectsFindResponse](./kibana-plugin-core-server.savedobjectsfindresponse.md) | Return type of the Saved Objects <code>find()</code> method.<!-- -->\*Note\*: this type is different between the Public and Server Saved Objects clients. |
 |  [SavedObjectsFindResult](./kibana-plugin-core-server.savedobjectsfindresult.md) |  |
+|  [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.md) | Represents a failure to import due to a conflict, which can be resolved in different ways with an overwrite. |
 |  [SavedObjectsImportConflictError](./kibana-plugin-core-server.savedobjectsimportconflicterror.md) | Represents a failure to import due to a conflict. |
 |  [SavedObjectsImportError](./kibana-plugin-core-server.savedobjectsimporterror.md) | Represents a failure to import. |
 |  [SavedObjectsImportMissingReferencesError](./kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.md) | Represents a failure to import due to missing references. |
 |  [SavedObjectsImportOptions](./kibana-plugin-core-server.savedobjectsimportoptions.md) | Options to control the import operation. |
 |  [SavedObjectsImportResponse](./kibana-plugin-core-server.savedobjectsimportresponse.md) | The response describing the result of an import. |
 |  [SavedObjectsImportRetry](./kibana-plugin-core-server.savedobjectsimportretry.md) | Describes a retry operation for importing a saved object. |
+|  [SavedObjectsImportSuccess](./kibana-plugin-core-server.savedobjectsimportsuccess.md) | Represents a successful import. |
 |  [SavedObjectsImportUnknownError](./kibana-plugin-core-server.savedobjectsimportunknownerror.md) | Represents a failure to import due to an unknown reason. |
 |  [SavedObjectsImportUnsupportedTypeError](./kibana-plugin-core-server.savedobjectsimportunsupportedtypeerror.md) | Represents a failure to import due to having an unsupported saved object type. |
 |  [SavedObjectsIncrementCounterOptions](./kibana-plugin-core-server.savedobjectsincrementcounteroptions.md) |  |
@@ -301,7 +305,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsClientFactoryProvider](./kibana-plugin-core-server.savedobjectsclientfactoryprovider.md) | Provider to invoke to retrieve a [SavedObjectsClientFactory](./kibana-plugin-core-server.savedobjectsclientfactory.md)<!-- -->. |
 |  [SavedObjectsClientWrapperFactory](./kibana-plugin-core-server.savedobjectsclientwrapperfactory.md) | Describes the factory used to create instances of Saved Objects Client Wrappers. |
 |  [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) | Describe a [saved object type mapping](./kibana-plugin-core-server.savedobjectstypemappingdefinition.md) field.<!-- -->Please refer to [elasticsearch documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html) For the mapping documentation |
-|  [SavedObjectsNamespaceType](./kibana-plugin-core-server.savedobjectsnamespacetype.md) | The namespace type dictates how a saved object can be interacted in relation to namespaces. Each type is mutually exclusive: \* single (default): this type of saved object is namespace-isolated, e.g., it exists in only one namespace. \* multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces. \* agnostic: this type of saved object is global.<!-- -->Note: do not write logic that uses this value directly; instead, use the appropriate accessors in the [type registry](./kibana-plugin-core-server.savedobjecttyperegistry.md)<!-- -->. |
+|  [SavedObjectsNamespaceType](./kibana-plugin-core-server.savedobjectsnamespacetype.md) | The namespace type dictates how a saved object can be interacted in relation to namespaces. Each type is mutually exclusive: \* single (default): this type of saved object is namespace-isolated, e.g., it exists in only one namespace. \* multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces. \* agnostic: this type of saved object is global. |
 |  [SavedObjectUnsanitizedDoc](./kibana-plugin-core-server.savedobjectunsanitizeddoc.md) | Describes Saved Object documents from Kibana &lt; 7.0.0 which don't have a <code>references</code> root property defined. This type should only be used in migrations. |
 |  [ScopeableRequest](./kibana-plugin-core-server.scopeablerequest.md) | A user credentials container. It accommodates the necessary auth credentials to impersonate the current user.<!-- -->See [KibanaRequest](./kibana-plugin-core-server.kibanarequest.md)<!-- -->. |
 |  [ServiceStatusLevel](./kibana-plugin-core-server.servicestatuslevel.md) | A convenience type that represents the union of each value in [ServiceStatusLevels](./kibana-plugin-core-server.servicestatuslevels.md)<!-- -->. |
diff --git a/docs/development/core/server/kibana-plugin-core-server.resolvesavedobjectsimporterrors.md b/docs/development/core/server/kibana-plugin-core-server.resolvesavedobjectsimporterrors.md
index c7f30b0533d04..a2255613e0f6c 100644
--- a/docs/development/core/server/kibana-plugin-core-server.resolvesavedobjectsimporterrors.md
+++ b/docs/development/core/server/kibana-plugin-core-server.resolvesavedobjectsimporterrors.md
@@ -9,14 +9,14 @@ Resolve and return saved object import errors. See the [options](./kibana-plugin
 <b>Signature:</b>
 
 ```typescript
-export declare function resolveSavedObjectsImportErrors({ readStream, objectLimit, retries, savedObjectsClient, supportedTypes, namespace, }: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse>;
+export declare function resolveSavedObjectsImportErrors({ readStream, objectLimit, retries, savedObjectsClient, typeRegistry, namespace, createNewCopies, }: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse>;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  { readStream, objectLimit, retries, savedObjectsClient, supportedTypes, namespace, } | <code>SavedObjectsResolveImportErrorsOptions</code> |  |
+|  { readStream, objectLimit, retries, savedObjectsClient, typeRegistry, namespace, createNewCopies, } | <code>SavedObjectsResolveImportErrorsOptions</code> |  |
 
 <b>Returns:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobject.error.md b/docs/development/core/server/kibana-plugin-core-server.savedobject.error.md
index dffef4392c85c..ef42053e38626 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobject.error.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobject.error.md
@@ -7,8 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-error?: {
-        message: string;
-        statusCode: number;
-    };
+error?: SavedObjectError;
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobject.md b/docs/development/core/server/kibana-plugin-core-server.savedobject.md
index 94d1c378899df..5aefc55736cd1 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobject.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobject.md
@@ -15,10 +15,11 @@ export interface SavedObject<T = unknown>
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [attributes](./kibana-plugin-core-server.savedobject.attributes.md) | <code>T</code> | The data for a Saved Object is stored as an object in the <code>attributes</code> property. |
-|  [error](./kibana-plugin-core-server.savedobject.error.md) | <code>{</code><br/><code>        message: string;</code><br/><code>        statusCode: number;</code><br/><code>    }</code> |  |
+|  [error](./kibana-plugin-core-server.savedobject.error.md) | <code>SavedObjectError</code> |  |
 |  [id](./kibana-plugin-core-server.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-server.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-server.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. |
+|  [originId](./kibana-plugin-core-server.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-server.savedobject.references.md) | <code>SavedObjectReference[]</code> | A reference to another saved object. |
 |  [type](./kibana-plugin-core-server.savedobject.type.md) | <code>string</code> | The type of Saved Object. Each plugin can define it's own custom Saved Object types. |
 |  [updated\_at](./kibana-plugin-core-server.savedobject.updated_at.md) | <code>string</code> | Timestamp of the last time this document had been updated. |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobject.originid.md b/docs/development/core/server/kibana-plugin-core-server.savedobject.originid.md
new file mode 100644
index 0000000000000..95bcad7ce8b1b
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobject.originid.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; [SavedObject](./kibana-plugin-core-server.savedobject.md) &gt; [originId](./kibana-plugin-core-server.savedobject.originid.md)
+
+## SavedObject.originId property
+
+The ID of the saved object this originated from. This is set if this object's `id` 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.
+
+<b>Signature:</b>
+
+```typescript
+originId?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.md
index 5ccad134248f6..019d30570ab36 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.md
@@ -18,6 +18,7 @@ export interface SavedObjectsBulkCreateObject<T = unknown>
 |  [attributes](./kibana-plugin-core-server.savedobjectsbulkcreateobject.attributes.md) | <code>T</code> |  |
 |  [id](./kibana-plugin-core-server.savedobjectsbulkcreateobject.id.md) | <code>string</code> |  |
 |  [migrationVersion](./kibana-plugin-core-server.savedobjectsbulkcreateobject.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. |
+|  [originId](./kibana-plugin-core-server.savedobjectsbulkcreateobject.originid.md) | <code>string</code> | Optional ID of the original saved object, if this object's <code>id</code> was regenerated |
 |  [references](./kibana-plugin-core-server.savedobjectsbulkcreateobject.references.md) | <code>SavedObjectReference[]</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectsbulkcreateobject.type.md) | <code>string</code> |  |
 |  [version](./kibana-plugin-core-server.savedobjectsbulkcreateobject.version.md) | <code>string</code> |  |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.originid.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.originid.md
new file mode 100644
index 0000000000000..c182a47891f62
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsbulkcreateobject.originid.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; [SavedObjectsBulkCreateObject](./kibana-plugin-core-server.savedobjectsbulkcreateobject.md) &gt; [originId](./kibana-plugin-core-server.savedobjectsbulkcreateobject.originid.md)
+
+## SavedObjectsBulkCreateObject.originId property
+
+Optional ID of the original saved object, if this object's `id` was regenerated
+
+<b>Signature:</b>
+
+```typescript
+originId?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.id.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.id.md
new file mode 100644
index 0000000000000..2b7cd5cc486a8
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.id.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsCheckConflictsObject](./kibana-plugin-core-server.savedobjectscheckconflictsobject.md) &gt; [id](./kibana-plugin-core-server.savedobjectscheckconflictsobject.id.md)
+
+## SavedObjectsCheckConflictsObject.id property
+
+<b>Signature:</b>
+
+```typescript
+id: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.md
new file mode 100644
index 0000000000000..c327cc4a20551
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.md
@@ -0,0 +1,20 @@
+<!-- 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; [SavedObjectsCheckConflictsObject](./kibana-plugin-core-server.savedobjectscheckconflictsobject.md)
+
+## SavedObjectsCheckConflictsObject interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsCheckConflictsObject 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [id](./kibana-plugin-core-server.savedobjectscheckconflictsobject.id.md) | <code>string</code> |  |
+|  [type](./kibana-plugin-core-server.savedobjectscheckconflictsobject.type.md) | <code>string</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.type.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.type.md
new file mode 100644
index 0000000000000..82f89536e4189
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsobject.type.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsCheckConflictsObject](./kibana-plugin-core-server.savedobjectscheckconflictsobject.md) &gt; [type](./kibana-plugin-core-server.savedobjectscheckconflictsobject.type.md)
+
+## SavedObjectsCheckConflictsObject.type property
+
+<b>Signature:</b>
+
+```typescript
+type: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsresponse.errors.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsresponse.errors.md
new file mode 100644
index 0000000000000..80bd61d8906e3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsresponse.errors.md
@@ -0,0 +1,15 @@
+<!-- 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; [SavedObjectsCheckConflictsResponse](./kibana-plugin-core-server.savedobjectscheckconflictsresponse.md) &gt; [errors](./kibana-plugin-core-server.savedobjectscheckconflictsresponse.errors.md)
+
+## SavedObjectsCheckConflictsResponse.errors property
+
+<b>Signature:</b>
+
+```typescript
+errors: Array<{
+        id: string;
+        type: string;
+        error: SavedObjectError;
+    }>;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsresponse.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsresponse.md
new file mode 100644
index 0000000000000..499398586e7dd
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscheckconflictsresponse.md
@@ -0,0 +1,19 @@
+<!-- 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; [SavedObjectsCheckConflictsResponse](./kibana-plugin-core-server.savedobjectscheckconflictsresponse.md)
+
+## SavedObjectsCheckConflictsResponse interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsCheckConflictsResponse 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [errors](./kibana-plugin-core-server.savedobjectscheckconflictsresponse.errors.md) | <code>Array&lt;{</code><br/><code>        id: string;</code><br/><code>        type: string;</code><br/><code>        error: SavedObjectError;</code><br/><code>    }&gt;</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.checkconflicts.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.checkconflicts.md
new file mode 100644
index 0000000000000..5cffb0c498b0b
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.checkconflicts.md
@@ -0,0 +1,25 @@
+<!-- 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; [SavedObjectsClient](./kibana-plugin-core-server.savedobjectsclient.md) &gt; [checkConflicts](./kibana-plugin-core-server.savedobjectsclient.checkconflicts.md)
+
+## SavedObjectsClient.checkConflicts() method
+
+Check what conflicts will result when creating a given array of saved objects. This includes "unresolvable conflicts", which are multi-namespace objects that exist in a different namespace; such conflicts cannot be resolved/overwritten.
+
+<b>Signature:</b>
+
+```typescript
+checkConflicts(objects?: SavedObjectsCheckConflictsObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsCheckConflictsResponse>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  objects | <code>SavedObjectsCheckConflictsObject[]</code> |  |
+|  options | <code>SavedObjectsBaseOptions</code> |  |
+
+<b>Returns:</b>
+
+`Promise<SavedObjectsCheckConflictsResponse>`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.md
index 7038c0c07012f..7c1273e63d24b 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsclient.md
@@ -29,6 +29,7 @@ The constructor for this class is marked as internal. Third-party code should no
 |  [bulkCreate(objects, options)](./kibana-plugin-core-server.savedobjectsclient.bulkcreate.md) |  | Persists multiple documents batched together as a single request |
 |  [bulkGet(objects, options)](./kibana-plugin-core-server.savedobjectsclient.bulkget.md) |  | Returns an array of objects by id |
 |  [bulkUpdate(objects, options)](./kibana-plugin-core-server.savedobjectsclient.bulkupdate.md) |  | Bulk Updates multiple SavedObject at once |
+|  [checkConflicts(objects, options)](./kibana-plugin-core-server.savedobjectsclient.checkconflicts.md) |  | Check what conflicts will result when creating a given array of saved objects. This includes "unresolvable conflicts", which are multi-namespace objects that exist in a different namespace; such conflicts cannot be resolved/overwritten. |
 |  [create(type, attributes, options)](./kibana-plugin-core-server.savedobjectsclient.create.md) |  | Persists a SavedObject |
 |  [delete(type, id, options)](./kibana-plugin-core-server.savedobjectsclient.delete.md) |  | Deletes a SavedObject |
 |  [deleteFromNamespaces(type, id, namespaces, options)](./kibana-plugin-core-server.savedobjectsclient.deletefromnamespaces.md) |  | Removes namespaces from a SavedObject |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.md
index c5201efd0608d..d936829443753 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.md
@@ -17,6 +17,7 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions
 |  --- | --- | --- |
 |  [id](./kibana-plugin-core-server.savedobjectscreateoptions.id.md) | <code>string</code> | (not recommended) Specify an id for the document |
 |  [migrationVersion](./kibana-plugin-core-server.savedobjectscreateoptions.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. |
+|  [originId](./kibana-plugin-core-server.savedobjectscreateoptions.originid.md) | <code>string</code> | Optional ID of the original saved object, if this object's <code>id</code> was regenerated |
 |  [overwrite](./kibana-plugin-core-server.savedobjectscreateoptions.overwrite.md) | <code>boolean</code> | Overwrite existing documents (defaults to false) |
 |  [references](./kibana-plugin-core-server.savedobjectscreateoptions.references.md) | <code>SavedObjectReference[]</code> |  |
 |  [refresh](./kibana-plugin-core-server.savedobjectscreateoptions.refresh.md) | <code>MutatingOperationRefreshSetting</code> | The Elasticsearch Refresh setting for this operation |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.originid.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.originid.md
new file mode 100644
index 0000000000000..14333079f7440
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscreateoptions.originid.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; [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md) &gt; [originId](./kibana-plugin-core-server.savedobjectscreateoptions.originid.md)
+
+## SavedObjectsCreateOptions.originId property
+
+Optional ID of the original saved object, if this object's `id` was regenerated
+
+<b>Signature:</b>
+
+```typescript
+originId?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
index 67e931f0cb3b3..15a9d99b3d062 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
@@ -23,6 +23,7 @@ export interface SavedObjectsFindOptions
 |  [page](./kibana-plugin-core-server.savedobjectsfindoptions.page.md) | <code>number</code> |  |
 |  [perPage](./kibana-plugin-core-server.savedobjectsfindoptions.perpage.md) | <code>number</code> |  |
 |  [preference](./kibana-plugin-core-server.savedobjectsfindoptions.preference.md) | <code>string</code> | An optional ES preference value to be used for the query \* |
+|  [rootSearchFields](./kibana-plugin-core-server.savedobjectsfindoptions.rootsearchfields.md) | <code>string[]</code> | The fields to perform the parsed query against. Unlike the <code>searchFields</code> argument, these are expected to be root fields and will not be modified. If used in conjunction with <code>searchFields</code>, both are concatenated together. |
 |  [search](./kibana-plugin-core-server.savedobjectsfindoptions.search.md) | <code>string</code> | Search documents using the Elasticsearch Simple Query String syntax. See Elasticsearch Simple Query String <code>query</code> argument for more information |
 |  [searchFields](./kibana-plugin-core-server.savedobjectsfindoptions.searchfields.md) | <code>string[]</code> | The fields to perform the parsed query against. See Elasticsearch Simple Query String <code>fields</code> argument for more information |
 |  [sortField](./kibana-plugin-core-server.savedobjectsfindoptions.sortfield.md) | <code>string</code> |  |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.rootsearchfields.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.rootsearchfields.md
new file mode 100644
index 0000000000000..204342c45f64e
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.rootsearchfields.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; [SavedObjectsFindOptions](./kibana-plugin-core-server.savedobjectsfindoptions.md) &gt; [rootSearchFields](./kibana-plugin-core-server.savedobjectsfindoptions.rootsearchfields.md)
+
+## SavedObjectsFindOptions.rootSearchFields property
+
+The fields to perform the parsed query against. Unlike the `searchFields` argument, these are expected to be root fields and will not be modified. If used in conjunction with `searchFields`<!-- -->, both are concatenated together.
+
+<b>Signature:</b>
+
+```typescript
+rootSearchFields?: string[];
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.destinations.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.destinations.md
new file mode 100644
index 0000000000000..445979dd740d3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.destinations.md
@@ -0,0 +1,15 @@
+<!-- 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; [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.md) &gt; [destinations](./kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.destinations.md)
+
+## SavedObjectsImportAmbiguousConflictError.destinations property
+
+<b>Signature:</b>
+
+```typescript
+destinations: Array<{
+        id: string;
+        title?: string;
+        updatedAt?: string;
+    }>;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.md
new file mode 100644
index 0000000000000..d2c0a397ebe8a
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.md
@@ -0,0 +1,21 @@
+<!-- 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; [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.md)
+
+## SavedObjectsImportAmbiguousConflictError interface
+
+Represents a failure to import due to a conflict, which can be resolved in different ways with an overwrite.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportAmbiguousConflictError 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [destinations](./kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.destinations.md) | <code>Array&lt;{</code><br/><code>        id: string;</code><br/><code>        title?: string;</code><br/><code>        updatedAt?: string;</code><br/><code>    }&gt;</code> |  |
+|  [type](./kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.type.md) | <code>'ambiguous_conflict'</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.type.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.type.md
new file mode 100644
index 0000000000000..ca98682873033
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.type.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsImportAmbiguousConflictError](./kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.md) &gt; [type](./kibana-plugin-core-server.savedobjectsimportambiguousconflicterror.type.md)
+
+## SavedObjectsImportAmbiguousConflictError.type property
+
+<b>Signature:</b>
+
+```typescript
+type: 'ambiguous_conflict';
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportconflicterror.destinationid.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportconflicterror.destinationid.md
new file mode 100644
index 0000000000000..858f171223472
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportconflicterror.destinationid.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsImportConflictError](./kibana-plugin-core-server.savedobjectsimportconflicterror.md) &gt; [destinationId](./kibana-plugin-core-server.savedobjectsimportconflicterror.destinationid.md)
+
+## SavedObjectsImportConflictError.destinationId property
+
+<b>Signature:</b>
+
+```typescript
+destinationId?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportconflicterror.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportconflicterror.md
index a3e946eccb984..153cd55c9199e 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportconflicterror.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportconflicterror.md
@@ -16,5 +16,6 @@ export interface SavedObjectsImportConflictError
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [destinationId](./kibana-plugin-core-server.savedobjectsimportconflicterror.destinationid.md) | <code>string</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectsimportconflicterror.type.md) | <code>'conflict'</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.error.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.error.md
index a5d33de32d594..6fc0c86b2fafc 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.error.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.error.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-error: SavedObjectsImportConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
+error: SavedObjectsImportConflictError | SavedObjectsImportAmbiguousConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.md
index 473812fcbfd72..713e23edef081 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.md
@@ -16,8 +16,10 @@ export interface SavedObjectsImportError
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [error](./kibana-plugin-core-server.savedobjectsimporterror.error.md) | <code>SavedObjectsImportConflictError &#124; SavedObjectsImportUnsupportedTypeError &#124; SavedObjectsImportMissingReferencesError &#124; SavedObjectsImportUnknownError</code> |  |
+|  [error](./kibana-plugin-core-server.savedobjectsimporterror.error.md) | <code>SavedObjectsImportConflictError &#124; SavedObjectsImportAmbiguousConflictError &#124; SavedObjectsImportUnsupportedTypeError &#124; SavedObjectsImportMissingReferencesError &#124; SavedObjectsImportUnknownError</code> |  |
 |  [id](./kibana-plugin-core-server.savedobjectsimporterror.id.md) | <code>string</code> |  |
+|  [meta](./kibana-plugin-core-server.savedobjectsimporterror.meta.md) | <code>{</code><br/><code>        title?: string;</code><br/><code>        icon?: string;</code><br/><code>    }</code> |  |
+|  [overwrite](./kibana-plugin-core-server.savedobjectsimporterror.overwrite.md) | <code>boolean</code> | If <code>overwrite</code> is specified, an attempt was made to overwrite an existing object. |
 |  [title](./kibana-plugin-core-server.savedobjectsimporterror.title.md) | <code>string</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectsimporterror.type.md) | <code>string</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.meta.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.meta.md
new file mode 100644
index 0000000000000..8d88bf1e375d4
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.meta.md
@@ -0,0 +1,14 @@
+<!-- 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; [SavedObjectsImportError](./kibana-plugin-core-server.savedobjectsimporterror.md) &gt; [meta](./kibana-plugin-core-server.savedobjectsimporterror.meta.md)
+
+## SavedObjectsImportError.meta property
+
+<b>Signature:</b>
+
+```typescript
+meta: {
+        title?: string;
+        icon?: string;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.overwrite.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.overwrite.md
new file mode 100644
index 0000000000000..f706f921cf052
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.overwrite.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; [SavedObjectsImportError](./kibana-plugin-core-server.savedobjectsimporterror.md) &gt; [overwrite](./kibana-plugin-core-server.savedobjectsimporterror.overwrite.md)
+
+## SavedObjectsImportError.overwrite property
+
+If `overwrite` is specified, an attempt was made to overwrite an existing object.
+
+<b>Signature:</b>
+
+```typescript
+overwrite?: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.title.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.title.md
index bfa20bb963acb..3d787cbe20bb4 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.title.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimporterror.title.md
@@ -4,6 +4,11 @@
 
 ## SavedObjectsImportError.title property
 
+> Warning: This API is now obsolete.
+> 
+> Use `meta.title` instead
+> 
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.blocking.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.blocking.md
deleted file mode 100644
index 7ab5662003d8f..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.blocking.md
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- 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; [SavedObjectsImportMissingReferencesError](./kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.md) &gt; [blocking](./kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.blocking.md)
-
-## SavedObjectsImportMissingReferencesError.blocking property
-
-<b>Signature:</b>
-
-```typescript
-blocking: Array<{
-        type: string;
-        id: string;
-    }>;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.md
index b489b1bec26c3..01557eff549f6 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.md
@@ -16,7 +16,6 @@ export interface SavedObjectsImportMissingReferencesError
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [blocking](./kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.blocking.md) | <code>Array&lt;{</code><br/><code>        type: string;</code><br/><code>        id: string;</code><br/><code>    }&gt;</code> |  |
 |  [references](./kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.references.md) | <code>Array&lt;{</code><br/><code>        type: string;</code><br/><code>        id: string;</code><br/><code>    }&gt;</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectsimportmissingreferenceserror.type.md) | <code>'missing_references'</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.createnewcopies.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.createnewcopies.md
new file mode 100644
index 0000000000000..23c6fe0051746
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.createnewcopies.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; [SavedObjectsImportOptions](./kibana-plugin-core-server.savedobjectsimportoptions.md) &gt; [createNewCopies](./kibana-plugin-core-server.savedobjectsimportoptions.createnewcopies.md)
+
+## SavedObjectsImportOptions.createNewCopies property
+
+If true, will create new copies of import objects, each with a random `id` and undefined `originId`<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+createNewCopies: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.md
index f9da9956772bb..6578b01ffa609 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.md
@@ -16,10 +16,11 @@ export interface SavedObjectsImportOptions
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [createNewCopies](./kibana-plugin-core-server.savedobjectsimportoptions.createnewcopies.md) | <code>boolean</code> | If true, will create new copies of import objects, each with a random <code>id</code> and undefined <code>originId</code>. |
 |  [namespace](./kibana-plugin-core-server.savedobjectsimportoptions.namespace.md) | <code>string</code> | if specified, will import in given namespace, else will import as global object |
 |  [objectLimit](./kibana-plugin-core-server.savedobjectsimportoptions.objectlimit.md) | <code>number</code> | The maximum number of object to import |
-|  [overwrite](./kibana-plugin-core-server.savedobjectsimportoptions.overwrite.md) | <code>boolean</code> | if true, will override existing object if present |
+|  [overwrite](./kibana-plugin-core-server.savedobjectsimportoptions.overwrite.md) | <code>boolean</code> | If true, will override existing object if present. Note: this has no effect when used with the <code>createNewCopies</code> option. |
 |  [readStream](./kibana-plugin-core-server.savedobjectsimportoptions.readstream.md) | <code>Readable</code> | The stream of [saved objects](./kibana-plugin-core-server.savedobject.md) to import |
 |  [savedObjectsClient](./kibana-plugin-core-server.savedobjectsimportoptions.savedobjectsclient.md) | <code>SavedObjectsClientContract</code> | [client](./kibana-plugin-core-server.savedobjectsclientcontract.md) to use to perform the import operation |
-|  [supportedTypes](./kibana-plugin-core-server.savedobjectsimportoptions.supportedtypes.md) | <code>string[]</code> | the list of allowed types to import |
+|  [typeRegistry](./kibana-plugin-core-server.savedobjectsimportoptions.typeregistry.md) | <code>ISavedObjectTypeRegistry</code> | The registry of all known saved object types |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.overwrite.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.overwrite.md
index e42d04c5a9180..1e9192c47679d 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.overwrite.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.overwrite.md
@@ -4,7 +4,7 @@
 
 ## SavedObjectsImportOptions.overwrite property
 
-if true, will override existing object if present
+If true, will override existing object if present. Note: this has no effect when used with the `createNewCopies` option.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.supportedtypes.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.supportedtypes.md
deleted file mode 100644
index 999cb73cbdfba..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.supportedtypes.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- 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; [SavedObjectsImportOptions](./kibana-plugin-core-server.savedobjectsimportoptions.md) &gt; [supportedTypes](./kibana-plugin-core-server.savedobjectsimportoptions.supportedtypes.md)
-
-## SavedObjectsImportOptions.supportedTypes property
-
-the list of allowed types to import
-
-<b>Signature:</b>
-
-```typescript
-supportedTypes: string[];
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.typeregistry.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.typeregistry.md
new file mode 100644
index 0000000000000..89c49471d24ef
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportoptions.typeregistry.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; [SavedObjectsImportOptions](./kibana-plugin-core-server.savedobjectsimportoptions.md) &gt; [typeRegistry](./kibana-plugin-core-server.savedobjectsimportoptions.typeregistry.md)
+
+## SavedObjectsImportOptions.typeRegistry property
+
+The registry of all known saved object types
+
+<b>Signature:</b>
+
+```typescript
+typeRegistry: ISavedObjectTypeRegistry;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportresponse.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportresponse.md
index 641934d43eddf..52d39d981d0c2 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportresponse.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportresponse.md
@@ -19,4 +19,5 @@ export interface SavedObjectsImportResponse
 |  [errors](./kibana-plugin-core-server.savedobjectsimportresponse.errors.md) | <code>SavedObjectsImportError[]</code> |  |
 |  [success](./kibana-plugin-core-server.savedobjectsimportresponse.success.md) | <code>boolean</code> |  |
 |  [successCount](./kibana-plugin-core-server.savedobjectsimportresponse.successcount.md) | <code>number</code> |  |
+|  [successResults](./kibana-plugin-core-server.savedobjectsimportresponse.successresults.md) | <code>SavedObjectsImportSuccess[]</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportresponse.successresults.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportresponse.successresults.md
new file mode 100644
index 0000000000000..63951d3a0b25f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportresponse.successresults.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsImportResponse](./kibana-plugin-core-server.savedobjectsimportresponse.md) &gt; [successResults](./kibana-plugin-core-server.savedobjectsimportresponse.successresults.md)
+
+## SavedObjectsImportResponse.successResults property
+
+<b>Signature:</b>
+
+```typescript
+successResults?: SavedObjectsImportSuccess[];
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.createnewcopy.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.createnewcopy.md
new file mode 100644
index 0000000000000..e9cc92c55ded1
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.createnewcopy.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; [SavedObjectsImportRetry](./kibana-plugin-core-server.savedobjectsimportretry.md) &gt; [createNewCopy](./kibana-plugin-core-server.savedobjectsimportretry.createnewcopy.md)
+
+## SavedObjectsImportRetry.createNewCopy property
+
+If `createNewCopy` is specified, the new object has a new (undefined) origin ID. This is only needed for the case where `createNewCopies` mode is disabled and ambiguous source conflicts are detected.
+
+<b>Signature:</b>
+
+```typescript
+createNewCopy?: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.destinationid.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.destinationid.md
new file mode 100644
index 0000000000000..9a3ccf4442db7
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.destinationid.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; [SavedObjectsImportRetry](./kibana-plugin-core-server.savedobjectsimportretry.md) &gt; [destinationId](./kibana-plugin-core-server.savedobjectsimportretry.destinationid.md)
+
+## SavedObjectsImportRetry.destinationId property
+
+The object ID that will be created or overwritten. If not specified, the `id` field will be used.
+
+<b>Signature:</b>
+
+```typescript
+destinationId?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.ignoremissingreferences.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.ignoremissingreferences.md
new file mode 100644
index 0000000000000..a23bec3c5341f
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.ignoremissingreferences.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; [SavedObjectsImportRetry](./kibana-plugin-core-server.savedobjectsimportretry.md) &gt; [ignoreMissingReferences](./kibana-plugin-core-server.savedobjectsimportretry.ignoremissingreferences.md)
+
+## SavedObjectsImportRetry.ignoreMissingReferences property
+
+If `ignoreMissingReferences` is specified, reference validation will be skipped for this object.
+
+<b>Signature:</b>
+
+```typescript
+ignoreMissingReferences?: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.md
index 64d8164a1c4a5..70693e6f43a39 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportretry.md
@@ -16,7 +16,10 @@ export interface SavedObjectsImportRetry
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [createNewCopy](./kibana-plugin-core-server.savedobjectsimportretry.createnewcopy.md) | <code>boolean</code> | If <code>createNewCopy</code> is specified, the new object has a new (undefined) origin ID. This is only needed for the case where <code>createNewCopies</code> mode is disabled and ambiguous source conflicts are detected. |
+|  [destinationId](./kibana-plugin-core-server.savedobjectsimportretry.destinationid.md) | <code>string</code> | The object ID that will be created or overwritten. If not specified, the <code>id</code> field will be used. |
 |  [id](./kibana-plugin-core-server.savedobjectsimportretry.id.md) | <code>string</code> |  |
+|  [ignoreMissingReferences](./kibana-plugin-core-server.savedobjectsimportretry.ignoremissingreferences.md) | <code>boolean</code> | If <code>ignoreMissingReferences</code> is specified, reference validation will be skipped for this object. |
 |  [overwrite](./kibana-plugin-core-server.savedobjectsimportretry.overwrite.md) | <code>boolean</code> |  |
 |  [replaceReferences](./kibana-plugin-core-server.savedobjectsimportretry.replacereferences.md) | <code>Array&lt;{</code><br/><code>        type: string;</code><br/><code>        from: string;</code><br/><code>        to: string;</code><br/><code>    }&gt;</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectsimportretry.type.md) | <code>string</code> |  |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.createnewcopy.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.createnewcopy.md
new file mode 100644
index 0000000000000..66b7a268f2ed5
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.createnewcopy.md
@@ -0,0 +1,16 @@
+<!-- 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; [SavedObjectsImportSuccess](./kibana-plugin-core-server.savedobjectsimportsuccess.md) &gt; [createNewCopy](./kibana-plugin-core-server.savedobjectsimportsuccess.createnewcopy.md)
+
+## SavedObjectsImportSuccess.createNewCopy property
+
+> Warning: This API is now obsolete.
+> 
+> If `createNewCopy` is specified, the new object has a new (undefined) origin ID. This is only needed for the case where `createNewCopies` mode is disabled and ambiguous source conflicts are detected. When `createNewCopies` mode is permanently enabled, this field will be redundant and can be removed.
+> 
+
+<b>Signature:</b>
+
+```typescript
+createNewCopy?: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.destinationid.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.destinationid.md
new file mode 100644
index 0000000000000..c5acc51c3ec99
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.destinationid.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; [SavedObjectsImportSuccess](./kibana-plugin-core-server.savedobjectsimportsuccess.md) &gt; [destinationId](./kibana-plugin-core-server.savedobjectsimportsuccess.destinationid.md)
+
+## SavedObjectsImportSuccess.destinationId property
+
+If `destinationId` is specified, the new object has a new ID that is different from the import ID.
+
+<b>Signature:</b>
+
+```typescript
+destinationId?: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.id.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.id.md
new file mode 100644
index 0000000000000..5b95f7f64bfac
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.id.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsImportSuccess](./kibana-plugin-core-server.savedobjectsimportsuccess.md) &gt; [id](./kibana-plugin-core-server.savedobjectsimportsuccess.id.md)
+
+## SavedObjectsImportSuccess.id property
+
+<b>Signature:</b>
+
+```typescript
+id: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.md
new file mode 100644
index 0000000000000..18a226f636b1d
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.md
@@ -0,0 +1,25 @@
+<!-- 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; [SavedObjectsImportSuccess](./kibana-plugin-core-server.savedobjectsimportsuccess.md)
+
+## SavedObjectsImportSuccess interface
+
+Represents a successful import.
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsImportSuccess 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [createNewCopy](./kibana-plugin-core-server.savedobjectsimportsuccess.createnewcopy.md) | <code>boolean</code> |  |
+|  [destinationId](./kibana-plugin-core-server.savedobjectsimportsuccess.destinationid.md) | <code>string</code> | If <code>destinationId</code> is specified, the new object has a new ID that is different from the import ID. |
+|  [id](./kibana-plugin-core-server.savedobjectsimportsuccess.id.md) | <code>string</code> |  |
+|  [meta](./kibana-plugin-core-server.savedobjectsimportsuccess.meta.md) | <code>{</code><br/><code>        title?: string;</code><br/><code>        icon?: string;</code><br/><code>    }</code> |  |
+|  [overwrite](./kibana-plugin-core-server.savedobjectsimportsuccess.overwrite.md) | <code>boolean</code> | If <code>overwrite</code> is specified, this object overwrote an existing one (or will do so, in the case of a pending resolution). |
+|  [type](./kibana-plugin-core-server.savedobjectsimportsuccess.type.md) | <code>string</code> |  |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.meta.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.meta.md
new file mode 100644
index 0000000000000..de6057b4729ec
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.meta.md
@@ -0,0 +1,14 @@
+<!-- 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; [SavedObjectsImportSuccess](./kibana-plugin-core-server.savedobjectsimportsuccess.md) &gt; [meta](./kibana-plugin-core-server.savedobjectsimportsuccess.meta.md)
+
+## SavedObjectsImportSuccess.meta property
+
+<b>Signature:</b>
+
+```typescript
+meta: {
+        title?: string;
+        icon?: string;
+    };
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.overwrite.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.overwrite.md
new file mode 100644
index 0000000000000..80cb659ef2cd2
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.overwrite.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; [SavedObjectsImportSuccess](./kibana-plugin-core-server.savedobjectsimportsuccess.md) &gt; [overwrite](./kibana-plugin-core-server.savedobjectsimportsuccess.overwrite.md)
+
+## SavedObjectsImportSuccess.overwrite property
+
+If `overwrite` is specified, this object overwrote an existing one (or will do so, in the case of a pending resolution).
+
+<b>Signature:</b>
+
+```typescript
+overwrite?: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.type.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.type.md
new file mode 100644
index 0000000000000..e6aa894cd0af9
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsimportsuccess.type.md
@@ -0,0 +1,11 @@
+<!-- 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; [SavedObjectsImportSuccess](./kibana-plugin-core-server.savedobjectsimportsuccess.md) &gt; [type](./kibana-plugin-core-server.savedobjectsimportsuccess.type.md)
+
+## SavedObjectsImportSuccess.type property
+
+<b>Signature:</b>
+
+```typescript
+type: string;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsnamespacetype.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsnamespacetype.md
index 173b9e19321d0..9075a780bd2c7 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsnamespacetype.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsnamespacetype.md
@@ -6,8 +6,6 @@
 
 The namespace type dictates how a saved object can be interacted in relation to namespaces. Each type is mutually exclusive: \* single (default): this type of saved object is namespace-isolated, e.g., it exists in only one namespace. \* multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces. \* agnostic: this type of saved object is global.
 
-Note: do not write logic that uses this value directly; instead, use the appropriate accessors in the [type registry](./kibana-plugin-core-server.savedobjecttyperegistry.md)<!-- -->.
-
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.checkconflicts.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.checkconflicts.md
new file mode 100644
index 0000000000000..6e44bd704d6a7
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.checkconflicts.md
@@ -0,0 +1,25 @@
+<!-- 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; [SavedObjectsRepository](./kibana-plugin-core-server.savedobjectsrepository.md) &gt; [checkConflicts](./kibana-plugin-core-server.savedobjectsrepository.checkconflicts.md)
+
+## SavedObjectsRepository.checkConflicts() method
+
+Check what conflicts will result when creating a given array of saved objects. This includes "unresolvable conflicts", which are multi-namespace objects that exist in a different namespace; such conflicts cannot be resolved/overwritten.
+
+<b>Signature:</b>
+
+```typescript
+checkConflicts(objects?: SavedObjectsCheckConflictsObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsCheckConflictsResponse>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  objects | <code>SavedObjectsCheckConflictsObject[]</code> |  |
+|  options | <code>SavedObjectsBaseOptions</code> |  |
+
+<b>Returns:</b>
+
+`Promise<SavedObjectsCheckConflictsResponse>`
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.find.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.find.md
index 6c41441302c0b..1b562263145da 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.find.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.find.md
@@ -7,14 +7,14 @@
 <b>Signature:</b>
 
 ```typescript
-find<T = unknown>({ search, defaultSearchOperator, searchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, }: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
+find<T = unknown>({ search, defaultSearchOperator, searchFields, rootSearchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, }: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  { search, defaultSearchOperator, searchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, } | <code>SavedObjectsFindOptions</code> |  |
+|  { search, defaultSearchOperator, searchFields, rootSearchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, } | <code>SavedObjectsFindOptions</code> |  |
 
 <b>Returns:</b>
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md
index 6b02cd910cdb1..f3a2ee38cbdbd 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md
@@ -9,14 +9,7 @@ Increases a counter field by one. Creates the document if one doesn't exist for
 <b>Signature:</b>
 
 ```typescript
-incrementCounter(type: string, id: string, counterFieldName: string, options?: SavedObjectsIncrementCounterOptions): Promise<{
-        id: string;
-        type: string;
-        updated_at: string;
-        references: any;
-        version: string;
-        attributes: any;
-    }>;
+incrementCounter(type: string, id: string, counterFieldName: string, options?: SavedObjectsIncrementCounterOptions): Promise<SavedObject>;
 ```
 
 ## Parameters
@@ -30,14 +23,7 @@ incrementCounter(type: string, id: string, counterFieldName: string, options?: S
 
 <b>Returns:</b>
 
-`Promise<{
-        id: string;
-        type: string;
-        updated_at: string;
-        references: any;
-        version: string;
-        attributes: any;
-    }>`
+`Promise<SavedObject>`
 
 {<!-- -->promise<!-- -->}
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.md
index 5b02707a3c0f4..14d3741425987 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.md
@@ -19,11 +19,12 @@ export declare class SavedObjectsRepository
 |  [bulkCreate(objects, options)](./kibana-plugin-core-server.savedobjectsrepository.bulkcreate.md) |  | Creates multiple documents at once |
 |  [bulkGet(objects, options)](./kibana-plugin-core-server.savedobjectsrepository.bulkget.md) |  | Returns an array of objects by id |
 |  [bulkUpdate(objects, options)](./kibana-plugin-core-server.savedobjectsrepository.bulkupdate.md) |  | Updates multiple objects in bulk |
+|  [checkConflicts(objects, options)](./kibana-plugin-core-server.savedobjectsrepository.checkconflicts.md) |  | Check what conflicts will result when creating a given array of saved objects. This includes "unresolvable conflicts", which are multi-namespace objects that exist in a different namespace; such conflicts cannot be resolved/overwritten. |
 |  [create(type, attributes, options)](./kibana-plugin-core-server.savedobjectsrepository.create.md) |  | Persists an object |
 |  [delete(type, id, options)](./kibana-plugin-core-server.savedobjectsrepository.delete.md) |  | Deletes an object |
 |  [deleteByNamespace(namespace, options)](./kibana-plugin-core-server.savedobjectsrepository.deletebynamespace.md) |  | Deletes all objects from the provided namespace. |
 |  [deleteFromNamespaces(type, id, namespaces, options)](./kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md) |  | Removes one or more namespaces from a given multi-namespace saved object. If no namespaces remain, the saved object is deleted entirely. This method and \[<code>addToNamespaces</code>\][SavedObjectsRepository.addToNamespaces()](./kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md) are the only ways to change which Spaces a multi-namespace saved object is shared to. |
-|  [find({ search, defaultSearchOperator, searchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, })](./kibana-plugin-core-server.savedobjectsrepository.find.md) |  |  |
+|  [find({ search, defaultSearchOperator, searchFields, rootSearchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, })](./kibana-plugin-core-server.savedobjectsrepository.find.md) |  |  |
 |  [get(type, id, options)](./kibana-plugin-core-server.savedobjectsrepository.get.md) |  | Gets a single object |
 |  [incrementCounter(type, id, counterFieldName, options)](./kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md) |  | Increases a counter field by one. Creates the document if one doesn't exist for the given id. |
 |  [update(type, id, attributes, options)](./kibana-plugin-core-server.savedobjectsrepository.update.md) |  | Updates an object |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.createnewcopies.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.createnewcopies.md
new file mode 100644
index 0000000000000..82831eae37d7b
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.createnewcopies.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; [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.md) &gt; [createNewCopies](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.createnewcopies.md)
+
+## SavedObjectsResolveImportErrorsOptions.createNewCopies property
+
+If true, will create new copies of import objects, each with a random `id` and undefined `originId`<!-- -->.
+
+<b>Signature:</b>
+
+```typescript
+createNewCopies: boolean;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.md
index c701b0a6d9bf7..f97bf284375d1 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.md
@@ -16,10 +16,11 @@ export interface SavedObjectsResolveImportErrorsOptions
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [createNewCopies](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.createnewcopies.md) | <code>boolean</code> | If true, will create new copies of import objects, each with a random <code>id</code> and undefined <code>originId</code>. |
 |  [namespace](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.namespace.md) | <code>string</code> | if specified, will import in given namespace |
 |  [objectLimit](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.objectlimit.md) | <code>number</code> | The maximum number of object to import |
 |  [readStream](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.readstream.md) | <code>Readable</code> | The stream of [saved objects](./kibana-plugin-core-server.savedobject.md) to resolve errors from |
 |  [retries](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.retries.md) | <code>SavedObjectsImportRetry[]</code> | saved object import references to retry |
 |  [savedObjectsClient](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.savedobjectsclient.md) | <code>SavedObjectsClientContract</code> | client to use to perform the import operation |
-|  [supportedTypes](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md) | <code>string[]</code> | the list of allowed types to import |
+|  [typeRegistry](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.typeregistry.md) | <code>ISavedObjectTypeRegistry</code> | The registry of all known saved object types |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.typeregistry.md
similarity index 54%
rename from docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md
rename to docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.typeregistry.md
index f5b7c3692b017..f06d3eb08c0ac 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.typeregistry.md
@@ -1,13 +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; [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.md) &gt; [supportedTypes](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.supportedtypes.md)
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsResolveImportErrorsOptions](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.md) &gt; [typeRegistry](./kibana-plugin-core-server.savedobjectsresolveimporterrorsoptions.typeregistry.md)
 
-## SavedObjectsResolveImportErrorsOptions.supportedTypes property
+## SavedObjectsResolveImportErrorsOptions.typeRegistry property
 
-the list of allowed types to import
+The registry of all known saved object types
 
 <b>Signature:</b>
 
 ```typescript
-supportedTypes: string[];
+typeRegistry: ISavedObjectTypeRegistry;
 ```
diff --git a/package.json b/package.json
index 84f6f30f064f9..1bf6e8b977af8 100644
--- a/package.json
+++ b/package.json
@@ -191,6 +191,7 @@
     "node-forge": "^0.9.1",
     "opn": "^5.5.0",
     "oppsy": "^2.0.0",
+    "p-map": "^4.0.0",
     "pegjs": "0.10.0",
     "proxy-from-env": "1.0.0",
     "query-string": "5.1.1",
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index 3e4e70fb99508..9176a277b3f43 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -140,6 +140,7 @@ export {
   SavedObjectAttribute,
   SavedObjectAttributes,
   SavedObjectAttributeSingle,
+  SavedObjectError,
   SavedObjectReference,
   SavedObjectsBaseOptions,
   SavedObjectsFindOptions,
@@ -148,12 +149,15 @@ export {
   SavedObjectsClient,
   SimpleSavedObject,
   SavedObjectsImportResponse,
+  SavedObjectsImportSuccess,
   SavedObjectsImportConflictError,
+  SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportUnsupportedTypeError,
   SavedObjectsImportMissingReferencesError,
   SavedObjectsImportUnknownError,
   SavedObjectsImportError,
   SavedObjectsImportRetry,
+  SavedObjectsNamespaceType,
 } from './saved_objects';
 
 export {
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 17626418cbeeb..6f25f46c76fb9 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -1061,13 +1061,11 @@ export type PublicUiSettingsParams = Omit<UiSettingsParams, 'schema'>;
 export interface SavedObject<T = unknown> {
     attributes: T;
     // (undocumented)
-    error?: {
-        message: string;
-        statusCode: number;
-    };
+    error?: SavedObjectError;
     id: string;
     migrationVersion?: SavedObjectsMigrationVersion;
     namespaces?: string[];
+    originId?: string;
     references: SavedObjectReference[];
     type: string;
     updated_at?: string;
@@ -1086,6 +1084,20 @@ export interface SavedObjectAttributes {
 // @public
 export type SavedObjectAttributeSingle = string | number | boolean | null | undefined | SavedObjectAttributes;
 
+// Warning: (ae-missing-release-tag) "SavedObjectError" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export interface SavedObjectError {
+    // (undocumented)
+    error: string;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    metadata?: Record<string, unknown>;
+    // (undocumented)
+    statusCode: number;
+}
+
 // @public
 export interface SavedObjectReference {
     // (undocumented)
@@ -1190,6 +1202,7 @@ export interface SavedObjectsFindOptions {
     // (undocumented)
     perPage?: number;
     preference?: string;
+    rootSearchFields?: string[];
     search?: string;
     searchFields?: string[];
     // (undocumented)
@@ -1210,8 +1223,22 @@ export interface SavedObjectsFindResponsePublic<T = unknown> extends SavedObject
     total: number;
 }
 
+// @public
+export interface SavedObjectsImportAmbiguousConflictError {
+    // (undocumented)
+    destinations: Array<{
+        id: string;
+        title?: string;
+        updatedAt?: string;
+    }>;
+    // (undocumented)
+    type: 'ambiguous_conflict';
+}
+
 // @public
 export interface SavedObjectsImportConflictError {
+    // (undocumented)
+    destinationId?: string;
     // (undocumented)
     type: 'conflict';
 }
@@ -1219,10 +1246,16 @@ export interface SavedObjectsImportConflictError {
 // @public
 export interface SavedObjectsImportError {
     // (undocumented)
-    error: SavedObjectsImportConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
+    error: SavedObjectsImportConflictError | SavedObjectsImportAmbiguousConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
     // (undocumented)
     id: string;
     // (undocumented)
+    meta: {
+        title?: string;
+        icon?: string;
+    };
+    overwrite?: boolean;
+    // @deprecated (undocumented)
     title?: string;
     // (undocumented)
     type: string;
@@ -1230,11 +1263,6 @@ export interface SavedObjectsImportError {
 
 // @public
 export interface SavedObjectsImportMissingReferencesError {
-    // (undocumented)
-    blocking: Array<{
-        type: string;
-        id: string;
-    }>;
     // (undocumented)
     references: Array<{
         type: string;
@@ -1252,12 +1280,17 @@ export interface SavedObjectsImportResponse {
     success: boolean;
     // (undocumented)
     successCount: number;
+    // (undocumented)
+    successResults?: SavedObjectsImportSuccess[];
 }
 
 // @public
 export interface SavedObjectsImportRetry {
+    createNewCopy?: boolean;
+    destinationId?: string;
     // (undocumented)
     id: string;
+    ignoreMissingReferences?: boolean;
     // (undocumented)
     overwrite: boolean;
     // (undocumented)
@@ -1270,6 +1303,23 @@ export interface SavedObjectsImportRetry {
     type: string;
 }
 
+// @public
+export interface SavedObjectsImportSuccess {
+    // @deprecated (undocumented)
+    createNewCopy?: boolean;
+    destinationId?: string;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    meta: {
+        title?: string;
+        icon?: string;
+    };
+    overwrite?: boolean;
+    // (undocumented)
+    type: string;
+}
+
 // @public
 export interface SavedObjectsImportUnknownError {
     // (undocumented)
@@ -1292,6 +1342,9 @@ export interface SavedObjectsMigrationVersion {
     [pluginName: string]: string;
 }
 
+// @public
+export type SavedObjectsNamespaceType = 'single' | 'multiple' | 'agnostic';
+
 // @public (undocumented)
 export interface SavedObjectsStart {
     // (undocumented)
diff --git a/src/core/public/saved_objects/index.ts b/src/core/public/saved_objects/index.ts
index 13b4a12893666..ef7b23448ad6f 100644
--- a/src/core/public/saved_objects/index.ts
+++ b/src/core/public/saved_objects/index.ts
@@ -36,12 +36,15 @@ export {
   SavedObjectsFindOptions,
   SavedObjectsMigrationVersion,
   SavedObjectsImportResponse,
+  SavedObjectsImportSuccess,
   SavedObjectsImportConflictError,
+  SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportUnsupportedTypeError,
   SavedObjectsImportMissingReferencesError,
   SavedObjectsImportUnknownError,
   SavedObjectsImportError,
   SavedObjectsImportRetry,
+  SavedObjectsNamespaceType,
 } from '../../server/types';
 
 export {
@@ -49,5 +52,6 @@ export {
   SavedObjectAttribute,
   SavedObjectAttributes,
   SavedObjectAttributeSingle,
+  SavedObjectError,
   SavedObjectReference,
 } from '../../types';
diff --git a/src/core/public/saved_objects/saved_objects_client.ts b/src/core/public/saved_objects/saved_objects_client.ts
index 209f489e29139..351020004b0e7 100644
--- a/src/core/public/saved_objects/saved_objects_client.ts
+++ b/src/core/public/saved_objects/saved_objects_client.ts
@@ -31,7 +31,10 @@ import {
 import { SimpleSavedObject } from './simple_saved_object';
 import { HttpFetchOptions, HttpSetup } from '../http';
 
-type SavedObjectsFindOptions = Omit<SavedObjectFindOptionsServer, 'namespace' | 'sortOrder'>;
+type SavedObjectsFindOptions = Omit<
+  SavedObjectFindOptionsServer,
+  'namespace' | 'sortOrder' | 'rootSearchFields'
+>;
 
 type PromiseType<T extends Promise<any>> = T extends Promise<infer U> ? U : never;
 
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 5c91d5a8c73ed..5422cbc2180ef 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -240,6 +240,8 @@ export {
   SavedObjectsBulkUpdateOptions,
   SavedObjectsBulkResponse,
   SavedObjectsBulkUpdateResponse,
+  SavedObjectsCheckConflictsObject,
+  SavedObjectsCheckConflictsResponse,
   SavedObjectsClient,
   SavedObjectsClientProviderOptions,
   SavedObjectsClientWrapperFactory,
@@ -253,11 +255,13 @@ export {
   SavedObjectsFindResult,
   SavedObjectsFindResponse,
   SavedObjectsImportConflictError,
+  SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportError,
   SavedObjectsImportMissingReferencesError,
   SavedObjectsImportOptions,
   SavedObjectsImportResponse,
   SavedObjectsImportRetry,
+  SavedObjectsImportSuccess,
   SavedObjectsImportUnknownError,
   SavedObjectsImportUnsupportedTypeError,
   SavedObjectMigrationContext,
diff --git a/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts b/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
index 27c0a5205ae38..85b3a281aef7f 100644
--- a/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
+++ b/src/core/server/saved_objects/export/get_sorted_objects_for_export.test.ts
@@ -665,6 +665,33 @@ describe('getSortedObjectsForExport()', () => {
         `);
   });
 
+  test('modifies return results to redact `namespaces` attribute', async () => {
+    const createSavedObject = (obj: any) => ({ ...obj, attributes: {}, references: [] });
+    savedObjectsClient.bulkGet.mockResolvedValueOnce({
+      saved_objects: [
+        createSavedObject({ type: 'multi', id: '1', namespaces: ['foo'] }),
+        createSavedObject({ type: 'multi', id: '2', namespaces: ['bar'] }),
+        createSavedObject({ type: 'other', id: '3' }),
+      ],
+    });
+    const exportStream = await exportSavedObjectsToStream({
+      exportSizeLimit: 10000,
+      savedObjectsClient,
+      objects: [
+        { type: 'multi', id: '1' },
+        { type: 'multi', id: '2' },
+        { type: 'other', id: '3' },
+      ],
+    });
+    const response = await readStreamToCompletion(exportStream);
+    expect(response).toEqual([
+      createSavedObject({ type: 'multi', id: '1' }),
+      createSavedObject({ type: 'multi', id: '2' }),
+      createSavedObject({ type: 'other', id: '3' }),
+      expect.objectContaining({ exportedCount: 3 }),
+    ]);
+  });
+
   test('includes nested dependencies when passed in', async () => {
     savedObjectsClient.bulkGet.mockResolvedValueOnce({
       saved_objects: [
diff --git a/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts b/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts
index 6cfe6f1be5669..94f727e238ecf 100644
--- a/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts
+++ b/src/core/server/saved_objects/export/get_sorted_objects_for_export.ts
@@ -151,7 +151,7 @@ export async function exportSavedObjectsToStream({
     exportSizeLimit,
     namespace,
   });
-  let exportedObjects = [];
+  let exportedObjects: Array<SavedObject<unknown>> = [];
   let missingReferences: SavedObjectsExportResultDetails['missingReferences'] = [];
 
   if (includeReferencesDeep) {
diff --git a/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts b/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts
index a571f62e3d1c1..1d5ce5625bf48 100644
--- a/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts
+++ b/src/core/server/saved_objects/export/inject_nested_depdendencies.test.ts
@@ -20,6 +20,7 @@
 import { SavedObject } from '../types';
 import { savedObjectsClientMock } from '../../mocks';
 import { getObjectReferencesToFetch, fetchNestedDependencies } from './inject_nested_depdendencies';
+import { SavedObjectsErrorHelpers } from '..';
 
 describe('getObjectReferencesToFetch()', () => {
   test('works with no saved objects', () => {
@@ -475,10 +476,8 @@ describe('injectNestedDependencies', () => {
         {
           id: '1',
           type: 'index-pattern',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
+          error: SavedObjectsErrorHelpers.createGenericNotFoundError('index-pattern', '1').output
+            .payload,
           attributes: {},
           references: [],
         },
diff --git a/src/core/server/saved_objects/import/__mocks__/index.ts b/src/core/server/saved_objects/import/__mocks__/index.ts
new file mode 100644
index 0000000000000..e2c48ee483ce4
--- /dev/null
+++ b/src/core/server/saved_objects/import/__mocks__/index.ts
@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+const mockUuidv4 = jest.fn().mockReturnValue('uuidv4');
+jest.mock('uuid', () => ({
+  v4: mockUuidv4,
+}));
+
+export { mockUuidv4 };
diff --git a/src/core/server/saved_objects/import/check_conflicts.test.ts b/src/core/server/saved_objects/import/check_conflicts.test.ts
new file mode 100644
index 0000000000000..0d58970eee2cc
--- /dev/null
+++ b/src/core/server/saved_objects/import/check_conflicts.test.ts
@@ -0,0 +1,222 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mockUuidv4 } from './__mocks__';
+import { savedObjectsClientMock } from '../../mocks';
+import { SavedObjectReference, SavedObjectsImportRetry } from 'kibana/public';
+import { SavedObjectsClientContract, SavedObject } from '../types';
+import { SavedObjectsErrorHelpers } from '..';
+import { checkConflicts } from './check_conflicts';
+
+type SavedObjectType = SavedObject<{ title?: string }>;
+type CheckConflictsParams = Parameters<typeof checkConflicts>[0];
+
+/**
+ * Function to create a realistic-looking import object given a type and ID
+ */
+const createObject = (type: string, id: string): SavedObjectType => ({
+  type,
+  id,
+  attributes: { title: 'some-title' },
+  references: (Symbol() as unknown) as SavedObjectReference[],
+});
+
+const getResultMock = {
+  conflict: (type: string, id: string) => {
+    const error = SavedObjectsErrorHelpers.createConflictError(type, id).output.payload;
+    return { type, id, error };
+  },
+  unresolvableConflict: (type: string, id: string) => {
+    const conflictMock = getResultMock.conflict(type, id);
+    const metadata = { isNotOverwritable: true };
+    return { ...conflictMock, error: { ...conflictMock.error, metadata } };
+  },
+  invalidType: (type: string, id: string) => {
+    const error = SavedObjectsErrorHelpers.createUnsupportedTypeError(type).output.payload;
+    return { type, id, error };
+  },
+};
+
+/**
+ * Create a variety of different objects to exercise different import / result scenarios
+ */
+const obj1 = createObject('type-1', 'id-1'); // -> success
+const obj2 = createObject('type-2', 'id-2'); // -> conflict
+const obj3 = createObject('type-3', 'id-3'); // -> unresolvable conflict
+const obj4 = createObject('type-4', 'id-4'); // -> invalid type
+const objects = [obj1, obj2, obj3, obj4];
+const obj2Error = getResultMock.conflict(obj2.type, obj2.id);
+const obj3Error = getResultMock.unresolvableConflict(obj3.type, obj3.id);
+const obj4Error = getResultMock.invalidType(obj4.type, obj4.id);
+
+describe('#checkConflicts', () => {
+  let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
+  let socCheckConflicts: typeof savedObjectsClient['checkConflicts'];
+
+  const setupParams = (partial: {
+    objects: SavedObjectType[];
+    namespace?: string;
+    ignoreRegularConflicts?: boolean;
+    retries?: SavedObjectsImportRetry[];
+    createNewCopies?: boolean;
+  }): CheckConflictsParams => {
+    savedObjectsClient = savedObjectsClientMock.create();
+    socCheckConflicts = savedObjectsClient.checkConflicts;
+    socCheckConflicts.mockResolvedValue({ errors: [] }); // by default, mock to empty results
+    return { ...partial, savedObjectsClient };
+  };
+
+  beforeEach(() => {
+    mockUuidv4.mockReset();
+    mockUuidv4.mockReturnValueOnce(`new-object-id`);
+  });
+
+  it('exits early if there are no objects to check', async () => {
+    const namespace = 'foo-namespace';
+    const params = setupParams({ objects: [], namespace });
+
+    const checkConflictsResult = await checkConflicts(params);
+    expect(socCheckConflicts).not.toHaveBeenCalled();
+    expect(checkConflictsResult).toEqual({
+      filteredObjects: [],
+      errors: [],
+      importIdMap: new Map(),
+      pendingOverwrites: new Set(),
+    });
+  });
+
+  it('calls checkConflicts with expected inputs', async () => {
+    const namespace = 'foo-namespace';
+    const params = setupParams({ objects, namespace });
+
+    await checkConflicts(params);
+    expect(socCheckConflicts).toHaveBeenCalledTimes(1);
+    expect(socCheckConflicts).toHaveBeenCalledWith(objects, { namespace });
+  });
+
+  it('returns expected result', async () => {
+    const namespace = 'foo-namespace';
+    const params = setupParams({ objects, namespace });
+    socCheckConflicts.mockResolvedValue({ errors: [obj2Error, obj3Error, obj4Error] });
+
+    const checkConflictsResult = await checkConflicts(params);
+    expect(checkConflictsResult).toEqual({
+      filteredObjects: [obj1, obj3],
+      errors: [
+        {
+          ...obj2Error,
+          title: obj2.attributes.title,
+          meta: { title: obj2.attributes.title },
+          error: { type: 'conflict' },
+        },
+        {
+          ...obj4Error,
+          title: obj4.attributes.title,
+          meta: { title: obj4.attributes.title },
+          error: { ...obj4Error.error, type: 'unknown' },
+        },
+      ],
+      importIdMap: new Map([[`${obj3.type}:${obj3.id}`, { id: `new-object-id` }]]),
+      pendingOverwrites: new Set(),
+    });
+  });
+
+  it('does not return errors for regular conflicts when ignoreRegularConflicts=true', async () => {
+    const namespace = 'foo-namespace';
+    const params = setupParams({ objects, namespace, ignoreRegularConflicts: true });
+    socCheckConflicts.mockResolvedValue({ errors: [obj2Error, obj3Error, obj4Error] });
+
+    const checkConflictsResult = await checkConflicts(params);
+    expect(checkConflictsResult).toEqual(
+      expect.objectContaining({
+        filteredObjects: [obj1, obj2, obj3],
+        errors: [
+          {
+            ...obj4Error,
+            title: obj4.attributes.title,
+            meta: { title: obj4.attributes.title },
+            error: { ...obj4Error.error, type: 'unknown' },
+          },
+        ],
+        pendingOverwrites: new Set([`${obj2.type}:${obj2.id}`]),
+      })
+    );
+  });
+
+  it('handles retries', async () => {
+    const namespace = 'foo-namespace';
+    const obj5 = createObject('type-5', 'id-5');
+    const _objects = [...objects, obj5];
+    const retries = [
+      { id: obj1.id, type: obj1.type }, // find no conflict for obj1
+      { id: obj2.id, type: obj2.type, destinationId: 'some-object-id' }, // find a conflict for obj2, and return it with the specified destinationId
+      { id: obj3.id, type: obj3.type, destinationId: 'another-object-id', createNewCopy: true }, // find an unresolvable conflict for obj3, regenerate the destinationId, and then omit originId because of the createNewCopy flag
+      { id: obj4.id, type: obj4.type }, // get an unknown error for obj4
+      { id: obj5.id, type: obj5.type, overwrite: true }, // find a conflict for obj5, but ignore it because of the overwrite flag
+    ] as SavedObjectsImportRetry[];
+    const params = setupParams({ objects: _objects, namespace, retries });
+    const obj5Error = getResultMock.conflict(obj5.type, obj5.id);
+    socCheckConflicts.mockResolvedValue({
+      errors: [
+        { ...obj2Error, id: 'some-object-id' },
+        { ...obj3Error, id: 'another-object-id' },
+        obj4Error,
+        obj5Error,
+      ],
+    });
+
+    const checkConflictsResult = await checkConflicts(params);
+    expect(checkConflictsResult).toEqual({
+      filteredObjects: [obj1, obj3, obj5],
+      errors: [
+        {
+          ...obj2Error,
+          title: obj2.attributes.title,
+          meta: { title: obj2.attributes.title },
+          error: { type: 'conflict', destinationId: 'some-object-id' },
+        },
+        {
+          ...obj4Error,
+          title: obj4.attributes.title,
+          meta: { title: obj4.attributes.title },
+          error: { ...obj4Error.error, type: 'unknown' },
+        },
+      ],
+      importIdMap: new Map([
+        [`${obj3.type}:${obj3.id}`, { id: `new-object-id`, omitOriginId: true }],
+      ]),
+      pendingOverwrites: new Set([`${obj5.type}:${obj5.id}`]),
+    });
+  });
+
+  it('adds `omitOriginId` field to `importIdMap` entries when createNewCopies=true', async () => {
+    const namespace = 'foo-namespace';
+    const params = setupParams({ objects, namespace, createNewCopies: true });
+    socCheckConflicts.mockResolvedValue({ errors: [obj2Error, obj3Error, obj4Error] });
+
+    const checkConflictsResult = await checkConflicts(params);
+    expect(checkConflictsResult).toEqual(
+      expect.objectContaining({
+        importIdMap: new Map([
+          [`${obj3.type}:${obj3.id}`, { id: `new-object-id`, omitOriginId: true }],
+        ]),
+      })
+    );
+  });
+});
diff --git a/src/core/server/saved_objects/import/check_conflicts.ts b/src/core/server/saved_objects/import/check_conflicts.ts
new file mode 100644
index 0000000000000..88ef1bf0e0236
--- /dev/null
+++ b/src/core/server/saved_objects/import/check_conflicts.ts
@@ -0,0 +1,105 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { v4 as uuidv4 } from 'uuid';
+import {
+  SavedObject,
+  SavedObjectsClientContract,
+  SavedObjectsImportError,
+  SavedObjectError,
+  SavedObjectsImportRetry,
+} from '../types';
+
+interface CheckConflictsParams {
+  objects: Array<SavedObject<{ title?: string }>>;
+  savedObjectsClient: SavedObjectsClientContract;
+  namespace?: string;
+  ignoreRegularConflicts?: boolean;
+  retries?: SavedObjectsImportRetry[];
+  createNewCopies?: boolean;
+}
+
+const isUnresolvableConflict = (error: SavedObjectError) =>
+  error.statusCode === 409 && error.metadata?.isNotOverwritable;
+
+export async function checkConflicts({
+  objects,
+  savedObjectsClient,
+  namespace,
+  ignoreRegularConflicts,
+  retries = [],
+  createNewCopies,
+}: CheckConflictsParams) {
+  const filteredObjects: Array<SavedObject<{ title?: string }>> = [];
+  const errors: SavedObjectsImportError[] = [];
+  const importIdMap = new Map<string, { id?: string; omitOriginId?: boolean }>();
+  const pendingOverwrites = new Set<string>();
+
+  // exit early if there are no objects to check
+  if (objects.length === 0) {
+    return { filteredObjects, errors, importIdMap, pendingOverwrites };
+  }
+
+  const retryMap = retries.reduce(
+    (acc, cur) => acc.set(`${cur.type}:${cur.id}`, cur),
+    new Map<string, SavedObjectsImportRetry>()
+  );
+  const objectsToCheck = objects.map((x) => {
+    const id = retryMap.get(`${x.type}:${x.id}`)?.destinationId ?? x.id;
+    return { ...x, id };
+  });
+  const checkConflictsResult = await savedObjectsClient.checkConflicts(objectsToCheck, {
+    namespace,
+  });
+  const errorMap = checkConflictsResult.errors.reduce(
+    (acc, { type, id, error }) => acc.set(`${type}:${id}`, error),
+    new Map<string, SavedObjectError>()
+  );
+
+  objects.forEach((object) => {
+    const {
+      type,
+      id,
+      attributes: { title },
+    } = object;
+    const { destinationId, overwrite, createNewCopy } = retryMap.get(`${type}:${id}`) || {};
+    const errorObj = errorMap.get(`${type}:${destinationId ?? id}`);
+    if (errorObj && isUnresolvableConflict(errorObj)) {
+      // Any object create attempt that would result in an unresolvable conflict should have its ID regenerated. This way, when an object
+      // with a "multi-namespace" type is exported from one namespace and imported to another, it does not result in an error, but instead a
+      // new object is created.
+      // This code path should not be triggered for a retry, but in case the consumer is using the import APIs incorrectly and attempting to
+      // retry an object with a destinationId that would result in an unresolvable conflict, we regenerate the ID here as a fail-safe.
+      const omitOriginId = createNewCopies || createNewCopy;
+      importIdMap.set(`${type}:${id}`, { id: uuidv4(), omitOriginId });
+      filteredObjects.push(object);
+    } else if (errorObj && errorObj.statusCode !== 409) {
+      errors.push({ type, id, title, meta: { title }, error: { ...errorObj, type: 'unknown' } });
+    } else if (errorObj?.statusCode === 409 && !ignoreRegularConflicts && !overwrite) {
+      const error = { type: 'conflict' as 'conflict', ...(destinationId && { destinationId }) };
+      errors.push({ type, id, title, meta: { title }, error });
+    } else {
+      filteredObjects.push(object);
+      if (errorObj?.statusCode === 409) {
+        pendingOverwrites.add(`${type}:${id}`);
+      }
+    }
+  });
+  return { filteredObjects, errors, importIdMap, pendingOverwrites };
+}
diff --git a/src/core/server/saved_objects/import/check_origin_conflicts.test.ts b/src/core/server/saved_objects/import/check_origin_conflicts.test.ts
new file mode 100644
index 0000000000000..ba5576bd05b73
--- /dev/null
+++ b/src/core/server/saved_objects/import/check_origin_conflicts.test.ts
@@ -0,0 +1,584 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mockUuidv4 } from './__mocks__';
+import {
+  SavedObjectsClientContract,
+  SavedObjectReference,
+  SavedObject,
+  SavedObjectsImportRetry,
+  SavedObjectsImportError,
+} from '../types';
+import { checkOriginConflicts, getImportIdMapForRetries } from './check_origin_conflicts';
+import { savedObjectsClientMock } from '../../mocks';
+import { typeRegistryMock } from '../saved_objects_type_registry.mock';
+import { ISavedObjectTypeRegistry } from '..';
+
+type SavedObjectType = SavedObject<{ title?: string }>;
+type CheckOriginConflictsParams = Parameters<typeof checkOriginConflicts>[0];
+
+/**
+ * Function to create a realistic-looking import object given a type, ID, and optional originId
+ */
+const createObject = (type: string, id: string, originId?: string): SavedObjectType => ({
+  type,
+  id,
+  attributes: { title: `Title for ${type}:${id}` },
+  references: (Symbol() as unknown) as SavedObjectReference[],
+  ...(originId && { originId }),
+});
+
+const MULTI_NS_TYPE = 'multi';
+const OTHER_TYPE = 'other';
+
+beforeEach(() => {
+  mockUuidv4.mockClear();
+});
+
+describe('#checkOriginConflicts', () => {
+  let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
+  let typeRegistry: jest.Mocked<ISavedObjectTypeRegistry>;
+  let find: typeof savedObjectsClient['find'];
+
+  const getResultMock = (...objects: SavedObjectType[]) => ({
+    page: 1,
+    per_page: 10,
+    total: objects.length,
+    saved_objects: objects.map((object) => ({ ...object, score: 0 })),
+  });
+
+  const setupParams = (partial: {
+    objects: SavedObjectType[];
+    namespace?: string;
+    importIdMap?: Map<string, unknown>;
+    ignoreRegularConflicts?: boolean;
+  }): CheckOriginConflictsParams => {
+    savedObjectsClient = savedObjectsClientMock.create();
+    find = savedObjectsClient.find;
+    find.mockResolvedValue(getResultMock()); // mock zero hits response by default
+    typeRegistry = typeRegistryMock.create();
+    typeRegistry.isMultiNamespace.mockImplementation((type) => type === MULTI_NS_TYPE);
+    return {
+      importIdMap: new Map<string, unknown>(), // empty by default
+      ...partial,
+      savedObjectsClient,
+      typeRegistry,
+    };
+  };
+
+  const mockFindResult = (...objects: SavedObjectType[]) => {
+    find.mockResolvedValueOnce(getResultMock(...objects));
+  };
+
+  describe('cluster calls', () => {
+    const multiNsObj = createObject(MULTI_NS_TYPE, 'id-1');
+    const multiNsObjWithOriginId = createObject(MULTI_NS_TYPE, 'id-2', 'originId-foo');
+    const otherObj = createObject(OTHER_TYPE, 'id-3');
+    // non-multi-namespace types shouldn't have origin IDs, but we include a test case to ensure it's handled gracefully
+    const otherObjWithOriginId = createObject(OTHER_TYPE, 'id-4', 'originId-bar');
+
+    const expectFindArgs = (n: number, object: SavedObject, rawIdPrefix: string) => {
+      const { type, id, originId } = object;
+      const search = `"${rawIdPrefix}${type}:${originId || id}" | "${originId || id}"`; // this template works for our basic test cases
+      const expectedArgs = expect.objectContaining({ type, search });
+      // exclude rootSearchFields, page, perPage, and fields attributes from assertion -- these are constant
+      // exclude namespace from assertion -- a separate test covers that
+      expect(find).toHaveBeenNthCalledWith(n, expectedArgs);
+    };
+
+    test('does not execute searches for non-multi-namespace objects', async () => {
+      const objects = [otherObj, otherObjWithOriginId];
+      const params = setupParams({ objects });
+
+      await checkOriginConflicts(params);
+      expect(find).not.toHaveBeenCalled();
+    });
+
+    test('executes searches for multi-namespace objects', async () => {
+      const objects = [multiNsObj, otherObj, multiNsObjWithOriginId, otherObjWithOriginId];
+      const params1 = setupParams({ objects });
+
+      await checkOriginConflicts(params1);
+      expect(find).toHaveBeenCalledTimes(2);
+      expectFindArgs(1, multiNsObj, '');
+      expectFindArgs(2, multiNsObjWithOriginId, '');
+
+      find.mockClear();
+      const params2 = setupParams({ objects, namespace: 'some-namespace' });
+      await checkOriginConflicts(params2);
+      expect(find).toHaveBeenCalledTimes(2);
+      expectFindArgs(1, multiNsObj, 'some-namespace:');
+      expectFindArgs(2, multiNsObjWithOriginId, 'some-namespace:');
+    });
+
+    test('searches within the current `namespace`', async () => {
+      const objects = [multiNsObj];
+      const namespace = 'some-namespace';
+      const params = setupParams({ objects, namespace });
+
+      await checkOriginConflicts(params);
+      expect(find).toHaveBeenCalledTimes(1);
+      expect(find).toHaveBeenCalledWith(expect.objectContaining({ namespaces: [namespace] }));
+    });
+
+    test('search query escapes quote and backslash characters in `id` and/or `originId`', async () => {
+      const weirdId = `some"weird\\id`;
+      const objects = [
+        createObject(MULTI_NS_TYPE, weirdId),
+        createObject(MULTI_NS_TYPE, 'some-id', weirdId),
+      ];
+      const params = setupParams({ objects });
+
+      await checkOriginConflicts(params);
+      const escapedId = `some\\"weird\\\\id`;
+      const expectedQuery = `"${MULTI_NS_TYPE}:${escapedId}" | "${escapedId}"`;
+      expect(find).toHaveBeenCalledTimes(2);
+      expect(find).toHaveBeenNthCalledWith(1, expect.objectContaining({ search: expectedQuery }));
+      expect(find).toHaveBeenNthCalledWith(2, expect.objectContaining({ search: expectedQuery }));
+    });
+  });
+
+  describe('results', () => {
+    const getAmbiguousConflicts = (objects: SavedObjectType[]) =>
+      objects.map(({ id, attributes, updated_at: updatedAt }) => ({
+        id,
+        title: attributes?.title,
+        updatedAt,
+      }));
+    const createAmbiguousConflictError = (
+      object: SavedObjectType,
+      destinations: SavedObjectType[]
+    ): SavedObjectsImportError => ({
+      type: object.type,
+      id: object.id,
+      title: object.attributes.title,
+      meta: { title: object.attributes.title },
+      error: {
+        type: 'ambiguous_conflict',
+        destinations: getAmbiguousConflicts(destinations),
+      },
+    });
+    const createConflictError = (
+      object: SavedObjectType,
+      destinationId?: string
+    ): SavedObjectsImportError => ({
+      type: object.type,
+      id: object.id,
+      title: object.attributes?.title,
+      meta: { title: object.attributes.title },
+      error: {
+        type: 'conflict',
+        ...(destinationId && { destinationId }),
+      },
+    });
+
+    describe('object result without a `importIdMap` entry (no match or exact match)', () => {
+      test('returns object when no match is detected (0 hits)', async () => {
+        // no objects exist in this space
+        // try to import obj1, obj2, obj3, and obj4
+        const obj1 = createObject(OTHER_TYPE, 'id-1'); // non-multi-namespace types are skipped when searching, so they will never have a match anyway
+        const obj2 = createObject(OTHER_TYPE, 'id-2', 'originId-foo'); // non-multi-namespace types are skipped when searching, so they will never have a match anyway
+        const obj3 = createObject(MULTI_NS_TYPE, 'id-3');
+        const obj4 = createObject(MULTI_NS_TYPE, 'id-4', 'originId-bar');
+        const objects = [obj1, obj2, obj3, obj4];
+        const params = setupParams({ objects });
+
+        // don't need to mock find results for obj3 and obj4, "no match" is the default find result in this test suite
+        const checkOriginConflictsResult = await checkOriginConflicts(params);
+
+        const expectedResult = {
+          importIdMap: new Map(),
+          errors: [],
+          pendingOverwrites: new Set(),
+        };
+        expect(checkOriginConflictsResult).toEqual(expectedResult);
+      });
+
+      test('returns object when an inexact match is detected (1 hit) with a destination that is exactly matched by another object', async () => {
+        // obj1 and obj3 exist in this space
+        // try to import obj1, obj2, obj3, and obj4; simulating a scenario where obj1 and obj3 were filtered out during `checkConflicts`, so we only call `checkOriginConflicts` with the remainder
+        const obj1 = createObject(MULTI_NS_TYPE, 'id-1');
+        const obj2 = createObject(MULTI_NS_TYPE, 'id-2', obj1.id);
+        const obj3 = createObject(MULTI_NS_TYPE, 'id-3', 'originId-foo');
+        const obj4 = createObject(MULTI_NS_TYPE, 'id-4', obj3.originId);
+        const objects = [obj2, obj4];
+        const params = setupParams({
+          objects,
+          importIdMap: new Map([
+            [`${obj1.type}:${obj1.id}`, {}],
+            [`${obj2.type}:${obj2.id}`, {}],
+            [`${obj3.type}:${obj3.id}`, {}],
+            [`${obj4.type}:${obj4.id}`, {}],
+          ]),
+        });
+        mockFindResult(obj1); // find for obj2: the result is an inexact match with one destination that is exactly matched by obj1 so it is ignored -- accordingly, obj2 has no match
+        mockFindResult(obj3); // find for obj4: the result is an inexact match with one destination that is exactly matched by obj3 so it is ignored -- accordingly, obj4 has no match
+
+        const checkOriginConflictsResult = await checkOriginConflicts(params);
+        const expectedResult = {
+          importIdMap: new Map(),
+          errors: [],
+          pendingOverwrites: new Set(),
+        };
+        expect(checkOriginConflictsResult).toEqual(expectedResult);
+      });
+
+      test('returns object when an inexact match is detected (2+ hits) with destinations that are all exactly matched by another object', async () => {
+        // obj1 and obj2 exist in this space
+        // try to import obj1, obj2, and obj3; simulating a scenario where obj1 and obj2 were filtered out during `checkConflicts`, so we only call `checkOriginConflicts` with the remainder
+        const obj1 = createObject(MULTI_NS_TYPE, 'id-1');
+        const obj2 = createObject(MULTI_NS_TYPE, 'id-2', obj1.id);
+        const obj3 = createObject(MULTI_NS_TYPE, 'id-3', obj1.id);
+        const objects = [obj3];
+        const params = setupParams({
+          objects,
+          importIdMap: new Map([
+            [`${obj1.type}:${obj1.id}`, {}],
+            [`${obj2.type}:${obj2.id}`, {}],
+            [`${obj3.type}:${obj3.id}`, {}],
+          ]),
+        });
+        mockFindResult(obj1, obj2); // find for obj3: the result is an inexact match with two destinations that are exactly matched by obj1 and obj2 so they are ignored -- accordingly, obj3 has no match
+
+        const checkOriginConflictsResult = await checkOriginConflicts(params);
+        const expectedResult = {
+          importIdMap: new Map(),
+          errors: [],
+          pendingOverwrites: new Set(),
+        };
+        expect(checkOriginConflictsResult).toEqual(expectedResult);
+      });
+    });
+
+    describe('object result with a `importIdMap` entry (partial match with a single destination)', () => {
+      describe('when an inexact match is detected (1 hit)', () => {
+        // objA and objB exist in this space
+        // try to import obj1 and obj2
+        const obj1 = createObject(MULTI_NS_TYPE, 'id-1');
+        const objA = createObject(MULTI_NS_TYPE, 'id-A', obj1.id);
+        const obj2 = createObject(MULTI_NS_TYPE, 'id-2', 'originId-foo');
+        const objB = createObject(MULTI_NS_TYPE, 'id-B', obj2.originId);
+        const objects = [obj1, obj2];
+
+        const setup = (ignoreRegularConflicts: boolean) => {
+          const params = setupParams({ objects, ignoreRegularConflicts });
+          mockFindResult(objA); // find for obj1: the result is an inexact match with one destination
+          mockFindResult(objB); // find for obj2: the result is an inexact match with one destination
+          return params;
+        };
+
+        test('returns conflict error when ignoreRegularConflicts=false', async () => {
+          const params = setup(false);
+          const checkOriginConflictsResult = await checkOriginConflicts(params);
+          const expectedResult = {
+            importIdMap: new Map(),
+            errors: [createConflictError(obj1, objA.id), createConflictError(obj2, objB.id)],
+            pendingOverwrites: new Set(),
+          };
+          expect(checkOriginConflictsResult).toEqual(expectedResult);
+        });
+
+        test('returns object with a `importIdMap` entry when ignoreRegularConflicts=true', async () => {
+          const params = setup(true);
+          const checkOriginConflictsResult = await checkOriginConflicts(params);
+          const expectedResult = {
+            importIdMap: new Map([
+              [`${obj1.type}:${obj1.id}`, { id: objA.id }],
+              [`${obj2.type}:${obj2.id}`, { id: objB.id }],
+            ]),
+            errors: [],
+            pendingOverwrites: new Set([`${obj1.type}:${obj1.id}`, `${obj2.type}:${obj2.id}`]),
+          };
+          expect(checkOriginConflictsResult).toEqual(expectedResult);
+        });
+      });
+
+      describe('when an inexact match is detected (2+ hits), with n-1 destinations that are exactly matched by another object', () => {
+        // obj1, obj3, objA, and objB exist in this space
+        // try to import obj1, obj2, obj3, and obj4; simulating a scenario where obj1 and obj3 were filtered out during `checkConflicts`, so we only call `checkOriginConflicts` with the remainder
+        const obj1 = createObject(MULTI_NS_TYPE, 'id-1');
+        const obj2 = createObject(MULTI_NS_TYPE, 'id-2', obj1.id);
+        const objA = createObject(MULTI_NS_TYPE, 'id-A', obj1.id);
+        const obj3 = createObject(MULTI_NS_TYPE, 'id-3', 'originId-foo');
+        const obj4 = createObject(MULTI_NS_TYPE, 'id-4', obj3.originId);
+        const objB = createObject(MULTI_NS_TYPE, 'id-B', obj3.originId);
+        const objects = [obj2, obj4];
+
+        const setup = (ignoreRegularConflicts: boolean) => {
+          const params = setupParams({
+            objects,
+            ignoreRegularConflicts,
+            importIdMap: new Map([
+              [`${obj1.type}:${obj1.id}`, {}],
+              [`${obj2.type}:${obj2.id}`, {}],
+              [`${obj3.type}:${obj3.id}`, {}],
+              [`${obj4.type}:${obj4.id}`, {}],
+            ]),
+          });
+          mockFindResult(obj1, objA); // find for obj2: the result is an inexact match with two destinations, but the first destination is exactly matched by obj1 so it is ignored -- accordingly, obj2 has an inexact match with one destination (objA)
+          mockFindResult(objB, obj3); // find for obj4: the result is an inexact match with two destinations, but the second destination is exactly matched by obj3 so it is ignored -- accordingly, obj4 has an inexact match with one destination (objB)
+          return params;
+        };
+
+        test('returns conflict error when ignoreRegularConflicts=false', async () => {
+          const params = setup(false);
+          const checkOriginConflictsResult = await checkOriginConflicts(params);
+          const expectedResult = {
+            importIdMap: new Map(),
+            errors: [createConflictError(obj2, objA.id), createConflictError(obj4, objB.id)],
+            pendingOverwrites: new Set(),
+          };
+          expect(checkOriginConflictsResult).toEqual(expectedResult);
+        });
+
+        test('returns object with a `importIdMap` entry when ignoreRegularConflicts=true', async () => {
+          const params = setup(true);
+          const checkOriginConflictsResult = await checkOriginConflicts(params);
+          const expectedResult = {
+            importIdMap: new Map([
+              [`${obj2.type}:${obj2.id}`, { id: objA.id }],
+              [`${obj4.type}:${obj4.id}`, { id: objB.id }],
+            ]),
+            errors: [],
+            pendingOverwrites: new Set([`${obj2.type}:${obj2.id}`, `${obj4.type}:${obj4.id}`]),
+          };
+          expect(checkOriginConflictsResult).toEqual(expectedResult);
+        });
+      });
+    });
+
+    describe('ambiguous conflicts', () => {
+      test('returns object with a `importIdMap` entry when multiple inexact matches are detected that target the same single destination', async () => {
+        // objA and objB exist in this space
+        // try to import obj1, obj2, obj3, and obj4
+        const obj1 = createObject(MULTI_NS_TYPE, 'id-1');
+        const obj2 = createObject(MULTI_NS_TYPE, 'id-2', obj1.id);
+        const objA = createObject(MULTI_NS_TYPE, 'id-A', obj1.id);
+        const obj3 = createObject(MULTI_NS_TYPE, 'id-3', 'originId-foo');
+        const obj4 = createObject(MULTI_NS_TYPE, 'id-4', obj3.originId);
+        const objB = createObject(MULTI_NS_TYPE, 'id-B', obj3.originId);
+        const objects = [obj1, obj2, obj3, obj4];
+        const params = setupParams({ objects });
+        mockFindResult(objA); // find for obj1: the result is an inexact match with one destination
+        mockFindResult(objA); // find for obj2: the result is an inexact match with one destination
+        mockFindResult(objB); // find for obj3: the result is an inexact match with one destination
+        mockFindResult(objB); // find for obj4: the result is an inexact match with one destination
+
+        const checkOriginConflictsResult = await checkOriginConflicts(params);
+        const expectedResult = {
+          importIdMap: new Map([
+            [`${obj1.type}:${obj1.id}`, { id: 'uuidv4', omitOriginId: true }],
+            [`${obj2.type}:${obj2.id}`, { id: 'uuidv4', omitOriginId: true }],
+            [`${obj3.type}:${obj3.id}`, { id: 'uuidv4', omitOriginId: true }],
+            [`${obj4.type}:${obj4.id}`, { id: 'uuidv4', omitOriginId: true }],
+          ]),
+          errors: [],
+          pendingOverwrites: new Set(),
+        };
+        expect(mockUuidv4).toHaveBeenCalledTimes(4);
+        expect(checkOriginConflictsResult).toEqual(expectedResult);
+      });
+
+      test('returns ambiguous_conflict error when an inexact match is detected (2+ hits)', async () => {
+        // objA, objB, objC, and objD exist in this space
+        // try to import obj1 and obj2
+        const obj1 = createObject(MULTI_NS_TYPE, 'id-1');
+        const obj2 = createObject(MULTI_NS_TYPE, 'id-2', 'originId-foo');
+        const objA = createObject(MULTI_NS_TYPE, 'id-A', obj1.id);
+        const objB = createObject(MULTI_NS_TYPE, 'id-B', obj1.id);
+        const objC = createObject(MULTI_NS_TYPE, 'id-C', obj2.originId);
+        const objD = createObject(MULTI_NS_TYPE, 'id-D', obj2.originId);
+        const objects = [obj1, obj2];
+        const params = setupParams({ objects });
+        mockFindResult(objA, objB); // find for obj1: the result is an inexact match with two destinations
+        mockFindResult(objC, objD); // find for obj2: the result is an inexact match with two destinations
+
+        const checkOriginConflictsResult = await checkOriginConflicts(params);
+        const expectedResult = {
+          importIdMap: new Map(),
+          errors: [
+            createAmbiguousConflictError(obj1, [objA, objB]),
+            createAmbiguousConflictError(obj2, [objC, objD]),
+          ],
+          pendingOverwrites: new Set(),
+        };
+        expect(mockUuidv4).not.toHaveBeenCalled();
+        expect(checkOriginConflictsResult).toEqual(expectedResult);
+      });
+
+      test('returns object with a `importIdMap` entry when multiple inexact matches are detected that target the same multiple destinations', async () => {
+        // objA, objB, objC, and objD exist in this space
+        // try to import obj1, obj2, obj3, and obj4
+        const obj1 = createObject(MULTI_NS_TYPE, 'id-1');
+        const obj2 = createObject(MULTI_NS_TYPE, 'id-2', obj1.id);
+        const obj3 = createObject(MULTI_NS_TYPE, 'id-3', 'originId-foo');
+        const obj4 = createObject(MULTI_NS_TYPE, 'id-4', obj3.originId);
+        const objA = createObject(MULTI_NS_TYPE, 'id-A', obj1.id);
+        const objB = createObject(MULTI_NS_TYPE, 'id-B', obj1.id);
+        const objC = createObject(MULTI_NS_TYPE, 'id-C', obj3.originId);
+        const objD = createObject(MULTI_NS_TYPE, 'id-D', obj3.originId);
+        const objects = [obj1, obj2, obj3, obj4];
+        const params = setupParams({ objects });
+        mockFindResult(objA, objB); // find for obj1: the result is an inexact match with two destinations
+        mockFindResult(objA, objB); // find for obj2: the result is an inexact match with two destinations
+        mockFindResult(objC, objD); // find for obj3: the result is an inexact match with two destinations
+        mockFindResult(objC, objD); // find for obj4: the result is an inexact match with two destinations
+
+        const checkOriginConflictsResult = await checkOriginConflicts(params);
+        const expectedResult = {
+          importIdMap: new Map([
+            [`${obj1.type}:${obj1.id}`, { id: 'uuidv4', omitOriginId: true }],
+            [`${obj2.type}:${obj2.id}`, { id: 'uuidv4', omitOriginId: true }],
+            [`${obj3.type}:${obj3.id}`, { id: 'uuidv4', omitOriginId: true }],
+            [`${obj4.type}:${obj4.id}`, { id: 'uuidv4', omitOriginId: true }],
+          ]),
+          errors: [],
+          pendingOverwrites: new Set(),
+        };
+        expect(mockUuidv4).toHaveBeenCalledTimes(4);
+        expect(checkOriginConflictsResult).toEqual(expectedResult);
+      });
+    });
+
+    describe('mixed results', () => {
+      // obj3, objA, objB, objC, objD, and objE exist in this space
+      // try to import obj1, obj2, obj3, obj4, obj5, obj6, and obj7; simulating a scenario where obj3 was filtered out during `checkConflicts`, so we only call `checkOriginConflicts` with the remainder
+      // note: this test is non-exhaustive for different permutations of import objects and results, but prior tests exercise these more thoroughly
+      const obj1 = createObject(OTHER_TYPE, 'id-1');
+      const obj2 = createObject(MULTI_NS_TYPE, 'id-2');
+      const obj3 = createObject(MULTI_NS_TYPE, 'id-3');
+      const obj4 = createObject(MULTI_NS_TYPE, 'id-4', obj3.id);
+      const obj5 = createObject(MULTI_NS_TYPE, 'id-5');
+      const obj6 = createObject(MULTI_NS_TYPE, 'id-6');
+      const obj7 = createObject(MULTI_NS_TYPE, 'id-7');
+      const obj8 = createObject(MULTI_NS_TYPE, 'id-8', obj7.id);
+      const objA = createObject(MULTI_NS_TYPE, 'id-A', obj5.id);
+      const objB = createObject(MULTI_NS_TYPE, 'id-B', obj6.id);
+      const objC = createObject(MULTI_NS_TYPE, 'id-C', obj6.id);
+      const objD = createObject(MULTI_NS_TYPE, 'id-D', obj7.id);
+      const objE = createObject(MULTI_NS_TYPE, 'id-E', obj7.id);
+      const objects = [obj1, obj2, obj4, obj5, obj6, obj7, obj8];
+
+      const importIdMap = new Map([...objects, obj3].map(({ type, id }) => [`${type}:${id}`, {}]));
+
+      const setup = (ignoreRegularConflicts: boolean) => {
+        const params = setupParams({ objects, importIdMap, ignoreRegularConflicts });
+        // obj1 is a non-multi-namespace type, so it is skipped while searching
+        mockFindResult(); // find for obj2: the result is no match
+        mockFindResult(obj3); // find for obj4: the result is an inexact match with one destination that is exactly matched by obj3 so it is ignored -- accordingly, obj4 has no match
+        mockFindResult(objA); // find for obj5: the result is an inexact match with one destination
+        mockFindResult(objB, objC); // find for obj6: the result is an inexact match with two destinations
+        mockFindResult(objD, objE); // find for obj7: the result is an inexact match with two destinations
+        mockFindResult(objD, objE); // find for obj8: the result is an inexact match with two destinations
+        return params;
+      };
+
+      test('returns errors for regular conflicts when ignoreRegularConflicts=false', async () => {
+        const params = setup(false);
+        const checkOriginConflictsResult = await checkOriginConflicts(params);
+        const expectedResult = {
+          importIdMap: new Map([
+            [`${obj7.type}:${obj7.id}`, { id: 'uuidv4', omitOriginId: true }],
+            [`${obj8.type}:${obj8.id}`, { id: 'uuidv4', omitOriginId: true }],
+          ]),
+          errors: [
+            createConflictError(obj5, objA.id),
+            createAmbiguousConflictError(obj6, [objB, objC]),
+          ],
+          pendingOverwrites: new Set(),
+        };
+        expect(mockUuidv4).toHaveBeenCalledTimes(2);
+        expect(checkOriginConflictsResult).toEqual(expectedResult);
+      });
+
+      test('does not return errors for regular conflicts when ignoreRegularConflicts=true', async () => {
+        const params = setup(true);
+        const checkOriginConflictsResult = await checkOriginConflicts(params);
+        const expectedResult = {
+          importIdMap: new Map([
+            [`${obj5.type}:${obj5.id}`, { id: objA.id }],
+            [`${obj7.type}:${obj7.id}`, { id: 'uuidv4', omitOriginId: true }],
+            [`${obj8.type}:${obj8.id}`, { id: 'uuidv4', omitOriginId: true }],
+          ]),
+          errors: [createAmbiguousConflictError(obj6, [objB, objC])],
+          pendingOverwrites: new Set([`${obj5.type}:${obj5.id}`]),
+        };
+        expect(mockUuidv4).toHaveBeenCalledTimes(2);
+        expect(checkOriginConflictsResult).toEqual(expectedResult);
+      });
+    });
+  });
+});
+
+describe('#getImportIdMapForRetries', () => {
+  const createRetry = (
+    { type, id }: { type: string; id: string },
+    params: { destinationId?: string; createNewCopy?: boolean } = {}
+  ): SavedObjectsImportRetry => {
+    const { destinationId, createNewCopy } = params;
+    return { type, id, overwrite: false, destinationId, replaceReferences: [], createNewCopy };
+  };
+
+  test('throws an error if retry is not found for an object', async () => {
+    const obj1 = createObject(MULTI_NS_TYPE, 'id-1');
+    const obj2 = createObject(MULTI_NS_TYPE, 'id-2');
+    const objects = [obj1, obj2];
+    const retries = [createRetry(obj1)];
+    const params = { objects, retries, createNewCopies: false };
+
+    expect(() => getImportIdMapForRetries(params)).toThrowErrorMatchingInlineSnapshot(
+      `"Retry was expected for \\"multi:id-2\\" but not found"`
+    );
+  });
+
+  test('returns expected results', async () => {
+    const obj1 = createObject('type-1', 'id-1');
+    const obj2 = createObject('type-2', 'id-2');
+    const obj3 = createObject('type-3', 'id-3');
+    const obj4 = createObject('type-4', 'id-4');
+    const objects = [obj1, obj2, obj3, obj4];
+    const retries = [
+      createRetry(obj1), // retries that do not have `destinationId` specified are ignored
+      createRetry(obj2, { destinationId: obj2.id }), // retries that have `id` that matches `destinationId` are ignored
+      createRetry(obj3, { destinationId: 'id-X' }), // this retry will get added to the `importIdMap`!
+      createRetry(obj4, { destinationId: 'id-Y', createNewCopy: true }), // this retry will get added to the `importIdMap`!
+    ];
+    const params = { objects, retries, createNewCopies: false };
+
+    const checkOriginConflictsResult = await getImportIdMapForRetries(params);
+    expect(checkOriginConflictsResult).toEqual(
+      new Map([
+        [`${obj3.type}:${obj3.id}`, { id: 'id-X', omitOriginId: false }],
+        [`${obj4.type}:${obj4.id}`, { id: 'id-Y', omitOriginId: true }],
+      ])
+    );
+  });
+
+  test('omits origin ID in `importIdMap` entries when createNewCopies=true', async () => {
+    const obj = createObject('type-1', 'id-1');
+    const objects = [obj];
+    const retries = [createRetry(obj, { destinationId: 'id-X' })];
+    const params = { objects, retries, createNewCopies: true };
+
+    const checkOriginConflictsResult = await getImportIdMapForRetries(params);
+    expect(checkOriginConflictsResult).toEqual(
+      new Map([[`${obj.type}:${obj.id}`, { id: 'id-X', omitOriginId: true }]])
+    );
+  });
+});
diff --git a/src/core/server/saved_objects/import/check_origin_conflicts.ts b/src/core/server/saved_objects/import/check_origin_conflicts.ts
new file mode 100644
index 0000000000000..433574fbdbf4c
--- /dev/null
+++ b/src/core/server/saved_objects/import/check_origin_conflicts.ts
@@ -0,0 +1,246 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import pMap from 'p-map';
+import { v4 as uuidv4 } from 'uuid';
+import {
+  SavedObject,
+  SavedObjectsClientContract,
+  SavedObjectsImportError,
+  SavedObjectsImportRetry,
+} from '../types';
+import { ISavedObjectTypeRegistry } from '..';
+
+interface CheckOriginConflictsParams {
+  objects: Array<SavedObject<{ title?: string }>>;
+  savedObjectsClient: SavedObjectsClientContract;
+  typeRegistry: ISavedObjectTypeRegistry;
+  namespace?: string;
+  ignoreRegularConflicts?: boolean;
+  importIdMap: Map<string, unknown>;
+}
+
+type CheckOriginConflictParams = Omit<CheckOriginConflictsParams, 'objects'> & {
+  object: SavedObject<{ title?: string }>;
+};
+
+interface GetImportIdMapForRetriesParams {
+  objects: SavedObject[];
+  retries: SavedObjectsImportRetry[];
+  createNewCopies: boolean;
+}
+
+interface InexactMatch<T> {
+  object: SavedObject<T>;
+  destinations: Array<{ id: string; title?: string; updatedAt?: string }>;
+}
+interface Left<T> {
+  tag: 'left';
+  value: InexactMatch<T>;
+}
+interface Right<T> {
+  tag: 'right';
+  value: SavedObject<T>;
+}
+type Either<T> = Left<T> | Right<T>;
+const isLeft = <T>(object: Either<T>): object is Left<T> => object.tag === 'left';
+
+const MAX_CONCURRENT_SEARCHES = 10;
+
+const createQueryTerm = (input: string) => input.replace(/\\/g, '\\\\').replace(/\"/g, '\\"');
+const createQuery = (type: string, id: string, rawIdPrefix: string) =>
+  `"${createQueryTerm(`${rawIdPrefix}${type}:${id}`)}" | "${createQueryTerm(id)}"`;
+const transformObjectsToAmbiguousConflictFields = (
+  objects: Array<SavedObject<{ title?: string }>>
+) =>
+  objects.map(({ id, attributes, updated_at: updatedAt }) => ({
+    id,
+    title: attributes?.title,
+    updatedAt,
+  }));
+const getAmbiguousConflictSourceKey = <T>({ object }: InexactMatch<T>) =>
+  `${object.type}:${object.originId || object.id}`;
+
+/**
+ * Make a search request for an import object to check if any objects of this type that match this object's `originId` or `id` exist in the
+ * specified namespace:
+ *  - A `Right` result indicates that no conflict destinations were found in this namespace ("no match").
+ *  - A `Left` result indicates that one or more conflict destinations exist in this namespace, none of which exactly match this object's ID
+ *    ("inexact match"). We can make this assumption because any "exact match" results would have been obtained and filtered out by the
+ *    `checkConflicts` submodule, which is called before this.
+ */
+const checkOriginConflict = async (
+  params: CheckOriginConflictParams
+): Promise<Either<{ title?: string }>> => {
+  const { object, savedObjectsClient, typeRegistry, namespace, importIdMap } = params;
+  const importIds = new Set(importIdMap.keys());
+  const { type, originId } = object;
+
+  if (!typeRegistry.isMultiNamespace(type)) {
+    // Skip the search request for non-multi-namespace types, since by definition they cannot have inexact matches or ambiguous conflicts.
+    return { tag: 'right', value: object };
+  }
+
+  const search = createQuery(type, originId || object.id, namespace ? `${namespace}:` : '');
+  const findOptions = {
+    type,
+    search,
+    rootSearchFields: ['_id', 'originId'],
+    page: 1,
+    perPage: 10,
+    fields: ['title'],
+    sortField: 'updated_at',
+    sortOrder: 'desc',
+    ...(namespace && { namespaces: [namespace] }),
+  };
+  const findResult = await savedObjectsClient.find<{ title?: string }>(findOptions);
+  const { total, saved_objects: savedObjects } = findResult;
+  if (total === 0) {
+    return { tag: 'right', value: object };
+  }
+  // This is an "inexact match" so far; filter the conflict destination(s) to exclude any that exactly match other objects we are importing.
+  const objects = savedObjects.filter((obj) => !importIds.has(`${obj.type}:${obj.id}`));
+  const destinations = transformObjectsToAmbiguousConflictFields(objects);
+  if (destinations.length === 0) {
+    // No conflict destinations remain after filtering, so this is a "no match" result.
+    return { tag: 'right', value: object };
+  }
+  return { tag: 'left', value: { object, destinations } };
+};
+
+/**
+ * This function takes all objects to import, and checks "multi-namespace" types for potential conflicts. An object with a multi-namespace
+ * type may include an `originId` field, which means that it should conflict with other objects that originate from the same source.
+ * Expected behavior of importing saved objects (single-namespace or multi-namespace):
+ *  1. The object 'foo' is exported from space A and imported to space B -- a new object 'bar' is created.
+ *  2. Then, the object 'bar' is exported from space B and imported to space C -- a new object 'baz' is created.
+ *  3. Then, the object 'baz' is exported from space C to space A -- the object conflicts with 'foo', which must be overwritten to continue.
+ * This behavior originated with "single-namespace" types, and this function was added to ensure importing objects of multi-namespace types
+ * will behave in the same way.
+ *
+ * To achieve this behavior for multi-namespace types, a search request is made for each object to determine if any objects of this type
+ * that match this object's `originId` or `id` exist in the specified namespace:
+ *  - If this is a `Right` result; return the import object and allow `createSavedObjects` to handle the conflict (if any).
+ *  - If this is a `Left` "partial match" result:
+ *     A. If there is a single source and destination match, add the destination to the importIdMap and return the import object, which
+ *        will allow `createSavedObjects` to modify the ID before creating the object (thus ensuring a conflict during).
+ *     B. Otherwise, this is an "ambiguous conflict" result; return an error.
+ */
+export async function checkOriginConflicts({ objects, ...params }: CheckOriginConflictsParams) {
+  // Check each object for possible destination conflicts, ensuring we don't too many concurrent searches running.
+  const mapper = async (object: SavedObject<{ title?: string }>) =>
+    checkOriginConflict({ object, ...params });
+  const checkOriginConflictResults = await pMap(objects, mapper, {
+    concurrency: MAX_CONCURRENT_SEARCHES,
+  });
+
+  // Get a map of all inexact matches that share the same destination(s).
+  const ambiguousConflictSourcesMap = checkOriginConflictResults
+    .filter(isLeft)
+    .reduce((acc, cur) => {
+      const key = getAmbiguousConflictSourceKey(cur.value);
+      const value = acc.get(key) ?? [];
+      return acc.set(key, [...value, cur.value.object]);
+    }, new Map<string, Array<SavedObject<{ title?: string }>>>());
+
+  const errors: SavedObjectsImportError[] = [];
+  const importIdMap = new Map<string, { id: string; omitOriginId?: boolean }>();
+  const pendingOverwrites = new Set<string>();
+  checkOriginConflictResults.forEach((result) => {
+    if (!isLeft(result)) {
+      return;
+    }
+    const key = getAmbiguousConflictSourceKey(result.value);
+    const sources = transformObjectsToAmbiguousConflictFields(
+      ambiguousConflictSourcesMap.get(key)!
+    );
+    const { object, destinations } = result.value;
+    const { type, id, attributes } = object;
+    if (sources.length === 1 && destinations.length === 1) {
+      // This is a simple "inexact match" result -- a single import object has a single destination conflict.
+      if (params.ignoreRegularConflicts) {
+        importIdMap.set(`${type}:${id}`, { id: destinations[0].id });
+        pendingOverwrites.add(`${type}:${id}`);
+      } else {
+        const { title } = attributes;
+        errors.push({
+          type,
+          id,
+          title,
+          meta: { title },
+          error: {
+            type: 'conflict',
+            destinationId: destinations[0].id,
+          },
+        });
+      }
+      return;
+    }
+    // This is an ambiguous conflict error, which is one of the following cases:
+    //  - a single import object has 2+ destination conflicts ("ambiguous destination")
+    //  - 2+ import objects have the same single destination conflict ("ambiguous source")
+    //  - 2+ import objects have the same 2+ destination conflicts ("ambiguous source and destination")
+    if (sources.length > 1) {
+      // In the case of ambiguous source conflicts, don't treat them as errors; instead, regenerate the object ID and reset its origin
+      // (e.g., the same outcome as if `createNewCopies` was enabled for the entire import operation).
+      importIdMap.set(`${type}:${id}`, { id: uuidv4(), omitOriginId: true });
+      return;
+    }
+    const { title } = attributes;
+    errors.push({
+      type,
+      id,
+      title,
+      meta: { title },
+      error: {
+        type: 'ambiguous_conflict',
+        destinations,
+      },
+    });
+  });
+
+  return { errors, importIdMap, pendingOverwrites };
+}
+
+/**
+ * Assume that all objects exist in the `retries` map (due to filtering at the beginning of `resolveSavedObjectsImportErrors`).
+ */
+export function getImportIdMapForRetries(params: GetImportIdMapForRetriesParams) {
+  const { objects, retries, createNewCopies } = params;
+
+  const retryMap = retries.reduce(
+    (acc, cur) => acc.set(`${cur.type}:${cur.id}`, cur),
+    new Map<string, SavedObjectsImportRetry>()
+  );
+  const importIdMap = new Map<string, { id: string; omitOriginId?: boolean }>();
+
+  objects.forEach(({ type, id }) => {
+    const retry = retryMap.get(`${type}:${id}`);
+    if (!retry) {
+      throw new Error(`Retry was expected for "${type}:${id}" but not found`);
+    }
+    const { destinationId } = retry;
+    const omitOriginId = createNewCopies || Boolean(retry.createNewCopy);
+    if (destinationId && destinationId !== id) {
+      importIdMap.set(`${type}:${id}`, { id: destinationId, omitOriginId });
+    }
+  });
+
+  return importIdMap;
+}
diff --git a/src/core/server/saved_objects/import/collect_saved_objects.test.ts b/src/core/server/saved_objects/import/collect_saved_objects.test.ts
index 9cccc3942f655..f54130be326ad 100644
--- a/src/core/server/saved_objects/import/collect_saved_objects.test.ts
+++ b/src/core/server/saved_objects/import/collect_saved_objects.test.ts
@@ -17,121 +17,192 @@
  * under the License.
  */
 
-import { Readable } from 'stream';
+import { Readable, PassThrough } from 'stream';
 import { collectSavedObjects } from './collect_saved_objects';
+import { createLimitStream } from './create_limit_stream';
+import { getNonUniqueEntries } from './get_non_unique_entries';
+
+jest.mock('./create_limit_stream');
+jest.mock('./get_non_unique_entries');
+
+const getMockFn = <T extends (...args: any[]) => any, U>(fn: (...args: Parameters<T>) => U) =>
+  fn as jest.MockedFunction<(...args: Parameters<T>) => U>;
+
+let limitStreamPush: jest.SpyInstance;
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  const stream = new PassThrough({ objectMode: true });
+  limitStreamPush = jest.spyOn(stream, 'push');
+  getMockFn(createLimitStream).mockReturnValue(stream);
+  getMockFn(getNonUniqueEntries).mockReturnValue([]);
+});
 
 describe('collectSavedObjects()', () => {
-  test('collects nothing when stream is empty', async () => {
-    const readStream = new Readable({
+  const objectLimit = 10;
+  const createReadStream = (...args: any[]) =>
+    new Readable({
       objectMode: true,
       read() {
+        args.forEach((arg) => this.push(arg));
         this.push(null);
       },
     });
-    const result = await collectSavedObjects({ readStream, objectLimit: 10, supportedTypes: [] });
-    expect(result).toMatchInlineSnapshot(`
-Object {
-  "collectedObjects": Array [],
-  "errors": Array [],
-}
-`);
-  });
 
-  test('collects objects from stream', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        this.push({ foo: true, type: 'a' });
-        this.push(null);
-      },
+  const obj1 = { type: 'a', id: '1', attributes: { title: 'my title 1' } };
+  const obj2 = { type: 'b', id: '2', attributes: { title: 'my title 2' } };
+
+  describe('module calls', () => {
+    test('limit stream with empty input stream is called with null', async () => {
+      const readStream = createReadStream();
+      await collectSavedObjects({ readStream, supportedTypes: [], objectLimit });
+
+      expect(createLimitStream).toHaveBeenCalledWith(objectLimit);
+      expect(limitStreamPush).toHaveBeenCalledTimes(1);
+      expect(limitStreamPush).toHaveBeenLastCalledWith(null);
     });
-    const result = await collectSavedObjects({
-      readStream,
-      objectLimit: 1,
-      supportedTypes: ['a'],
+
+    test('limit stream with non-empty input stream is called with all objects', async () => {
+      const readStream = createReadStream(obj1, obj2);
+      const supportedTypes = [obj2.type];
+      await collectSavedObjects({ readStream, supportedTypes, objectLimit });
+
+      expect(createLimitStream).toHaveBeenCalledWith(objectLimit);
+      expect(limitStreamPush).toHaveBeenCalledTimes(3);
+      expect(limitStreamPush).toHaveBeenNthCalledWith(1, obj1);
+      expect(limitStreamPush).toHaveBeenNthCalledWith(2, obj2);
+      expect(limitStreamPush).toHaveBeenLastCalledWith(null);
     });
-    expect(result).toMatchInlineSnapshot(`
-Object {
-  "collectedObjects": Array [
-    Object {
-      "foo": true,
-      "migrationVersion": Object {},
-      "type": "a",
-    },
-  ],
-  "errors": Array [],
-}
-`);
-  });
 
-  test('throws error when object limit is reached', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        this.push({ foo: true, type: 'a' });
-        this.push({ bar: true, type: 'a' });
-        this.push(null);
-      },
+    test('get non-unique entries with empty input stream is called with empty array', async () => {
+      const readStream = createReadStream();
+      await collectSavedObjects({ readStream, supportedTypes: [], objectLimit });
+
+      expect(getNonUniqueEntries).toHaveBeenCalledWith([]);
     });
-    await expect(
-      collectSavedObjects({
-        readStream,
-        objectLimit: 1,
-        supportedTypes: ['a'],
-      })
-    ).rejects.toThrowErrorMatchingInlineSnapshot(`"Can't import more than 1 objects"`);
-  });
 
-  test('unsupported types return as import errors', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        this.push({ id: '1', type: 'a', attributes: { title: 'my title' } });
-        this.push({ id: '2', type: 'b', attributes: { title: 'my title 2' } });
-        this.push(null);
-      },
+    test('get non-unique entries with non-empty input stream is called with all entries', async () => {
+      const readStream = createReadStream(obj1, obj2);
+      const supportedTypes = [obj2.type];
+      await collectSavedObjects({ readStream, supportedTypes, objectLimit });
+
+      expect(getNonUniqueEntries).toHaveBeenCalledWith([
+        { type: obj1.type, id: obj1.id },
+        { type: obj2.type, id: obj2.id },
+      ]);
+    });
+
+    test('filter with empty input stream is not called', async () => {
+      const readStream = createReadStream();
+      const filter = jest.fn();
+      await collectSavedObjects({ readStream, supportedTypes: [], objectLimit, filter });
+
+      expect(filter).not.toHaveBeenCalled();
+    });
+
+    test('filter with non-empty input stream is called with all objects of supported types', async () => {
+      const readStream = createReadStream(obj1, obj2);
+      const filter = jest.fn();
+      const supportedTypes = [obj2.type];
+      await collectSavedObjects({ readStream, supportedTypes, objectLimit, filter });
+
+      expect(filter).toHaveBeenCalledTimes(1);
+      expect(filter).toHaveBeenCalledWith(obj2);
     });
-    const result = await collectSavedObjects({ readStream, objectLimit: 2, supportedTypes: ['1'] });
-    expect(result).toMatchInlineSnapshot(`
-Object {
-  "collectedObjects": Array [],
-  "errors": Array [
-    Object {
-      "error": Object {
-        "type": "unsupported_type",
-      },
-      "id": "1",
-      "title": "my title",
-      "type": "a",
-    },
-    Object {
-      "error": Object {
-        "type": "unsupported_type",
-      },
-      "id": "2",
-      "title": "my title 2",
-      "type": "b",
-    },
-  ],
-}
-`);
   });
 
-  test('unsupported types still count towards object limit', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        this.push({ foo: true, type: 'a' });
-        this.push({ bar: true, type: 'b' });
-        this.push(null);
-      },
+  describe('results', () => {
+    test('throws Boom error if any import objects are not unique', async () => {
+      getMockFn(getNonUniqueEntries).mockReturnValue(['type1:id1', 'type2:id2']);
+      const readStream = createReadStream();
+      expect.assertions(2);
+      try {
+        await collectSavedObjects({ readStream, supportedTypes: [], objectLimit });
+      } catch ({ isBoom, message }) {
+        expect(isBoom).toBe(true);
+        expect(message).toMatchInlineSnapshot(
+          `"Non-unique import objects detected: [type1:id1,type2:id2]: Bad Request"`
+        );
+      }
+    });
+
+    test('collects nothing when stream is empty', async () => {
+      const readStream = createReadStream();
+      const result = await collectSavedObjects({ readStream, supportedTypes: [], objectLimit });
+
+      expect(result).toEqual({ collectedObjects: [], errors: [], importIdMap: new Map() });
+    });
+
+    test('collects objects from stream', async () => {
+      const readStream = createReadStream(obj1);
+      const supportedTypes = [obj1.type];
+      const result = await collectSavedObjects({ readStream, supportedTypes, objectLimit });
+
+      const collectedObjects = [{ ...obj1, migrationVersion: {} }];
+      const importIdMap = new Map([[`${obj1.type}:${obj1.id}`, {}]]);
+      expect(result).toEqual({ collectedObjects, errors: [], importIdMap });
+    });
+
+    test('unsupported types return as import errors', async () => {
+      const readStream = createReadStream(obj1);
+      const supportedTypes = ['not-obj1-type'];
+      const result = await collectSavedObjects({ readStream, supportedTypes, objectLimit });
+
+      const error = { type: 'unsupported_type' };
+      const { title } = obj1.attributes;
+      const errors = [{ error, type: obj1.type, id: obj1.id, title, meta: { title } }];
+      expect(result).toEqual({ collectedObjects: [], errors, importIdMap: new Map() });
+    });
+
+    test('returns mixed results', async () => {
+      const readStream = createReadStream(obj1, obj2);
+      const supportedTypes = [obj2.type];
+      const result = await collectSavedObjects({ readStream, supportedTypes, objectLimit });
+
+      const collectedObjects = [{ ...obj2, migrationVersion: {} }];
+      const importIdMap = new Map([[`${obj2.type}:${obj2.id}`, {}]]);
+      const error = { type: 'unsupported_type' };
+      const { title } = obj1.attributes;
+      const errors = [{ error, type: obj1.type, id: obj1.id, title, meta: { title } }];
+      expect(result).toEqual({ collectedObjects, errors, importIdMap });
+    });
+
+    describe('with optional filter', () => {
+      test('filters out objects when result === false', async () => {
+        const readStream = createReadStream(obj1, obj2);
+        const filter = jest.fn().mockReturnValue(false);
+        const supportedTypes = [obj2.type];
+        const result = await collectSavedObjects({
+          readStream,
+          supportedTypes,
+          objectLimit,
+          filter,
+        });
+
+        const error = { type: 'unsupported_type' };
+        const { title } = obj1.attributes;
+        const errors = [{ error, type: obj1.type, id: obj1.id, title, meta: { title } }];
+        expect(result).toEqual({ collectedObjects: [], errors, importIdMap: new Map() });
+      });
+
+      test('does not filter out objects when result === true', async () => {
+        const readStream = createReadStream(obj1, obj2);
+        const filter = jest.fn().mockReturnValue(true);
+        const supportedTypes = [obj2.type];
+        const result = await collectSavedObjects({
+          readStream,
+          supportedTypes,
+          objectLimit,
+          filter,
+        });
+
+        const collectedObjects = [{ ...obj2, migrationVersion: {} }];
+        const importIdMap = new Map([[`${obj2.type}:${obj2.id}`, {}]]);
+        const error = { type: 'unsupported_type' };
+        const { title } = obj1.attributes;
+        const errors = [{ error, type: obj1.type, id: obj1.id, title, meta: { title } }];
+        expect(result).toEqual({ collectedObjects, errors, importIdMap });
+      });
     });
-    await expect(
-      collectSavedObjects({
-        readStream,
-        objectLimit: 1,
-        supportedTypes: ['a'],
-      })
-    ).rejects.toThrowErrorMatchingInlineSnapshot(`"Can't import more than 1 objects"`);
   });
 });
diff --git a/src/core/server/saved_objects/import/collect_saved_objects.ts b/src/core/server/saved_objects/import/collect_saved_objects.ts
index 1b787c7d9dc10..f55e6bf0d2af4 100644
--- a/src/core/server/saved_objects/import/collect_saved_objects.ts
+++ b/src/core/server/saved_objects/import/collect_saved_objects.ts
@@ -27,6 +27,8 @@ import {
 import { SavedObject } from '../types';
 import { createLimitStream } from './create_limit_stream';
 import { SavedObjectsImportError } from './types';
+import { getNonUniqueEntries } from './get_non_unique_entries';
+import { SavedObjectsErrorHelpers } from '..';
 
 interface CollectSavedObjectsOptions {
   readStream: Readable;
@@ -42,17 +44,22 @@ export async function collectSavedObjects({
   supportedTypes,
 }: CollectSavedObjectsOptions) {
   const errors: SavedObjectsImportError[] = [];
-  const collectedObjects: Array<SavedObject<{ title: string }>> = await createPromiseFromStreams([
+  const entries: Array<{ type: string; id: string }> = [];
+  const importIdMap = new Map<string, { id?: string; omitOriginId?: boolean }>();
+  const collectedObjects: Array<SavedObject<{ title?: string }>> = await createPromiseFromStreams([
     readStream,
     createLimitStream(objectLimit),
     createFilterStream<SavedObject<{ title: string }>>((obj) => {
+      entries.push({ type: obj.type, id: obj.id });
       if (supportedTypes.includes(obj.type)) {
         return true;
       }
+      const { title } = obj.attributes;
       errors.push({
         id: obj.id,
         type: obj.type,
-        title: obj.attributes.title,
+        title,
+        meta: { title },
         error: {
           type: 'unsupported_type',
         },
@@ -61,13 +68,24 @@ export async function collectSavedObjects({
     }),
     createFilterStream<SavedObject>((obj) => (filter ? filter(obj) : true)),
     createMapStream((obj: SavedObject) => {
+      importIdMap.set(`${obj.type}:${obj.id}`, {});
       // Ensure migrations execute on every saved object
       return Object.assign({ migrationVersion: {} }, obj);
     }),
     createConcatStream([]),
   ]);
+
+  // throw a BadRequest error if we see the same import object type/id more than once
+  const nonUniqueEntries = getNonUniqueEntries(entries);
+  if (nonUniqueEntries.length > 0) {
+    throw SavedObjectsErrorHelpers.createBadRequestError(
+      `Non-unique import objects detected: [${nonUniqueEntries.join()}]`
+    );
+  }
+
   return {
     errors,
     collectedObjects,
+    importIdMap,
   };
 }
diff --git a/src/core/server/saved_objects/import/create_saved_objects.test.ts b/src/core/server/saved_objects/import/create_saved_objects.test.ts
new file mode 100644
index 0000000000000..6c396e58e1a28
--- /dev/null
+++ b/src/core/server/saved_objects/import/create_saved_objects.test.ts
@@ -0,0 +1,309 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { savedObjectsClientMock } from '../../mocks';
+import { createSavedObjects } from './create_saved_objects';
+import { SavedObjectsClientContract, SavedObject, SavedObjectsImportError } from '../types';
+import { SavedObjectsErrorHelpers } from '..';
+import { extractErrors } from './extract_errors';
+
+type CreateSavedObjectsParams = Parameters<typeof createSavedObjects>[0];
+
+/**
+ * Function to create a realistic-looking import object given a type, ID, and optional originId
+ */
+const createObject = (type: string, id: string, originId?: string): SavedObject => ({
+  type,
+  id,
+  attributes: {},
+  references: [
+    { name: 'name-1', type: 'other-type', id: 'other-id' }, // object that is not present
+    { name: 'name-2', type: MULTI_NS_TYPE, id: 'id-1' }, // object that is present, but does not have an importIdMap entry
+    { name: 'name-3', type: MULTI_NS_TYPE, id: 'id-3' }, // object that is present and has an importIdMap entry
+  ],
+  ...(originId && { originId }),
+});
+
+const MULTI_NS_TYPE = 'multi';
+const OTHER_TYPE = 'other';
+/**
+ * Create a variety of different objects to exercise different import / result scenarios
+ */
+const obj1 = createObject(MULTI_NS_TYPE, 'id-1', 'originId-a'); // -> success
+const obj2 = createObject(MULTI_NS_TYPE, 'id-2', 'originId-b'); // -> conflict
+const obj3 = createObject(MULTI_NS_TYPE, 'id-3', 'originId-c'); // -> conflict (with known importId and omitOriginId=true)
+const obj4 = createObject(MULTI_NS_TYPE, 'id-4', 'originId-d'); // -> conflict (with known importId)
+const obj5 = createObject(MULTI_NS_TYPE, 'id-5', 'originId-e'); // -> unresolvable conflict
+const obj6 = createObject(MULTI_NS_TYPE, 'id-6'); // -> success
+const obj7 = createObject(MULTI_NS_TYPE, 'id-7'); // -> conflict
+const obj8 = createObject(MULTI_NS_TYPE, 'id-8'); // -> conflict (with known importId)
+const obj9 = createObject(MULTI_NS_TYPE, 'id-9'); // -> unresolvable conflict
+const obj10 = createObject(OTHER_TYPE, 'id-10', 'originId-f'); // -> success
+const obj11 = createObject(OTHER_TYPE, 'id-11', 'originId-g'); // -> conflict
+const obj12 = createObject(OTHER_TYPE, 'id-12'); // -> success
+const obj13 = createObject(OTHER_TYPE, 'id-13'); // -> conflict
+// non-multi-namespace types shouldn't have origin IDs, but we include test cases to ensure it's handled gracefully
+// non-multi-namespace types by definition cannot result in an unresolvable conflict, so we don't include test cases for those
+const importId3 = 'id-foo';
+const importId4 = 'id-bar';
+const importId8 = 'id-baz';
+const importIdMap = new Map([
+  [`${obj3.type}:${obj3.id}`, { id: importId3, omitOriginId: true }],
+  [`${obj4.type}:${obj4.id}`, { id: importId4 }],
+  [`${obj8.type}:${obj8.id}`, { id: importId8 }],
+]);
+
+describe('#createSavedObjects', () => {
+  let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
+  let bulkCreate: typeof savedObjectsClient['bulkCreate'];
+
+  /**
+   * Creates an options object to be used as an argument for createSavedObjects
+   * Includes mock savedObjectsClient
+   */
+  const setupParams = (partial: {
+    objects: SavedObject[];
+    accumulatedErrors?: SavedObjectsImportError[];
+    namespace?: string;
+    overwrite?: boolean;
+  }): CreateSavedObjectsParams => {
+    savedObjectsClient = savedObjectsClientMock.create();
+    bulkCreate = savedObjectsClient.bulkCreate;
+    return { accumulatedErrors: [], ...partial, savedObjectsClient, importIdMap };
+  };
+
+  const getExpectedBulkCreateArgsObjects = (objects: SavedObject[], retry?: boolean) =>
+    objects.map(({ type, id, attributes, originId }) => ({
+      type,
+      id: retry ? `new-id-for-${id}` : id, // if this was a retry, we regenerated the id -- this is mocked below
+      attributes,
+      references: [
+        { name: 'name-1', type: 'other-type', id: 'other-id' }, // object that is not present
+        { name: 'name-2', type: MULTI_NS_TYPE, id: 'id-1' }, // object that is present, but does not have an importIdMap entry
+        { name: 'name-3', type: MULTI_NS_TYPE, id: 'id-foo' }, // object that is present and has an importIdMap entry
+      ],
+      // if the import object had an originId, and/or if we regenerated the id, expect an originId to be included in the create args
+      ...((originId || retry) && { originId: originId || id }),
+    }));
+
+  const expectBulkCreateArgs = {
+    objects: (n: number, objects: SavedObject[], retry?: boolean) => {
+      const expectedObjects = getExpectedBulkCreateArgsObjects(objects, retry);
+      const expectedOptions = expect.any(Object);
+      expect(bulkCreate).toHaveBeenNthCalledWith(n, expectedObjects, expectedOptions);
+    },
+    options: (n: number, options: CreateSavedObjectsParams) => {
+      const expectedObjects = expect.any(Array);
+      const expectedOptions = { namespace: options.namespace, overwrite: options.overwrite };
+      expect(bulkCreate).toHaveBeenNthCalledWith(n, expectedObjects, expectedOptions);
+    },
+  };
+
+  const getResultMock = {
+    success: (
+      { type, id, attributes, references, originId }: SavedObject,
+      { namespace }: CreateSavedObjectsParams
+    ): SavedObject => ({
+      type,
+      id,
+      attributes,
+      references,
+      ...(originId && { originId }),
+      version: 'some-version',
+      updated_at: 'some-date',
+      namespaces: [namespace ?? 'default'],
+    }),
+    conflict: (type: string, id: string) => {
+      const error = SavedObjectsErrorHelpers.createConflictError(type, id).output.payload;
+      return ({ type, id, error } as unknown) as SavedObject;
+    },
+    unresolvableConflict: (type: string, id: string) => {
+      const conflictMock = getResultMock.conflict(type, id);
+      conflictMock.error!.metadata = { isNotOverwritable: true };
+      return conflictMock;
+    },
+  };
+
+  /**
+   * Remap the bulkCreate results to ensure that each returned object reflects the ID of the imported object.
+   * This is needed because createSavedObjects may change the ID of the object to create, but this process is opaque to consumers of the
+   * API; we have to remap IDs of results so consumers can act upon them, as there is no guarantee that results will be returned in the same
+   * order as they were imported in.
+   * For the purposes of this test suite, the objects ARE guaranteed to be in the same order, so we do a simple loop to remap the IDs.
+   * In addition, extract the errors out of the created objects -- since we are testing with realistic objects/errors, we can use the real
+   * `extractErrors` module to do so.
+   */
+  const getExpectedResults = (resultObjects: SavedObject[], objects: SavedObject[]) => {
+    const remappedResults = resultObjects.map((result, i) => ({ ...result, id: objects[i].id }));
+    return {
+      createdObjects: remappedResults.filter((obj) => !obj.error),
+      errors: extractErrors(remappedResults, objects),
+    };
+  };
+
+  test('filters out objects that have errors present', async () => {
+    const error = { type: obj1.type, id: obj1.id } as SavedObjectsImportError;
+    const options = setupParams({ objects: [obj1], accumulatedErrors: [error] });
+
+    const createSavedObjectsResult = await createSavedObjects(options);
+    expect(bulkCreate).not.toHaveBeenCalled();
+    expect(createSavedObjectsResult).toEqual({ createdObjects: [], errors: [] });
+  });
+
+  test('exits early if there are no objects to create', async () => {
+    const options = setupParams({ objects: [] });
+
+    const createSavedObjectsResult = await createSavedObjects(options);
+    expect(bulkCreate).not.toHaveBeenCalled();
+    expect(createSavedObjectsResult).toEqual({ createdObjects: [], errors: [] });
+  });
+
+  const objs = [obj1, obj2, obj3, obj4, obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13];
+
+  const setupMockResults = (options: CreateSavedObjectsParams) => {
+    bulkCreate.mockResolvedValue({
+      saved_objects: [
+        getResultMock.success(obj1, options),
+        getResultMock.conflict(obj2.type, obj2.id),
+        getResultMock.conflict(obj3.type, importId3),
+        getResultMock.conflict(obj4.type, importId4),
+        getResultMock.unresolvableConflict(obj5.type, obj5.id),
+        getResultMock.success(obj6, options),
+        getResultMock.conflict(obj7.type, obj7.id),
+        getResultMock.conflict(obj8.type, importId8),
+        getResultMock.unresolvableConflict(obj9.type, obj9.id),
+        getResultMock.success(obj10, options),
+        getResultMock.conflict(obj11.type, obj11.id),
+        getResultMock.success(obj12, options),
+        getResultMock.conflict(obj13.type, obj13.id),
+      ],
+    });
+  };
+
+  describe('handles accumulated errors as expected', () => {
+    const resolvableErrors: SavedObjectsImportError[] = [
+      { type: 'foo', id: 'foo-id', error: { type: 'conflict' } } as SavedObjectsImportError,
+      {
+        type: 'bar',
+        id: 'bar-id',
+        error: { type: 'ambiguous_conflict' },
+      } as SavedObjectsImportError,
+      {
+        type: 'baz',
+        id: 'baz-id',
+        error: { type: 'missing_references' },
+      } as SavedObjectsImportError,
+    ];
+    const unresolvableErrors: SavedObjectsImportError[] = [
+      { type: 'qux', id: 'qux-id', error: { type: 'unsupported_type' } } as SavedObjectsImportError,
+      { type: 'quux', id: 'quux-id', error: { type: 'unknown' } } as SavedObjectsImportError,
+    ];
+
+    test('does not call bulkCreate when resolvable errors are present', async () => {
+      for (const error of resolvableErrors) {
+        const options = setupParams({ objects: objs, accumulatedErrors: [error] });
+        await createSavedObjects(options);
+        expect(bulkCreate).not.toHaveBeenCalled();
+      }
+    });
+
+    test('calls bulkCreate when unresolvable errors or no errors are present', async () => {
+      for (const error of unresolvableErrors) {
+        const options = setupParams({ objects: objs, accumulatedErrors: [error] });
+        setupMockResults(options);
+        await createSavedObjects(options);
+        expect(bulkCreate).toHaveBeenCalledTimes(1);
+        bulkCreate.mockClear();
+      }
+      const options = setupParams({ objects: objs });
+      setupMockResults(options);
+      await createSavedObjects(options);
+      expect(bulkCreate).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  it('filters out version from objects before create', async () => {
+    const options = setupParams({ objects: [{ ...obj1, version: 'foo' }] });
+    bulkCreate.mockResolvedValue({ saved_objects: [getResultMock.success(obj1, options)] });
+
+    await createSavedObjects(options);
+    expectBulkCreateArgs.objects(1, [obj1]);
+  });
+
+  const testBulkCreateObjects = async (namespace?: string) => {
+    const options = setupParams({ objects: objs, namespace });
+    setupMockResults(options);
+
+    await createSavedObjects(options);
+    expect(bulkCreate).toHaveBeenCalledTimes(1);
+    // these three objects are transformed before being created, because they are included in the `importIdMap`
+    const x3 = { ...obj3, id: importId3, originId: undefined }; // this import object already has an originId, but the entry has omitOriginId=true
+    const x4 = { ...obj4, id: importId4 }; // this import object already has an originId
+    const x8 = { ...obj8, id: importId8, originId: obj8.id }; // this import object doesn't have an originId, so it is set before create
+    const argObjs = [obj1, obj2, x3, x4, obj5, obj6, obj7, x8, obj9, obj10, obj11, obj12, obj13];
+    expectBulkCreateArgs.objects(1, argObjs);
+  };
+  const testBulkCreateOptions = async (namespace?: string) => {
+    const overwrite = (Symbol() as unknown) as boolean;
+    const options = setupParams({ objects: objs, namespace, overwrite });
+    setupMockResults(options);
+
+    await createSavedObjects(options);
+    expect(bulkCreate).toHaveBeenCalledTimes(1);
+    expectBulkCreateArgs.options(1, options);
+  };
+  const testReturnValue = async (namespace?: string) => {
+    const options = setupParams({ objects: objs, namespace });
+    setupMockResults(options);
+
+    const results = await createSavedObjects(options);
+    const resultSavedObjects = (await bulkCreate.mock.results[0].value).saved_objects;
+    const [r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13] = resultSavedObjects;
+    // these three results are transformed before being returned, because the bulkCreate attempt used different IDs for them
+    const [x3, x4, x8] = [r3, r4, r8].map((x: SavedObject) => ({ ...x, destinationId: x.id }));
+    const transformedResults = [r1, r2, x3, x4, r5, r6, r7, x8, r9, r10, r11, r12, r13];
+    const expectedResults = getExpectedResults(transformedResults, objs);
+    expect(results).toEqual(expectedResults);
+  };
+
+  describe('with an undefined namespace', () => {
+    test('calls bulkCreate once with input objects', async () => {
+      await testBulkCreateObjects();
+    });
+    test('calls bulkCreate once with input options', async () => {
+      await testBulkCreateOptions();
+    });
+    test('returns bulkCreate results that are remapped to IDs of imported objects', async () => {
+      await testReturnValue();
+    });
+  });
+
+  describe('with a defined namespace', () => {
+    const namespace = 'some-namespace';
+    test('calls bulkCreate once with input objects', async () => {
+      await testBulkCreateObjects(namespace);
+    });
+    test('calls bulkCreate once with input options', async () => {
+      await testBulkCreateOptions(namespace);
+    });
+    test('returns bulkCreate results that are remapped to IDs of imported objects', async () => {
+      await testReturnValue(namespace);
+    });
+  });
+});
diff --git a/src/core/server/saved_objects/import/create_saved_objects.ts b/src/core/server/saved_objects/import/create_saved_objects.ts
new file mode 100644
index 0000000000000..9930e9c69358a
--- /dev/null
+++ b/src/core/server/saved_objects/import/create_saved_objects.ts
@@ -0,0 +1,111 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObject, SavedObjectsClientContract, SavedObjectsImportError } from '../types';
+import { extractErrors } from './extract_errors';
+import { CreatedObject } from './types';
+
+interface CreateSavedObjectsParams<T> {
+  objects: Array<SavedObject<T>>;
+  accumulatedErrors: SavedObjectsImportError[];
+  savedObjectsClient: SavedObjectsClientContract;
+  importIdMap: Map<string, { id?: string; omitOriginId?: boolean }>;
+  namespace?: string;
+  overwrite?: boolean;
+}
+interface CreateSavedObjectsResult<T> {
+  createdObjects: Array<CreatedObject<T>>;
+  errors: SavedObjectsImportError[];
+}
+
+/**
+ * This function abstracts the bulk creation of import objects. The main reason for this is that the import ID map should dictate the IDs of
+ * the objects we create, and the create results should be mapped to the original IDs that consumers will be able to understand.
+ */
+export const createSavedObjects = async <T>({
+  objects,
+  accumulatedErrors,
+  savedObjectsClient,
+  importIdMap,
+  namespace,
+  overwrite,
+}: CreateSavedObjectsParams<T>): Promise<CreateSavedObjectsResult<T>> => {
+  // filter out any objects that resulted in errors
+  const errorSet = accumulatedErrors.reduce(
+    (acc, { type, id }) => acc.add(`${type}:${id}`),
+    new Set<string>()
+  );
+  const filteredObjects = objects.filter(({ type, id }) => !errorSet.has(`${type}:${id}`));
+
+  // exit early if there are no objects to create
+  if (filteredObjects.length === 0) {
+    return { createdObjects: [], errors: [] };
+  }
+
+  // generate a map of the raw object IDs
+  const objectIdMap = filteredObjects.reduce(
+    (map, object) => map.set(`${object.type}:${object.id}`, object),
+    new Map<string, SavedObject<T>>()
+  );
+
+  // filter out the 'version' field of each object, if it exists
+  const objectsToCreate = filteredObjects.map(({ version, ...object }) => {
+    // use the import ID map to ensure that each reference is being created with the correct ID
+    const references = object.references?.map((reference) => {
+      const { type, id } = reference;
+      const importIdEntry = importIdMap.get(`${type}:${id}`);
+      if (importIdEntry?.id) {
+        return { ...reference, id: importIdEntry.id };
+      }
+      return reference;
+    });
+    // use the import ID map to ensure that each object is being created with the correct ID, also ensure that the `originId` is set on
+    // the created object if it did not have one (or is omitted if specified)
+    const importIdEntry = importIdMap.get(`${object.type}:${object.id}`);
+    if (importIdEntry?.id) {
+      objectIdMap.set(`${object.type}:${importIdEntry.id}`, object);
+      const originId = importIdEntry.omitOriginId ? undefined : object.originId ?? object.id;
+      return { ...object, id: importIdEntry.id, originId, ...(references && { references }) };
+    }
+    return { ...object, ...(references && { references }) };
+  });
+
+  const resolvableErrors = ['conflict', 'ambiguous_conflict', 'missing_references'];
+  let expectedResults = objectsToCreate;
+  if (!accumulatedErrors.some(({ error: { type } }) => resolvableErrors.includes(type))) {
+    const bulkCreateResponse = await savedObjectsClient.bulkCreate(objectsToCreate, {
+      namespace,
+      overwrite,
+    });
+    expectedResults = bulkCreateResponse.saved_objects;
+  }
+
+  // remap results to reflect the object IDs that were submitted for import
+  // this ensures that consumers understand the results
+  const remappedResults = expectedResults.map<CreatedObject<T>>((result) => {
+    const { id } = objectIdMap.get(`${result.type}:${result.id}`)!;
+    // also, include a `destinationId` field if the object create attempt was made with a different ID
+    return { ...result, id, ...(id !== result.id && { destinationId: result.id }) };
+  });
+
+  return {
+    createdObjects: remappedResults.filter((obj) => !obj.error),
+    errors: extractErrors(remappedResults, objects),
+  };
+};
diff --git a/src/core/server/saved_objects/import/extract_errors.test.ts b/src/core/server/saved_objects/import/extract_errors.test.ts
index f97cc661c0bca..047c4ae36266f 100644
--- a/src/core/server/saved_objects/import/extract_errors.test.ts
+++ b/src/core/server/saved_objects/import/extract_errors.test.ts
@@ -19,6 +19,8 @@
 
 import { SavedObject } from '../types';
 import { extractErrors } from './extract_errors';
+import { SavedObjectsErrorHelpers } from '..';
+import { CreatedObject } from './types';
 
 describe('extractErrors()', () => {
   test('returns empty array when no errors exist', () => {
@@ -28,38 +30,34 @@ describe('extractErrors()', () => {
   });
 
   test('extracts errors from saved objects', () => {
-    const savedObjects: SavedObject[] = [
+    const savedObjects: Array<CreatedObject<unknown>> = [
       {
         id: '1',
         type: 'dashboard',
-        attributes: {
-          title: 'My Dashboard 1',
-        },
+        attributes: { title: 'My Dashboard 1' },
         references: [],
       },
       {
         id: '2',
         type: 'dashboard',
-        attributes: {
-          title: 'My Dashboard 2',
-        },
+        attributes: { title: 'My Dashboard 2' },
         references: [],
-        error: {
-          statusCode: 409,
-          message: 'Conflict',
-        },
+        error: SavedObjectsErrorHelpers.createConflictError('dashboard', '2').output.payload,
       },
       {
         id: '3',
         type: 'dashboard',
-        attributes: {
-          title: 'My Dashboard 3',
-        },
+        attributes: { title: 'My Dashboard 3' },
         references: [],
-        error: {
-          statusCode: 400,
-          message: 'Bad Request',
-        },
+        error: SavedObjectsErrorHelpers.createBadRequestError().output.payload,
+      },
+      {
+        id: '4',
+        type: 'dashboard',
+        attributes: { title: 'My Dashboard 4' },
+        references: [],
+        error: SavedObjectsErrorHelpers.createConflictError('dashboard', '4').output.payload,
+        destinationId: 'foo',
       },
     ];
     const result = extractErrors(savedObjects, savedObjects);
@@ -70,19 +68,38 @@ Array [
       "type": "conflict",
     },
     "id": "2",
+    "meta": Object {
+      "title": "My Dashboard 2",
+    },
     "title": "My Dashboard 2",
     "type": "dashboard",
   },
   Object {
     "error": Object {
+      "error": "Bad Request",
       "message": "Bad Request",
       "statusCode": 400,
       "type": "unknown",
     },
     "id": "3",
+    "meta": Object {
+      "title": "My Dashboard 3",
+    },
     "title": "My Dashboard 3",
     "type": "dashboard",
   },
+  Object {
+    "error": Object {
+      "destinationId": "foo",
+      "type": "conflict",
+    },
+    "id": "4",
+    "meta": Object {
+      "title": "My Dashboard 4",
+    },
+    "title": "My Dashboard 4",
+    "type": "dashboard",
+  },
 ]
 `);
   });
diff --git a/src/core/server/saved_objects/import/extract_errors.ts b/src/core/server/saved_objects/import/extract_errors.ts
index 5728ce8b7b59f..6a7e5d4d9dfa4 100644
--- a/src/core/server/saved_objects/import/extract_errors.ts
+++ b/src/core/server/saved_objects/import/extract_errors.ts
@@ -17,11 +17,11 @@
  * under the License.
  */
 import { SavedObject } from '../types';
-import { SavedObjectsImportError } from './types';
+import { SavedObjectsImportError, CreatedObject } from './types';
 
 export function extractErrors(
   // TODO: define saved object type
-  savedObjectResults: Array<SavedObject<any>>,
+  savedObjectResults: Array<CreatedObject<unknown>>,
   savedObjectsToImport: Array<SavedObject<any>>
 ) {
   const errors: SavedObjectsImportError[] = [];
@@ -34,17 +34,17 @@ export function extractErrors(
       const originalSavedObject = originalSavedObjectsMap.get(
         `${savedObject.type}:${savedObject.id}`
       );
-      const title =
-        originalSavedObject &&
-        originalSavedObject.attributes &&
-        originalSavedObject.attributes.title;
+      const title = originalSavedObject?.attributes?.title;
+      const { destinationId } = savedObject;
       if (savedObject.error.statusCode === 409) {
         errors.push({
           id: savedObject.id,
           type: savedObject.type,
           title,
+          meta: { title },
           error: {
             type: 'conflict',
+            ...(destinationId && { destinationId }),
           },
         });
         continue;
@@ -53,6 +53,7 @@ export function extractErrors(
         id: savedObject.id,
         type: savedObject.type,
         title,
+        meta: { title },
         error: {
           ...savedObject.error,
           type: 'unknown',
diff --git a/src/core/server/saved_objects/import/get_non_unique_entries.test.ts b/src/core/server/saved_objects/import/get_non_unique_entries.test.ts
new file mode 100644
index 0000000000000..a66fa437142d3
--- /dev/null
+++ b/src/core/server/saved_objects/import/get_non_unique_entries.test.ts
@@ -0,0 +1,38 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getNonUniqueEntries } from './get_non_unique_entries';
+
+const foo1 = { type: 'foo', id: '1' };
+const foo2 = { type: 'foo', id: '2' }; // same type as foo1, different ID
+const bar1 = { type: 'bar', id: '1' }; // same ID as foo1, different type
+
+describe('#getNonUniqueEntries', () => {
+  test('returns empty array if entries are unique', () => {
+    const result = getNonUniqueEntries([foo1, foo2, bar1]);
+    expect(result).toEqual([]);
+  });
+
+  test('returns non-empty array for non-unique results', () => {
+    const result1 = getNonUniqueEntries([foo1, foo2, foo1]);
+    const result2 = getNonUniqueEntries([foo1, foo2, foo1, foo2]);
+    expect(result1).toEqual([`${foo1.type}:${foo1.id}`]);
+    expect(result2).toEqual([`${foo1.type}:${foo1.id}`, `${foo2.type}:${foo2.id}`]);
+  });
+});
diff --git a/src/core/server/saved_objects/import/get_non_unique_entries.ts b/src/core/server/saved_objects/import/get_non_unique_entries.ts
new file mode 100644
index 0000000000000..468bf73d9b2db
--- /dev/null
+++ b/src/core/server/saved_objects/import/get_non_unique_entries.ts
@@ -0,0 +1,35 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+type Entries = Array<{ type: string; id: string }>;
+
+export const getNonUniqueEntries = (objects: Entries) => {
+  const idCountMap = objects.reduce((acc, { type, id }) => {
+    const key = `${type}:${id}`;
+    const val = acc.get(key) ?? 0;
+    return acc.set(key, val + 1);
+  }, new Map<string, number>());
+  const nonUniqueEntries: string[] = [];
+  idCountMap.forEach((value, key) => {
+    if (value >= 2) {
+      nonUniqueEntries.push(key);
+    }
+  });
+  return nonUniqueEntries;
+};
diff --git a/src/core/server/saved_objects/import/import_saved_objects.test.ts b/src/core/server/saved_objects/import/import_saved_objects.test.ts
index e204cd7bddfc7..77f49e336a7b9 100644
--- a/src/core/server/saved_objects/import/import_saved_objects.test.ts
+++ b/src/core/server/saved_objects/import/import_saved_objects.test.ts
@@ -18,602 +18,432 @@
  */
 
 import { Readable } from 'stream';
-import { SavedObject } from '../types';
-import { importSavedObjectsFromStream } from './import_saved_objects';
+import { v4 as uuidv4 } from 'uuid';
+import {
+  SavedObjectsClientContract,
+  SavedObjectsType,
+  SavedObject,
+  SavedObjectsImportError,
+} from '../types';
 import { savedObjectsClientMock } from '../../mocks';
+import { SavedObjectsImportOptions, ISavedObjectTypeRegistry } from '..';
+import { typeRegistryMock } from '../saved_objects_type_registry.mock';
+import { importSavedObjectsFromStream } from './import_saved_objects';
 
-const emptyResponse = {
-  saved_objects: [],
-  total: 0,
-  per_page: 0,
-  page: 0,
-};
-describe('importSavedObjects()', () => {
-  const savedObjects: SavedObject[] = [
-    {
-      id: '1',
-      type: 'index-pattern',
-      attributes: {
-        title: 'My Index Pattern',
-      },
-      references: [],
-    },
-    {
-      id: '2',
-      type: 'search',
-      attributes: {
-        title: 'My Search',
-      },
-      references: [],
-    },
-    {
-      id: '3',
-      type: 'visualization',
-      attributes: {
-        title: 'My Visualization',
-      },
-      references: [],
-    },
-    {
-      id: '4',
-      type: 'dashboard',
-      attributes: {
-        title: 'My Dashboard',
-      },
-      references: [],
-    },
-  ];
-  const savedObjectsClient = savedObjectsClientMock.create();
+import { collectSavedObjects } from './collect_saved_objects';
+import { regenerateIds } from './regenerate_ids';
+import { validateReferences } from './validate_references';
+import { checkConflicts } from './check_conflicts';
+import { checkOriginConflicts } from './check_origin_conflicts';
+import { createSavedObjects } from './create_saved_objects';
 
-  beforeEach(() => {
-    jest.resetAllMocks();
-  });
+jest.mock('./collect_saved_objects');
+jest.mock('./regenerate_ids');
+jest.mock('./validate_references');
+jest.mock('./check_conflicts');
+jest.mock('./check_origin_conflicts');
+jest.mock('./create_saved_objects');
 
-  test('returns early when no objects exist', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        this.push(null);
-      },
-    });
-    const result = await importSavedObjectsFromStream({
-      readStream,
-      objectLimit: 1,
-      overwrite: false,
-      savedObjectsClient,
-      supportedTypes: [],
-    });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "success": true,
-        "successCount": 0,
-      }
-    `);
-  });
+const getMockFn = <T extends (...args: any[]) => any, U>(fn: (...args: Parameters<T>) => U) =>
+  fn as jest.MockedFunction<(...args: Parameters<T>) => U>;
 
-  test('calls bulkCreate without overwrite', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push(null);
-      },
+describe('#importSavedObjectsFromStream', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // mock empty output of each of these mocked modules so the import doesn't throw an error
+    getMockFn(collectSavedObjects).mockResolvedValue({
+      errors: [],
+      collectedObjects: [],
+      importIdMap: new Map(),
     });
-    savedObjectsClient.find.mockResolvedValueOnce(emptyResponse);
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: savedObjects,
+    getMockFn(regenerateIds).mockReturnValue(new Map());
+    getMockFn(validateReferences).mockResolvedValue([]);
+    getMockFn(checkConflicts).mockResolvedValue({
+      errors: [],
+      filteredObjects: [],
+      importIdMap: new Map(),
+      pendingOverwrites: new Set(),
     });
-    const result = await importSavedObjectsFromStream({
-      readStream,
-      objectLimit: 4,
-      overwrite: false,
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+    getMockFn(checkOriginConflicts).mockResolvedValue({
+      errors: [],
+      importIdMap: new Map(),
+      pendingOverwrites: new Set(),
     });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "success": true,
-        "successCount": 4,
-      }
-    `);
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "attributes": Object {
-                  "title": "My Index Pattern",
-                },
-                "id": "1",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "index-pattern",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Search",
-                },
-                "id": "2",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "search",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Visualization",
-                },
-                "id": "3",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "visualization",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Dashboard",
-                },
-                "id": "4",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "dashboard",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-              "overwrite": false,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
+    getMockFn(createSavedObjects).mockResolvedValue({ errors: [], createdObjects: [] });
   });
 
-  test('uses the provided namespace when present', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push(null);
-      },
-    });
-    savedObjectsClient.find.mockResolvedValueOnce(emptyResponse);
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: savedObjects,
-    });
-    const result = await importSavedObjectsFromStream({
+  let readStream: Readable;
+  const objectLimit = 10;
+  const overwrite = (Symbol() as unknown) as boolean;
+  let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
+  let typeRegistry: jest.Mocked<ISavedObjectTypeRegistry>;
+  const namespace = 'some-namespace';
+
+  const setupOptions = (createNewCopies: boolean = false): SavedObjectsImportOptions => {
+    readStream = new Readable();
+    savedObjectsClient = savedObjectsClientMock.create();
+    typeRegistry = typeRegistryMock.create();
+    typeRegistry.getType.mockImplementation(
+      (type: string) =>
+        ({
+          // other attributes aren't needed for the purposes of injecting metadata
+          management: { icon: `${type}-icon` },
+        } as any)
+    );
+    return {
       readStream,
-      objectLimit: 4,
-      overwrite: false,
+      objectLimit,
+      overwrite,
       savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
-      namespace: 'foo',
+      typeRegistry,
+      namespace,
+      createNewCopies,
+    };
+  };
+  const createObject = (): SavedObject<{
+    title: string;
+  }> => {
+    return {
+      type: 'foo-type',
+      id: uuidv4(),
+      references: [],
+      attributes: { title: 'some-title' },
+    };
+  };
+  const createError = (): SavedObjectsImportError => {
+    const title = 'some-title';
+    return {
+      type: 'foo-type',
+      id: uuidv4(),
+      title: 'some-title',
+      meta: { title },
+      error: { type: 'conflict' },
+    };
+  };
+
+  /**
+   * These tests use minimal mocks which don't look realistic, but are sufficient to exercise the code paths correctly. For example, for an
+   * object to be imported successfully it would need to be obtained from `collectSavedObjects`, passed to `validateReferences`, passed to
+   * `checkOriginConflicts`, passed to `createSavedObjects`, and returned from that. However, for each of the tests below, we skip the
+   * intermediate steps in the interest of brevity.
+   */
+  describe('module calls', () => {
+    test('collects saved objects from stream', async () => {
+      const options = setupOptions();
+      const supportedTypes = ['foo-type'];
+      typeRegistry.getImportableAndExportableTypes.mockReturnValue(
+        supportedTypes.map((name) => ({ name })) as SavedObjectsType[]
+      );
+
+      await importSavedObjectsFromStream(options);
+      expect(typeRegistry.getImportableAndExportableTypes).toHaveBeenCalled();
+      const collectSavedObjectsOptions = { readStream, objectLimit, supportedTypes };
+      expect(collectSavedObjects).toHaveBeenCalledWith(collectSavedObjectsOptions);
     });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "success": true,
-        "successCount": 4,
-      }
-    `);
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "attributes": Object {
-                  "title": "My Index Pattern",
-                },
-                "id": "1",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "index-pattern",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Search",
-                },
-                "id": "2",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "search",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Visualization",
-                },
-                "id": "3",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "visualization",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Dashboard",
-                },
-                "id": "4",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "dashboard",
-              },
-            ],
-            Object {
-              "namespace": "foo",
-              "overwrite": false,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
-  });
 
-  test('calls bulkCreate with overwrite', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push(null);
-      },
+    test('validates references', async () => {
+      const options = setupOptions();
+      const collectedObjects = [createObject()];
+      getMockFn(collectSavedObjects).mockResolvedValue({
+        errors: [],
+        collectedObjects,
+        importIdMap: new Map(),
+      });
+
+      await importSavedObjectsFromStream(options);
+      expect(validateReferences).toHaveBeenCalledWith(
+        collectedObjects,
+        savedObjectsClient,
+        namespace
+      );
     });
-    savedObjectsClient.find.mockResolvedValueOnce(emptyResponse);
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: savedObjects,
+
+    describe('with createNewCopies disabled', () => {
+      test('does not regenerate object IDs', async () => {
+        const options = setupOptions();
+        const collectedObjects = [createObject()];
+        getMockFn(collectSavedObjects).mockResolvedValue({
+          errors: [],
+          collectedObjects,
+          importIdMap: new Map(),
+        });
+
+        await importSavedObjectsFromStream(options);
+        expect(regenerateIds).not.toHaveBeenCalled();
+      });
+
+      test('checks conflicts', async () => {
+        const options = setupOptions();
+        const collectedObjects = [createObject()];
+        getMockFn(collectSavedObjects).mockResolvedValue({
+          errors: [],
+          collectedObjects,
+          importIdMap: new Map(),
+        });
+
+        await importSavedObjectsFromStream(options);
+        const checkConflictsParams = {
+          objects: collectedObjects,
+          savedObjectsClient,
+          namespace,
+          ignoreRegularConflicts: overwrite,
+        };
+        expect(checkConflicts).toHaveBeenCalledWith(checkConflictsParams);
+      });
+
+      test('checks origin conflicts', async () => {
+        const options = setupOptions();
+        const filteredObjects = [createObject()];
+        const importIdMap = new Map();
+        getMockFn(checkConflicts).mockResolvedValue({
+          errors: [],
+          filteredObjects,
+          importIdMap,
+          pendingOverwrites: new Set(),
+        });
+
+        await importSavedObjectsFromStream(options);
+        const checkOriginConflictsParams = {
+          objects: filteredObjects,
+          savedObjectsClient,
+          typeRegistry,
+          namespace,
+          ignoreRegularConflicts: overwrite,
+          importIdMap,
+        };
+        expect(checkOriginConflicts).toHaveBeenCalledWith(checkOriginConflictsParams);
+      });
+
+      test('creates saved objects', async () => {
+        const options = setupOptions();
+        const collectedObjects = [createObject()];
+        const filteredObjects = [createObject()];
+        const errors = [createError(), createError(), createError(), createError()];
+        getMockFn(collectSavedObjects).mockResolvedValue({
+          errors: [errors[0]],
+          collectedObjects,
+          importIdMap: new Map([
+            ['foo', {}],
+            ['bar', {}],
+            ['baz', {}],
+          ]),
+        });
+        getMockFn(validateReferences).mockResolvedValue([errors[1]]);
+        getMockFn(checkConflicts).mockResolvedValue({
+          errors: [errors[2]],
+          filteredObjects,
+          importIdMap: new Map([['bar', { id: 'newId1' }]]),
+          pendingOverwrites: new Set(),
+        });
+        getMockFn(checkOriginConflicts).mockResolvedValue({
+          errors: [errors[3]],
+          importIdMap: new Map([['baz', { id: 'newId2' }]]),
+          pendingOverwrites: new Set(),
+        });
+
+        await importSavedObjectsFromStream(options);
+        const importIdMap = new Map([
+          ['foo', {}],
+          ['bar', { id: 'newId1' }],
+          ['baz', { id: 'newId2' }],
+        ]);
+        const createSavedObjectsParams = {
+          objects: collectedObjects,
+          accumulatedErrors: errors,
+          savedObjectsClient,
+          importIdMap,
+          overwrite,
+          namespace,
+        };
+        expect(createSavedObjects).toHaveBeenCalledWith(createSavedObjectsParams);
+      });
     });
-    const result = await importSavedObjectsFromStream({
-      readStream,
-      objectLimit: 4,
-      overwrite: true,
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+
+    describe('with createNewCopies enabled', () => {
+      test('regenerates object IDs', async () => {
+        const options = setupOptions(true);
+        const collectedObjects = [createObject()];
+        getMockFn(collectSavedObjects).mockResolvedValue({
+          errors: [],
+          collectedObjects,
+          importIdMap: new Map(), // doesn't matter
+        });
+
+        await importSavedObjectsFromStream(options);
+        expect(regenerateIds).toHaveBeenCalledWith(collectedObjects);
+      });
+
+      test('does not check conflicts or check origin conflicts', async () => {
+        const options = setupOptions(true);
+        getMockFn(validateReferences).mockResolvedValue([]);
+
+        await importSavedObjectsFromStream(options);
+        expect(checkConflicts).not.toHaveBeenCalled();
+        expect(checkOriginConflicts).not.toHaveBeenCalled();
+      });
+
+      test('creates saved objects', async () => {
+        const options = setupOptions(true);
+        const collectedObjects = [createObject()];
+        const errors = [createError(), createError()];
+        getMockFn(collectSavedObjects).mockResolvedValue({
+          errors: [errors[0]],
+          collectedObjects,
+          importIdMap: new Map([
+            ['foo', {}],
+            ['bar', {}],
+          ]),
+        });
+        getMockFn(validateReferences).mockResolvedValue([errors[1]]);
+        // this importIdMap is not composed with the one obtained from `collectSavedObjects`
+        const importIdMap = new Map().set(`id1`, { id: `newId1` });
+        getMockFn(regenerateIds).mockReturnValue(importIdMap);
+
+        await importSavedObjectsFromStream(options);
+        const createSavedObjectsParams = {
+          objects: collectedObjects,
+          accumulatedErrors: errors,
+          savedObjectsClient,
+          importIdMap,
+          overwrite,
+          namespace,
+        };
+        expect(createSavedObjects).toHaveBeenCalledWith(createSavedObjectsParams);
+      });
     });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "success": true,
-        "successCount": 4,
-      }
-    `);
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "attributes": Object {
-                  "title": "My Index Pattern",
-                },
-                "id": "1",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "index-pattern",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Search",
-                },
-                "id": "2",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "search",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Visualization",
-                },
-                "id": "3",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "visualization",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Dashboard",
-                },
-                "id": "4",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "dashboard",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-              "overwrite": true,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
   });
 
-  test('extracts errors for conflicts', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push(null);
-      },
-    });
-    savedObjectsClient.find.mockResolvedValueOnce(emptyResponse);
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: savedObjects.map((savedObject) => ({
-        type: savedObject.type,
-        id: savedObject.id,
-        error: {
-          statusCode: 409,
-          message: 'conflict',
-        },
-        attributes: {},
-        references: [],
-      })),
+  describe('results', () => {
+    test('returns success=true if no errors occurred', async () => {
+      const options = setupOptions();
+
+      const result = await importSavedObjectsFromStream(options);
+      expect(result).toEqual({ success: true, successCount: 0 });
     });
-    const result = await importSavedObjectsFromStream({
-      readStream,
-      objectLimit: 4,
-      overwrite: false,
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+
+    test('returns success=false if an error occurred', async () => {
+      const options = setupOptions();
+      getMockFn(collectSavedObjects).mockResolvedValue({
+        errors: [createError()],
+        collectedObjects: [],
+        importIdMap: new Map(), // doesn't matter
+      });
+
+      const result = await importSavedObjectsFromStream(options);
+      expect(result).toEqual({ success: false, successCount: 0, errors: [expect.any(Object)] });
     });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [
-          Object {
-            "error": Object {
-              "type": "conflict",
-            },
-            "id": "1",
-            "title": "My Index Pattern",
-            "type": "index-pattern",
-          },
-          Object {
-            "error": Object {
-              "type": "conflict",
-            },
-            "id": "2",
-            "title": "My Search",
-            "type": "search",
-          },
-          Object {
-            "error": Object {
-              "type": "conflict",
-            },
-            "id": "3",
-            "title": "My Visualization",
-            "type": "visualization",
-          },
-          Object {
-            "error": Object {
-              "type": "conflict",
-            },
-            "id": "4",
-            "title": "My Dashboard",
-            "type": "dashboard",
-          },
-        ],
-        "success": false,
-        "successCount": 0,
-      }
-    `);
-  });
 
-  test('validates references', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        this.push({
-          id: '1',
-          type: 'search',
-          attributes: {
-            title: 'My Search',
-          },
-          references: [
-            {
-              name: 'ref_0',
-              type: 'index-pattern',
-              id: '2',
-            },
-          ],
+    describe('handles a mix of successes and errors and injects metadata', () => {
+      const obj1 = createObject();
+      const tmp = createObject();
+      const obj2 = { ...tmp, destinationId: 'some-destinationId', originId: tmp.id };
+      const obj3 = { ...createObject(), destinationId: 'another-destinationId' }; // empty originId
+      const createdObjects = [obj1, obj2, obj3];
+      const error1 = createError();
+      const error2 = createError();
+      // results
+      const success1 = {
+        type: obj1.type,
+        id: obj1.id,
+        meta: { title: obj1.attributes.title, icon: `${obj1.type}-icon` },
+      };
+      const success2 = {
+        type: obj2.type,
+        id: obj2.id,
+        meta: { title: obj2.attributes.title, icon: `${obj2.type}-icon` },
+        destinationId: obj2.destinationId,
+      };
+      const success3 = {
+        type: obj3.type,
+        id: obj3.id,
+        meta: { title: obj3.attributes.title, icon: `${obj3.type}-icon` },
+        destinationId: obj3.destinationId,
+      };
+      const errors = [error1, error2];
+
+      test('with createNewCopies disabled', async () => {
+        const options = setupOptions();
+        getMockFn(checkConflicts).mockResolvedValue({
+          errors: [],
+          filteredObjects: [],
+          importIdMap: new Map(),
+          pendingOverwrites: new Set([
+            `${success2.type}:${success2.id}`, // the success2 object was overwritten
+            `${error2.type}:${error2.id}`, // an attempt was made to overwrite the error2 object
+          ]),
         });
-        this.push({
-          id: '3',
-          type: 'visualization',
-          attributes: {
-            title: 'My Visualization',
-          },
-          references: [
-            {
-              name: 'ref_0',
-              type: 'search',
-              id: '1',
-            },
-          ],
+        getMockFn(createSavedObjects).mockResolvedValue({ errors, createdObjects });
+
+        const result = await importSavedObjectsFromStream(options);
+        // successResults only includes the imported object's type, id, and destinationId (if a new one was generated)
+        const successResults = [
+          success1,
+          { ...success2, overwrite: true },
+          // `createNewCopies` mode is not enabled, but obj3 ran into an ambiguous source conflict and it was created with an empty
+          // originId; hence, this specific object is a new copy -- we would need this information for rendering the appropriate originId
+          // in the client UI, and we would need it to construct a retry for this object if other objects had errors that needed to be
+          // resolved
+          { ...success3, createNewCopy: true },
+        ];
+        const errorResults = [
+          { ...error1, meta: { ...error1.meta, icon: `${error1.type}-icon` } },
+          { ...error2, meta: { ...error2.meta, icon: `${error2.type}-icon` }, overwrite: true },
+        ];
+        expect(result).toEqual({
+          success: false,
+          successCount: 3,
+          successResults,
+          errors: errorResults,
         });
-        this.push(null);
-      },
-    });
-    savedObjectsClient.bulkGet.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          type: 'index-pattern',
-          id: '2',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
-          attributes: {},
-          references: [],
-        },
-      ],
-    });
-    const result = await importSavedObjectsFromStream({
-      readStream,
-      objectLimit: 4,
-      overwrite: false,
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
-    });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [
-          Object {
-            "error": Object {
-              "blocking": Array [
-                Object {
-                  "id": "3",
-                  "type": "visualization",
-                },
-              ],
-              "references": Array [
-                Object {
-                  "id": "2",
-                  "type": "index-pattern",
-                },
-              ],
-              "type": "missing_references",
-            },
-            "id": "1",
-            "title": "My Search",
-            "type": "search",
-          },
-        ],
-        "success": false,
-        "successCount": 0,
-      }
-    `);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "fields": Array [
-                  "id",
-                ],
-                "id": "2",
-                "type": "index-pattern",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
-  });
+      });
 
-  test('validates supported types', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push({ id: '1', type: 'wigwags', attributes: { title: 'my title' }, references: [] });
-        this.push(null);
-      },
-    });
-    savedObjectsClient.find.mockResolvedValueOnce(emptyResponse);
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: savedObjects,
+      test('with createNewCopies enabled', async () => {
+        // however, we include it here for posterity
+        const options = setupOptions(true);
+        getMockFn(createSavedObjects).mockResolvedValue({ errors, createdObjects });
+
+        const result = await importSavedObjectsFromStream(options);
+        // successResults only includes the imported object's type, id, and destinationId (if a new one was generated)
+        // obj2 being created with createNewCopies mode enabled isn't a realistic test case (all objects would have originId omitted)
+        const successResults = [success1, success2, success3];
+        const errorResults = [
+          { ...error1, meta: { ...error1.meta, icon: `${error1.type}-icon` } },
+          { ...error2, meta: { ...error2.meta, icon: `${error2.type}-icon` } },
+        ];
+        expect(result).toEqual({
+          success: false,
+          successCount: 3,
+          successResults,
+          errors: errorResults,
+        });
+      });
     });
-    const result = await importSavedObjectsFromStream({
-      readStream,
-      objectLimit: 5,
-      overwrite: false,
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+
+    test('accumulates multiple errors', async () => {
+      const options = setupOptions();
+      const errors = [createError(), createError(), createError(), createError(), createError()];
+      getMockFn(collectSavedObjects).mockResolvedValue({
+        errors: [errors[0]],
+        collectedObjects: [],
+        importIdMap: new Map(), // doesn't matter
+      });
+      getMockFn(validateReferences).mockResolvedValue([errors[1]]);
+      getMockFn(checkConflicts).mockResolvedValue({
+        errors: [errors[2]],
+        filteredObjects: [],
+        importIdMap: new Map(), // doesn't matter
+        pendingOverwrites: new Set(),
+      });
+      getMockFn(checkOriginConflicts).mockResolvedValue({
+        errors: [errors[3]],
+        importIdMap: new Map(), // doesn't matter
+        pendingOverwrites: new Set(),
+      });
+      getMockFn(createSavedObjects).mockResolvedValue({ errors: [errors[4]], createdObjects: [] });
+
+      const result = await importSavedObjectsFromStream(options);
+      const expectedErrors = errors.map(({ type, id }) => expect.objectContaining({ type, id }));
+      expect(result).toEqual({ success: false, successCount: 0, errors: expectedErrors });
     });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [
-          Object {
-            "error": Object {
-              "type": "unsupported_type",
-            },
-            "id": "1",
-            "title": "my title",
-            "type": "wigwags",
-          },
-        ],
-        "success": false,
-        "successCount": 4,
-      }
-    `);
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "attributes": Object {
-                  "title": "My Index Pattern",
-                },
-                "id": "1",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "index-pattern",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Search",
-                },
-                "id": "2",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "search",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Visualization",
-                },
-                "id": "3",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "visualization",
-              },
-              Object {
-                "attributes": Object {
-                  "title": "My Dashboard",
-                },
-                "id": "4",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "dashboard",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-              "overwrite": false,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
   });
 });
diff --git a/src/core/server/saved_objects/import/import_saved_objects.ts b/src/core/server/saved_objects/import/import_saved_objects.ts
index 4956491a79aa9..4530c7ff427da 100644
--- a/src/core/server/saved_objects/import/import_saved_objects.ts
+++ b/src/core/server/saved_objects/import/import_saved_objects.ts
@@ -18,14 +18,16 @@
  */
 
 import { collectSavedObjects } from './collect_saved_objects';
-import { extractErrors } from './extract_errors';
 import {
   SavedObjectsImportError,
   SavedObjectsImportResponse,
   SavedObjectsImportOptions,
 } from './types';
 import { validateReferences } from './validate_references';
-import { SavedObject } from '../types';
+import { checkOriginConflicts } from './check_origin_conflicts';
+import { createSavedObjects } from './create_saved_objects';
+import { checkConflicts } from './check_conflicts';
+import { regenerateIds } from './regenerate_ids';
 
 /**
  * Import saved objects from given stream. See the {@link SavedObjectsImportOptions | options} for more
@@ -37,53 +39,106 @@ export async function importSavedObjectsFromStream({
   readStream,
   objectLimit,
   overwrite,
+  createNewCopies,
   savedObjectsClient,
-  supportedTypes,
+  typeRegistry,
   namespace,
 }: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse> {
   let errorAccumulator: SavedObjectsImportError[] = [];
+  const supportedTypes = typeRegistry.getImportableAndExportableTypes().map((type) => type.name);
 
   // Get the objects to import
-  const {
-    errors: collectorErrors,
-    collectedObjects: objectsFromStream,
-  } = await collectSavedObjects({ readStream, objectLimit, supportedTypes });
-  errorAccumulator = [...errorAccumulator, ...collectorErrors];
+  const collectSavedObjectsResult = await collectSavedObjects({
+    readStream,
+    objectLimit,
+    supportedTypes,
+  });
+  errorAccumulator = [...errorAccumulator, ...collectSavedObjectsResult.errors];
+  /** Map of all IDs for objects that we are attempting to import; each value is empty by default */
+  let importIdMap = collectSavedObjectsResult.importIdMap;
+  let pendingOverwrites = new Set<string>();
 
   // Validate references
-  const { filteredObjects, errors: validationErrors } = await validateReferences(
-    objectsFromStream,
+  const validateReferencesResult = await validateReferences(
+    collectSavedObjectsResult.collectedObjects,
     savedObjectsClient,
     namespace
   );
-  errorAccumulator = [...errorAccumulator, ...validationErrors];
+  errorAccumulator = [...errorAccumulator, ...validateReferencesResult];
 
-  // Exit early if no objects to import
-  if (filteredObjects.length === 0) {
-    return {
-      success: errorAccumulator.length === 0,
-      successCount: 0,
-      ...(errorAccumulator.length ? { errors: errorAccumulator } : {}),
+  if (createNewCopies) {
+    importIdMap = regenerateIds(collectSavedObjectsResult.collectedObjects);
+  } else {
+    // Check single-namespace objects for conflicts in this namespace, and check multi-namespace objects for conflicts across all namespaces
+    const checkConflictsParams = {
+      objects: collectSavedObjectsResult.collectedObjects,
+      savedObjectsClient,
+      namespace,
+      ignoreRegularConflicts: overwrite,
+    };
+    const checkConflictsResult = await checkConflicts(checkConflictsParams);
+    errorAccumulator = [...errorAccumulator, ...checkConflictsResult.errors];
+    importIdMap = new Map([...importIdMap, ...checkConflictsResult.importIdMap]);
+    pendingOverwrites = checkConflictsResult.pendingOverwrites;
+
+    // Check multi-namespace object types for origin conflicts in this namespace
+    const checkOriginConflictsParams = {
+      objects: checkConflictsResult.filteredObjects,
+      savedObjectsClient,
+      typeRegistry,
+      namespace,
+      ignoreRegularConflicts: overwrite,
+      importIdMap,
     };
+    const checkOriginConflictsResult = await checkOriginConflicts(checkOriginConflictsParams);
+    errorAccumulator = [...errorAccumulator, ...checkOriginConflictsResult.errors];
+    importIdMap = new Map([...importIdMap, ...checkOriginConflictsResult.importIdMap]);
+    pendingOverwrites = new Set([
+      ...pendingOverwrites,
+      ...checkOriginConflictsResult.pendingOverwrites,
+    ]);
   }
 
   // Create objects in bulk
-  const bulkCreateResult = await savedObjectsClient.bulkCreate(omitVersion(filteredObjects), {
+  const createSavedObjectsParams = {
+    objects: collectSavedObjectsResult.collectedObjects,
+    accumulatedErrors: errorAccumulator,
+    savedObjectsClient,
+    importIdMap,
     overwrite,
     namespace,
+  };
+  const createSavedObjectsResult = await createSavedObjects(createSavedObjectsParams);
+  errorAccumulator = [...errorAccumulator, ...createSavedObjectsResult.errors];
+
+  const successResults = createSavedObjectsResult.createdObjects.map(
+    ({ type, id, attributes: { title }, destinationId, originId }) => {
+      const meta = { title, icon: typeRegistry.getType(type)?.management?.icon };
+      const attemptedOverwrite = pendingOverwrites.has(`${type}:${id}`);
+      return {
+        type,
+        id,
+        meta,
+        ...(attemptedOverwrite && { overwrite: true }),
+        ...(destinationId && { destinationId }),
+        ...(destinationId && !originId && !createNewCopies && { createNewCopy: true }),
+      };
+    }
+  );
+  const errorResults = errorAccumulator.map((error) => {
+    const icon = typeRegistry.getType(error.type)?.management?.icon;
+    const attemptedOverwrite = pendingOverwrites.has(`${error.type}:${error.id}`);
+    return {
+      ...error,
+      meta: { ...error.meta, icon },
+      ...(attemptedOverwrite && { overwrite: true }),
+    };
   });
-  errorAccumulator = [
-    ...errorAccumulator,
-    ...extractErrors(bulkCreateResult.saved_objects, filteredObjects),
-  ];
 
   return {
+    successCount: createSavedObjectsResult.createdObjects.length,
     success: errorAccumulator.length === 0,
-    successCount: bulkCreateResult.saved_objects.filter((obj) => !obj.error).length,
-    ...(errorAccumulator.length ? { errors: errorAccumulator } : {}),
+    ...(successResults.length && { successResults }),
+    ...(errorResults.length && { errors: errorResults }),
   };
 }
-
-export function omitVersion(objects: SavedObject[]): SavedObject[] {
-  return objects.map(({ version, ...object }) => object);
-}
diff --git a/src/core/server/saved_objects/import/index.ts b/src/core/server/saved_objects/import/index.ts
index e268e970b94ac..ab69e4fc44197 100644
--- a/src/core/server/saved_objects/import/index.ts
+++ b/src/core/server/saved_objects/import/index.ts
@@ -21,9 +21,11 @@ export { importSavedObjectsFromStream } from './import_saved_objects';
 export { resolveSavedObjectsImportErrors } from './resolve_import_errors';
 export {
   SavedObjectsImportResponse,
+  SavedObjectsImportSuccess,
   SavedObjectsImportError,
   SavedObjectsImportOptions,
   SavedObjectsImportConflictError,
+  SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportMissingReferencesError,
   SavedObjectsImportUnknownError,
   SavedObjectsImportUnsupportedTypeError,
diff --git a/src/core/server/saved_objects/import/regenerate_ids.test.ts b/src/core/server/saved_objects/import/regenerate_ids.test.ts
new file mode 100644
index 0000000000000..1bbc2693e4f49
--- /dev/null
+++ b/src/core/server/saved_objects/import/regenerate_ids.test.ts
@@ -0,0 +1,53 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { mockUuidv4 } from './__mocks__';
+import { regenerateIds } from './regenerate_ids';
+import { SavedObject } from '../types';
+
+describe('#regenerateIds', () => {
+  const objects = ([
+    { type: 'foo', id: '1' },
+    { type: 'bar', id: '2' },
+    { type: 'baz', id: '3' },
+  ] as any) as SavedObject[];
+
+  test('returns expected values', () => {
+    mockUuidv4
+      .mockReturnValueOnce('uuidv4 #1')
+      .mockReturnValueOnce('uuidv4 #2')
+      .mockReturnValueOnce('uuidv4 #3');
+    expect(regenerateIds(objects)).toMatchInlineSnapshot(`
+      Map {
+        "foo:1" => Object {
+          "id": "uuidv4 #1",
+          "omitOriginId": true,
+        },
+        "bar:2" => Object {
+          "id": "uuidv4 #2",
+          "omitOriginId": true,
+        },
+        "baz:3" => Object {
+          "id": "uuidv4 #3",
+          "omitOriginId": true,
+        },
+      }
+    `);
+  });
+});
diff --git a/src/core/server/saved_objects/import/regenerate_ids.ts b/src/core/server/saved_objects/import/regenerate_ids.ts
new file mode 100644
index 0000000000000..647386ed16469
--- /dev/null
+++ b/src/core/server/saved_objects/import/regenerate_ids.ts
@@ -0,0 +1,33 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { v4 as uuidv4 } from 'uuid';
+import { SavedObject } from '../types';
+
+/**
+ * Takes an array of saved objects and returns an importIdMap of randomly-generated new IDs.
+ *
+ * @param objects The saved objects to generate new IDs for.
+ */
+export const regenerateIds = (objects: SavedObject[]) => {
+  const importIdMap = objects.reduce((acc, object) => {
+    return acc.set(`${object.type}:${object.id}`, { id: uuidv4(), omitOriginId: true });
+  }, new Map<string, { id: string; omitOriginId?: boolean }>());
+  return importIdMap;
+};
diff --git a/src/core/server/saved_objects/import/resolve_import_errors.test.ts b/src/core/server/saved_objects/import/resolve_import_errors.test.ts
index 54ebecc7dca70..51a48dc511e2a 100644
--- a/src/core/server/saved_objects/import/resolve_import_errors.test.ts
+++ b/src/core/server/saved_objects/import/resolve_import_errors.test.ts
@@ -18,567 +18,500 @@
  */
 
 import { Readable } from 'stream';
-import { SavedObject } from '../types';
-import { resolveSavedObjectsImportErrors } from './resolve_import_errors';
+import { v4 as uuidv4 } from 'uuid';
+import {
+  SavedObjectsClientContract,
+  SavedObjectsType,
+  SavedObject,
+  SavedObjectsImportError,
+  SavedObjectsImportRetry,
+  SavedObjectReference,
+} from '../types';
 import { savedObjectsClientMock } from '../../mocks';
+import { SavedObjectsResolveImportErrorsOptions, ISavedObjectTypeRegistry } from '..';
+import { typeRegistryMock } from '../saved_objects_type_registry.mock';
+import { resolveSavedObjectsImportErrors } from './resolve_import_errors';
 
-describe('resolveImportErrors()', () => {
-  const savedObjects: SavedObject[] = [
-    {
-      id: '1',
-      type: 'index-pattern',
-      attributes: {
-        title: 'My Index Pattern',
-      },
-      references: [],
-    },
-    {
-      id: '2',
-      type: 'search',
-      attributes: {
-        title: 'My Search',
-      },
-      references: [],
-    },
-    {
-      id: '3',
-      type: 'visualization',
-      attributes: {
-        title: 'My Visualization',
-      },
-      references: [],
-    },
-    {
-      id: '4',
-      type: 'dashboard',
-      attributes: {
-        title: 'My Dashboard',
-      },
-      references: [
-        {
-          name: 'panel_0',
-          type: 'visualization',
-          id: '3',
-        },
-      ],
-    },
-  ];
-  const savedObjectsClient = savedObjectsClientMock.create();
+import { validateRetries } from './validate_retries';
+import { collectSavedObjects } from './collect_saved_objects';
+import { regenerateIds } from './regenerate_ids';
+import { validateReferences } from './validate_references';
+import { checkConflicts } from './check_conflicts';
+import { getImportIdMapForRetries } from './check_origin_conflicts';
+import { splitOverwrites } from './split_overwrites';
+import { createSavedObjects } from './create_saved_objects';
+import { createObjectsFilter } from './create_objects_filter';
 
-  beforeEach(() => {
-    jest.resetAllMocks();
-  });
+jest.mock('./validate_retries');
+jest.mock('./create_objects_filter');
+jest.mock('./collect_saved_objects');
+jest.mock('./regenerate_ids');
+jest.mock('./validate_references');
+jest.mock('./check_conflicts');
+jest.mock('./check_origin_conflicts');
+jest.mock('./split_overwrites');
+jest.mock('./create_saved_objects');
+
+const getMockFn = <T extends (...args: any[]) => any, U>(fn: (...args: Parameters<T>) => U) =>
+  fn as jest.MockedFunction<(...args: Parameters<T>) => U>;
 
-  test('works with empty parameters', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push(null);
-      },
+describe('#importSavedObjectsFromStream', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    // mock empty output of each of these mocked modules so the import doesn't throw an error
+    getMockFn(createObjectsFilter).mockReturnValue(() => false);
+    getMockFn(collectSavedObjects).mockResolvedValue({
+      errors: [],
+      collectedObjects: [],
+      importIdMap: new Map(),
     });
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: [],
+    getMockFn(regenerateIds).mockReturnValue(new Map());
+    getMockFn(validateReferences).mockResolvedValue([]);
+    getMockFn(checkConflicts).mockResolvedValue({
+      errors: [],
+      filteredObjects: [],
+      importIdMap: new Map(),
+      pendingOverwrites: new Set(), // not used by resolveImportErrors, but is a required return type
     });
-    const result = await resolveSavedObjectsImportErrors({
-      readStream,
-      objectLimit: 4,
-      retries: [],
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+    getMockFn(getImportIdMapForRetries).mockReturnValue(new Map());
+    getMockFn(splitOverwrites).mockReturnValue({
+      objectsToOverwrite: [],
+      objectsToNotOverwrite: [],
     });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "success": true,
-        "successCount": 0,
-      }
-    `);
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`[MockFunction]`);
+    getMockFn(createSavedObjects).mockResolvedValue({ errors: [], createdObjects: [] });
   });
 
-  test('works with retries', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push(null);
-      },
-    });
-    savedObjectsClient.bulkCreate.mockResolvedValueOnce({
-      saved_objects: savedObjects.filter((obj) => obj.type === 'visualization' && obj.id === '3'),
-    });
-    const result = await resolveSavedObjectsImportErrors({
+  let readStream: Readable;
+  const objectLimit = 10;
+  let savedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
+  let typeRegistry: jest.Mocked<ISavedObjectTypeRegistry>;
+  const namespace = 'some-namespace';
+
+  const setupOptions = (
+    retries: SavedObjectsImportRetry[] = [],
+    createNewCopies: boolean = false
+  ): SavedObjectsResolveImportErrorsOptions => {
+    readStream = new Readable();
+    savedObjectsClient = savedObjectsClientMock.create();
+    typeRegistry = typeRegistryMock.create();
+    typeRegistry.getType.mockImplementation(
+      (type: string) =>
+        ({
+          // other attributes aren't needed for the purposes of injecting metadata
+          management: { icon: `${type}-icon` },
+        } as any)
+    );
+    return {
       readStream,
-      objectLimit: 4,
-      retries: [
-        {
-          type: 'visualization',
-          id: '3',
-          replaceReferences: [],
-          overwrite: false,
-        },
-      ],
+      objectLimit,
+      retries,
       savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
-    });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "success": true,
-        "successCount": 1,
-      }
-    `);
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "attributes": Object {
-                  "title": "My Visualization",
-                },
-                "id": "3",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "visualization",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
-  });
+      typeRegistry,
+      // namespace and createNewCopies don't matter, as they don't change the logic in this module, they just get passed to sub-module methods
+      namespace,
+      createNewCopies,
+    };
+  };
 
-  test('works with overwrites', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push(null);
-      },
-    });
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: savedObjects.filter((obj) => obj.type === 'index-pattern' && obj.id === '1'),
+  const createRetry = (options?: {
+    id?: string;
+    overwrite?: boolean;
+    replaceReferences?: SavedObjectsImportRetry['replaceReferences'];
+  }) => {
+    const { id = uuidv4(), overwrite = false, replaceReferences = [] } = options ?? {};
+    return { type: 'foo-type', id, overwrite, replaceReferences };
+  };
+  const createObject = (
+    references?: SavedObjectReference[]
+  ): SavedObject<{
+    title: string;
+  }> => {
+    return {
+      type: 'foo-type',
+      id: uuidv4(),
+      references: references || [],
+      attributes: { title: 'some-title' },
+    };
+  };
+  const createError = (): SavedObjectsImportError => {
+    const title = 'some-title';
+    return {
+      type: 'foo-type',
+      id: uuidv4(),
+      title: 'some-title',
+      meta: { title },
+      error: { type: 'conflict' },
+    };
+  };
+
+  /**
+   * These tests use minimal mocks which don't look realistic, but are sufficient to exercise the code paths correctly. For example, for an
+   * object to be imported successfully it would need to be obtained from `collectSavedObjects`, passed to `validateReferences`, passed to
+   * `getImportIdMapForRetries`, passed to `createSavedObjects`, and returned from that. However, for each of the tests below, we skip the
+   * intermediate steps in the interest of brevity.
+   */
+  describe('module calls', () => {
+    test('validates retries', async () => {
+      const retry = createRetry();
+      const options = setupOptions([retry]);
+
+      await resolveSavedObjectsImportErrors(options);
+      expect(validateRetries).toHaveBeenCalledWith([retry]);
     });
-    const result = await resolveSavedObjectsImportErrors({
-      readStream,
-      objectLimit: 4,
-      retries: [
-        {
-          type: 'index-pattern',
-          id: '1',
-          overwrite: true,
-          replaceReferences: [],
-        },
-      ],
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+
+    test('creates objects filter', async () => {
+      const retry = createRetry();
+      const options = setupOptions([retry]);
+
+      await resolveSavedObjectsImportErrors(options);
+      expect(createObjectsFilter).toHaveBeenCalledWith([retry]);
     });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "success": true,
-        "successCount": 1,
-      }
-    `);
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "attributes": Object {
-                  "title": "My Index Pattern",
-                },
-                "id": "1",
-                "migrationVersion": Object {},
-                "references": Array [],
-                "type": "index-pattern",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-              "overwrite": true,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
-  });
 
-  test('works wtih replaceReferences', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push(null);
-      },
+    test('collects saved objects from stream', async () => {
+      const options = setupOptions();
+      const supportedTypes = ['foo'];
+      typeRegistry.getImportableAndExportableTypes.mockReturnValue(
+        supportedTypes.map((name) => ({ name })) as SavedObjectsType[]
+      );
+
+      await resolveSavedObjectsImportErrors(options);
+      expect(typeRegistry.getImportableAndExportableTypes).toHaveBeenCalled();
+      const filter = getMockFn(createObjectsFilter).mock.results[0].value;
+      const collectSavedObjectsOptions = { readStream, objectLimit, filter, supportedTypes };
+      expect(collectSavedObjects).toHaveBeenCalledWith(collectSavedObjectsOptions);
     });
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: savedObjects.filter((obj) => obj.type === 'dashboard' && obj.id === '4'),
+
+    test('validates references', async () => {
+      const retries = [createRetry()];
+      const options = setupOptions(retries);
+      const collectedObjects = [createObject()];
+      getMockFn(collectSavedObjects).mockResolvedValue({
+        errors: [],
+        collectedObjects,
+        importIdMap: new Map(), // doesn't matter
+      });
+
+      await resolveSavedObjectsImportErrors(options);
+      expect(validateReferences).toHaveBeenCalledWith(
+        collectedObjects,
+        savedObjectsClient,
+        namespace,
+        retries
+      );
     });
-    const result = await resolveSavedObjectsImportErrors({
-      readStream,
-      objectLimit: 4,
-      retries: [
-        {
-          type: 'dashboard',
-          id: '4',
-          overwrite: false,
-          replaceReferences: [
-            {
-              type: 'visualization',
-              from: '3',
-              to: '13',
-            },
-          ],
-        },
-      ],
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+
+    test('uses `retries` to replace references of collected objects before validating', async () => {
+      const object = createObject([{ type: 'bar-type', id: 'abc', name: 'some name' }]);
+      const retries = [
+        createRetry({
+          id: object.id,
+          replaceReferences: [{ type: 'bar-type', from: 'abc', to: 'def' }],
+        }),
+      ];
+      const options = setupOptions(retries);
+      getMockFn(collectSavedObjects).mockResolvedValue({
+        errors: [],
+        collectedObjects: [object],
+        importIdMap: new Map(), // doesn't matter
+      });
+
+      await resolveSavedObjectsImportErrors(options);
+      const objectWithReplacedReferences = {
+        ...object,
+        references: [{ ...object.references[0], id: 'def' }],
+      };
+      expect(validateReferences).toHaveBeenCalledWith(
+        [objectWithReplacedReferences],
+        savedObjectsClient,
+        namespace,
+        retries
+      );
     });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "success": true,
-        "successCount": 1,
-      }
-    `);
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "attributes": Object {
-                  "title": "My Dashboard",
-                },
-                "id": "4",
-                "migrationVersion": Object {},
-                "references": Array [
-                  Object {
-                    "id": "13",
-                    "name": "panel_0",
-                    "type": "visualization",
-                  },
-                ],
-                "type": "dashboard",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
-  });
 
-  test('extracts errors for conflicts', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push(null);
-      },
+    test('checks conflicts', async () => {
+      const createNewCopies = (Symbol() as unknown) as boolean;
+      const retries = [createRetry()];
+      const options = setupOptions(retries, createNewCopies);
+      const collectedObjects = [createObject()];
+      getMockFn(collectSavedObjects).mockResolvedValue({
+        errors: [],
+        collectedObjects,
+        importIdMap: new Map(), // doesn't matter
+      });
+
+      await resolveSavedObjectsImportErrors(options);
+      const checkConflictsParams = {
+        objects: collectedObjects,
+        savedObjectsClient,
+        namespace,
+        retries,
+        createNewCopies,
+      };
+      expect(checkConflicts).toHaveBeenCalledWith(checkConflictsParams);
     });
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: savedObjects.map((savedObject) => ({
-        type: savedObject.type,
-        id: savedObject.id,
-        error: {
-          statusCode: 409,
-          message: 'conflict',
-        },
-        attributes: {},
-        references: [],
-      })),
+
+    test('gets import ID map for retries', async () => {
+      const retries = [createRetry()];
+      const createNewCopies = (Symbol() as unknown) as boolean;
+      const options = setupOptions(retries, createNewCopies);
+      const filteredObjects = [createObject()];
+      getMockFn(checkConflicts).mockResolvedValue({
+        errors: [],
+        filteredObjects,
+        importIdMap: new Map(),
+        pendingOverwrites: new Set(), // not used by resolveImportErrors, but is a required return type
+      });
+
+      await resolveSavedObjectsImportErrors(options);
+      const getImportIdMapForRetriesParams = { objects: filteredObjects, retries, createNewCopies };
+      expect(getImportIdMapForRetries).toHaveBeenCalledWith(getImportIdMapForRetriesParams);
     });
-    const result = await resolveSavedObjectsImportErrors({
-      readStream,
-      objectLimit: 4,
-      retries: savedObjects.map((obj) => ({
-        type: obj.type,
-        id: obj.id,
-        overwrite: false,
-        replaceReferences: [],
-      })),
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+
+    test('splits objects to ovewrite from those not to overwrite', async () => {
+      const retries = [createRetry()];
+      const options = setupOptions(retries);
+      const collectedObjects = [createObject()];
+      getMockFn(collectSavedObjects).mockResolvedValue({
+        errors: [],
+        collectedObjects,
+        importIdMap: new Map(), // doesn't matter
+      });
+
+      await resolveSavedObjectsImportErrors(options);
+      expect(splitOverwrites).toHaveBeenCalledWith(collectedObjects, retries);
     });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [
-          Object {
-            "error": Object {
-              "type": "conflict",
-            },
-            "id": "1",
-            "title": "My Index Pattern",
-            "type": "index-pattern",
-          },
-          Object {
-            "error": Object {
-              "type": "conflict",
-            },
-            "id": "2",
-            "title": "My Search",
-            "type": "search",
-          },
-          Object {
-            "error": Object {
-              "type": "conflict",
-            },
-            "id": "3",
-            "title": "My Visualization",
-            "type": "visualization",
-          },
-          Object {
-            "error": Object {
-              "type": "conflict",
-            },
-            "id": "4",
-            "title": "My Dashboard",
-            "type": "dashboard",
-          },
-        ],
-        "success": false,
-        "successCount": 0,
-      }
-    `);
-  });
 
-  test('validates references', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        this.push({
-          id: '1',
-          type: 'search',
-          attributes: {
-            title: 'My Search',
-          },
-          references: [
-            {
-              name: 'ref_0',
-              type: 'index-pattern',
-              id: '2',
-            },
-          ],
+    describe('with createNewCopies disabled', () => {
+      test('does not regenerate object IDs', async () => {
+        const options = setupOptions();
+        const collectedObjects = [createObject()];
+        getMockFn(collectSavedObjects).mockResolvedValue({
+          errors: [],
+          collectedObjects,
+          importIdMap: new Map(), // doesn't matter
+        });
+
+        await resolveSavedObjectsImportErrors(options);
+        expect(regenerateIds).not.toHaveBeenCalled();
+      });
+
+      test('creates saved objects', async () => {
+        const options = setupOptions();
+        const errors = [createError(), createError(), createError()];
+        getMockFn(collectSavedObjects).mockResolvedValue({
+          errors: [errors[0]],
+          collectedObjects: [], // doesn't matter
+          importIdMap: new Map(), // doesn't matter
         });
-        this.push({
-          id: '3',
-          type: 'visualization',
-          attributes: {
-            title: 'My Visualization',
-          },
-          references: [
-            {
-              name: 'ref_0',
-              type: 'search',
-              id: '1',
-            },
-          ],
+        getMockFn(validateReferences).mockResolvedValue([errors[1]]);
+        getMockFn(checkConflicts).mockResolvedValue({
+          errors: [errors[2]],
+          filteredObjects: [],
+          importIdMap: new Map([['foo', { id: 'someId' }]]),
+          pendingOverwrites: new Set(), // not used by resolveImportErrors, but is a required return type
+        });
+        getMockFn(getImportIdMapForRetries).mockReturnValue(
+          new Map([
+            ['foo', { id: 'newId' }],
+            ['bar', { id: 'anotherNewId' }],
+          ])
+        );
+        const importIdMap = new Map([
+          ['foo', { id: 'someId' }],
+          ['bar', { id: 'anotherNewId' }],
+        ]);
+        const objectsToOverwrite = [createObject()];
+        const objectsToNotOverwrite = [createObject()];
+        getMockFn(splitOverwrites).mockReturnValue({ objectsToOverwrite, objectsToNotOverwrite });
+        getMockFn(createSavedObjects).mockResolvedValueOnce({
+          errors: [createError()], // this error will NOT be passed to the second `createSavedObjects` call
+          createdObjects: [],
         });
-        this.push(null);
-      },
-    });
-    savedObjectsClient.bulkGet.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          type: 'index-pattern',
-          id: '2',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
-          attributes: {},
-          references: [],
-        },
-      ],
-    });
-    const result = await resolveSavedObjectsImportErrors({
-      readStream,
-      objectLimit: 2,
-      retries: [
-        {
-          type: 'search',
-          id: '1',
-          overwrite: false,
-          replaceReferences: [],
-        },
-        {
-          type: 'visualization',
-          id: '3',
-          overwrite: false,
-          replaceReferences: [],
-        },
-      ],
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
-    });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [
-          Object {
-            "error": Object {
-              "blocking": Array [
-                Object {
-                  "id": "3",
-                  "type": "visualization",
-                },
-              ],
-              "references": Array [
-                Object {
-                  "id": "2",
-                  "type": "index-pattern",
-                },
-              ],
-              "type": "missing_references",
-            },
-            "id": "1",
-            "title": "My Search",
-            "type": "search",
-          },
-        ],
-        "success": false,
-        "successCount": 0,
-      }
-    `);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "fields": Array [
-                  "id",
-                ],
-                "id": "2",
-                "type": "index-pattern",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
-  });
 
-  test('validates object types', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push({ id: '1', type: 'wigwags', attributes: { title: 'my title' }, references: [] });
-        this.push(null);
-      },
-    });
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: [],
+        await resolveSavedObjectsImportErrors(options);
+        const partialCreateSavedObjectsParams = {
+          accumulatedErrors: errors,
+          savedObjectsClient,
+          importIdMap,
+          namespace,
+        };
+        expect(createSavedObjects).toHaveBeenNthCalledWith(1, {
+          ...partialCreateSavedObjectsParams,
+          objects: objectsToOverwrite,
+          overwrite: true,
+        });
+        expect(createSavedObjects).toHaveBeenNthCalledWith(2, {
+          ...partialCreateSavedObjectsParams,
+          objects: objectsToNotOverwrite,
+        });
+      });
     });
-    const result = await resolveSavedObjectsImportErrors({
-      readStream,
-      objectLimit: 5,
-      retries: [
-        {
-          id: 'i',
-          type: 'wigwags',
-          overwrite: false,
-          replaceReferences: [],
-        },
-      ],
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
+
+    describe('with createNewCopies enabled', () => {
+      test('regenerates object IDs', async () => {
+        const options = setupOptions([], true);
+        const collectedObjects = [createObject()];
+        getMockFn(collectSavedObjects).mockResolvedValue({
+          errors: [],
+          collectedObjects,
+          importIdMap: new Map(), // doesn't matter
+        });
+
+        await resolveSavedObjectsImportErrors(options);
+        expect(regenerateIds).toHaveBeenCalledWith(collectedObjects);
+      });
+
+      test('creates saved objects', async () => {
+        const options = setupOptions([], true);
+        const errors = [createError(), createError(), createError()];
+        getMockFn(collectSavedObjects).mockResolvedValue({
+          errors: [errors[0]],
+          collectedObjects: [], // doesn't matter
+          importIdMap: new Map(), // doesn't matter
+        });
+        getMockFn(validateReferences).mockResolvedValue([errors[1]]);
+        getMockFn(regenerateIds).mockReturnValue(
+          new Map([
+            ['foo', { id: 'randomId1' }],
+            ['bar', { id: 'randomId2' }],
+            ['baz', { id: 'randomId3' }],
+          ])
+        );
+        getMockFn(checkConflicts).mockResolvedValue({
+          errors: [errors[2]],
+          filteredObjects: [],
+          importIdMap: new Map([['bar', { id: 'someId' }]]),
+          pendingOverwrites: new Set(), // not used by resolveImportErrors, but is a required return type
+        });
+        getMockFn(getImportIdMapForRetries).mockReturnValue(
+          new Map([
+            ['bar', { id: 'newId' }],
+            ['baz', { id: 'anotherNewId' }],
+          ])
+        );
+        const importIdMap = new Map([
+          ['foo', { id: 'randomId1' }],
+          ['bar', { id: 'someId' }],
+          ['baz', { id: 'anotherNewId' }],
+        ]);
+        const objectsToOverwrite = [createObject()];
+        const objectsToNotOverwrite = [createObject()];
+        getMockFn(splitOverwrites).mockReturnValue({ objectsToOverwrite, objectsToNotOverwrite });
+        getMockFn(createSavedObjects).mockResolvedValueOnce({
+          errors: [createError()], // this error will NOT be passed to the second `createSavedObjects` call
+          createdObjects: [],
+        });
+
+        await resolveSavedObjectsImportErrors(options);
+        const partialCreateSavedObjectsParams = {
+          accumulatedErrors: errors,
+          savedObjectsClient,
+          importIdMap,
+          namespace,
+        };
+        expect(createSavedObjects).toHaveBeenNthCalledWith(1, {
+          ...partialCreateSavedObjectsParams,
+          objects: objectsToOverwrite,
+          overwrite: true,
+        });
+        expect(createSavedObjects).toHaveBeenNthCalledWith(2, {
+          ...partialCreateSavedObjectsParams,
+          objects: objectsToNotOverwrite,
+        });
+      });
     });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [
-          Object {
-            "error": Object {
-              "type": "unsupported_type",
-            },
-            "id": "1",
-            "title": "my title",
-            "type": "wigwags",
-          },
-        ],
-        "success": false,
-        "successCount": 0,
-      }
-    `);
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`[MockFunction]`);
   });
 
-  test('uses namespace when provided', async () => {
-    const readStream = new Readable({
-      objectMode: true,
-      read() {
-        savedObjects.forEach((obj) => this.push(obj));
-        this.push(null);
-      },
+  describe('results', () => {
+    test('returns success=true if no errors occurred', async () => {
+      const options = setupOptions();
+
+      const result = await resolveSavedObjectsImportErrors(options);
+      expect(result).toEqual({ success: true, successCount: 0 });
     });
-    savedObjectsClient.bulkCreate.mockResolvedValue({
-      saved_objects: savedObjects.filter((obj) => obj.type === 'index-pattern' && obj.id === '1'),
+
+    test('returns success=false if an error occurred', async () => {
+      const options = setupOptions();
+      getMockFn(collectSavedObjects).mockResolvedValue({
+        errors: [createError()],
+        collectedObjects: [],
+        importIdMap: new Map(), // doesn't matter
+      });
+
+      const result = await resolveSavedObjectsImportErrors(options);
+      expect(result).toEqual({ success: false, successCount: 0, errors: [expect.any(Object)] });
     });
-    const result = await resolveSavedObjectsImportErrors({
-      readStream,
-      objectLimit: 4,
-      retries: [
+
+    test('handles a mix of successes and errors and injects metadata', async () => {
+      const error1 = createError();
+      const error2 = createError();
+      const options = setupOptions([
+        { type: error2.type, id: error2.id, overwrite: true, replaceReferences: [] },
+      ]);
+      const obj1 = createObject();
+      const tmp = createObject();
+      const obj2 = { ...tmp, destinationId: 'some-destinationId', originId: tmp.id };
+      const obj3 = { ...createObject(), destinationId: 'another-destinationId' }; // empty originId; this is a new copy
+      getMockFn(createSavedObjects).mockResolvedValueOnce({
+        errors: [error1],
+        createdObjects: [obj1],
+      });
+      getMockFn(createSavedObjects).mockResolvedValueOnce({
+        errors: [error2],
+        createdObjects: [obj2, obj3],
+      });
+
+      const result = await resolveSavedObjectsImportErrors(options);
+      // successResults only includes the imported object's type, id, and destinationId (if a new one was generated)
+      const successResults = [
         {
-          type: 'index-pattern',
-          id: '1',
+          type: obj1.type,
+          id: obj1.id,
+          meta: { title: obj1.attributes.title, icon: `${obj1.type}-icon` },
           overwrite: true,
-          replaceReferences: [],
         },
-      ],
-      savedObjectsClient,
-      supportedTypes: ['index-pattern', 'search', 'visualization', 'dashboard'],
-      namespace: 'foo',
-    });
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "success": true,
-        "successCount": 1,
-      }
-    `);
-    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
-      [
         {
-          attributes: { title: 'My Index Pattern' },
-          id: '1',
-          migrationVersion: {},
-          references: [],
-          type: 'index-pattern',
+          type: obj2.type,
+          id: obj2.id,
+          meta: { title: obj2.attributes.title, icon: `${obj2.type}-icon` },
+          destinationId: obj2.destinationId,
         },
-      ],
-      { namespace: 'foo', overwrite: true }
-    );
+        {
+          type: obj3.type,
+          id: obj3.id,
+          meta: { title: obj3.attributes.title, icon: `${obj3.type}-icon` },
+          destinationId: obj3.destinationId,
+          createNewCopy: true,
+        },
+      ];
+      const errors = [
+        { ...error1, meta: { ...error1.meta, icon: `${error1.type}-icon` } },
+        { ...error2, meta: { ...error2.meta, icon: `${error2.type}-icon` }, overwrite: true },
+      ];
+      expect(result).toEqual({ success: false, successCount: 3, successResults, errors });
+    });
+
+    test('accumulates multiple errors', async () => {
+      const options = setupOptions();
+      const errors = [createError(), createError(), createError(), createError()];
+      getMockFn(collectSavedObjects).mockResolvedValue({
+        errors: [errors[0]],
+        collectedObjects: [],
+        importIdMap: new Map(), // doesn't matter
+      });
+      getMockFn(validateReferences).mockResolvedValue([errors[1]]);
+      getMockFn(createSavedObjects).mockResolvedValueOnce({
+        errors: [errors[2]],
+        createdObjects: [],
+      });
+      getMockFn(createSavedObjects).mockResolvedValueOnce({
+        errors: [errors[3]],
+        createdObjects: [],
+      });
+
+      const result = await resolveSavedObjectsImportErrors(options);
+      const expectedErrors = errors.map(({ type, id }) => expect.objectContaining({ type, id }));
+      expect(result).toEqual({ success: false, successCount: 0, errors: expectedErrors });
+    });
   });
 });
diff --git a/src/core/server/saved_objects/import/resolve_import_errors.ts b/src/core/server/saved_objects/import/resolve_import_errors.ts
index dce044a31a577..2182d9252cd51 100644
--- a/src/core/server/saved_objects/import/resolve_import_errors.ts
+++ b/src/core/server/saved_objects/import/resolve_import_errors.ts
@@ -18,15 +18,20 @@
  */
 import { collectSavedObjects } from './collect_saved_objects';
 import { createObjectsFilter } from './create_objects_filter';
-import { extractErrors } from './extract_errors';
 import { splitOverwrites } from './split_overwrites';
 import {
   SavedObjectsImportError,
   SavedObjectsImportResponse,
   SavedObjectsResolveImportErrorsOptions,
+  SavedObjectsImportSuccess,
 } from './types';
+import { regenerateIds } from './regenerate_ids';
 import { validateReferences } from './validate_references';
-import { omitVersion } from './import_saved_objects';
+import { validateRetries } from './validate_retries';
+import { createSavedObjects } from './create_saved_objects';
+import { getImportIdMapForRetries } from './check_origin_conflicts';
+import { SavedObject } from '../types';
+import { checkConflicts } from './check_conflicts';
 
 /**
  * Resolve and return saved object import errors.
@@ -39,11 +44,17 @@ export async function resolveSavedObjectsImportErrors({
   objectLimit,
   retries,
   savedObjectsClient,
-  supportedTypes,
+  typeRegistry,
   namespace,
+  createNewCopies,
 }: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse> {
+  // throw a BadRequest error if we see invalid retries
+  validateRetries(retries);
+
   let successCount = 0;
   let errorAccumulator: SavedObjectsImportError[] = [];
+  let importIdMap: Map<string, { id?: string; omitOriginId?: boolean }> = new Map();
+  const supportedTypes = typeRegistry.getImportableAndExportableTypes().map((type) => type.name);
   const filter = createObjectsFilter(retries);
 
   // Get the objects to resolve errors
@@ -82,43 +93,99 @@ export async function resolveSavedObjectsImportErrors({
   }
 
   // Validate references
-  const { filteredObjects, errors: validationErrors } = await validateReferences(
+  const validateReferencesResult = await validateReferences(
     objectsToResolve,
     savedObjectsClient,
-    namespace
+    namespace,
+    retries
   );
-  errorAccumulator = [...errorAccumulator, ...validationErrors];
+  errorAccumulator = [...errorAccumulator, ...validateReferencesResult];
+
+  if (createNewCopies) {
+    // In case any missing reference errors were resolved, ensure that we regenerate those object IDs as well
+    // This is because a retry to resolve a missing reference error may not necessarily specify a destinationId
+    importIdMap = regenerateIds(objectsToResolve);
+  }
+
+  // Check single-namespace objects for conflicts in this namespace, and check multi-namespace objects for conflicts across all namespaces
+  const checkConflictsParams = {
+    objects: objectsToResolve,
+    savedObjectsClient,
+    namespace,
+    retries,
+    createNewCopies,
+  };
+  const checkConflictsResult = await checkConflicts(checkConflictsParams);
+  errorAccumulator = [...errorAccumulator, ...checkConflictsResult.errors];
+
+  // Check multi-namespace object types for regular conflicts and ambiguous conflicts
+  const getImportIdMapForRetriesParams = {
+    objects: checkConflictsResult.filteredObjects,
+    retries,
+    createNewCopies,
+  };
+  const importIdMapForRetries = getImportIdMapForRetries(getImportIdMapForRetriesParams);
+  importIdMap = new Map([
+    ...importIdMap,
+    ...importIdMapForRetries,
+    ...checkConflictsResult.importIdMap, // this importIdMap takes precedence over the others
+  ]);
 
   // Bulk create in two batches, overwrites and non-overwrites
-  const { objectsToOverwrite, objectsToNotOverwrite } = splitOverwrites(filteredObjects, retries);
-  if (objectsToOverwrite.length) {
-    const bulkCreateResult = await savedObjectsClient.bulkCreate(omitVersion(objectsToOverwrite), {
-      overwrite: true,
+  let successResults: SavedObjectsImportSuccess[] = [];
+  const accumulatedErrors = [...errorAccumulator];
+  const bulkCreateObjects = async (
+    objects: Array<SavedObject<{ title?: string }>>,
+    overwrite?: boolean
+  ) => {
+    const createSavedObjectsParams = {
+      objects,
+      accumulatedErrors,
+      savedObjectsClient,
+      importIdMap,
       namespace,
-    });
-    errorAccumulator = [
-      ...errorAccumulator,
-      ...extractErrors(bulkCreateResult.saved_objects, objectsToOverwrite),
-    ];
-    successCount += bulkCreateResult.saved_objects.filter((obj) => !obj.error).length;
-  }
-  if (objectsToNotOverwrite.length) {
-    const bulkCreateResult = await savedObjectsClient.bulkCreate(
-      omitVersion(objectsToNotOverwrite),
-      {
-        namespace,
-      }
+      overwrite,
+    };
+    const { createdObjects, errors: bulkCreateErrors } = await createSavedObjects(
+      createSavedObjectsParams
     );
-    errorAccumulator = [
-      ...errorAccumulator,
-      ...extractErrors(bulkCreateResult.saved_objects, objectsToNotOverwrite),
+    errorAccumulator = [...errorAccumulator, ...bulkCreateErrors];
+    successCount += createdObjects.length;
+    successResults = [
+      ...successResults,
+      ...createdObjects.map(({ type, id, attributes: { title }, destinationId, originId }) => {
+        const meta = { title, icon: typeRegistry.getType(type)?.management?.icon };
+        return {
+          type,
+          id,
+          meta,
+          ...(overwrite && { overwrite }),
+          ...(destinationId && { destinationId }),
+          ...(destinationId && !originId && !createNewCopies && { createNewCopy: true }),
+        };
+      }),
     ];
-    successCount += bulkCreateResult.saved_objects.filter((obj) => !obj.error).length;
-  }
+  };
+  const { objectsToOverwrite, objectsToNotOverwrite } = splitOverwrites(objectsToResolve, retries);
+  await bulkCreateObjects(objectsToOverwrite, true);
+  await bulkCreateObjects(objectsToNotOverwrite);
+
+  const errorResults = errorAccumulator.map((error) => {
+    const icon = typeRegistry.getType(error.type)?.management?.icon;
+    const attemptedOverwrite = retries.some(
+      ({ type, id, overwrite }) => type === error.type && id === error.id && overwrite
+    );
+    return {
+      ...error,
+      meta: { ...error.meta, icon },
+      ...(attemptedOverwrite && { overwrite: true }),
+    };
+  });
 
   return {
     successCount,
     success: errorAccumulator.length === 0,
-    ...(errorAccumulator.length ? { errors: errorAccumulator } : {}),
+    ...(successResults.length && { successResults }),
+    ...(errorResults.length && { errors: errorResults }),
   };
 }
diff --git a/src/core/server/saved_objects/import/split_overwrites.ts b/src/core/server/saved_objects/import/split_overwrites.ts
index be55e049a2bfc..03ae6b96e7823 100644
--- a/src/core/server/saved_objects/import/split_overwrites.ts
+++ b/src/core/server/saved_objects/import/split_overwrites.ts
@@ -20,9 +20,12 @@
 import { SavedObject } from '../types';
 import { SavedObjectsImportRetry } from './types';
 
-export function splitOverwrites(savedObjects: SavedObject[], retries: SavedObjectsImportRetry[]) {
-  const objectsToOverwrite: SavedObject[] = [];
-  const objectsToNotOverwrite: SavedObject[] = [];
+export function splitOverwrites<T>(
+  savedObjects: Array<SavedObject<T>>,
+  retries: SavedObjectsImportRetry[]
+) {
+  const objectsToOverwrite: Array<SavedObject<T>> = [];
+  const objectsToNotOverwrite: Array<SavedObject<T>> = [];
   const overwrites = retries
     .filter((retry) => retry.overwrite)
     .map((retry) => `${retry.type}:${retry.id}`);
diff --git a/src/core/server/saved_objects/import/types.ts b/src/core/server/saved_objects/import/types.ts
index 067579f54edac..a242ffdf5b50f 100644
--- a/src/core/server/saved_objects/import/types.ts
+++ b/src/core/server/saved_objects/import/types.ts
@@ -18,7 +18,8 @@
  */
 
 import { Readable } from 'stream';
-import { SavedObjectsClientContract } from '../types';
+import { SavedObjectsClientContract, SavedObject } from '../types';
+import { ISavedObjectTypeRegistry } from '..';
 
 /**
  * Describes a retry operation for importing a saved object.
@@ -28,11 +29,24 @@ export interface SavedObjectsImportRetry {
   type: string;
   id: string;
   overwrite: boolean;
+  /**
+   * The object ID that will be created or overwritten. If not specified, the `id` field will be used.
+   */
+  destinationId?: string;
   replaceReferences: Array<{
     type: string;
     from: string;
     to: string;
   }>;
+  /**
+   * If `createNewCopy` is specified, the new object has a new (undefined) origin ID. This is only needed for the case where
+   * `createNewCopies` mode is disabled and ambiguous source conflicts are detected.
+   */
+  createNewCopy?: boolean;
+  /**
+   * If `ignoreMissingReferences` is specified, reference validation will be skipped for this object.
+   */
+  ignoreMissingReferences?: boolean;
 }
 
 /**
@@ -41,6 +55,16 @@ export interface SavedObjectsImportRetry {
  */
 export interface SavedObjectsImportConflictError {
   type: 'conflict';
+  destinationId?: string;
+}
+
+/**
+ * Represents a failure to import due to a conflict, which can be resolved in different ways with an overwrite.
+ * @public
+ */
+export interface SavedObjectsImportAmbiguousConflictError {
+  type: 'ambiguous_conflict';
+  destinations: Array<{ id: string; title?: string; updatedAt?: string }>;
 }
 
 /**
@@ -67,14 +91,7 @@ export interface SavedObjectsImportUnknownError {
  */
 export interface SavedObjectsImportMissingReferencesError {
   type: 'missing_references';
-  references: Array<{
-    type: string;
-    id: string;
-  }>;
-  blocking: Array<{
-    type: string;
-    id: string;
-  }>;
+  references: Array<{ type: string; id: string }>;
 }
 
 /**
@@ -84,14 +101,51 @@ export interface SavedObjectsImportMissingReferencesError {
 export interface SavedObjectsImportError {
   id: string;
   type: string;
+  /**
+   * @deprecated Use `meta.title` instead
+   */
   title?: string;
+  meta: { title?: string; icon?: string };
+  /**
+   * If `overwrite` is specified, an attempt was made to overwrite an existing object.
+   */
+  overwrite?: boolean;
   error:
     | SavedObjectsImportConflictError
+    | SavedObjectsImportAmbiguousConflictError
     | SavedObjectsImportUnsupportedTypeError
     | SavedObjectsImportMissingReferencesError
     | SavedObjectsImportUnknownError;
 }
 
+/**
+ * Represents a successful import.
+ * @public
+ */
+export interface SavedObjectsImportSuccess {
+  id: string;
+  type: string;
+  /**
+   * If `destinationId` is specified, the new object has a new ID that is different from the import ID.
+   */
+  destinationId?: string;
+  /**
+   * @deprecated
+   * If `createNewCopy` is specified, the new object has a new (undefined) origin ID. This is only needed for the case where
+   * `createNewCopies` mode is disabled and ambiguous source conflicts are detected. When `createNewCopies` mode is permanently enabled,
+   * this field will be redundant and can be removed.
+   */
+  createNewCopy?: boolean;
+  meta: {
+    title?: string;
+    icon?: string;
+  };
+  /**
+   * If `overwrite` is specified, this object overwrote an existing one (or will do so, in the case of a pending resolution).
+   */
+  overwrite?: boolean;
+}
+
 /**
  * The response describing the result of an import.
  * @public
@@ -99,6 +153,7 @@ export interface SavedObjectsImportError {
 export interface SavedObjectsImportResponse {
   success: boolean;
   successCount: number;
+  successResults?: SavedObjectsImportSuccess[];
   errors?: SavedObjectsImportError[];
 }
 
@@ -111,14 +166,16 @@ export interface SavedObjectsImportOptions {
   readStream: Readable;
   /** The maximum number of object to import */
   objectLimit: number;
-  /** if true, will override existing object if present */
+  /** If true, will override existing object if present. Note: this has no effect when used with the `createNewCopies` option. */
   overwrite: boolean;
   /** {@link SavedObjectsClientContract | client} to use to perform the import operation */
   savedObjectsClient: SavedObjectsClientContract;
-  /** the list of allowed types to import */
-  supportedTypes: string[];
+  /** The registry of all known saved object types */
+  typeRegistry: ISavedObjectTypeRegistry;
   /** if specified, will import in given namespace, else will import as global object */
   namespace?: string;
+  /** If true, will create new copies of import objects, each with a random `id` and undefined `originId`. */
+  createNewCopies: boolean;
 }
 
 /**
@@ -132,10 +189,14 @@ export interface SavedObjectsResolveImportErrorsOptions {
   objectLimit: number;
   /** client to use to perform the import operation */
   savedObjectsClient: SavedObjectsClientContract;
+  /** The registry of all known saved object types */
+  typeRegistry: ISavedObjectTypeRegistry;
   /** saved object import references to retry */
   retries: SavedObjectsImportRetry[];
-  /** the list of allowed types to import */
-  supportedTypes: string[];
   /** if specified, will import in given namespace */
   namespace?: string;
+  /** If true, will create new copies of import objects, each with a random `id` and undefined `originId`. */
+  createNewCopies: boolean;
 }
+
+export type CreatedObject<T> = SavedObject<T> & { destinationId?: string };
diff --git a/src/core/server/saved_objects/import/validate_references.test.ts b/src/core/server/saved_objects/import/validate_references.test.ts
index a9dce65b97d72..6efd1b28b199d 100644
--- a/src/core/server/saved_objects/import/validate_references.test.ts
+++ b/src/core/server/saved_objects/import/validate_references.test.ts
@@ -19,6 +19,7 @@
 
 import { getNonExistingReferenceAsKeys, validateReferences } from './validate_references';
 import { savedObjectsClientMock } from '../../mocks';
+import { SavedObjectsErrorHelpers } from '..';
 
 describe('getNonExistingReferenceAsKeys()', () => {
   const savedObjectsClient = savedObjectsClientMock.create();
@@ -33,6 +34,34 @@ describe('getNonExistingReferenceAsKeys()', () => {
     expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(0);
   });
 
+  test('skips objects when ignoreMissingReferences is included in retry', async () => {
+    const savedObjects = [
+      {
+        id: '2',
+        type: 'visualization',
+        attributes: {},
+        references: [{ name: 'ref_0', type: 'index-pattern', id: '1' }],
+      },
+    ];
+    const retries = [
+      {
+        type: 'visualization',
+        id: '2',
+        overwrite: false,
+        replaceReferences: [],
+        ignoreMissingReferences: true,
+      },
+    ];
+    const result = await getNonExistingReferenceAsKeys(
+      savedObjects,
+      savedObjectsClient,
+      undefined,
+      retries
+    );
+    expect(result).toEqual([]);
+    expect(savedObjectsClient.bulkGet).not.toHaveBeenCalled();
+  });
+
   test('removes references that exist within savedObjects', async () => {
     const savedObjects = [
       {
@@ -164,20 +193,15 @@ describe('getNonExistingReferenceAsKeys()', () => {
         {
           id: '1',
           type: 'index-pattern',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
+          error: SavedObjectsErrorHelpers.createGenericNotFoundError('index-pattern', '1').output
+            .payload,
           attributes: {},
           references: [],
         },
         {
           id: '3',
           type: 'search',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
+          error: SavedObjectsErrorHelpers.createGenericNotFoundError('search', '3').output.payload,
           attributes: {},
           references: [],
         },
@@ -230,12 +254,7 @@ describe('validateReferences()', () => {
 
   test('returns empty when no objects are passed in', async () => {
     const result = await validateReferences([], savedObjectsClient);
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [],
-        "filteredObjects": Array [],
-      }
-    `);
+    expect(result).toEqual([]);
     expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(0);
   });
 
@@ -245,40 +264,31 @@ describe('validateReferences()', () => {
         {
           type: 'index-pattern',
           id: '3',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
+          error: SavedObjectsErrorHelpers.createGenericNotFoundError('index-pattern', '3').output
+            .payload,
           attributes: {},
           references: [],
         },
         {
           type: 'index-pattern',
           id: '5',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
+          error: SavedObjectsErrorHelpers.createGenericNotFoundError('index-pattern', '5').output
+            .payload,
           attributes: {},
           references: [],
         },
         {
           type: 'index-pattern',
           id: '6',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
+          error: SavedObjectsErrorHelpers.createGenericNotFoundError('index-pattern', '6').output
+            .payload,
           attributes: {},
           references: [],
         },
         {
           type: 'search',
           id: '7',
-          error: {
-            statusCode: 404,
-            message: 'Not found',
-          },
+          error: SavedObjectsErrorHelpers.createGenericNotFoundError('search', '7').output.payload,
           attributes: {},
           references: [],
         },
@@ -343,56 +353,50 @@ describe('validateReferences()', () => {
     ];
     const result = await validateReferences(savedObjects, savedObjectsClient);
     expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [
-          Object {
-            "error": Object {
-              "blocking": Array [],
-              "references": Array [
-                Object {
-                  "id": "3",
-                  "type": "index-pattern",
-                },
-              ],
-              "type": "missing_references",
-            },
-            "id": "2",
+      Array [
+        Object {
+          "error": Object {
+            "references": Array [
+              Object {
+                "id": "3",
+                "type": "index-pattern",
+              },
+            ],
+            "type": "missing_references",
+          },
+          "id": "2",
+          "meta": Object {
             "title": "My Visualization 2",
-            "type": "visualization",
           },
-          Object {
-            "error": Object {
-              "blocking": Array [],
-              "references": Array [
-                Object {
-                  "id": "5",
-                  "type": "index-pattern",
-                },
-                Object {
-                  "id": "6",
-                  "type": "index-pattern",
-                },
-                Object {
-                  "id": "7",
-                  "type": "search",
-                },
-              ],
-              "type": "missing_references",
-            },
-            "id": "4",
-            "title": "My Visualization 4",
-            "type": "visualization",
+          "title": "My Visualization 2",
+          "type": "visualization",
+        },
+        Object {
+          "error": Object {
+            "references": Array [
+              Object {
+                "id": "5",
+                "type": "index-pattern",
+              },
+              Object {
+                "id": "6",
+                "type": "index-pattern",
+              },
+              Object {
+                "id": "7",
+                "type": "search",
+              },
+            ],
+            "type": "missing_references",
           },
-        ],
-        "filteredObjects": Array [
-          Object {
-            "attributes": Object {},
-            "id": "1",
-            "references": Array [],
-            "type": "visualization",
+          "id": "4",
+          "meta": Object {
+            "title": "My Visualization 4",
           },
-        ],
-      }
+          "title": "My Visualization 4",
+          "type": "visualization",
+        },
+      ]
     `);
     expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
       [MockFunction] {
@@ -450,6 +454,29 @@ describe('validateReferences()', () => {
     `);
   });
 
+  test(`doesn't return errors when ignoreMissingReferences is included in retry`, async () => {
+    const savedObjects = [
+      {
+        id: '2',
+        type: 'visualization',
+        attributes: {},
+        references: [{ name: 'ref_0', type: 'index-pattern', id: '1' }],
+      },
+    ];
+    const retries = [
+      {
+        type: 'visualization',
+        id: '2',
+        overwrite: false,
+        replaceReferences: [],
+        ignoreMissingReferences: true,
+      },
+    ];
+    const result = await validateReferences(savedObjects, savedObjectsClient, undefined, retries);
+    expect(result).toEqual([]);
+    expect(savedObjectsClient.bulkGet).not.toHaveBeenCalled();
+  });
+
   test(`doesn't return errors when references exist in Elasticsearch`, async () => {
     savedObjectsClient.bulkGet.mockResolvedValue({
       saved_objects: [
@@ -476,25 +503,7 @@ describe('validateReferences()', () => {
       },
     ];
     const result = await validateReferences(savedObjects, savedObjectsClient);
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [],
-        "filteredObjects": Array [
-          Object {
-            "attributes": Object {},
-            "id": "2",
-            "references": Array [
-              Object {
-                "id": "1",
-                "name": "ref_0",
-                "type": "index-pattern",
-              },
-            ],
-            "type": "visualization",
-          },
-        ],
-      }
-    `);
+    expect(result).toEqual([]);
     expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(1);
   });
 
@@ -520,31 +529,7 @@ describe('validateReferences()', () => {
       },
     ];
     const result = await validateReferences(savedObjects, savedObjectsClient);
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [],
-        "filteredObjects": Array [
-          Object {
-            "attributes": Object {},
-            "id": "1",
-            "references": Array [],
-            "type": "index-pattern",
-          },
-          Object {
-            "attributes": Object {},
-            "id": "2",
-            "references": Array [
-              Object {
-                "id": "1",
-                "name": "ref_0",
-                "type": "index-pattern",
-              },
-            ],
-            "type": "visualization",
-          },
-        ],
-      }
-    `);
+    expect(result).toEqual([]);
     expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(0);
   });
 
@@ -569,30 +554,7 @@ describe('validateReferences()', () => {
       },
     ];
     const result = await validateReferences(savedObjects, savedObjectsClient);
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "errors": Array [],
-        "filteredObjects": Array [
-          Object {
-            "attributes": Object {},
-            "id": "1",
-            "references": Array [
-              Object {
-                "id": "2",
-                "name": "ref_0",
-                "type": "visualization",
-              },
-              Object {
-                "id": "3",
-                "name": "ref_1",
-                "type": "other-type",
-              },
-            ],
-            "type": "dashboard",
-          },
-        ],
-      }
-    `);
+    expect(result).toEqual([]);
     expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(0);
   });
 
@@ -602,10 +564,7 @@ describe('validateReferences()', () => {
         {
           id: '1',
           type: 'index-pattern',
-          error: {
-            statusCode: 400,
-            message: 'Error',
-          },
+          error: SavedObjectsErrorHelpers.createBadRequestError().output.payload,
           attributes: {},
           references: [],
         },
diff --git a/src/core/server/saved_objects/import/validate_references.ts b/src/core/server/saved_objects/import/validate_references.ts
index 2a30dcc96c08a..89fe8ec8c0901 100644
--- a/src/core/server/saved_objects/import/validate_references.ts
+++ b/src/core/server/saved_objects/import/validate_references.ts
@@ -19,22 +19,34 @@
 
 import Boom from 'boom';
 import { SavedObject, SavedObjectsClientContract } from '../types';
-import { SavedObjectsImportError } from './types';
+import { SavedObjectsImportError, SavedObjectsImportRetry } from './types';
 
 const REF_TYPES_TO_VLIDATE = ['index-pattern', 'search'];
 
 function filterReferencesToValidate({ type }: { type: string }) {
   return REF_TYPES_TO_VLIDATE.includes(type);
 }
+const getObjectsToSkip = (retries: SavedObjectsImportRetry[] = []) =>
+  retries.reduce(
+    (acc, { type, id, ignoreMissingReferences }) =>
+      ignoreMissingReferences ? acc.add(`${type}:${id}`) : acc,
+    new Set<string>()
+  );
 
 export async function getNonExistingReferenceAsKeys(
   savedObjects: SavedObject[],
   savedObjectsClient: SavedObjectsClientContract,
-  namespace?: string
+  namespace?: string,
+  retries?: SavedObjectsImportRetry[]
 ) {
+  const objectsToSkip = getObjectsToSkip(retries);
   const collector = new Map();
   // Collect all references within objects
   for (const savedObject of savedObjects) {
+    if (objectsToSkip.has(`${savedObject.type}:${savedObject.id}`)) {
+      // skip objects with retries that have specified `ignoreMissingReferences`
+      continue;
+    }
     const filteredReferences = (savedObject.references || []).filter(filterReferencesToValidate);
     for (const { type, id } of filteredReferences) {
       collector.set(`${type}:${id}`, { type, id });
@@ -79,62 +91,44 @@ export async function getNonExistingReferenceAsKeys(
 export async function validateReferences(
   savedObjects: Array<SavedObject<{ title?: string }>>,
   savedObjectsClient: SavedObjectsClientContract,
-  namespace?: string
+  namespace?: string,
+  retries?: SavedObjectsImportRetry[]
 ) {
+  const objectsToSkip = getObjectsToSkip(retries);
   const errorMap: { [key: string]: SavedObjectsImportError } = {};
   const nonExistingReferenceKeys = await getNonExistingReferenceAsKeys(
     savedObjects,
     savedObjectsClient,
-    namespace
+    namespace,
+    retries
   );
 
   // Filter out objects with missing references, add to error object
-  let filteredObjects = savedObjects.filter((savedObject) => {
+  savedObjects.forEach(({ type, id, references, attributes }) => {
+    if (objectsToSkip.has(`${type}:${id}`)) {
+      // skip objects with retries that have specified `ignoreMissingReferences`
+      return;
+    }
+
     const missingReferences = [];
-    const enforcedTypeReferences = (savedObject.references || []).filter(
-      filterReferencesToValidate
-    );
+    const enforcedTypeReferences = (references || []).filter(filterReferencesToValidate);
     for (const { type: refType, id: refId } of enforcedTypeReferences) {
       if (nonExistingReferenceKeys.includes(`${refType}:${refId}`)) {
         missingReferences.push({ type: refType, id: refId });
       }
     }
     if (missingReferences.length === 0) {
-      return true;
+      return;
     }
-    errorMap[`${savedObject.type}:${savedObject.id}`] = {
-      id: savedObject.id,
-      type: savedObject.type,
-      title: savedObject.attributes && savedObject.attributes.title,
-      error: {
-        type: 'missing_references',
-        references: missingReferences,
-        blocking: [],
-      },
+    const { title } = attributes;
+    errorMap[`${type}:${id}`] = {
+      id,
+      type,
+      title,
+      meta: { title },
+      error: { type: 'missing_references', references: missingReferences },
     };
-    return false;
-  });
-
-  // Filter out objects that reference objects within the import but are missing_references
-  // For example: visualization referencing a search that is missing an index pattern needs to be filtered out
-  filteredObjects = filteredObjects.filter((savedObject) => {
-    let isBlocked = false;
-    for (const reference of savedObject.references || []) {
-      const referencedObjectError = errorMap[`${reference.type}:${reference.id}`];
-      if (!referencedObjectError || referencedObjectError.error.type !== 'missing_references') {
-        continue;
-      }
-      referencedObjectError.error.blocking.push({
-        type: savedObject.type,
-        id: savedObject.id,
-      });
-      isBlocked = true;
-    }
-    return !isBlocked;
   });
 
-  return {
-    errors: Object.values(errorMap),
-    filteredObjects,
-  };
+  return Object.values(errorMap);
 }
diff --git a/src/core/server/saved_objects/import/validate_retries.test.ts b/src/core/server/saved_objects/import/validate_retries.test.ts
new file mode 100644
index 0000000000000..fd3c1e9795f9f
--- /dev/null
+++ b/src/core/server/saved_objects/import/validate_retries.test.ts
@@ -0,0 +1,97 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { validateRetries } from './validate_retries';
+import { SavedObjectsImportRetry } from '.';
+
+import { getNonUniqueEntries } from './get_non_unique_entries';
+jest.mock('./get_non_unique_entries');
+const mockGetNonUniqueEntries = getNonUniqueEntries as jest.MockedFunction<
+  typeof getNonUniqueEntries
+>;
+
+beforeEach(() => {
+  jest.clearAllMocks();
+  mockGetNonUniqueEntries.mockReturnValue([]);
+});
+
+describe('#validateRetries', () => {
+  const createRetry = (object: unknown) => object as SavedObjectsImportRetry;
+
+  describe('module calls', () => {
+    test('empty retries', () => {
+      validateRetries([]);
+      expect(getNonUniqueEntries).toHaveBeenCalledTimes(2);
+      expect(getNonUniqueEntries).toHaveBeenNthCalledWith(1, []);
+      expect(getNonUniqueEntries).toHaveBeenNthCalledWith(2, []);
+    });
+
+    test('non-empty retries', () => {
+      const retry1 = createRetry({ type: 'foo', id: '1' });
+      const retry2 = createRetry({ type: 'foo', id: '2', overwrite: true });
+      const retry3 = createRetry({ type: 'foo', id: '3', destinationId: 'a' });
+      const retry4 = createRetry({ type: 'foo', id: '4', overwrite: true, destinationId: 'b' });
+      const retries = [retry1, retry2, retry3, retry4];
+      validateRetries(retries);
+      expect(getNonUniqueEntries).toHaveBeenCalledTimes(2);
+      // check all retry objects for non-unique entries
+      expect(getNonUniqueEntries).toHaveBeenNthCalledWith(1, retries);
+      // check only retry objects with `destinationId` !== undefined for non-unique entries
+      const retryOverwriteEntries = [
+        { type: retry3.type, id: retry3.destinationId },
+        { type: retry4.type, id: retry4.destinationId },
+      ];
+      expect(getNonUniqueEntries).toHaveBeenNthCalledWith(2, retryOverwriteEntries);
+    });
+  });
+
+  describe('results', () => {
+    test('throws Boom error if any retry objects are not unique', () => {
+      mockGetNonUniqueEntries.mockReturnValue(['type1:id1', 'type2:id2']);
+      expect.assertions(2);
+      try {
+        validateRetries([]);
+      } catch ({ isBoom, message }) {
+        expect(isBoom).toBe(true);
+        expect(message).toMatchInlineSnapshot(
+          `"Non-unique retry objects: [type1:id1,type2:id2]: Bad Request"`
+        );
+      }
+    });
+
+    test('throws Boom error if any retry destinations are not unique', () => {
+      mockGetNonUniqueEntries.mockReturnValueOnce([]);
+      mockGetNonUniqueEntries.mockReturnValue(['type1:id1', 'type2:id2']);
+      expect.assertions(2);
+      try {
+        validateRetries([]);
+      } catch ({ isBoom, message }) {
+        expect(isBoom).toBe(true);
+        expect(message).toMatchInlineSnapshot(
+          `"Non-unique retry destinations: [type1:id1,type2:id2]: Bad Request"`
+        );
+      }
+    });
+
+    test('does not throw error if retry objects and retry destinations are unique', () => {
+      // no need to mock return value, the mock `getNonUniqueEntries` function returns an empty array by default
+      expect(() => validateRetries([])).not.toThrowError();
+    });
+  });
+});
diff --git a/src/core/server/saved_objects/import/validate_retries.ts b/src/core/server/saved_objects/import/validate_retries.ts
new file mode 100644
index 0000000000000..f625436edb636
--- /dev/null
+++ b/src/core/server/saved_objects/import/validate_retries.ts
@@ -0,0 +1,41 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectsImportRetry } from './types';
+import { getNonUniqueEntries } from './get_non_unique_entries';
+import { SavedObjectsErrorHelpers } from '..';
+
+export const validateRetries = (retries: SavedObjectsImportRetry[]) => {
+  const nonUniqueRetryObjects = getNonUniqueEntries(retries);
+  if (nonUniqueRetryObjects.length > 0) {
+    throw SavedObjectsErrorHelpers.createBadRequestError(
+      `Non-unique retry objects: [${nonUniqueRetryObjects.join()}]`
+    );
+  }
+
+  const destinationEntries = retries
+    .filter((retry) => retry.destinationId !== undefined)
+    .map(({ type, destinationId }) => ({ type, id: destinationId! }));
+  const nonUniqueRetryDestinations = getNonUniqueEntries(destinationEntries);
+  if (nonUniqueRetryDestinations.length > 0) {
+    throw SavedObjectsErrorHelpers.createBadRequestError(
+      `Non-unique retry destinations: [${nonUniqueRetryDestinations.join()}]`
+    );
+  }
+};
diff --git a/src/core/server/saved_objects/migrations/core/__snapshots__/build_active_mappings.test.ts.snap b/src/core/server/saved_objects/migrations/core/__snapshots__/build_active_mappings.test.ts.snap
index bc9a66926e880..f8ef47cae8944 100644
--- a/src/core/server/saved_objects/migrations/core/__snapshots__/build_active_mappings.test.ts.snap
+++ b/src/core/server/saved_objects/migrations/core/__snapshots__/build_active_mappings.test.ts.snap
@@ -9,6 +9,7 @@ Object {
       "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
       "namespace": "2f4316de49999235636386fe51dc06c1",
       "namespaces": "2f4316de49999235636386fe51dc06c1",
+      "originId": "2f4316de49999235636386fe51dc06c1",
       "references": "7997cf5a56cc02bdc9c93361bde732b0",
       "type": "2f4316de49999235636386fe51dc06c1",
       "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
@@ -32,6 +33,9 @@ Object {
     "namespaces": Object {
       "type": "keyword",
     },
+    "originId": Object {
+      "type": "keyword",
+    },
     "references": Object {
       "properties": Object {
         "id": Object {
@@ -64,6 +68,7 @@ Object {
       "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
       "namespace": "2f4316de49999235636386fe51dc06c1",
       "namespaces": "2f4316de49999235636386fe51dc06c1",
+      "originId": "2f4316de49999235636386fe51dc06c1",
       "references": "7997cf5a56cc02bdc9c93361bde732b0",
       "secondType": "72d57924f415fbadb3ee293b67d233ab",
       "thirdType": "510f1f0adb69830cf8a1c5ce2923ed82",
@@ -91,6 +96,9 @@ Object {
     "namespaces": Object {
       "type": "keyword",
     },
+    "originId": Object {
+      "type": "keyword",
+    },
     "references": Object {
       "properties": Object {
         "id": Object {
diff --git a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
index 4561f4d30e104..2f4427b27b6bf 100644
--- a/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
+++ b/src/core/server/saved_objects/migrations/core/build_active_mappings.ts
@@ -144,6 +144,9 @@ function defaultMapping(): IndexMapping {
       namespaces: {
         type: 'keyword',
       },
+      originId: {
+        type: 'keyword',
+      },
       updated_at: {
         type: 'date',
       },
diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
index b0669774207dd..df89137a1d798 100644
--- a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -66,6 +66,7 @@ describe('IndexMigrator', () => {
               migrationVersion: '4a1746014a75ade3a714e1db5763276f',
               namespace: '2f4316de49999235636386fe51dc06c1',
               namespaces: '2f4316de49999235636386fe51dc06c1',
+              originId: '2f4316de49999235636386fe51dc06c1',
               references: '7997cf5a56cc02bdc9c93361bde732b0',
               type: '2f4316de49999235636386fe51dc06c1',
               updated_at: '00da57df13e94e9d98437d13ace4bfe0',
@@ -76,6 +77,7 @@ describe('IndexMigrator', () => {
             migrationVersion: { dynamic: 'true', type: 'object' },
             namespace: { type: 'keyword' },
             namespaces: { type: 'keyword' },
+            originId: { type: 'keyword' },
             type: { type: 'keyword' },
             updated_at: { type: 'date' },
             references: {
@@ -185,6 +187,7 @@ describe('IndexMigrator', () => {
               migrationVersion: '4a1746014a75ade3a714e1db5763276f',
               namespace: '2f4316de49999235636386fe51dc06c1',
               namespaces: '2f4316de49999235636386fe51dc06c1',
+              originId: '2f4316de49999235636386fe51dc06c1',
               references: '7997cf5a56cc02bdc9c93361bde732b0',
               type: '2f4316de49999235636386fe51dc06c1',
               updated_at: '00da57df13e94e9d98437d13ace4bfe0',
@@ -196,6 +199,7 @@ describe('IndexMigrator', () => {
             migrationVersion: { dynamic: 'true', type: 'object' },
             namespace: { type: 'keyword' },
             namespaces: { type: 'keyword' },
+            originId: { type: 'keyword' },
             type: { type: 'keyword' },
             updated_at: { type: 'date' },
             references: {
@@ -244,6 +248,7 @@ describe('IndexMigrator', () => {
               migrationVersion: '4a1746014a75ade3a714e1db5763276f',
               namespace: '2f4316de49999235636386fe51dc06c1',
               namespaces: '2f4316de49999235636386fe51dc06c1',
+              originId: '2f4316de49999235636386fe51dc06c1',
               references: '7997cf5a56cc02bdc9c93361bde732b0',
               type: '2f4316de49999235636386fe51dc06c1',
               updated_at: '00da57df13e94e9d98437d13ace4bfe0',
@@ -255,6 +260,7 @@ describe('IndexMigrator', () => {
             migrationVersion: { dynamic: 'true', type: 'object' },
             namespace: { type: 'keyword' },
             namespaces: { type: 'keyword' },
+            originId: { type: 'keyword' },
             type: { type: 'keyword' },
             updated_at: { type: 'date' },
             references: {
diff --git a/src/core/server/saved_objects/migrations/kibana/__snapshots__/kibana_migrator.test.ts.snap b/src/core/server/saved_objects/migrations/kibana/__snapshots__/kibana_migrator.test.ts.snap
index 3453f3fc80310..9311292a6a0ed 100644
--- a/src/core/server/saved_objects/migrations/kibana/__snapshots__/kibana_migrator.test.ts.snap
+++ b/src/core/server/saved_objects/migrations/kibana/__snapshots__/kibana_migrator.test.ts.snap
@@ -9,6 +9,7 @@ Object {
       "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
       "namespace": "2f4316de49999235636386fe51dc06c1",
       "namespaces": "2f4316de49999235636386fe51dc06c1",
+      "originId": "2f4316de49999235636386fe51dc06c1",
       "references": "7997cf5a56cc02bdc9c93361bde732b0",
       "type": "2f4316de49999235636386fe51dc06c1",
       "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
@@ -40,6 +41,9 @@ Object {
     "namespaces": Object {
       "type": "keyword",
     },
+    "originId": Object {
+      "type": "keyword",
+    },
     "references": Object {
       "properties": Object {
         "id": Object {
diff --git a/src/core/server/saved_objects/routes/import.ts b/src/core/server/saved_objects/routes/import.ts
index 8fce6f49fb850..4fac8fede0cd9 100644
--- a/src/core/server/saved_objects/routes/import.ts
+++ b/src/core/server/saved_objects/routes/import.ts
@@ -45,32 +45,39 @@ export const registerImportRoute = (router: IRouter, config: SavedObjectConfig)
         },
       },
       validate: {
-        query: schema.object({
-          overwrite: schema.boolean({ defaultValue: false }),
-        }),
+        query: schema.object(
+          {
+            overwrite: schema.boolean({ defaultValue: false }),
+            createNewCopies: schema.boolean({ defaultValue: false }),
+          },
+          {
+            validate: (object) => {
+              if (object.overwrite && object.createNewCopies) {
+                return 'cannot use [overwrite] with [createNewCopies]';
+              }
+            },
+          }
+        ),
         body: schema.object({
           file: schema.stream(),
         }),
       },
     },
     router.handleLegacyErrors(async (context, req, res) => {
-      const { overwrite } = req.query;
+      const { overwrite, createNewCopies } = req.query;
       const file = req.body.file as FileStream;
       const fileExtension = extname(file.hapi.filename).toLowerCase();
       if (fileExtension !== '.ndjson') {
         return res.badRequest({ body: `Invalid file extension ${fileExtension}` });
       }
 
-      const supportedTypes = context.core.savedObjects.typeRegistry
-        .getImportableAndExportableTypes()
-        .map((type) => type.name);
-
       const result = await importSavedObjectsFromStream({
-        supportedTypes,
         savedObjectsClient: context.core.savedObjects.client,
+        typeRegistry: context.core.savedObjects.typeRegistry,
         readStream: createSavedObjectsStreamFromNdJson(file),
         objectLimit: maxImportExportSize,
         overwrite,
+        createNewCopies,
       });
 
       return res.ok({ body: result });
diff --git a/src/core/server/saved_objects/routes/integration_tests/import.test.ts b/src/core/server/saved_objects/routes/integration_tests/import.test.ts
index 61f32a420d92b..0bc03fbcf8038 100644
--- a/src/core/server/saved_objects/routes/integration_tests/import.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/import.test.ts
@@ -17,42 +17,58 @@
  * under the License.
  */
 
+import { mockUuidv4 } from '../../import/__mocks__';
 import supertest from 'supertest';
 import { UnwrapPromise } from '@kbn/utility-types';
 import { registerImportRoute } from '../import';
 import { savedObjectsClientMock } from '../../../../../core/server/mocks';
 import { SavedObjectConfig } from '../../saved_objects_config';
 import { setupServer, createExportableType } from '../test_utils';
+import { SavedObjectsErrorHelpers } from '../..';
 
 type SetupServerReturn = UnwrapPromise<ReturnType<typeof setupServer>>;
 
+const { v4: uuidv4 } = jest.requireActual('uuid');
 const allowedTypes = ['index-pattern', 'visualization', 'dashboard'];
-const config = {
-  maxImportPayloadBytes: 10485760,
-  maxImportExportSize: 10000,
-} as SavedObjectConfig;
+const config = { maxImportPayloadBytes: 10485760, maxImportExportSize: 10000 } as SavedObjectConfig;
+const URL = '/internal/saved_objects/_import';
 
-describe('POST /internal/saved_objects/_import', () => {
+describe(`POST ${URL}`, () => {
   let server: SetupServerReturn['server'];
   let httpSetup: SetupServerReturn['httpSetup'];
   let handlerContext: SetupServerReturn['handlerContext'];
   let savedObjectsClient: ReturnType<typeof savedObjectsClientMock.create>;
 
-  const emptyResponse = {
-    saved_objects: [],
-    total: 0,
-    per_page: 0,
-    page: 0,
+  const emptyResponse = { saved_objects: [], total: 0, per_page: 0, page: 0 };
+  const mockIndexPattern = {
+    type: 'index-pattern',
+    id: 'my-pattern',
+    attributes: { title: 'my-pattern-*' },
+    references: [],
+  };
+  const mockDashboard = {
+    type: 'dashboard',
+    id: 'my-dashboard',
+    attributes: { title: 'Look at my dashboard' },
+    references: [],
   };
 
   beforeEach(async () => {
+    mockUuidv4.mockReset();
+    mockUuidv4.mockImplementation(() => uuidv4());
     ({ server, httpSetup, handlerContext } = await setupServer());
     handlerContext.savedObjects.typeRegistry.getImportableAndExportableTypes.mockReturnValue(
       allowedTypes.map(createExportableType)
     );
+    handlerContext.savedObjects.typeRegistry.getType.mockImplementation(
+      (type: string) =>
+        // other attributes aren't needed for the purposes of injecting metadata
+        ({ management: { icon: `${type}-icon` } } as any)
+    );
 
     savedObjectsClient = handlerContext.savedObjects.client;
     savedObjectsClient.find.mockResolvedValue(emptyResponse);
+    savedObjectsClient.checkConflicts.mockResolvedValue({ errors: [] });
 
     const router = httpSetup.createRouter('/internal/saved_objects/');
     registerImportRoute(router, config);
@@ -66,7 +82,7 @@ describe('POST /internal/saved_objects/_import', () => {
 
   it('formats successful response', async () => {
     const result = await supertest(httpSetup.server.listener)
-      .post('/internal/saved_objects/_import')
+      .post(URL)
       .set('content-Type', 'multipart/form-data; boundary=BOUNDARY')
       .send(
         [
@@ -80,29 +96,15 @@ describe('POST /internal/saved_objects/_import', () => {
       )
       .expect(200);
 
-    expect(result.body).toEqual({
-      success: true,
-      successCount: 0,
-    });
-    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(0);
+    expect(result.body).toEqual({ success: true, successCount: 0 });
+    expect(savedObjectsClient.bulkCreate).not.toHaveBeenCalled(); // no objects were created
   });
 
   it('defaults migrationVersion to empty object', async () => {
-    savedObjectsClient.bulkCreate.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          type: 'index-pattern',
-          id: 'my-pattern',
-          attributes: {
-            title: 'my-pattern-*',
-          },
-          references: [],
-        },
-      ],
-    });
+    savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [mockIndexPattern] });
 
     const result = await supertest(httpSetup.server.listener)
-      .post('/internal/saved_objects/_import')
+      .post(URL)
       .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
       .send(
         [
@@ -119,39 +121,30 @@ describe('POST /internal/saved_objects/_import', () => {
     expect(result.body).toEqual({
       success: true,
       successCount: 1,
+      successResults: [
+        {
+          type: 'index-pattern',
+          id: 'my-pattern',
+          meta: { title: 'my-pattern-*', icon: 'index-pattern-icon' },
+        },
+      ],
     });
-    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1);
-    const firstBulkCreateCallArray = savedObjectsClient.bulkCreate.mock.calls[0][0];
-    expect(firstBulkCreateCallArray).toHaveLength(1);
-    expect(firstBulkCreateCallArray[0].migrationVersion).toEqual({});
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
+      [expect.objectContaining({ migrationVersion: {} })],
+      expect.any(Object) // options
+    );
   });
 
   it('imports an index pattern and dashboard, ignoring empty lines in the file', async () => {
     // NOTE: changes to this scenario should be reflected in the docs
 
     savedObjectsClient.bulkCreate.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          type: 'index-pattern',
-          id: 'my-pattern',
-          attributes: {
-            title: 'my-pattern-*',
-          },
-          references: [],
-        },
-        {
-          type: 'dashboard',
-          id: 'my-dashboard',
-          attributes: {
-            title: 'Look at my dashboard',
-          },
-          references: [],
-        },
-      ],
+      saved_objects: [mockIndexPattern, mockDashboard],
     });
 
     const result = await supertest(httpSetup.server.listener)
-      .post('/internal/saved_objects/_import')
+      .post(URL)
       .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
       .send(
         [
@@ -172,37 +165,84 @@ describe('POST /internal/saved_objects/_import', () => {
     expect(result.body).toEqual({
       success: true,
       successCount: 2,
+      successResults: [
+        {
+          type: mockIndexPattern.type,
+          id: mockIndexPattern.id,
+          meta: { title: mockIndexPattern.attributes.title, icon: 'index-pattern-icon' },
+        },
+        {
+          type: mockDashboard.type,
+          id: mockDashboard.id,
+          meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
+        },
+      ],
     });
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
   });
 
   it('imports an index pattern and dashboard but has a conflict on the index pattern', async () => {
     // NOTE: changes to this scenario should be reflected in the docs
 
-    savedObjectsClient.bulkCreate.mockResolvedValueOnce({
-      saved_objects: [
+    const error = SavedObjectsErrorHelpers.createConflictError('index-pattern', 'my-pattern').output
+      .payload;
+    savedObjectsClient.checkConflicts.mockResolvedValue({
+      errors: [{ type: mockIndexPattern.type, id: mockIndexPattern.id, error }],
+    });
+
+    const result = await supertest(httpSetup.server.listener)
+      .post(URL)
+      .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
+      .send(
+        [
+          '--EXAMPLE',
+          'Content-Disposition: form-data; name="file"; filename="export.ndjson"',
+          'Content-Type: application/ndjson',
+          '',
+          '{"type":"index-pattern","id":"my-pattern","attributes":{"title":"my-pattern-*"}}',
+          '{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"}}',
+          '--EXAMPLE--',
+        ].join('\r\n')
+      )
+      .expect(200);
+
+    expect(result.body).toEqual({
+      success: false,
+      successCount: 1,
+      successResults: [
         {
-          type: 'index-pattern',
-          id: 'my-pattern',
-          attributes: {},
-          references: [],
-          error: {
-            statusCode: 409,
-            message: 'Saved object [index-pattern/my-pattern] conflict',
-          },
+          type: mockDashboard.type,
+          id: mockDashboard.id,
+          meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
         },
+      ],
+      errors: [
         {
-          type: 'dashboard',
-          id: 'my-dashboard',
-          attributes: {
-            title: 'Look at my dashboard',
-          },
-          references: [],
+          id: mockIndexPattern.id,
+          type: mockIndexPattern.type,
+          title: mockIndexPattern.attributes.title,
+          meta: { title: mockIndexPattern.attributes.title, icon: 'index-pattern-icon' },
+          error: { type: 'conflict' },
         },
       ],
     });
+    expect(savedObjectsClient.bulkCreate).not.toHaveBeenCalled(); // successResults objects were not created because resolvable errors are present
+  });
+
+  it('imports an index pattern and dashboard but has a conflict on the index pattern, with overwrite=true', async () => {
+    // NOTE: changes to this scenario should be reflected in the docs
+
+    const error = SavedObjectsErrorHelpers.createConflictError('index-pattern', 'my-pattern').output
+      .payload;
+    savedObjectsClient.checkConflicts.mockResolvedValue({
+      errors: [{ type: mockIndexPattern.type, id: mockIndexPattern.id, error }],
+    });
+    savedObjectsClient.bulkCreate.mockResolvedValueOnce({
+      saved_objects: [mockIndexPattern, mockDashboard],
+    });
 
     const result = await supertest(httpSetup.server.listener)
-      .post('/internal/saved_objects/_import')
+      .post(`${URL}?overwrite=true`)
       .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
       .send(
         [
@@ -217,42 +257,172 @@ describe('POST /internal/saved_objects/_import', () => {
       )
       .expect(200);
 
+    expect(result.body).toEqual({
+      success: true,
+      successCount: 2,
+      successResults: [
+        {
+          type: mockIndexPattern.type,
+          id: mockIndexPattern.id,
+          meta: { title: mockIndexPattern.attributes.title, icon: 'index-pattern-icon' },
+          overwrite: true,
+        },
+        {
+          type: mockDashboard.type,
+          id: mockDashboard.id,
+          meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
+        },
+      ],
+    });
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
+  });
+
+  it('imports a visualization with missing references', async () => {
+    // NOTE: changes to this scenario should be reflected in the docs
+
+    const error = SavedObjectsErrorHelpers.createGenericNotFoundError(
+      'index-pattern',
+      'my-pattern-*'
+    ).output.payload;
+    savedObjectsClient.bulkGet.mockResolvedValueOnce({
+      saved_objects: [{ ...mockIndexPattern, error }],
+    });
+
+    const result = await supertest(httpSetup.server.listener)
+      .post(URL)
+      .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
+      .send(
+        [
+          '--EXAMPLE',
+          'Content-Disposition: form-data; name="file"; filename="export.ndjson"',
+          'Content-Type: application/ndjson',
+          '',
+          '{"type":"visualization","id":"my-vis","attributes":{"title":"my-vis"},"references":[{"name":"ref_0","type":"index-pattern","id":"my-pattern"}]}',
+          '{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"},"references":[{"name":"ref_0","type":"visualization","id":"my-vis"}]}',
+          '--EXAMPLE--',
+        ].join('\r\n')
+      )
+      .expect(200);
+
     expect(result.body).toEqual({
       success: false,
       successCount: 1,
       errors: [
         {
-          id: 'my-pattern',
-          type: 'index-pattern',
-          title: 'my-pattern-*',
+          id: 'my-vis',
+          type: 'visualization',
+          title: 'my-vis',
+          meta: { title: 'my-vis', icon: 'visualization-icon' },
           error: {
-            type: 'conflict',
+            type: 'missing_references',
+            references: [{ type: 'index-pattern', id: 'my-pattern' }],
           },
         },
       ],
+      successResults: [
+        {
+          type: mockDashboard.type,
+          id: mockDashboard.id,
+          meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
+        },
+      ],
     });
+    expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(1);
+    expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith(
+      [{ fields: ['id'], id: 'my-pattern', type: 'index-pattern' }],
+      expect.any(Object) // options
+    );
+    expect(savedObjectsClient.bulkCreate).not.toHaveBeenCalled(); // no objects were created
   });
 
-  it('imports a visualization with missing references', async () => {
+  it('imports a visualization with missing references and a conflict', async () => {
     // NOTE: changes to this scenario should be reflected in the docs
 
+    const error1 = SavedObjectsErrorHelpers.createGenericNotFoundError(
+      'index-pattern',
+      'my-pattern-*'
+    ).output.payload;
     savedObjectsClient.bulkGet.mockResolvedValueOnce({
-      saved_objects: [
+      saved_objects: [{ ...mockIndexPattern, error: error1 }],
+    });
+    const error2 = SavedObjectsErrorHelpers.createConflictError('index-pattern', 'my-pattern')
+      .output.payload;
+    savedObjectsClient.checkConflicts.mockResolvedValue({
+      errors: [{ type: 'visualization', id: 'my-vis', error: error2 }],
+    });
+
+    const result = await supertest(httpSetup.server.listener)
+      .post(URL)
+      .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
+      .send(
+        [
+          '--EXAMPLE',
+          'Content-Disposition: form-data; name="file"; filename="export.ndjson"',
+          'Content-Type: application/ndjson',
+          '',
+          '{"type":"visualization","id":"my-vis","attributes":{"title":"my-vis"},"references":[{"name":"ref_0","type":"index-pattern","id":"my-pattern"}]}',
+          '{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"},"references":[{"name":"ref_0","type":"visualization","id":"my-vis"}]}',
+          '--EXAMPLE--',
+        ].join('\r\n')
+      )
+      .expect(200);
+
+    expect(result.body).toEqual({
+      success: false,
+      successCount: 1,
+      errors: [
         {
-          id: 'my-pattern-*',
-          type: 'index-pattern',
+          id: 'my-vis',
+          type: 'visualization',
+          title: 'my-vis',
+          meta: { title: 'my-vis', icon: 'visualization-icon' },
           error: {
-            statusCode: 404,
-            message: 'Not found',
+            type: 'missing_references',
+            references: [{ type: 'index-pattern', id: 'my-pattern' }],
           },
-          references: [],
-          attributes: {},
+        },
+        {
+          id: 'my-vis',
+          type: 'visualization',
+          title: 'my-vis',
+          meta: { title: 'my-vis', icon: 'visualization-icon' },
+          error: { type: 'conflict' },
+        },
+      ],
+      successResults: [
+        {
+          type: mockDashboard.type,
+          id: mockDashboard.id,
+          meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
         },
       ],
     });
+    expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(1);
+    expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith(
+      [{ fields: ['id'], id: 'my-pattern', type: 'index-pattern' }],
+      expect.any(Object) // options
+    );
+    expect(savedObjectsClient.bulkCreate).not.toHaveBeenCalled(); // no objects were created
+  });
+
+  it('imports a visualization with missing references and a conflict, with overwrite=true', async () => {
+    // NOTE: changes to this scenario should be reflected in the docs
+
+    const error1 = SavedObjectsErrorHelpers.createGenericNotFoundError(
+      'index-pattern',
+      'my-pattern-*'
+    ).output.payload;
+    savedObjectsClient.bulkGet.mockResolvedValueOnce({
+      saved_objects: [{ ...mockIndexPattern, error: error1 }],
+    });
+    const error2 = SavedObjectsErrorHelpers.createConflictError('index-pattern', 'my-pattern')
+      .output.payload;
+    savedObjectsClient.checkConflicts.mockResolvedValue({
+      errors: [{ type: 'visualization', id: 'my-vis', error: error2 }],
+    });
 
     const result = await supertest(httpSetup.server.listener)
-      .post('/internal/saved_objects/_import')
+      .post(`${URL}?overwrite=true`)
       .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
       .send(
         [
@@ -260,7 +430,7 @@ describe('POST /internal/saved_objects/_import', () => {
           'Content-Disposition: form-data; name="file"; filename="export.ndjson"',
           'Content-Type: application/ndjson',
           '',
-          '{"type":"visualization","id":"my-vis","attributes":{"title":"my-vis"},"references":[{"name":"ref_0","type":"index-pattern","id":"my-pattern-*"}]}',
+          '{"type":"visualization","id":"my-vis","attributes":{"title":"my-vis"},"references":[{"name":"ref_0","type":"index-pattern","id":"my-pattern"}]}',
           '{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"},"references":[{"name":"ref_0","type":"visualization","id":"my-vis"}]}',
           '--EXAMPLE--',
         ].join('\r\n')
@@ -269,55 +439,107 @@ describe('POST /internal/saved_objects/_import', () => {
 
     expect(result.body).toEqual({
       success: false,
-      successCount: 0,
+      successCount: 1,
       errors: [
         {
           id: 'my-vis',
           type: 'visualization',
           title: 'my-vis',
+          meta: { title: 'my-vis', icon: 'visualization-icon' },
+          overwrite: true,
           error: {
             type: 'missing_references',
-            references: [
-              {
-                type: 'index-pattern',
-                id: 'my-pattern-*',
-              },
-            ],
-            blocking: [
-              {
-                type: 'dashboard',
-                id: 'my-dashboard',
-              },
-            ],
+            references: [{ type: 'index-pattern', id: 'my-pattern' }],
           },
         },
       ],
-    });
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-[MockFunction] {
-  "calls": Array [
-    Array [
-      Array [
-        Object {
-          "fields": Array [
-            "id",
-          ],
-          "id": "my-pattern-*",
-          "type": "index-pattern",
+      successResults: [
+        {
+          type: mockDashboard.type,
+          id: mockDashboard.id,
+          meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
         },
       ],
-      Object {
-        "namespace": undefined,
-      },
-    ],
-  ],
-  "results": Array [
-    Object {
-      "type": "return",
-      "value": Promise {},
-    },
-  ],
-}
-`);
+    });
+    expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(1);
+    expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith(
+      [{ fields: ['id'], id: 'my-pattern', type: 'index-pattern' }],
+      expect.any(Object) // options
+    );
+    expect(savedObjectsClient.bulkCreate).not.toHaveBeenCalled(); // no objects were created
+  });
+
+  describe('createNewCopies enabled', () => {
+    it('imports objects, regenerating all IDs/reference IDs present, and resetting all origin IDs', async () => {
+      mockUuidv4.mockReturnValueOnce('new-id-1').mockReturnValueOnce('new-id-2');
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({ saved_objects: [mockIndexPattern] });
+      const obj1 = {
+        type: 'visualization',
+        id: 'new-id-1',
+        attributes: { title: 'Look at my visualization' },
+        references: [],
+      };
+      const obj2 = {
+        type: 'dashboard',
+        id: 'new-id-2',
+        attributes: { title: 'Look at my dashboard' },
+        references: [],
+      };
+      savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [obj1, obj2] });
+
+      const result = await supertest(httpSetup.server.listener)
+        .post(`${URL}?createNewCopies=true`)
+        .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
+        .set('x-opaque-id', uuidv4()) // prevents src/core/server/http/http_tools.ts from using our mocked uuidv4 to generate a unique ID for this request
+        .send(
+          [
+            '--EXAMPLE',
+            'Content-Disposition: form-data; name="file"; filename="export.ndjson"',
+            'Content-Type: application/ndjson',
+            '',
+            '{"type":"visualization","id":"my-vis","attributes":{"title":"Look at my visualization"},"references":[{"name":"ref_0","type":"index-pattern","id":"my-pattern"}]}',
+            '{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"},"references":[{"name":"ref_0","type":"visualization","id":"my-vis"}]}',
+            '--EXAMPLE--',
+          ].join('\r\n')
+        )
+        .expect(200);
+
+      expect(result.body).toEqual({
+        success: true,
+        successCount: 2,
+        successResults: [
+          {
+            type: obj1.type,
+            id: 'my-vis',
+            meta: { title: obj1.attributes.title, icon: 'visualization-icon' },
+            destinationId: obj1.id,
+          },
+          {
+            type: obj2.type,
+            id: 'my-dashboard',
+            meta: { title: obj2.attributes.title, icon: 'dashboard-icon' },
+            destinationId: obj2.id,
+          },
+        ],
+      });
+      expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
+      expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
+        [
+          expect.objectContaining({
+            type: 'visualization',
+            id: 'new-id-1',
+            references: [{ name: 'ref_0', type: 'index-pattern', id: 'my-pattern' }],
+            originId: undefined,
+          }),
+          expect.objectContaining({
+            type: 'dashboard',
+            id: 'new-id-2',
+            references: [{ name: 'ref_0', type: 'visualization', id: 'new-id-1' }],
+            originId: undefined,
+          }),
+        ],
+        expect.any(Object) // options
+      );
+    });
   });
 });
diff --git a/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts b/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts
index 6a6976b513ca1..a933838cc92e3 100644
--- a/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/resolve_import_errors.test.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { mockUuidv4 } from '../../import/__mocks__';
 import supertest from 'supertest';
 import { UnwrapPromise } from '@kbn/utility-types';
 import { registerResolveImportErrorsRoute } from '../resolve_import_errors';
@@ -26,25 +27,53 @@ import { SavedObjectConfig } from '../../saved_objects_config';
 
 type SetupServerReturn = UnwrapPromise<ReturnType<typeof setupServer>>;
 
+const { v4: uuidv4 } = jest.requireActual('uuid');
 const allowedTypes = ['index-pattern', 'visualization', 'dashboard'];
-const config = {
-  maxImportPayloadBytes: 10485760,
-  maxImportExportSize: 10000,
-} as SavedObjectConfig;
+const config = { maxImportPayloadBytes: 10485760, maxImportExportSize: 10000 } as SavedObjectConfig;
+const URL = '/api/saved_objects/_resolve_import_errors';
 
-describe('POST /api/saved_objects/_resolve_import_errors', () => {
+describe(`POST ${URL}`, () => {
   let server: SetupServerReturn['server'];
   let httpSetup: SetupServerReturn['httpSetup'];
   let handlerContext: SetupServerReturn['handlerContext'];
   let savedObjectsClient: ReturnType<typeof savedObjectsClientMock.create>;
 
+  const mockDashboard = {
+    type: 'dashboard',
+    id: 'my-dashboard',
+    attributes: { title: 'Look at my dashboard' },
+    references: [],
+  };
+  const mockVisualization = {
+    type: 'visualization',
+    id: 'my-vis',
+    attributes: { title: 'Look at my visualization' },
+    references: [{ name: 'ref_0', type: 'index-pattern', id: 'existing' }],
+  };
+  const mockIndexPattern = {
+    type: 'index-pattern',
+    id: 'existing',
+    attributes: {},
+    references: [],
+  };
+
   beforeEach(async () => {
+    mockUuidv4.mockReset();
+    mockUuidv4.mockImplementation(() => uuidv4());
     ({ server, httpSetup, handlerContext } = await setupServer());
     handlerContext.savedObjects.typeRegistry.getImportableAndExportableTypes.mockReturnValue(
       allowedTypes.map(createExportableType)
     );
+    handlerContext.savedObjects.typeRegistry.getType.mockImplementation(
+      (type: string) =>
+        ({
+          // other attributes aren't needed for the purposes of injecting metadata
+          management: { icon: `${type}-icon` },
+        } as any)
+    );
 
     savedObjectsClient = handlerContext.savedObjects.client;
+    savedObjectsClient.checkConflicts.mockResolvedValue({ errors: [] });
 
     const router = httpSetup.createRouter('/api/saved_objects/');
     registerResolveImportErrorsRoute(router, config);
@@ -58,7 +87,7 @@ describe('POST /api/saved_objects/_resolve_import_errors', () => {
 
   it('formats successful response', async () => {
     const result = await supertest(httpSetup.server.listener)
-      .post('/api/saved_objects/_resolve_import_errors')
+      .post(URL)
       .set('content-Type', 'multipart/form-data; boundary=BOUNDARY')
       .send(
         [
@@ -77,25 +106,14 @@ describe('POST /api/saved_objects/_resolve_import_errors', () => {
       .expect(200);
 
     expect(result.body).toEqual({ success: true, successCount: 0 });
-    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(0);
+    expect(savedObjectsClient.bulkCreate).not.toHaveBeenCalled(); // no objects were created
   });
 
   it('defaults migrationVersion to empty object', async () => {
-    savedObjectsClient.bulkCreate.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          type: 'dashboard',
-          id: 'my-dashboard',
-          attributes: {
-            title: 'Look at my dashboard',
-          },
-          references: [],
-        },
-      ],
-    });
+    savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [mockDashboard] });
 
     const result = await supertest(httpSetup.server.listener)
-      .post('/api/saved_objects/_resolve_import_errors')
+      .post(URL)
       .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
       .send(
         [
@@ -113,30 +131,30 @@ describe('POST /api/saved_objects/_resolve_import_errors', () => {
       )
       .expect(200);
 
-    expect(result.body).toEqual({ success: true, successCount: 1 });
-    expect(savedObjectsClient.bulkCreate.mock.calls).toHaveLength(1);
-    const firstBulkCreateCallArray = savedObjectsClient.bulkCreate.mock.calls[0][0];
-    expect(firstBulkCreateCallArray).toHaveLength(1);
-    expect(firstBulkCreateCallArray[0].migrationVersion).toEqual({});
+    const {
+      type,
+      id,
+      attributes: { title },
+    } = mockDashboard;
+    const meta = { title, icon: 'dashboard-icon' };
+    expect(result.body).toEqual({
+      success: true,
+      successCount: 1,
+      successResults: [{ type, id, meta }],
+    });
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
+      [expect.objectContaining({ migrationVersion: {} })],
+      expect.any(Object) // options
+    );
   });
 
   it('retries importing a dashboard', async () => {
     // NOTE: changes to this scenario should be reflected in the docs
-    savedObjectsClient.bulkCreate.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          type: 'dashboard',
-          id: 'my-dashboard',
-          attributes: {
-            title: 'Look at my dashboard',
-          },
-          references: [],
-        },
-      ],
-    });
+    savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [mockDashboard] });
 
     const result = await supertest(httpSetup.server.listener)
-      .post('/api/saved_objects/_resolve_import_errors')
+      .post(URL)
       .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
       .send(
         [
@@ -154,53 +172,26 @@ describe('POST /api/saved_objects/_resolve_import_errors', () => {
       )
       .expect(200);
 
-    expect(result.body).toEqual({ success: true, successCount: 1 });
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "attributes": Object {
-                  "title": "Look at my dashboard",
-                },
-                "id": "my-dashboard",
-                "migrationVersion": Object {},
-                "type": "dashboard",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
+    const { type, id, attributes } = mockDashboard;
+    const meta = { title: attributes.title, icon: 'dashboard-icon' };
+    expect(result.body).toEqual({
+      success: true,
+      successCount: 1,
+      successResults: [{ type, id, meta }],
+    });
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
+      [{ type, id, attributes, migrationVersion: {} }],
+      expect.objectContaining({ overwrite: undefined })
+    );
   });
 
   it('resolves conflicts for dashboard', async () => {
     // NOTE: changes to this scenario should be reflected in the docs
-    savedObjectsClient.bulkCreate.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          type: 'dashboard',
-          id: 'my-dashboard',
-          attributes: {
-            title: 'Look at my dashboard',
-          },
-          references: [],
-        },
-      ],
-    });
+    savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [mockDashboard] });
 
     const result = await supertest(httpSetup.server.listener)
-      .post('/api/saved_objects/_resolve_import_errors')
+      .post(URL)
       .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
       .send(
         [
@@ -219,70 +210,74 @@ describe('POST /api/saved_objects/_resolve_import_errors', () => {
       )
       .expect(200);
 
-    expect(result.body).toEqual({ success: true, successCount: 1 });
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "attributes": Object {
-                  "title": "Look at my dashboard",
-                },
-                "id": "my-dashboard",
-                "migrationVersion": Object {},
-                "type": "dashboard",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-              "overwrite": true,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
+    const { type, id, attributes } = mockDashboard;
+    const meta = { title: attributes.title, icon: 'dashboard-icon' };
+    expect(result.body).toEqual({
+      success: true,
+      successCount: 1,
+      successResults: [{ type, id, meta, overwrite: true }],
+    });
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
+      [{ type, id, attributes, migrationVersion: {} }],
+      expect.objectContaining({ overwrite: true })
+    );
   });
 
-  it('resolves conflicts by replacing the visualization references', async () => {
+  it('resolves `missing_references` errors by replacing the missing references', async () => {
     // NOTE: changes to this scenario should be reflected in the docs
-    savedObjectsClient.bulkCreate.mockResolvedValueOnce({
-      saved_objects: [
+    savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [mockVisualization] });
+    savedObjectsClient.bulkGet.mockResolvedValueOnce({ saved_objects: [mockIndexPattern] });
+
+    const result = await supertest(httpSetup.server.listener)
+      .post(URL)
+      .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
+      .send(
+        [
+          '--EXAMPLE',
+          'Content-Disposition: form-data; name="file"; filename="export.ndjson"',
+          'Content-Type: application/ndjson',
+          '',
+          '{"type":"visualization","id":"my-vis","attributes":{"title":"Look at my visualization"},"references":[{"name":"ref_0","type":"index-pattern","id":"missing"}]}',
+          '--EXAMPLE',
+          'Content-Disposition: form-data; name="retries"',
+          '',
+          '[{"type":"visualization","id":"my-vis","replaceReferences":[{"type":"index-pattern","from":"missing","to":"existing"}]}]',
+          '--EXAMPLE--',
+        ].join('\r\n')
+      )
+      .expect(200);
+
+    const { type, id, attributes, references } = mockVisualization;
+    expect(result.body).toEqual({
+      success: true,
+      successCount: 1,
+      successResults: [
         {
           type: 'visualization',
           id: 'my-vis',
-          attributes: {
-            title: 'Look at my visualization',
-          },
-          references: [
-            {
-              name: 'ref_0',
-              type: 'index-pattern',
-              id: 'existing',
-            },
-          ],
-        },
-      ],
-    });
-    savedObjectsClient.bulkGet.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          id: 'existing',
-          type: 'index-pattern',
-          attributes: {},
-          references: [],
+          meta: { title: 'Look at my visualization', icon: 'visualization-icon' },
         },
       ],
     });
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
+      [{ type, id, attributes, references, migrationVersion: {} }],
+      expect.objectContaining({ overwrite: undefined })
+    );
+    expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(1);
+    expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith(
+      [{ fields: ['id'], id: 'existing', type: 'index-pattern' }],
+      expect.any(Object) // options
+    );
+  });
+
+  it('resolves `missing_references` errors by ignoring the missing references', async () => {
+    // NOTE: changes to this scenario should be reflected in the docs
+    savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [mockVisualization] });
 
     const result = await supertest(httpSetup.server.listener)
-      .post('/api/saved_objects/_resolve_import_errors')
+      .post(URL)
       .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
       .send(
         [
@@ -294,72 +289,107 @@ describe('POST /api/saved_objects/_resolve_import_errors', () => {
           '--EXAMPLE',
           'Content-Disposition: form-data; name="retries"',
           '',
-          '[{"type":"visualization","id":"my-vis","replaceReferences":[{"type":"index-pattern","from":"missing","to":"existing"}]}]',
+          '[{"type":"visualization","id":"my-vis","ignoreMissingReferences":true}]',
           '--EXAMPLE--',
         ].join('\r\n')
       )
       .expect(200);
 
-    expect(result.body).toEqual({ success: true, successCount: 1 });
-    expect(savedObjectsClient.bulkCreate).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "attributes": Object {
-                  "title": "Look at my visualization",
-                },
-                "id": "my-vis",
-                "migrationVersion": Object {},
-                "references": Array [
-                  Object {
-                    "id": "existing",
-                    "name": "ref_0",
-                    "type": "index-pattern",
-                  },
-                ],
-                "type": "visualization",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
+    const { type, id, attributes } = mockVisualization;
+    const references = [{ name: 'ref_0', type: 'index-pattern', id: 'missing' }];
+    expect(result.body).toEqual({
+      success: true,
+      successCount: 1,
+      successResults: [
+        {
+          type: 'visualization',
+          id: 'my-vis',
+          meta: { title: 'Look at my visualization', icon: 'visualization-icon' },
+        },
+      ],
+    });
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
+      [{ type, id, attributes, references, migrationVersion: {} }],
+      expect.objectContaining({ overwrite: undefined })
+    );
+    expect(savedObjectsClient.bulkGet).not.toHaveBeenCalled();
+  });
+
+  describe('createNewCopies enabled', () => {
+    it('imports objects, regenerating all IDs/reference IDs present, and resetting all origin IDs', async () => {
+      mockUuidv4.mockReturnValue('new-id-1');
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({ saved_objects: [mockIndexPattern] });
+      const obj1 = {
+        type: 'visualization',
+        id: 'new-id-1',
+        attributes: { title: 'Look at my visualization' },
+        references: [],
+      };
+      const obj2 = {
+        type: 'dashboard',
+        id: 'new-id-2',
+        attributes: { title: 'Look at my dashboard' },
+        references: [],
+      };
+      savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [obj1, obj2] });
+
+      const result = await supertest(httpSetup.server.listener)
+        .post(`${URL}?createNewCopies=true`)
+        .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
+        .send(
+          [
+            '--EXAMPLE',
+            'Content-Disposition: form-data; name="file"; filename="export.ndjson"',
+            'Content-Type: application/ndjson',
+            '',
+            '{"type":"visualization","id":"my-vis","attributes":{"title":"Look at my visualization"},"references":[{"name":"ref_0","type":"index-pattern","id":"my-pattern"}]}',
+            '{"type":"dashboard","id":"my-dashboard","attributes":{"title":"Look at my dashboard"},"references":[{"name":"ref_0","type":"visualization","id":"my-vis"}]}',
+            '--EXAMPLE',
+            'Content-Disposition: form-data; name="retries"',
+            '',
+            '[{"type":"visualization","id":"my-vis","replaceReferences":[{"type":"index-pattern","from":"my-pattern","to":"existing"}]},{"type":"dashboard","id":"my-dashboard","destinationId":"new-id-2"}]',
+            '--EXAMPLE--',
+          ].join('\r\n')
+        )
+        .expect(200);
+
+      expect(result.body).toEqual({
+        success: true,
+        successCount: 2,
+        successResults: [
+          {
+            type: obj1.type,
+            id: 'my-vis',
+            meta: { title: obj1.attributes.title, icon: 'visualization-icon' },
+            destinationId: obj1.id,
           },
-        ],
-      }
-    `);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "fields": Array [
-                  "id",
-                ],
-                "id": "existing",
-                "type": "index-pattern",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
+          {
+            type: obj2.type,
+            id: 'my-dashboard',
+            meta: { title: obj2.attributes.title, icon: 'dashboard-icon' },
+            destinationId: obj2.id,
           },
         ],
-      }
-    `);
+      });
+      expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
+      expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
+        [
+          expect.objectContaining({
+            type: 'visualization',
+            id: 'new-id-1',
+            references: [{ name: 'ref_0', type: 'index-pattern', id: 'existing' }],
+            originId: undefined,
+          }),
+          expect.objectContaining({
+            type: 'dashboard',
+            id: 'new-id-2',
+            references: [{ name: 'ref_0', type: 'visualization', id: 'new-id-1' }],
+            originId: undefined,
+          }),
+        ],
+        expect.any(Object) // options
+      );
+    });
   });
 });
diff --git a/src/core/server/saved_objects/routes/resolve_import_errors.ts b/src/core/server/saved_objects/routes/resolve_import_errors.ts
index 3458e601e0fe6..93fcb6dbda0ac 100644
--- a/src/core/server/saved_objects/routes/resolve_import_errors.ts
+++ b/src/core/server/saved_objects/routes/resolve_import_errors.ts
@@ -45,6 +45,9 @@ export const registerResolveImportErrorsRoute = (router: IRouter, config: SavedO
         },
       },
       validate: {
+        query: schema.object({
+          createNewCopies: schema.boolean({ defaultValue: false }),
+        }),
         body: schema.object({
           file: schema.stream(),
           retries: schema.arrayOf(
@@ -52,6 +55,7 @@ export const registerResolveImportErrorsRoute = (router: IRouter, config: SavedO
               type: schema.string(),
               id: schema.string(),
               overwrite: schema.boolean({ defaultValue: false }),
+              destinationId: schema.maybe(schema.string()),
               replaceReferences: schema.arrayOf(
                 schema.object({
                   type: schema.string(),
@@ -60,6 +64,8 @@ export const registerResolveImportErrorsRoute = (router: IRouter, config: SavedO
                 }),
                 { defaultValue: [] }
               ),
+              createNewCopy: schema.maybe(schema.boolean()),
+              ignoreMissingReferences: schema.maybe(schema.boolean()),
             })
           ),
         }),
@@ -72,16 +78,13 @@ export const registerResolveImportErrorsRoute = (router: IRouter, config: SavedO
         return res.badRequest({ body: `Invalid file extension ${fileExtension}` });
       }
 
-      const supportedTypes = context.core.savedObjects.typeRegistry
-        .getImportableAndExportableTypes()
-        .map((type) => type.name);
-
       const result = await resolveSavedObjectsImportErrors({
-        supportedTypes,
+        typeRegistry: context.core.savedObjects.typeRegistry,
         savedObjectsClient: context.core.savedObjects.client,
         readStream: createSavedObjectsStreamFromNdJson(file),
         retries: req.body.retries,
         objectLimit: maxImportExportSize,
+        createNewCopies: req.query.createNewCopies,
       });
 
       return res.ok({ body: result });
diff --git a/src/core/server/saved_objects/serialization/serializer.test.ts b/src/core/server/saved_objects/serialization/serializer.test.ts
index 1a7dfdd2d130e..e5f0e8abd3b71 100644
--- a/src/core/server/saved_objects/serialization/serializer.test.ts
+++ b/src/core/server/saved_objects/serialization/serializer.test.ts
@@ -214,6 +214,28 @@ describe('#rawToSavedObject', () => {
     expect(actual).not.toHaveProperty('updated_at');
   });
 
+  test('if specified it copies the _source.originId property to originId', () => {
+    const originId = 'baz';
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'foo:bar',
+      _source: {
+        type: 'foo',
+        originId,
+      },
+    });
+    expect(actual).toHaveProperty('originId', originId);
+  });
+
+  test(`if _source.originId is unspecified it doesn't set originId`, () => {
+    const actual = singleNamespaceSerializer.rawToSavedObject({
+      _id: 'foo:bar',
+      _source: {
+        type: 'foo',
+      },
+    });
+    expect(actual).not.toHaveProperty('originId');
+  });
+
   test('it does not pass unknown properties through', () => {
     const actual = singleNamespaceSerializer.rawToSavedObject({
       _id: 'universe',
@@ -280,6 +302,7 @@ describe('#rawToSavedObject', () => {
         namespace: 'foo-namespace',
         updated_at: String(new Date()),
         references: [],
+        originId: 'baz',
       },
     };
 
@@ -458,6 +481,26 @@ describe('#savedObjectToRaw', () => {
     expect(actual._source).not.toHaveProperty('updated_at');
   });
 
+  test('if specified it copies the originId property to _source.originId', () => {
+    const originId = 'baz';
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      type: '',
+      attributes: {},
+      originId,
+    } as any);
+
+    expect(actual._source).toHaveProperty('originId', originId);
+  });
+
+  test(`if unspecified it doesn't add originId property to _source`, () => {
+    const actual = singleNamespaceSerializer.savedObjectToRaw({
+      type: '',
+      attributes: {},
+    } as any);
+
+    expect(actual._source).not.toHaveProperty('originId');
+  });
+
   test('it copies the migrationVersion property to _source.migrationVersion', () => {
     const actual = singleNamespaceSerializer.savedObjectToRaw({
       type: '',
diff --git a/src/core/server/saved_objects/serialization/serializer.ts b/src/core/server/saved_objects/serialization/serializer.ts
index c0c09b6375bdf..145dd286c1ca8 100644
--- a/src/core/server/saved_objects/serialization/serializer.ts
+++ b/src/core/server/saved_objects/serialization/serializer.ts
@@ -62,7 +62,7 @@ export class SavedObjectsSerializer {
    */
   public rawToSavedObject(doc: SavedObjectsRawDoc): SavedObjectSanitizedDoc {
     const { _id, _source, _seq_no, _primary_term } = doc;
-    const { type, namespace, namespaces } = _source;
+    const { type, namespace, namespaces, originId } = _source;
 
     const version =
       _seq_no != null || _primary_term != null
@@ -74,6 +74,7 @@ export class SavedObjectsSerializer {
       id: this.trimIdPrefix(namespace, type, _id),
       ...(namespace && this.registry.isSingleNamespace(type) && { namespace }),
       ...(namespaces && this.registry.isMultiNamespace(type) && { namespaces }),
+      ...(originId && { originId }),
       attributes: _source[type],
       references: _source.references || [],
       ...(_source.migrationVersion && { migrationVersion: _source.migrationVersion }),
@@ -93,6 +94,7 @@ export class SavedObjectsSerializer {
       type,
       namespace,
       namespaces,
+      originId,
       attributes,
       migrationVersion,
       // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -106,6 +108,7 @@ export class SavedObjectsSerializer {
       references,
       ...(namespace && this.registry.isSingleNamespace(type) && { namespace }),
       ...(namespaces && this.registry.isMultiNamespace(type) && { namespaces }),
+      ...(originId && { originId }),
       ...(migrationVersion && { migrationVersion }),
       ...(updated_at && { updated_at }),
     };
diff --git a/src/core/server/saved_objects/serialization/types.ts b/src/core/server/saved_objects/serialization/types.ts
index acd2c7b5284aa..8b3eebceb2c5a 100644
--- a/src/core/server/saved_objects/serialization/types.ts
+++ b/src/core/server/saved_objects/serialization/types.ts
@@ -40,6 +40,7 @@ export interface SavedObjectsRawDocSource {
   migrationVersion?: SavedObjectsMigrationVersion;
   updated_at?: string;
   references?: SavedObjectReference[];
+  originId?: string;
 
   [typeMapping: string]: any;
 }
@@ -56,6 +57,7 @@ interface SavedObjectDoc<T = unknown> {
   migrationVersion?: SavedObjectsMigrationVersion;
   version?: string;
   updated_at?: string;
+  originId?: string;
 }
 
 interface Referencable {
diff --git a/src/core/server/saved_objects/service/lib/included_fields.test.ts b/src/core/server/saved_objects/service/lib/included_fields.test.ts
index ced99361f1ea0..356ffff398343 100644
--- a/src/core/server/saved_objects/service/lib/included_fields.test.ts
+++ b/src/core/server/saved_objects/service/lib/included_fields.test.ts
@@ -19,6 +19,8 @@
 
 import { includedFields } from './included_fields';
 
+const BASE_FIELD_COUNT = 9;
+
 describe('includedFields', () => {
   it('returns undefined if fields are not provided', () => {
     expect(includedFields()).toBe(undefined);
@@ -26,7 +28,7 @@ describe('includedFields', () => {
 
   it('accepts type string', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(8);
+    expect(fields).toHaveLength(BASE_FIELD_COUNT);
     expect(fields).toContain('type');
   });
 
@@ -42,6 +44,7 @@ Array [
   "references",
   "migrationVersion",
   "updated_at",
+  "originId",
   "foo",
 ]
 `);
@@ -49,14 +52,14 @@ Array [
 
   it('accepts field as string', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(8);
+    expect(fields).toHaveLength(BASE_FIELD_COUNT);
     expect(fields).toContain('config.foo');
   });
 
   it('accepts fields as an array', () => {
     const fields = includedFields('config', ['foo', 'bar']);
 
-    expect(fields).toHaveLength(10);
+    expect(fields).toHaveLength(BASE_FIELD_COUNT + 2);
     expect(fields).toContain('config.foo');
     expect(fields).toContain('config.bar');
   });
@@ -75,6 +78,7 @@ Array [
   "references",
   "migrationVersion",
   "updated_at",
+  "originId",
   "foo",
   "bar",
 ]
@@ -83,37 +87,43 @@ Array [
 
   it('includes namespace', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(8);
+    expect(fields).toHaveLength(BASE_FIELD_COUNT);
     expect(fields).toContain('namespace');
   });
 
   it('includes namespaces', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(8);
+    expect(fields).toHaveLength(BASE_FIELD_COUNT);
     expect(fields).toContain('namespaces');
   });
 
   it('includes references', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(8);
+    expect(fields).toHaveLength(BASE_FIELD_COUNT);
     expect(fields).toContain('references');
   });
 
   it('includes migrationVersion', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(8);
+    expect(fields).toHaveLength(BASE_FIELD_COUNT);
     expect(fields).toContain('migrationVersion');
   });
 
   it('includes updated_at', () => {
     const fields = includedFields('config', 'foo');
-    expect(fields).toHaveLength(8);
+    expect(fields).toHaveLength(BASE_FIELD_COUNT);
     expect(fields).toContain('updated_at');
   });
 
+  it('includes originId', () => {
+    const fields = includedFields('config', 'foo');
+    expect(fields).toHaveLength(BASE_FIELD_COUNT);
+    expect(fields).toContain('originId');
+  });
+
   it('uses wildcard when type is not provided', () => {
     const fields = includedFields(undefined, 'foo');
-    expect(fields).toHaveLength(8);
+    expect(fields).toHaveLength(BASE_FIELD_COUNT);
     expect(fields).toContain('*.foo');
   });
 
@@ -121,7 +131,7 @@ Array [
     it('includes legacy field path', () => {
       const fields = includedFields('config', ['foo', 'bar']);
 
-      expect(fields).toHaveLength(10);
+      expect(fields).toHaveLength(BASE_FIELD_COUNT + 2);
       expect(fields).toContain('foo');
       expect(fields).toContain('bar');
     });
diff --git a/src/core/server/saved_objects/service/lib/included_fields.ts b/src/core/server/saved_objects/service/lib/included_fields.ts
index 33bca49e3fc58..63d8f184ed2f2 100644
--- a/src/core/server/saved_objects/service/lib/included_fields.ts
+++ b/src/core/server/saved_objects/service/lib/included_fields.ts
@@ -42,5 +42,6 @@ export function includedFields(type: string | string[] = '*', fields?: string[]
     .concat('references')
     .concat('migrationVersion')
     .concat('updated_at')
+    .concat('originId')
     .concat(fields); // v5 compatibility
 }
diff --git a/src/core/server/saved_objects/service/lib/repository.mock.ts b/src/core/server/saved_objects/service/lib/repository.mock.ts
index afef378b7307b..c5fd260b78a9f 100644
--- a/src/core/server/saved_objects/service/lib/repository.mock.ts
+++ b/src/core/server/saved_objects/service/lib/repository.mock.ts
@@ -20,6 +20,7 @@
 import { ISavedObjectsRepository } from './repository';
 
 const create = (): jest.Mocked<ISavedObjectsRepository> => ({
+  checkConflicts: jest.fn(),
   create: jest.fn(),
   bulkCreate: jest.fn(),
   bulkUpdate: jest.fn(),
diff --git a/src/core/server/saved_objects/service/lib/repository.test.js b/src/core/server/saved_objects/service/lib/repository.test.js
index 6d85223d1fc88..39433981dfd59 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.js
+++ b/src/core/server/saved_objects/service/lib/repository.test.js
@@ -154,7 +154,7 @@ describe('SavedObjectsRepository', () => {
     validateDoc: jest.fn(),
   });
 
-  const getMockGetResponse = ({ type, id, references, namespace }) => ({
+  const getMockGetResponse = ({ type, id, references, namespace, originId }) => ({
     // NOTE: Elasticsearch returns more fields (_index, _type) but the SavedObjectsRepository method ignores these
     found: true,
     _id: `${registry.isSingleNamespace(type) && namespace ? `${namespace}:` : ''}${type}:${id}`,
@@ -162,6 +162,7 @@ describe('SavedObjectsRepository', () => {
     _source: {
       ...(registry.isSingleNamespace(type) && { namespace }),
       ...(registry.isMultiNamespace(type) && { namespaces: [namespace ?? 'default'] }),
+      ...(originId && { originId }),
       type,
       [type]: { title: 'Testing' },
       references,
@@ -187,13 +188,17 @@ describe('SavedObjectsRepository', () => {
   });
   const expectSuccess = ({ type, id }) => expect.toBeDocumentWithoutError(type, id);
   const expectError = ({ type, id }) => ({ type, id, error: expect.any(Object) });
-  const expectErrorResult = ({ type, id }, error) => ({ type, id, error });
-  const expectErrorNotFound = (obj) =>
-    expectErrorResult(obj, createGenericNotFoundError(obj.type, obj.id));
-  const expectErrorConflict = (obj) =>
-    expectErrorResult(obj, createConflictError(obj.type, obj.id));
-  const expectErrorInvalidType = (obj) =>
-    expectErrorResult(obj, createUnsupportedTypeError(obj.type, obj.id));
+  const expectErrorResult = ({ type, id }, error, overrides = {}) => ({
+    type,
+    id,
+    error: { ...error, ...overrides },
+  });
+  const expectErrorNotFound = (obj, overrides) =>
+    expectErrorResult(obj, createGenericNotFoundError(obj.type, obj.id), overrides);
+  const expectErrorConflict = (obj, overrides) =>
+    expectErrorResult(obj, createConflictError(obj.type, obj.id), overrides);
+  const expectErrorInvalidType = (obj, overrides) =>
+    expectErrorResult(obj, createUnsupportedTypeError(obj.type, obj.id), overrides);
 
   const expectMigrationArgs = (args, contains = true, n = 1) => {
     const obj = contains ? expect.objectContaining(args) : expect.not.objectContaining(args);
@@ -411,6 +416,7 @@ describe('SavedObjectsRepository', () => {
       id: '6.0.0-alpha1',
       attributes: { title: 'Test One' },
       references: [{ name: 'ref_0', type: 'test', id: '1' }],
+      originId: 'some-origin-id', // only one of the object args has an originId, this is intentional to test both a positive and negative case
     };
     const obj2 = {
       type: 'index-pattern',
@@ -422,13 +428,14 @@ describe('SavedObjectsRepository', () => {
 
     const getMockBulkCreateResponse = (objects, namespace) => {
       return {
-        items: objects.map(({ type, id, attributes, references, migrationVersion }) => ({
+        items: objects.map(({ type, id, originId, attributes, references, migrationVersion }) => ({
           create: {
             _id: `${namespace ? `${namespace}:` : ''}${type}:${id}`,
             _source: {
               [type]: attributes,
               type,
               namespace,
+              ...(originId && { originId }),
               references,
               ...mockTimestampFields,
               migrationVersion: migrationVersion || { [type]: '1.1.1' },
@@ -440,9 +447,9 @@ describe('SavedObjectsRepository', () => {
     };
 
     const bulkCreateSuccess = async (objects, options) => {
-      const multiNamespaceObjects =
-        options?.overwrite &&
-        objects.filter(({ type, id }) => registry.isMultiNamespace(type) && id);
+      const multiNamespaceObjects = objects.filter(
+        ({ type, id }) => registry.isMultiNamespace(type) && id
+      );
       if (multiNamespaceObjects?.length) {
         const response = getMockMgetResponse(multiNamespaceObjects, options?.namespace);
         client.mget.mockResolvedValue(
@@ -507,9 +514,9 @@ describe('SavedObjectsRepository', () => {
         expect(client.bulk).toHaveBeenCalledTimes(1);
       });
 
-      it(`should use the ES mget action before bulk action for any types that are multi-namespace, when overwrite=true`, async () => {
+      it(`should use the ES mget action before bulk action for any types that are multi-namespace, when id is defined`, async () => {
         const objects = [obj1, { ...obj2, type: MULTI_NAMESPACE_TYPE }];
-        await bulkCreateSuccess(objects, { overwrite: true });
+        await bulkCreateSuccess(objects);
         expect(client.bulk).toHaveBeenCalledTimes(1);
         expect(client.mget).toHaveBeenCalledTimes(1);
         const docs = [expect.objectContaining({ _id: `${MULTI_NAMESPACE_TYPE}:${obj2.id}` })];
@@ -748,8 +755,9 @@ describe('SavedObjectsRepository', () => {
           expect.objectContaining({ body: body2 }),
           expect.anything()
         );
+        const expectedError = expectErrorConflict(obj, { metadata: { isNotOverwritable: true } });
         expect(result).toEqual({
-          saved_objects: [expectSuccess(obj1), expectErrorConflict(obj), expectSuccess(obj2)],
+          saved_objects: [expectSuccess(obj1), expectedError, expectSuccess(obj2)],
         });
       });
 
@@ -911,6 +919,7 @@ describe('SavedObjectsRepository', () => {
           id: '1',
         },
       ],
+      originId: 'some-origin-id', // only one of the results has an originId, this is intentional to test both a positive and negative case
     };
     const obj2 = {
       type: 'index-pattern',
@@ -1045,6 +1054,7 @@ describe('SavedObjectsRepository', () => {
         type,
         id,
         namespaces: doc._source.namespaces ?? ['default'],
+        ...(doc._source.originId && { originId: doc._source.originId }),
         ...(doc._source.updated_at && { updated_at: doc._source.updated_at }),
         version: encodeHitVersion(doc),
         attributes: doc._source[type],
@@ -1115,21 +1125,29 @@ describe('SavedObjectsRepository', () => {
       attributes: { title: 'Test Two' },
     };
     const references = [{ name: 'ref_0', type: 'test', id: '1' }];
+    const originId = 'some-origin-id';
     const namespace = 'foo-namespace';
 
-    const getMockBulkUpdateResponse = (objects, options) => ({
+    const getMockBulkUpdateResponse = (objects, options, includeOriginId) => ({
       items: objects.map(({ type, id }) => ({
         update: {
           _id: `${
             registry.isSingleNamespace(type) && options?.namespace ? `${options?.namespace}:` : ''
           }${type}:${id}`,
           ...mockVersionProps,
+          get: {
+            _source: {
+              // "includeOriginId" is not an option for the operation; however, if the existing saved object contains an originId attribute, the
+              // operation will return it in the result. This flag is just used for test purposes to modify the mock cluster call response.
+              ...(includeOriginId && { originId }),
+            },
+          },
           result: 'updated',
         },
       })),
     });
 
-    const bulkUpdateSuccess = async (objects, options) => {
+    const bulkUpdateSuccess = async (objects, options, includeOriginId) => {
       const multiNamespaceObjects = objects.filter(({ type }) => registry.isMultiNamespace(type));
       if (multiNamespaceObjects?.length) {
         const response = getMockMgetResponse(multiNamespaceObjects, options?.namespace);
@@ -1137,7 +1155,7 @@ describe('SavedObjectsRepository', () => {
           elasticsearchClientMock.createSuccessTransportRequestPromise(response)
         );
       }
-      const response = getMockBulkUpdateResponse(objects, options?.namespace);
+      const response = getMockBulkUpdateResponse(objects, options?.namespace, includeOriginId);
       client.bulk.mockResolvedValueOnce(
         elasticsearchClientMock.createSuccessTransportRequestPromise(response)
       );
@@ -1443,9 +1461,10 @@ describe('SavedObjectsRepository', () => {
     });
 
     describe('returns', () => {
-      const expectSuccessResult = ({ type, id, attributes, references, namespaces }) => ({
+      const expectSuccessResult = ({ type, id, attributes, references, namespaces, originId }) => ({
         type,
         id,
+        originId,
         attributes,
         references,
         version: mockVersion,
@@ -1496,6 +1515,133 @@ describe('SavedObjectsRepository', () => {
           ],
         });
       });
+
+      it(`includes originId property if present in cluster call response`, async () => {
+        const obj = { type: MULTI_NAMESPACE_TYPE, id: 'three' };
+        const result = await bulkUpdateSuccess([obj1, obj], {}, true);
+        expect(result).toEqual({
+          saved_objects: [
+            expect.objectContaining({ originId }),
+            expect.objectContaining({ originId }),
+          ],
+        });
+      });
+    });
+  });
+
+  describe('#checkConflicts', () => {
+    const obj1 = { type: 'dashboard', id: 'one' };
+    const obj2 = { type: 'dashboard', id: 'two' };
+    const obj3 = { type: MULTI_NAMESPACE_TYPE, id: 'three' };
+    const obj4 = { type: MULTI_NAMESPACE_TYPE, id: 'four' };
+    const obj5 = { type: MULTI_NAMESPACE_TYPE, id: 'five' };
+    const obj6 = { type: NAMESPACE_AGNOSTIC_TYPE, id: 'six' };
+    const obj7 = { type: NAMESPACE_AGNOSTIC_TYPE, id: 'seven' };
+    const namespace = 'foo-namespace';
+
+    const checkConflicts = async (objects, options) =>
+      savedObjectsRepository.checkConflicts(
+        objects.map(({ type, id }) => ({ type, id })), // checkConflicts only uses type and id
+        options
+      );
+    const checkConflictsSuccess = async (objects, options) => {
+      const response = getMockMgetResponse(objects, options?.namespace);
+      client.mget.mockResolvedValue(
+        elasticsearchClientMock.createSuccessTransportRequestPromise(response)
+      );
+      const result = await checkConflicts(objects, options);
+      expect(client.mget).toHaveBeenCalledTimes(1);
+      return result;
+    };
+
+    const _expectClientCallArgs = (
+      objects,
+      { _index = expect.any(String), getId = () => expect.any(String) }
+    ) => {
+      expect(client.mget).toHaveBeenCalledWith(
+        expect.objectContaining({
+          body: {
+            docs: objects.map(({ type, id }) =>
+              expect.objectContaining({
+                _index,
+                _id: getId(type, id),
+              })
+            ),
+          },
+        }),
+        expect.anything()
+      );
+    };
+
+    describe('cluster calls', () => {
+      it(`doesn't make a cluster call if the objects array is empty`, async () => {
+        await checkConflicts([]);
+        expect(client.mget).not.toHaveBeenCalled();
+      });
+
+      it(`prepends namespace to the id when providing namespace for single-namespace type`, async () => {
+        const getId = (type, id) => `${namespace}:${type}:${id}`;
+        await checkConflictsSuccess([obj1, obj2], { namespace });
+        _expectClientCallArgs([obj1, obj2], { getId });
+      });
+
+      it(`doesn't prepend namespace to the id when providing no namespace for single-namespace type`, async () => {
+        const getId = (type, id) => `${type}:${id}`;
+        await checkConflictsSuccess([obj1, obj2]);
+        _expectClientCallArgs([obj1, obj2], { getId });
+      });
+
+      it(`doesn't prepend namespace to the id when not using single-namespace type`, async () => {
+        const getId = (type, id) => `${type}:${id}`;
+        // obj3 is multi-namespace, and obj6 is namespace-agnostic
+        await checkConflictsSuccess([obj3, obj6], { namespace });
+        _expectClientCallArgs([obj3, obj6], { getId });
+      });
+    });
+
+    describe('returns', () => {
+      it(`expected results`, async () => {
+        const unknownTypeObj = { type: 'unknownType', id: 'three' };
+        const hiddenTypeObj = { type: HIDDEN_TYPE, id: 'three' };
+        const objects = [unknownTypeObj, hiddenTypeObj, obj1, obj2, obj3, obj4, obj5, obj6, obj7];
+        const response = {
+          status: 200,
+          docs: [
+            getMockGetResponse(obj1),
+            { found: false },
+            getMockGetResponse(obj3),
+            getMockGetResponse({ ...obj4, namespace: 'bar-namespace' }),
+            { found: false },
+            getMockGetResponse(obj6),
+            { found: false },
+          ],
+        };
+        client.mget.mockResolvedValue(
+          elasticsearchClientMock.createSuccessTransportRequestPromise(response)
+        );
+
+        const result = await checkConflicts(objects);
+        expect(client.mget).toHaveBeenCalledTimes(1);
+        expect(result).toEqual({
+          errors: [
+            { ...unknownTypeObj, error: createUnsupportedTypeError(unknownTypeObj.type) },
+            { ...hiddenTypeObj, error: createUnsupportedTypeError(hiddenTypeObj.type) },
+            { ...obj1, error: createConflictError(obj1.type, obj1.id) },
+            // obj2 was not found so it does not result in a conflict error
+            { ...obj3, error: createConflictError(obj3.type, obj3.id) },
+            {
+              ...obj4,
+              error: {
+                ...createConflictError(obj4.type, obj4.id),
+                metadata: { isNotOverwritable: true },
+              },
+            },
+            // obj5 was not found so it does not result in a conflict error
+            { ...obj6, error: createConflictError(obj6.type, obj6.id) },
+            // obj7 was not found so it does not result in a conflict error
+          ],
+        });
+      });
     });
   });
 
@@ -1513,6 +1659,7 @@ describe('SavedObjectsRepository', () => {
     const attributes = { title: 'Logstash' };
     const id = 'logstash-*';
     const namespace = 'foo-namespace';
+    const originId = 'some-origin-id';
     const references = [
       {
         name: 'ref_0',
@@ -1594,6 +1741,26 @@ describe('SavedObjectsRepository', () => {
         await test(null);
       });
 
+      it(`defaults to no originId`, async () => {
+        await createSuccess(type, attributes, { id });
+        expect(client.create).toHaveBeenCalledWith(
+          expect.objectContaining({
+            body: expect.not.objectContaining({ originId: expect.anything() }),
+          }),
+          expect.anything()
+        );
+      });
+
+      it(`accepts custom originId`, async () => {
+        await createSuccess(type, attributes, { id, originId });
+        expect(client.create).toHaveBeenCalledWith(
+          expect.objectContaining({
+            body: expect.objectContaining({ originId }),
+          }),
+          expect.anything()
+        );
+      });
+
       it(`defaults to a refresh setting of wait_for`, async () => {
         await createSuccess(type, attributes);
         expect(client.create).toHaveBeenCalledWith(
@@ -1763,10 +1930,16 @@ describe('SavedObjectsRepository', () => {
 
     describe('returns', () => {
       it(`formats the ES response`, async () => {
-        const result = await createSuccess(type, attributes, { id, namespace, references });
+        const result = await createSuccess(type, attributes, {
+          id,
+          namespace,
+          references,
+          originId,
+        });
         expect(result).toEqual({
           type,
           id,
+          originId,
           ...mockTimestampFields,
           version: mockVersion,
           attributes,
@@ -2063,6 +2236,7 @@ describe('SavedObjectsRepository', () => {
               ...mockVersionProps,
               _source: {
                 namespace,
+                originId: 'some-origin-id', // only one of the results has an originId, this is intentional to test both a positive and negative case
                 type: 'index-pattern',
                 ...mockTimestampFields,
                 'index-pattern': {
@@ -2188,6 +2362,7 @@ describe('SavedObjectsRepository', () => {
               'references',
               'migrationVersion',
               'updated_at',
+              'originId',
               'title',
             ],
           }),
@@ -2283,6 +2458,7 @@ describe('SavedObjectsRepository', () => {
           expect(response.saved_objects[i]).toEqual({
             id: doc._id.replace(/(index-pattern|config|globalType)\:/, ''),
             type: doc._source.type,
+            originId: doc._source.originId,
             ...mockTimestampFields,
             version: mockVersion,
             score: doc._score,
@@ -2309,6 +2485,7 @@ describe('SavedObjectsRepository', () => {
           expect(response.saved_objects[i]).toEqual({
             id: doc._id.replace(/(foo-namespace\:)?(index-pattern|config|globalType)\:/, ''),
             type: doc._source.type,
+            originId: doc._source.originId,
             ...mockTimestampFields,
             version: mockVersion,
             score: doc._score,
@@ -2438,9 +2615,17 @@ describe('SavedObjectsRepository', () => {
     const type = 'index-pattern';
     const id = 'logstash-*';
     const namespace = 'foo-namespace';
+    const originId = 'some-origin-id';
 
-    const getSuccess = async (type, id, options) => {
-      const response = getMockGetResponse({ type, id, namespace: options?.namespace });
+    const getSuccess = async (type, id, options, includeOriginId) => {
+      const response = getMockGetResponse({
+        type,
+        id,
+        namespace: options?.namespace,
+        // "includeOriginId" is not an option for the operation; however, if the existing saved object contains an originId attribute, the
+        // operation will return it in the result. This flag is just used for test purposes to modify the mock cluster call response.
+        ...(includeOriginId && { originId }),
+      });
       client.get.mockResolvedValueOnce(
         elasticsearchClientMock.createSuccessTransportRequestPromise(response)
       );
@@ -2567,6 +2752,11 @@ describe('SavedObjectsRepository', () => {
           namespaces: ['default'],
         });
       });
+
+      it(`includes originId property if present in cluster call response`, async () => {
+        const result = await getSuccess(type, id, {}, true);
+        expect(result).toMatchObject({ originId });
+      });
     });
   });
 
@@ -2575,6 +2765,7 @@ describe('SavedObjectsRepository', () => {
     const id = 'one';
     const field = 'buildNum';
     const namespace = 'foo-namespace';
+    const originId = 'some-origin-id';
 
     const incrementCounterSuccess = async (type, id, field, options) => {
       const isMultiNamespace = registry.isMultiNamespace(type);
@@ -2764,6 +2955,7 @@ describe('SavedObjectsRepository', () => {
                   buildNum: 8468,
                   defaultIndex: 'logstash-*',
                 },
+                originId,
               },
             },
           })
@@ -2787,6 +2979,7 @@ describe('SavedObjectsRepository', () => {
             buildNum: 8468,
             defaultIndex: 'logstash-*',
           },
+          originId,
         });
       });
     });
@@ -3149,8 +3342,9 @@ describe('SavedObjectsRepository', () => {
         id: '1',
       },
     ];
+    const originId = 'some-origin-id';
 
-    const updateSuccess = async (type, id, attributes, options) => {
+    const updateSuccess = async (type, id, attributes, options, includeOriginId) => {
       if (registry.isMultiNamespace(type)) {
         const mockGetResponse = getMockGetResponse({ type, id, namespace: options?.namespace });
         client.get.mockResolvedValueOnce(
@@ -3167,6 +3361,10 @@ describe('SavedObjectsRepository', () => {
             _source: {
               namespaces: [options?.namespace ?? 'default'],
               namespace: options?.namespace,
+
+              // "includeOriginId" is not an option for the operation; however, if the existing saved object contains an originId attribute, the
+              // operation will return it in the result. This flag is just used for test purposes to modify the mock cluster call response.
+              ...(includeOriginId && { originId }),
             },
           },
         })
@@ -3299,7 +3497,7 @@ describe('SavedObjectsRepository', () => {
       it(`includes _source_includes when type is multi-namespace`, async () => {
         await updateSuccess(MULTI_NAMESPACE_TYPE, id, attributes);
         expect(client.update).toHaveBeenCalledWith(
-          expect.objectContaining({ _source_includes: ['namespace', 'namespaces'] }),
+          expect.objectContaining({ _source_includes: ['namespace', 'namespaces', 'originId'] }),
           expect.anything()
         );
       });
@@ -3308,7 +3506,7 @@ describe('SavedObjectsRepository', () => {
         await updateSuccess(type, id, attributes);
         expect(client.update).toHaveBeenLastCalledWith(
           expect.objectContaining({
-            _source_includes: ['namespace', 'namespaces'],
+            _source_includes: ['namespace', 'namespaces', 'originId'],
           }),
           expect.anything()
         );
@@ -3396,6 +3594,11 @@ describe('SavedObjectsRepository', () => {
           namespaces: ['default'],
         });
       });
+
+      it(`includes originId property if present in cluster call response`, async () => {
+        const result = await updateSuccess(type, id, attributes, {}, true);
+        expect(result).toMatchObject({ originId });
+      });
     });
   });
 });
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index 28d409f7b65bb..dd25989725f3e 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -29,7 +29,7 @@ import { getRootPropertiesObjects, IndexMapping } from '../../mappings';
 import { createRepositoryEsClient, RepositoryEsClient } from './repository_es_client';
 import { getSearchDsl } from './search_dsl';
 import { includedFields } from './included_fields';
-import { SavedObjectsErrorHelpers } from './errors';
+import { SavedObjectsErrorHelpers, DecoratedError } from './errors';
 import { decodeRequestVersion, encodeVersion, encodeHitVersion } from '../../version';
 import { KibanaMigrator } from '../../migrations';
 import {
@@ -43,6 +43,8 @@ import {
   SavedObjectsBulkGetObject,
   SavedObjectsBulkResponse,
   SavedObjectsBulkUpdateResponse,
+  SavedObjectsCheckConflictsObject,
+  SavedObjectsCheckConflictsResponse,
   SavedObjectsCreateOptions,
   SavedObjectsFindResponse,
   SavedObjectsFindResult,
@@ -222,6 +224,7 @@ export class SavedObjectsRepository {
       overwrite = false,
       references = [],
       refresh = DEFAULT_REFRESH_SETTING,
+      originId,
       version,
     } = options;
 
@@ -249,6 +252,7 @@ export class SavedObjectsRepository {
       type,
       ...(savedObjectNamespace && { namespace: savedObjectNamespace }),
       ...(savedObjectNamespaces && { namespaces: savedObjectNamespaces }),
+      originId,
       attributes,
       migrationVersion,
       updated_at: time,
@@ -300,14 +304,13 @@ export class SavedObjectsRepository {
           error: {
             id: object.id,
             type: object.type,
-            error: SavedObjectsErrorHelpers.createUnsupportedTypeError(object.type).output.payload,
+            error: errorContent(SavedObjectsErrorHelpers.createUnsupportedTypeError(object.type)),
           },
         };
       }
 
       const method = object.id && overwrite ? 'index' : 'create';
-      const requiresNamespacesCheck =
-        method === 'index' && this._registry.isMultiNamespace(object.type);
+      const requiresNamespacesCheck = object.id && this._registry.isMultiNamespace(object.type);
 
       if (object.id == null) object.id = uuid.v1();
 
@@ -366,7 +369,10 @@ export class SavedObjectsRepository {
             error: {
               id,
               type,
-              error: SavedObjectsErrorHelpers.createConflictError(type, id).output.payload,
+              error: {
+                ...errorContent(SavedObjectsErrorHelpers.createConflictError(type, id)),
+                metadata: { isNotOverwritable: true },
+              },
             },
           };
         }
@@ -394,6 +400,7 @@ export class SavedObjectsRepository {
             ...(savedObjectNamespaces && { namespaces: savedObjectNamespaces }),
             updated_at: time,
             references: object.references || [],
+            originId: object.originId,
           }) as SavedObjectSanitizedDoc
         ),
       };
@@ -449,6 +456,87 @@ export class SavedObjectsRepository {
     };
   }
 
+  /**
+   * Check what conflicts will result when creating a given array of saved objects. This includes "unresolvable conflicts", which are
+   * multi-namespace objects that exist in a different namespace; such conflicts cannot be resolved/overwritten.
+   */
+  async checkConflicts(
+    objects: SavedObjectsCheckConflictsObject[] = [],
+    options: SavedObjectsBaseOptions = {}
+  ): Promise<SavedObjectsCheckConflictsResponse> {
+    if (objects.length === 0) {
+      return { errors: [] };
+    }
+
+    const { namespace } = options;
+
+    let bulkGetRequestIndexCounter = 0;
+    const expectedBulkGetResults: Either[] = objects.map((object) => {
+      const { type, id } = object;
+
+      if (!this._allowedTypes.includes(type)) {
+        return {
+          tag: 'Left' as 'Left',
+          error: {
+            id,
+            type,
+            error: errorContent(SavedObjectsErrorHelpers.createUnsupportedTypeError(type)),
+          },
+        };
+      }
+
+      return {
+        tag: 'Right' as 'Right',
+        value: {
+          type,
+          id,
+          esRequestIndex: bulkGetRequestIndexCounter++,
+        },
+      };
+    });
+
+    const bulkGetDocs = expectedBulkGetResults.filter(isRight).map(({ value: { type, id } }) => ({
+      _id: this._serializer.generateRawId(namespace, type, id),
+      _index: this.getIndexForType(type),
+      _source: ['type', 'namespaces'],
+    }));
+    const bulkGetResponse = bulkGetDocs.length
+      ? await this.client.mget(
+          {
+            body: {
+              docs: bulkGetDocs,
+            },
+          },
+          { ignore: [404] }
+        )
+      : undefined;
+
+    const errors: SavedObjectsCheckConflictsResponse['errors'] = [];
+    expectedBulkGetResults.forEach((expectedResult) => {
+      if (isLeft(expectedResult)) {
+        errors.push(expectedResult.error as any);
+        return;
+      }
+
+      const { type, id, esRequestIndex } = expectedResult.value;
+      const doc = bulkGetResponse?.body.docs[esRequestIndex];
+      if (doc.found) {
+        errors.push({
+          id,
+          type,
+          error: {
+            ...errorContent(SavedObjectsErrorHelpers.createConflictError(type, id)),
+            ...(!this.rawDocExistsInNamespace(doc, namespace) && {
+              metadata: { isNotOverwritable: true },
+            }),
+          },
+        });
+      }
+    });
+
+    return { errors };
+  }
+
   /**
    * Deletes an object
    *
@@ -606,6 +694,7 @@ export class SavedObjectsRepository {
     search,
     defaultSearchOperator = 'OR',
     searchFields,
+    rootSearchFields,
     hasReference,
     page = 1,
     perPage = 20,
@@ -669,6 +758,7 @@ export class SavedObjectsRepository {
           search,
           defaultSearchOperator,
           searchFields,
+          rootSearchFields,
           type: allowedTypes,
           sortField,
           sortOrder,
@@ -740,7 +830,7 @@ export class SavedObjectsRepository {
           error: {
             id,
             type,
-            error: SavedObjectsErrorHelpers.createUnsupportedTypeError(type).output.payload,
+            error: errorContent(SavedObjectsErrorHelpers.createUnsupportedTypeError(type)),
           },
         };
       }
@@ -787,12 +877,11 @@ export class SavedObjectsRepository {
           return ({
             id,
             type,
-            error: SavedObjectsErrorHelpers.createGenericNotFoundError(type, id).output.payload,
+            error: errorContent(SavedObjectsErrorHelpers.createGenericNotFoundError(type, id)),
           } as any) as SavedObject<T>;
         }
 
-        const time = doc._source.updated_at;
-
+        const { originId, updated_at: updatedAt } = doc._source;
         let namespaces = [];
         if (!this._registry.isNamespaceAgnostic(type)) {
           namespaces = doc._source.namespaces ?? [getNamespaceString(doc._source.namespace)];
@@ -802,7 +891,8 @@ export class SavedObjectsRepository {
           id,
           type,
           namespaces,
-          ...(time && { updated_at: time }),
+          ...(originId && { originId }),
+          ...(updatedAt && { updated_at: updatedAt }),
           version: encodeHitVersion(doc),
           attributes: doc._source[type],
           references: doc._source.references || [],
@@ -847,7 +937,7 @@ export class SavedObjectsRepository {
       throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
     }
 
-    const { updated_at: updatedAt } = body._source;
+    const { originId, updated_at: updatedAt } = body._source;
 
     let namespaces: string[] = [];
     if (!this._registry.isNamespaceAgnostic(type)) {
@@ -858,6 +948,7 @@ export class SavedObjectsRepository {
       id,
       type,
       namespaces,
+      ...(originId && { originId }),
       ...(updatedAt && { updated_at: updatedAt }),
       version: encodeHitVersion(body),
       attributes: body._source[type],
@@ -912,7 +1003,7 @@ export class SavedObjectsRepository {
         body: {
           doc,
         },
-        _source_includes: ['namespace', 'namespaces'],
+        _source_includes: ['namespace', 'namespaces', 'originId'],
       },
       { ignore: [404] }
     );
@@ -922,6 +1013,7 @@ export class SavedObjectsRepository {
       throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
     }
 
+    const { originId } = body.get._source;
     let namespaces = [];
     if (!this._registry.isNamespaceAgnostic(type)) {
       namespaces = body.get._source.namespaces ?? [getNamespaceString(body.get._source.namespace)];
@@ -934,6 +1026,7 @@ export class SavedObjectsRepository {
       // @ts-expect-error update doesn't have _seq_no, _primary_term as Record<string, any> / any in LP
       version: encodeHitVersion(body),
       namespaces,
+      ...(originId && { originId }),
       references,
       attributes,
     };
@@ -1127,7 +1220,7 @@ export class SavedObjectsRepository {
           error: {
             id,
             type,
-            error: SavedObjectsErrorHelpers.createGenericNotFoundError(type, id).output.payload,
+            error: errorContent(SavedObjectsErrorHelpers.createGenericNotFoundError(type, id)),
           },
         };
       }
@@ -1196,7 +1289,7 @@ export class SavedObjectsRepository {
               error: {
                 id,
                 type,
-                error: SavedObjectsErrorHelpers.createGenericNotFoundError(type, id).output.payload,
+                error: errorContent(SavedObjectsErrorHelpers.createGenericNotFoundError(type, id)),
               },
             };
           }
@@ -1239,6 +1332,7 @@ export class SavedObjectsRepository {
       ? await this.client.bulk({
           refresh,
           body: bulkUpdateParams,
+          _source_includes: ['originId'],
         })
       : undefined;
 
@@ -1250,7 +1344,9 @@ export class SavedObjectsRepository {
 
         const { type, id, namespaces, documentToSave, esRequestIndex } = expectedResult.value;
         const response = bulkUpdateResponse?.body.items[esRequestIndex];
-        const { error, _seq_no: seqNo, _primary_term: primaryTerm } = Object.values(
+        // When a bulk update operation is completed, any fields specified in `_sourceIncludes` will be found in the "get" value of the
+        // returned object. We need to retrieve the `originId` if it exists so we can return it to the consumer.
+        const { error, _seq_no: seqNo, _primary_term: primaryTerm, get } = Object.values(
           response
         )[0] as any;
 
@@ -1263,10 +1359,13 @@ export class SavedObjectsRepository {
             error: getBulkOperationError(error, type, id),
           };
         }
+
+        const { originId } = get._source;
         return {
           id,
           type,
           ...(namespaces && { namespaces }),
+          ...(originId && { originId }),
           updated_at,
           version: encodeVersion(seqNo, primaryTerm),
           attributes,
@@ -1291,7 +1390,7 @@ export class SavedObjectsRepository {
     id: string,
     counterFieldName: string,
     options: SavedObjectsIncrementCounterOptions = {}
-  ) {
+  ): Promise<SavedObject> {
     if (typeof type !== 'string') {
       throw new Error('"type" argument must be a string');
     }
@@ -1354,9 +1453,12 @@ export class SavedObjectsRepository {
       },
     });
 
+    const { originId } = body.get._source;
     return {
       id,
       type,
+      ...(savedObjectNamespaces && { namespaces: savedObjectNamespaces }),
+      ...(originId && { originId }),
       updated_at: time,
       references: body.get._source.references,
       // @ts-expect-error
@@ -1493,9 +1595,9 @@ export class SavedObjectsRepository {
 function getBulkOperationError(error: { type: string; reason?: string }, type: string, id: string) {
   switch (error.type) {
     case 'version_conflict_engine_exception':
-      return SavedObjectsErrorHelpers.createConflictError(type, id).output.payload;
+      return errorContent(SavedObjectsErrorHelpers.createConflictError(type, id));
     case 'document_missing_exception':
-      return SavedObjectsErrorHelpers.createGenericNotFoundError(type, id).output.payload;
+      return errorContent(SavedObjectsErrorHelpers.createGenericNotFoundError(type, id));
     default:
       return {
         message: error.reason || JSON.stringify(error),
@@ -1547,4 +1649,9 @@ function getSavedObjectNamespaces(
   return [getNamespaceString(namespace)];
 }
 
+/**
+ * Extracts the contents of a decorated error to return the attributes for bulk operations.
+ */
+const errorContent = (error: DecoratedError) => error.output.payload;
+
 const unique = (array: string[]) => [...new Set(array)];
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts
index f916638c5251b..85c47029e36d5 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/query_params.test.ts
@@ -309,13 +309,19 @@ describe('#getQueryParams', () => {
       });
     });
 
-    describe('`searchFields` parameter', () => {
+    describe('`searchFields` and `rootSearchFields` parameters', () => {
       const getExpectedFields = (searchFields: string[], typeOrTypes: string | string[]) => {
         const types = Array.isArray(typeOrTypes) ? typeOrTypes : [typeOrTypes];
         return searchFields.map((x) => types.map((y) => `${y}.${x}`)).flat();
       };
 
-      const test = (searchFields: string[]) => {
+      const test = ({
+        searchFields,
+        rootSearchFields,
+      }: {
+        searchFields?: string[];
+        rootSearchFields?: string[];
+      }) => {
         for (const typeOrTypes of ALL_TYPE_SUBSETS) {
           const result = getQueryParams({
             mappings,
@@ -323,8 +329,12 @@ describe('#getQueryParams', () => {
             type: typeOrTypes,
             search,
             searchFields,
+            rootSearchFields,
           });
-          const fields = getExpectedFields(searchFields, typeOrTypes);
+          let fields = rootSearchFields || [];
+          if (searchFields) {
+            fields = fields.concat(getExpectedFields(searchFields, typeOrTypes));
+          }
           expectResult(result, expect.objectContaining({ fields }));
         }
         // also test with no specified type/s
@@ -334,31 +344,63 @@ describe('#getQueryParams', () => {
           type: undefined,
           search,
           searchFields,
+          rootSearchFields,
         });
-        const fields = getExpectedFields(searchFields, ALL_TYPES);
+        let fields = rootSearchFields || [];
+        if (searchFields) {
+          fields = fields.concat(getExpectedFields(searchFields, ALL_TYPES));
+        }
         expectResult(result, expect.objectContaining({ fields }));
       };
 
-      it('includes lenient flag and all fields when `searchFields` is not specified', () => {
+      it('throws an error if a raw search field contains a "." character', () => {
+        expect(() =>
+          getQueryParams({
+            mappings,
+            registry,
+            type: undefined,
+            search,
+            searchFields: undefined,
+            rootSearchFields: ['foo', 'bar.baz'],
+          })
+        ).toThrowErrorMatchingInlineSnapshot(
+          `"rootSearchFields entry \\"bar.baz\\" is invalid: cannot contain \\".\\" character"`
+        );
+      });
+
+      it('includes lenient flag and all fields when `searchFields` and `rootSearchFields` are not specified', () => {
         const result = getQueryParams({
           mappings,
           registry,
           search,
           searchFields: undefined,
+          rootSearchFields: undefined,
         });
         expectResult(result, expect.objectContaining({ lenient: true, fields: ['*'] }));
       });
 
       it('includes specified search fields for appropriate type/s', () => {
-        test(['title']);
+        test({ searchFields: ['title'] });
       });
 
       it('supports boosting', () => {
-        test(['title^3']);
+        test({ searchFields: ['title^3'] });
+      });
+
+      it('supports multiple search fields', () => {
+        test({ searchFields: ['title, title.raw'] });
+      });
+
+      it('includes specified raw search fields', () => {
+        test({ rootSearchFields: ['_id'] });
+      });
+
+      it('supports multiple raw search fields', () => {
+        test({ rootSearchFields: ['_id', 'originId'] });
       });
 
-      it('supports multiple fields', () => {
-        test(['title, title.raw']);
+      it('supports search fields and raw search fields', () => {
+        test({ searchFields: ['title'], rootSearchFields: ['_id'] });
       });
     });
 
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts b/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts
index 164756f9796a5..ad1a08187dc32 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/query_params.ts
@@ -39,17 +39,27 @@ function getTypes(mappings: IndexMapping, type?: string | string[]) {
 }
 
 /**
- *  Get the field params based on the types and searchFields
+ *  Get the field params based on the types, searchFields, and rootSearchFields
  */
-function getFieldsForTypes(types: string[], searchFields?: string[]) {
-  if (!searchFields || !searchFields.length) {
+function getFieldsForTypes(
+  types: string[],
+  searchFields: string[] = [],
+  rootSearchFields: string[] = []
+) {
+  if (!searchFields.length && !rootSearchFields.length) {
     return {
       lenient: true,
       fields: ['*'],
     };
   }
 
-  let fields: string[] = [];
+  let fields = [...rootSearchFields];
+  fields.forEach((field) => {
+    if (field.indexOf('.') !== -1) {
+      throw new Error(`rootSearchFields entry "${field}" is invalid: cannot contain "." character`);
+    }
+  });
+
   for (const field of searchFields) {
     fields = fields.concat(types.map((prefix) => `${prefix}.${field}`));
   }
@@ -119,6 +129,7 @@ interface QueryParams {
   type?: string | string[];
   search?: string;
   searchFields?: string[];
+  rootSearchFields?: string[];
   defaultSearchOperator?: string;
   hasReference?: HasReferenceQueryParams;
   kueryNode?: KueryNode;
@@ -134,6 +145,7 @@ export function getQueryParams({
   type,
   search,
   searchFields,
+  rootSearchFields,
   defaultSearchOperator,
   hasReference,
   kueryNode,
@@ -199,7 +211,7 @@ export function getQueryParams({
       {
         simple_query_string: {
           query: search,
-          ...getFieldsForTypes(types, searchFields),
+          ...getFieldsForTypes(types, searchFields, rootSearchFields),
           ...(defaultSearchOperator ? { default_operator: defaultSearchOperator } : {}),
         },
       },
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.test.ts
index 08ad72397e4a2..62e629ad33cc8 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.test.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.test.ts
@@ -57,12 +57,13 @@ describe('getSearchDsl', () => {
   });
 
   describe('passes control', () => {
-    it('passes (mappings, schema, namespaces, type, search, searchFields, hasReference) to getQueryParams', () => {
+    it('passes (mappings, schema, namespaces, type, search, searchFields, rootSearchFields, hasReference) to getQueryParams', () => {
       const opts = {
         namespaces: ['foo-namespace'],
         type: 'foo',
         search: 'bar',
         searchFields: ['baz'],
+        rootSearchFields: ['qux'],
         defaultSearchOperator: 'AND',
         hasReference: {
           type: 'bar',
@@ -79,6 +80,7 @@ describe('getSearchDsl', () => {
         type: opts.type,
         search: opts.search,
         searchFields: opts.searchFields,
+        rootSearchFields: opts.rootSearchFields,
         defaultSearchOperator: opts.defaultSearchOperator,
         hasReference: opts.hasReference,
       });
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts
index 6de868c320240..ddf20606800c8 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts
@@ -31,6 +31,7 @@ interface GetSearchDslOptions {
   search?: string;
   defaultSearchOperator?: string;
   searchFields?: string[];
+  rootSearchFields?: string[];
   sortField?: string;
   sortOrder?: string;
   namespaces?: string[];
@@ -51,6 +52,7 @@ export function getSearchDsl(
     search,
     defaultSearchOperator,
     searchFields,
+    rootSearchFields,
     sortField,
     sortOrder,
     namespaces,
@@ -74,6 +76,7 @@ export function getSearchDsl(
       type,
       search,
       searchFields,
+      rootSearchFields,
       defaultSearchOperator,
       hasReference,
       kueryNode,
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts
index c7a4b7df06547..a44b21aef5706 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts
@@ -178,6 +178,20 @@ describe('searchDsl/getSortParams', () => {
         });
       });
     });
+    describe('sortField is root simple property with single type', () => {
+      it('returns correct params', () => {
+        expect(getSortingParams(MAPPINGS, ['saved'], 'type', 'desc')).toEqual({
+          sort: [
+            {
+              type: {
+                order: 'desc',
+                unmapped_type: 'text',
+              },
+            },
+          ],
+        });
+      });
+    });
     describe('sortField is root simple property with multiple type', () => {
       it('returns correct params', () => {
         expect(getSortingParams(MAPPINGS, ['saved', 'pending'], 'type', 'desc')).toEqual({
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts
index f850954e84323..ccf5ccd50bb75 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts
@@ -67,10 +67,15 @@ export function getSortingParams(
   }
 
   const [typeField] = types;
-  const key = `${typeField}.${sortField}`;
-  const field = getProperty(mappings, key);
+  let key = `${typeField}.${sortField}`;
+  let field = getProperty(mappings, key);
   if (!field) {
-    throw Boom.badRequest(`Unknown sort field ${sortField}`);
+    // type field does not exist, try checking the root properties
+    key = sortField;
+    field = getProperty(mappings, sortField);
+    if (!field) {
+      throw Boom.badRequest(`Unknown sort field ${sortField}`);
+    }
   }
 
   return {
diff --git a/src/core/server/saved_objects/service/saved_objects_client.mock.ts b/src/core/server/saved_objects/service/saved_objects_client.mock.ts
index b209c9ca54f63..3b0789970cc6b 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.mock.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.mock.ts
@@ -25,6 +25,7 @@ const create = () =>
     errors: SavedObjectsErrorHelpers,
     create: jest.fn(),
     bulkCreate: jest.fn(),
+    checkConflicts: jest.fn(),
     bulkUpdate: jest.fn(),
     delete: jest.fn(),
     bulkGet: jest.fn(),
diff --git a/src/core/server/saved_objects/service/saved_objects_client.test.js b/src/core/server/saved_objects/service/saved_objects_client.test.js
index 53bb31369adbf..47011414cbc7f 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.test.js
+++ b/src/core/server/saved_objects/service/saved_objects_client.test.js
@@ -35,6 +35,21 @@ test(`#create`, async () => {
   expect(result).toBe(returnValue);
 });
 
+test(`#checkConflicts`, async () => {
+  const returnValue = Symbol();
+  const mockRepository = {
+    checkConflicts: jest.fn().mockResolvedValue(returnValue),
+  };
+  const client = new SavedObjectsClient(mockRepository);
+
+  const objects = Symbol();
+  const options = Symbol();
+  const result = await client.checkConflicts(objects, options);
+
+  expect(mockRepository.checkConflicts).toHaveBeenCalledWith(objects, options);
+  expect(result).toBe(returnValue);
+});
+
 test(`#bulkCreate`, async () => {
   const returnValue = Symbol();
   const mockRepository = {
diff --git a/src/core/server/saved_objects/service/saved_objects_client.ts b/src/core/server/saved_objects/service/saved_objects_client.ts
index 812669ee108a2..347c760f841bc 100644
--- a/src/core/server/saved_objects/service/saved_objects_client.ts
+++ b/src/core/server/saved_objects/service/saved_objects_client.ts
@@ -20,6 +20,7 @@
 import { ISavedObjectsRepository } from './lib';
 import {
   SavedObject,
+  SavedObjectError,
   SavedObjectReference,
   SavedObjectsMigrationVersion,
   SavedObjectsBaseOptions,
@@ -47,6 +48,8 @@ export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions {
   references?: SavedObjectReference[];
   /** The Elasticsearch Refresh setting for this operation */
   refresh?: MutatingOperationRefreshSetting;
+  /** Optional ID of the original saved object, if this object's `id` was regenerated */
+  originId?: string;
 }
 
 /**
@@ -61,6 +64,8 @@ export interface SavedObjectsBulkCreateObject<T = unknown> {
   references?: SavedObjectReference[];
   /** {@inheritDoc SavedObjectsMigrationVersion} */
   migrationVersion?: SavedObjectsMigrationVersion;
+  /** Optional ID of the original saved object, if this object's `id` was regenerated */
+  originId?: string;
 }
 
 /**
@@ -111,6 +116,27 @@ export interface SavedObjectsFindResponse<T = unknown> {
   page: number;
 }
 
+/**
+ *
+ * @public
+ */
+export interface SavedObjectsCheckConflictsObject {
+  id: string;
+  type: string;
+}
+
+/**
+ *
+ * @public
+ */
+export interface SavedObjectsCheckConflictsResponse {
+  errors: Array<{
+    id: string;
+    type: string;
+    error: SavedObjectError;
+  }>;
+}
+
 /**
  *
  * @public
@@ -256,6 +282,20 @@ export class SavedObjectsClient {
     return await this._repository.bulkCreate(objects, options);
   }
 
+  /**
+   * Check what conflicts will result when creating a given array of saved objects. This includes "unresolvable conflicts", which are
+   * multi-namespace objects that exist in a different namespace; such conflicts cannot be resolved/overwritten.
+   *
+   * @param objects
+   * @param options
+   */
+  async checkConflicts(
+    objects: SavedObjectsCheckConflictsObject[] = [],
+    options: SavedObjectsBaseOptions = {}
+  ): Promise<SavedObjectsCheckConflictsResponse> {
+    return await this._repository.checkConflicts(objects, options);
+  }
+
   /**
    * Deletes a SavedObject
    *
diff --git a/src/core/server/saved_objects/types.ts b/src/core/server/saved_objects/types.ts
index f9301d6598b1d..edbdbe4d16784 100644
--- a/src/core/server/saved_objects/types.ts
+++ b/src/core/server/saved_objects/types.ts
@@ -24,7 +24,9 @@ import { PropertyValidators } from './validation';
 
 export {
   SavedObjectsImportResponse,
+  SavedObjectsImportSuccess,
   SavedObjectsImportConflictError,
+  SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportUnsupportedTypeError,
   SavedObjectsImportMissingReferencesError,
   SavedObjectsImportUnknownError,
@@ -42,6 +44,7 @@ export {
   SavedObjectAttribute,
   SavedObjectAttributeSingle,
   SavedObject,
+  SavedObjectError,
   SavedObjectReference,
   SavedObjectsMigrationVersion,
 } from '../../types';
@@ -79,6 +82,11 @@ export interface SavedObjectsFindOptions {
   search?: string;
   /** The fields to perform the parsed query against. See Elasticsearch Simple Query String `fields` argument for more information */
   searchFields?: string[];
+  /**
+   * The fields to perform the parsed query against. Unlike the `searchFields` argument, these are expected to be root fields and will not
+   * be modified. If used in conjunction with `searchFields`, both are concatenated together.
+   */
+  rootSearchFields?: string[];
   hasReference?: { type: string; id: string };
   defaultSearchOperator?: 'AND' | 'OR';
   filter?: string;
@@ -172,9 +180,6 @@ export type SavedObjectsClientContract = Pick<SavedObjectsClient, keyof SavedObj
  *  * multiple: this type of saved object is shareable, e.g., it can exist in one or more namespaces.
  *  * agnostic: this type of saved object is global.
  *
- * Note: do not write logic that uses this value directly; instead, use the appropriate accessors in the
- * {@link SavedObjectTypeRegistry | type registry}.
- *
  * @public
  */
 export type SavedObjectsNamespaceType = 'single' | 'multiple' | 'agnostic';
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 6186906bc3a42..49c97d837579d 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -975,7 +975,7 @@ export interface ImageValidation {
 }
 
 // @public
-export function importSavedObjectsFromStream({ readStream, objectLimit, overwrite, savedObjectsClient, supportedTypes, namespace, }: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
+export function importSavedObjectsFromStream({ readStream, objectLimit, overwrite, createNewCopies, savedObjectsClient, typeRegistry, namespace, }: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse>;
 
 // @public @deprecated (undocumented)
 export interface IndexSettingsDeprecationInfo {
@@ -1860,7 +1860,7 @@ export type RequestHandlerContextProvider<TContextName extends keyof RequestHand
 export type RequestHandlerWrapper = <P, Q, B, Method extends RouteMethod = any, ResponseFactory extends KibanaResponseFactory = KibanaResponseFactory>(handler: RequestHandler<P, Q, B, Method, ResponseFactory>) => RequestHandler<P, Q, B, Method, ResponseFactory>;
 
 // @public
-export function resolveSavedObjectsImportErrors({ readStream, objectLimit, retries, savedObjectsClient, supportedTypes, namespace, }: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse>;
+export function resolveSavedObjectsImportErrors({ readStream, objectLimit, retries, savedObjectsClient, typeRegistry, namespace, createNewCopies, }: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse>;
 
 // @public
 export type ResponseError = string | Error | {
@@ -1966,14 +1966,14 @@ export type SafeRouteMethod = 'get' | 'options';
 // @public (undocumented)
 export interface SavedObject<T = unknown> {
     attributes: T;
+    // Warning: (ae-forgotten-export) The symbol "SavedObjectError" needs to be exported by the entry point index.d.ts
+    //
     // (undocumented)
-    error?: {
-        message: string;
-        statusCode: number;
-    };
+    error?: SavedObjectError;
     id: string;
     migrationVersion?: SavedObjectsMigrationVersion;
     namespaces?: string[];
+    originId?: string;
     references: SavedObjectReference[];
     type: string;
     updated_at?: string;
@@ -2045,6 +2045,7 @@ export interface SavedObjectsBulkCreateObject<T = unknown> {
     // (undocumented)
     id?: string;
     migrationVersion?: SavedObjectsMigrationVersion;
+    originId?: string;
     // (undocumented)
     references?: SavedObjectReference[];
     // (undocumented)
@@ -2092,6 +2093,24 @@ export interface SavedObjectsBulkUpdateResponse<T = unknown> {
     saved_objects: Array<SavedObjectsUpdateResponse<T>>;
 }
 
+// @public (undocumented)
+export interface SavedObjectsCheckConflictsObject {
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    type: string;
+}
+
+// @public (undocumented)
+export interface SavedObjectsCheckConflictsResponse {
+    // (undocumented)
+    errors: Array<{
+        id: string;
+        type: string;
+        error: SavedObjectError;
+    }>;
+}
+
 // @public (undocumented)
 export class SavedObjectsClient {
     // @internal
@@ -2100,6 +2119,7 @@ export class SavedObjectsClient {
     bulkCreate<T = unknown>(objects: Array<SavedObjectsBulkCreateObject<T>>, options?: SavedObjectsCreateOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkGet<T = unknown>(objects?: SavedObjectsBulkGetObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkUpdate<T = unknown>(objects: Array<SavedObjectsBulkUpdateObject<T>>, options?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
+    checkConflicts(objects?: SavedObjectsCheckConflictsObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsCheckConflictsResponse>;
     create<T = unknown>(type: string, attributes: T, options?: SavedObjectsCreateOptions): Promise<SavedObject<T>>;
     delete(type: string, id: string, options?: SavedObjectsDeleteOptions): Promise<{}>;
     deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<SavedObjectsDeleteFromNamespacesResponse>;
@@ -2181,6 +2201,7 @@ export interface SavedObjectsCoreFieldMapping {
 export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions {
     id?: string;
     migrationVersion?: SavedObjectsMigrationVersion;
+    originId?: string;
     overwrite?: boolean;
     // (undocumented)
     references?: SavedObjectReference[];
@@ -2313,6 +2334,7 @@ export interface SavedObjectsFindOptions {
     // (undocumented)
     perPage?: number;
     preference?: string;
+    rootSearchFields?: string[];
     search?: string;
     searchFields?: string[];
     // (undocumented)
@@ -2340,8 +2362,22 @@ export interface SavedObjectsFindResult<T = unknown> extends SavedObject<T> {
     score: number;
 }
 
+// @public
+export interface SavedObjectsImportAmbiguousConflictError {
+    // (undocumented)
+    destinations: Array<{
+        id: string;
+        title?: string;
+        updatedAt?: string;
+    }>;
+    // (undocumented)
+    type: 'ambiguous_conflict';
+}
+
 // @public
 export interface SavedObjectsImportConflictError {
+    // (undocumented)
+    destinationId?: string;
     // (undocumented)
     type: 'conflict';
 }
@@ -2349,10 +2385,16 @@ export interface SavedObjectsImportConflictError {
 // @public
 export interface SavedObjectsImportError {
     // (undocumented)
-    error: SavedObjectsImportConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
+    error: SavedObjectsImportConflictError | SavedObjectsImportAmbiguousConflictError | SavedObjectsImportUnsupportedTypeError | SavedObjectsImportMissingReferencesError | SavedObjectsImportUnknownError;
     // (undocumented)
     id: string;
     // (undocumented)
+    meta: {
+        title?: string;
+        icon?: string;
+    };
+    overwrite?: boolean;
+    // @deprecated (undocumented)
     title?: string;
     // (undocumented)
     type: string;
@@ -2360,11 +2402,6 @@ export interface SavedObjectsImportError {
 
 // @public
 export interface SavedObjectsImportMissingReferencesError {
-    // (undocumented)
-    blocking: Array<{
-        type: string;
-        id: string;
-    }>;
     // (undocumented)
     references: Array<{
         type: string;
@@ -2376,12 +2413,13 @@ export interface SavedObjectsImportMissingReferencesError {
 
 // @public
 export interface SavedObjectsImportOptions {
+    createNewCopies: boolean;
     namespace?: string;
     objectLimit: number;
     overwrite: boolean;
     readStream: Readable;
     savedObjectsClient: SavedObjectsClientContract;
-    supportedTypes: string[];
+    typeRegistry: ISavedObjectTypeRegistry;
 }
 
 // @public
@@ -2392,12 +2430,17 @@ export interface SavedObjectsImportResponse {
     success: boolean;
     // (undocumented)
     successCount: number;
+    // (undocumented)
+    successResults?: SavedObjectsImportSuccess[];
 }
 
 // @public
 export interface SavedObjectsImportRetry {
+    createNewCopy?: boolean;
+    destinationId?: string;
     // (undocumented)
     id: string;
+    ignoreMissingReferences?: boolean;
     // (undocumented)
     overwrite: boolean;
     // (undocumented)
@@ -2410,6 +2453,23 @@ export interface SavedObjectsImportRetry {
     type: string;
 }
 
+// @public
+export interface SavedObjectsImportSuccess {
+    // @deprecated (undocumented)
+    createNewCopy?: boolean;
+    destinationId?: string;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    meta: {
+        title?: string;
+        icon?: string;
+    };
+    overwrite?: boolean;
+    // (undocumented)
+    type: string;
+}
+
 // @public
 export interface SavedObjectsImportUnknownError {
     // (undocumented)
@@ -2511,6 +2571,7 @@ export class SavedObjectsRepository {
     bulkCreate<T = unknown>(objects: Array<SavedObjectsBulkCreateObject<T>>, options?: SavedObjectsCreateOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkGet<T = unknown>(objects?: SavedObjectsBulkGetObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsBulkResponse<T>>;
     bulkUpdate<T = unknown>(objects: Array<SavedObjectsBulkUpdateObject<T>>, options?: SavedObjectsBulkUpdateOptions): Promise<SavedObjectsBulkUpdateResponse<T>>;
+    checkConflicts(objects?: SavedObjectsCheckConflictsObject[], options?: SavedObjectsBaseOptions): Promise<SavedObjectsCheckConflictsResponse>;
     create<T = unknown>(type: string, attributes: T, options?: SavedObjectsCreateOptions): Promise<SavedObject<T>>;
     // Warning: (ae-forgotten-export) The symbol "KibanaMigrator" needs to be exported by the entry point index.d.ts
     //
@@ -2520,16 +2581,9 @@ export class SavedObjectsRepository {
     deleteByNamespace(namespace: string, options?: SavedObjectsDeleteByNamespaceOptions): Promise<any>;
     deleteFromNamespaces(type: string, id: string, namespaces: string[], options?: SavedObjectsDeleteFromNamespacesOptions): Promise<SavedObjectsDeleteFromNamespacesResponse>;
     // (undocumented)
-    find<T = unknown>({ search, defaultSearchOperator, searchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, }: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
+    find<T = unknown>({ search, defaultSearchOperator, searchFields, rootSearchFields, hasReference, page, perPage, sortField, sortOrder, fields, namespaces, type, filter, preference, }: SavedObjectsFindOptions): Promise<SavedObjectsFindResponse<T>>;
     get<T = unknown>(type: string, id: string, options?: SavedObjectsBaseOptions): Promise<SavedObject<T>>;
-    incrementCounter(type: string, id: string, counterFieldName: string, options?: SavedObjectsIncrementCounterOptions): Promise<{
-        id: string;
-        type: string;
-        updated_at: string;
-        references: any;
-        version: string;
-        attributes: any;
-    }>;
+    incrementCounter(type: string, id: string, counterFieldName: string, options?: SavedObjectsIncrementCounterOptions): Promise<SavedObject>;
     update<T = unknown>(type: string, id: string, attributes: Partial<T>, options?: SavedObjectsUpdateOptions): Promise<SavedObjectsUpdateResponse<T>>;
 }
 
@@ -2541,12 +2595,13 @@ export interface SavedObjectsRepositoryFactory {
 
 // @public
 export interface SavedObjectsResolveImportErrorsOptions {
+    createNewCopies: boolean;
     namespace?: string;
     objectLimit: number;
     readStream: Readable;
     retries: SavedObjectsImportRetry[];
     savedObjectsClient: SavedObjectsClientContract;
-    supportedTypes: string[];
+    typeRegistry: ISavedObjectTypeRegistry;
 }
 
 // @internal @deprecated (undocumented)
diff --git a/src/core/types/saved_objects.ts b/src/core/types/saved_objects.ts
index 04aaacc3cf31a..9abc093c74fb3 100644
--- a/src/core/types/saved_objects.ts
+++ b/src/core/types/saved_objects.ts
@@ -86,10 +86,7 @@ export interface SavedObject<T = unknown> {
   version?: string;
   /** Timestamp of the last time this document had been updated.  */
   updated_at?: string;
-  error?: {
-    message: string;
-    statusCode: number;
-  };
+  error?: SavedObjectError;
   /** {@inheritdoc SavedObjectAttributes} */
   attributes: T;
   /** {@inheritdoc SavedObjectReference} */
@@ -98,4 +95,18 @@ export interface SavedObject<T = unknown> {
   migrationVersion?: SavedObjectsMigrationVersion;
   /** Namespace(s) that this saved object exists in. This attribute is only used for multi-namespace saved object types. */
   namespaces?: string[];
+  /**
+   * The ID of the saved object this originated from. This is set if this object's `id` 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.
+   */
+  originId?: string;
+}
+
+export interface SavedObjectError {
+  error: string;
+  message: string;
+  statusCode: number;
+  metadata?: Record<string, unknown>;
 }
diff --git a/src/plugins/saved_objects_management/common/types.ts b/src/plugins/saved_objects_management/common/types.ts
index be52d8e6486e2..1f9f26b0ddb98 100644
--- a/src/plugins/saved_objects_management/common/types.ts
+++ b/src/plugins/saved_objects_management/common/types.ts
@@ -18,6 +18,7 @@
  */
 
 import { SavedObject } from 'src/core/types';
+import { SavedObjectsNamespaceType } from 'src/core/public';
 
 /**
  * The metadata injected into a {@link SavedObject | saved object} when returning
@@ -28,6 +29,7 @@ export interface SavedObjectMetadata {
   title?: string;
   editUrl?: string;
   inAppUrl?: { path: string; uiCapabilitiesPath: string };
+  namespaceType?: SavedObjectsNamespaceType;
 }
 
 /**
diff --git a/src/plugins/saved_objects_management/public/index.ts b/src/plugins/saved_objects_management/public/index.ts
index 6663409c259d5..c85d66c0ac38b 100644
--- a/src/plugins/saved_objects_management/public/index.ts
+++ b/src/plugins/saved_objects_management/public/index.ts
@@ -25,11 +25,14 @@ export {
   SavedObjectsManagementActionServiceSetup,
   SavedObjectsManagementActionServiceStart,
   SavedObjectsManagementAction,
+  SavedObjectsManagementColumnServiceSetup,
+  SavedObjectsManagementColumnServiceStart,
+  SavedObjectsManagementColumn,
   SavedObjectsManagementRecord,
   ISavedObjectsManagementServiceRegistry,
   SavedObjectsManagementServiceRegistryEntry,
 } from './services';
-export { ProcessedImportResponse, processImportResponse } from './lib';
+export { ProcessedImportResponse, processImportResponse, FailedImport } from './lib';
 export { SavedObjectRelation, SavedObjectWithMetadata, SavedObjectMetadata } from './types';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/plugins/saved_objects_management/public/lib/find_objects.ts b/src/plugins/saved_objects_management/public/lib/find_objects.ts
index 5a77d3ae2f663..530dcc4648d8c 100644
--- a/src/plugins/saved_objects_management/public/lib/find_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/find_objects.ts
@@ -41,3 +41,13 @@ export async function findObjects(
 
   return keysToCamelCaseShallow(response) as SavedObjectsFindResponse;
 }
+
+export async function findObject(
+  http: HttpStart,
+  type: string,
+  id: string
+): Promise<SavedObjectWithMetadata> {
+  return await http.get<SavedObjectWithMetadata>(
+    `/api/kibana/management/saved_objects/${encodeURIComponent(type)}/${encodeURIComponent(id)}`
+  );
+}
diff --git a/src/plugins/saved_objects_management/public/lib/import_file.ts b/src/plugins/saved_objects_management/public/lib/import_file.ts
index 96263452253ba..84177bda3eb43 100644
--- a/src/plugins/saved_objects_management/public/lib/import_file.ts
+++ b/src/plugins/saved_objects_management/public/lib/import_file.ts
@@ -18,6 +18,7 @@
  */
 
 import { HttpStart, SavedObjectsImportError } from 'src/core/public';
+import { ImportMode } from '../management_section/objects_table/components/import_mode_control';
 
 interface ImportResponse {
   success: boolean;
@@ -25,17 +26,20 @@ interface ImportResponse {
   errors?: SavedObjectsImportError[];
 }
 
-export async function importFile(http: HttpStart, file: File, overwriteAll: boolean = false) {
+export async function importFile(
+  http: HttpStart,
+  file: File,
+  { createNewCopies, overwrite }: ImportMode
+) {
   const formData = new FormData();
   formData.append('file', file);
+  const query = createNewCopies ? { createNewCopies } : { overwrite };
   return await http.post<ImportResponse>('/api/saved_objects/_import', {
     body: formData,
     headers: {
       // Important to be undefined, it forces proper headers to be set for FormData
       'Content-Type': undefined,
     },
-    query: {
-      overwrite: overwriteAll,
-    },
+    query,
   });
 }
diff --git a/src/plugins/saved_objects_management/public/lib/index.ts b/src/plugins/saved_objects_management/public/lib/index.ts
index 7021744095651..9ed5b1907cecb 100644
--- a/src/plugins/saved_objects_management/public/lib/index.ts
+++ b/src/plugins/saved_objects_management/public/lib/index.ts
@@ -41,7 +41,7 @@ export {
   FailedImport,
 } from './process_import_response';
 export { getDefaultTitle } from './get_default_title';
-export { findObjects } from './find_objects';
+export { findObjects, findObject } from './find_objects';
 export { extractExportDetails, SavedObjectsExportResultDetails } from './extract_export_details';
 export { createFieldList } from './create_field_list';
 export { getAllowedTypes } from './get_allowed_types';
diff --git a/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts b/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
index c1a153b800550..4d7e74c2649cd 100644
--- a/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/process_import_response.test.ts
@@ -19,6 +19,7 @@
 
 import {
   SavedObjectsImportConflictError,
+  SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportUnknownError,
   SavedObjectsImportMissingReferencesError,
 } from 'src/core/public';
@@ -35,7 +36,7 @@ describe('processImportResponse()', () => {
     expect(result.importCount).toBe(0);
   });
 
-  test('conflict errors get added to failedImports', () => {
+  test('conflict errors get added to failedImports and result in idle status', () => {
     const response = {
       success: false,
       successCount: 0,
@@ -46,6 +47,7 @@ describe('processImportResponse()', () => {
           error: {
             type: 'conflict',
           } as SavedObjectsImportConflictError,
+          meta: {},
         },
       ],
     };
@@ -58,14 +60,49 @@ describe('processImportResponse()', () => {
           },
           "obj": Object {
             "id": "1",
+            "meta": Object {},
             "type": "a",
           },
         },
       ]
     `);
+    expect(result.status).toBe('idle');
   });
 
-  test('unknown errors get added to failedImports', () => {
+  test('ambiguous conflict errors get added to failedImports and result in idle status', () => {
+    const response = {
+      success: false,
+      successCount: 0,
+      errors: [
+        {
+          type: 'a',
+          id: '1',
+          error: {
+            type: 'ambiguous_conflict',
+          } as SavedObjectsImportAmbiguousConflictError,
+          meta: {},
+        },
+      ],
+    };
+    const result = processImportResponse(response);
+    expect(result.failedImports).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "error": Object {
+            "type": "ambiguous_conflict",
+          },
+          "obj": Object {
+            "id": "1",
+            "meta": Object {},
+            "type": "a",
+          },
+        },
+      ]
+    `);
+    expect(result.status).toBe('idle');
+  });
+
+  test('unknown errors get added to failedImports and result in success status', () => {
     const response = {
       success: false,
       successCount: 0,
@@ -76,6 +113,7 @@ describe('processImportResponse()', () => {
           error: {
             type: 'unknown',
           } as SavedObjectsImportUnknownError,
+          meta: {},
         },
       ],
     };
@@ -88,14 +126,16 @@ describe('processImportResponse()', () => {
           },
           "obj": Object {
             "id": "1",
+            "meta": Object {},
             "type": "a",
           },
         },
       ]
     `);
+    expect(result.status).toBe('success');
   });
 
-  test('missing references get added to failedImports', () => {
+  test('missing references get added to failedImports and result in idle status', () => {
     const response = {
       success: false,
       successCount: 0,
@@ -112,6 +152,7 @@ describe('processImportResponse()', () => {
               },
             ],
           } as SavedObjectsImportMissingReferencesError,
+          meta: {},
         },
       ],
     };
@@ -130,10 +171,58 @@ describe('processImportResponse()', () => {
           },
           "obj": Object {
             "id": "1",
+            "meta": Object {},
             "type": "a",
           },
         },
       ]
     `);
+    expect(result.status).toBe('idle');
+  });
+
+  test('missing references get added to unmatchedReferences, but are not duplicated', () => {
+    const response = {
+      success: false,
+      successCount: 0,
+      errors: [
+        {
+          type: 'a',
+          id: '1',
+          error: {
+            type: 'missing_references',
+            references: [
+              { type: 'index-pattern', id: '2' },
+              { type: 'index-pattern', id: '3' },
+              { type: 'index-pattern', id: '2' }, // duplicate that should not show in the result's unmatchedReferences
+            ],
+          } as SavedObjectsImportMissingReferencesError,
+          meta: {},
+        },
+      ],
+    };
+    const result = processImportResponse(response);
+    expect(result.unmatchedReferences).toEqual([
+      expect.objectContaining({ existingIndexPatternId: '2' }),
+      expect.objectContaining({ existingIndexPatternId: '3' }),
+    ]);
+  });
+
+  test('success results get added to successfulImports and result in success status', () => {
+    const response = {
+      success: true,
+      successCount: 1,
+      successResults: [{ type: 'a', id: '1', meta: {} }],
+    };
+    const result = processImportResponse(response);
+    expect(result.successfulImports).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "id": "1",
+          "meta": Object {},
+          "type": "a",
+        },
+      ]
+    `);
+    expect(result.status).toBe('success');
   });
 });
diff --git a/src/plugins/saved_objects_management/public/lib/process_import_response.ts b/src/plugins/saved_objects_management/public/lib/process_import_response.ts
index 4725000aa9d55..bb7492bb9b3de 100644
--- a/src/plugins/saved_objects_management/public/lib/process_import_response.ts
+++ b/src/plugins/saved_objects_management/public/lib/process_import_response.ts
@@ -20,40 +20,49 @@
 import {
   SavedObjectsImportResponse,
   SavedObjectsImportConflictError,
+  SavedObjectsImportAmbiguousConflictError,
   SavedObjectsImportUnsupportedTypeError,
   SavedObjectsImportMissingReferencesError,
   SavedObjectsImportUnknownError,
   SavedObjectsImportError,
+  SavedObjectsImportSuccess,
 } from 'src/core/public';
 
 export interface FailedImport {
-  obj: Pick<SavedObjectsImportError, 'id' | 'type' | 'title'>;
+  obj: Omit<SavedObjectsImportError, 'error'>;
   error:
     | SavedObjectsImportConflictError
+    | SavedObjectsImportAmbiguousConflictError
     | SavedObjectsImportUnsupportedTypeError
     | SavedObjectsImportMissingReferencesError
     | SavedObjectsImportUnknownError;
 }
 
+interface UnmatchedReference {
+  existingIndexPatternId: string;
+  list: Array<Omit<SavedObjectsImportError, 'error'>>;
+  newIndexPatternId?: string;
+}
+
 export interface ProcessedImportResponse {
   failedImports: FailedImport[];
-  unmatchedReferences: Array<{
-    existingIndexPatternId: string;
-    list: Array<Record<string, any>>;
-    newIndexPatternId: string | undefined;
-  }>;
+  successfulImports: SavedObjectsImportSuccess[];
+  unmatchedReferences: UnmatchedReference[];
   status: 'success' | 'idle';
   importCount: number;
   conflictedSavedObjectsLinkedToSavedSearches: undefined;
   conflictedSearchDocs: undefined;
 }
 
+const isAnyConflict = ({ type }: FailedImport['error']) =>
+  type === 'conflict' || type === 'ambiguous_conflict';
+
 export function processImportResponse(
   response: SavedObjectsImportResponse
 ): ProcessedImportResponse {
   // Go through the failures and split between unmatchedReferences and failedImports
   const failedImports = [];
-  const unmatchedReferences = new Map();
+  const unmatchedReferences = new Map<string, UnmatchedReference>();
   for (const { error, ...obj } of response.errors || []) {
     failedImports.push({ obj, error });
     if (error.type !== 'missing_references') {
@@ -69,19 +78,21 @@ export function processImportResponse(
         list: [],
         newIndexPatternId: undefined,
       };
-      conflict.list.push(obj);
-      unmatchedReferences.set(`${missingReference.type}:${missingReference.id}`, conflict);
+      if (!conflict.list.some(({ type, id }) => type === obj.type && id === obj.id)) {
+        conflict.list.push(obj);
+        unmatchedReferences.set(`${missingReference.type}:${missingReference.id}`, conflict);
+      }
     }
   }
 
   return {
     failedImports,
+    successfulImports: response.successResults ?? [],
     unmatchedReferences: Array.from(unmatchedReferences.values()),
     // Import won't be successful in the scenario unmatched references exist, import API returned errors of type unknown or import API
     // returned errors of type missing_references.
     status:
-      unmatchedReferences.size === 0 &&
-      !failedImports.some((issue) => issue.error.type === 'conflict')
+      unmatchedReferences.size === 0 && !failedImports.some((issue) => isAnyConflict(issue.error))
         ? 'success'
         : 'idle',
     importCount: response.successCount,
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
index 86eebad7ae787..9aa9e3e664413 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.test.ts
@@ -50,17 +50,16 @@ describe('resolveImportErrors', () => {
     const result = await resolveImportErrors({
       http: httpMock,
       getConflictResolutions,
-      state: {
-        importCount: 0,
-      },
+      state: { importCount: 0, importMode: { createNewCopies: false, overwrite: false } },
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "failedImports": Array [],
-  "importCount": 0,
-  "status": "success",
-}
-`);
+      Object {
+        "failedImports": Array [],
+        "importCount": 0,
+        "status": "success",
+        "successfulImports": Array [],
+      }
+    `);
   });
 
   test(`doesn't retry if only unknown failures are passed in`, async () => {
@@ -74,41 +73,49 @@ Object {
             obj: {
               type: 'a',
               id: '1',
+              meta: {},
             },
-            error: {
-              type: 'unknown',
-            } as SavedObjectsImportUnknownError,
+            error: { type: 'unknown' } as SavedObjectsImportUnknownError,
           },
         ],
+        importMode: { createNewCopies: false, overwrite: false },
       },
     });
+    expect(httpMock.post).not.toHaveBeenCalled();
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "failedImports": Array [
-    Object {
-      "error": Object {
-        "type": "unknown",
-      },
-      "obj": Object {
-        "id": "1",
-        "type": "a",
-      },
-    },
-  ],
-  "importCount": 0,
-  "status": "success",
-}
-`);
+      Object {
+        "failedImports": Array [
+          Object {
+            "error": Object {
+              "type": "unknown",
+            },
+            "obj": Object {
+              "id": "1",
+              "meta": Object {},
+              "type": "a",
+            },
+          },
+        ],
+        "importCount": 0,
+        "status": "success",
+        "successfulImports": Array [],
+      }
+    `);
   });
 
   test('resolves conflicts', async () => {
     httpMock.post.mockResolvedValueOnce({
       success: true,
-      successCount: 1,
+      successCount: 2,
+      successResults: [
+        { type: 'a', id: '1' },
+        { type: 'a', id: '2', destinationId: 'x' },
+      ],
     });
     getConflictResolutions.mockReturnValueOnce({
-      'a:1': true,
-      'a:2': false,
+      'a:1': { retry: true, options: { overwrite: true } },
+      'a:2': { retry: true, options: { overwrite: true, destinationId: 'x' } },
+      'a:3': { retry: false },
     });
     const result = await resolveImportErrors({
       http: httpMock,
@@ -116,124 +123,54 @@ Object {
       state: {
         importCount: 0,
         failedImports: [
+          { obj: { type: 'a', id: '1', meta: {} }, error: { type: 'conflict' } },
           {
-            obj: {
-              type: 'a',
-              id: '1',
-            },
-            error: {
-              type: 'conflict',
-            },
-          },
-          {
-            obj: {
-              type: 'a',
-              id: '2',
-            },
-            error: {
-              type: 'conflict',
-            },
+            obj: { type: 'a', id: '2', meta: {} },
+            error: { type: 'conflict', destinationId: 'x' },
           },
+          { obj: { type: 'a', id: '3', meta: {} }, error: { type: 'conflict' } },
         ],
+        importMode: { createNewCopies: false, overwrite: false },
       },
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "failedImports": Array [],
-  "importCount": 1,
-  "status": "success",
-}
-`);
+      Object {
+        "failedImports": Array [],
+        "importCount": 2,
+        "status": "success",
+        "successfulImports": Array [
+          Object {
+            "id": "1",
+            "type": "a",
+          },
+          Object {
+            "destinationId": "x",
+            "id": "2",
+            "type": "a",
+          },
+        ],
+      }
+    `);
 
     const formData = getFormData(extractBodyFromCall(0));
     expect(formData).toMatchInlineSnapshot(`
-Object {
-  "file": "undefined",
-  "retries": Array [
-    Object {
-      "id": "1",
-      "overwrite": true,
-      "replaceReferences": Array [],
-      "type": "a",
-    },
-  ],
-}
-`);
-  });
-
-  test('resolves missing references', async () => {
-    httpMock.post.mockResolvedValueOnce({
-      success: true,
-      successCount: 2,
-    });
-    getConflictResolutions.mockResolvedValueOnce({});
-    const result = await resolveImportErrors({
-      http: httpMock,
-      getConflictResolutions,
-      state: {
-        importCount: 0,
-        unmatchedReferences: [
-          {
-            existingIndexPatternId: '2',
-            newIndexPatternId: '3',
+      Object {
+        "file": "undefined",
+        "retries": Array [
+          Object {
+            "id": "1",
+            "overwrite": true,
+            "type": "a",
           },
-        ],
-        failedImports: [
-          {
-            obj: {
-              type: 'a',
-              id: '1',
-            },
-            error: {
-              type: 'missing_references',
-              references: [
-                {
-                  type: 'index-pattern',
-                  id: '2',
-                },
-              ],
-              blocking: [
-                {
-                  type: 'a',
-                  id: '2',
-                },
-              ],
-            },
+          Object {
+            "destinationId": "x",
+            "id": "2",
+            "overwrite": true,
+            "type": "a",
           },
         ],
-      },
-    });
-    expect(result).toMatchInlineSnapshot(`
-Object {
-  "failedImports": Array [],
-  "importCount": 2,
-  "status": "success",
-}
-`);
-    const formData = getFormData(extractBodyFromCall(0));
-    expect(formData).toMatchInlineSnapshot(`
-Object {
-  "file": "undefined",
-  "retries": Array [
-    Object {
-      "id": "1",
-      "overwrite": false,
-      "replaceReferences": Array [
-        Object {
-          "from": "2",
-          "to": "3",
-          "type": "index-pattern",
-        },
-      ],
-      "type": "a",
-    },
-    Object {
-      "id": "2",
-      "type": "a",
-    },
-  ],
-}
-`);
+      }
+    `);
   });
 
   test(`doesn't resolve missing references if newIndexPatternId isn't defined`, async () => {
@@ -244,144 +181,115 @@ Object {
       state: {
         importCount: 0,
         unmatchedReferences: [
-          {
-            existingIndexPatternId: '2',
-            newIndexPatternId: undefined,
-          },
+          { existingIndexPatternId: '2', newIndexPatternId: undefined, list: [] },
         ],
         failedImports: [
           {
             obj: {
               type: 'a',
               id: '1',
+              meta: {},
             },
             error: {
               type: 'missing_references',
-              references: [
-                {
-                  type: 'index-pattern',
-                  id: '2',
-                },
-              ],
-              blocking: [
-                {
-                  type: 'a',
-                  id: '2',
-                },
-              ],
+              references: [{ type: 'index-pattern', id: '2' }],
             },
           },
         ],
+        importMode: { createNewCopies: false, overwrite: false },
       },
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "failedImports": Array [],
-  "importCount": 0,
-  "status": "success",
-}
-`);
+      Object {
+        "failedImports": Array [],
+        "importCount": 0,
+        "status": "success",
+        "successfulImports": Array [],
+      }
+    `);
   });
 
   test('handles missing references then conflicts on the same errored objects', async () => {
     httpMock.post.mockResolvedValueOnce({
       success: false,
       successCount: 0,
-      errors: [
-        {
-          type: 'a',
-          id: '1',
-          error: {
-            type: 'conflict',
-          },
-        },
-      ],
+      errors: [{ type: 'a', id: '1', error: { type: 'conflict' } }],
     });
     httpMock.post.mockResolvedValueOnce({
       success: true,
       successCount: 1,
+      successResults: [{ type: 'a', id: '1' }],
     });
     getConflictResolutions.mockResolvedValueOnce({});
     getConflictResolutions.mockResolvedValueOnce({
-      'a:1': true,
+      'a:1': { retry: true, options: { overwrite: true } },
     });
     const result = await resolveImportErrors({
       http: httpMock,
       getConflictResolutions,
       state: {
         importCount: 0,
-        unmatchedReferences: [
-          {
-            existingIndexPatternId: '2',
-            newIndexPatternId: '3',
-          },
-        ],
+        unmatchedReferences: [{ existingIndexPatternId: '2', newIndexPatternId: '3', list: [] }],
         failedImports: [
           {
-            obj: {
-              type: 'a',
-              id: '1',
-            },
-            error: {
-              type: 'missing_references',
-              references: [
-                {
-                  type: 'index-pattern',
-                  id: '2',
-                },
-              ],
-              blocking: [],
-            },
+            obj: { type: 'a', id: '1', meta: {} },
+            error: { type: 'missing_references', references: [{ type: 'index-pattern', id: '2' }] },
           },
         ],
+        importMode: { createNewCopies: false, overwrite: false },
       },
     });
     expect(result).toMatchInlineSnapshot(`
-Object {
-  "failedImports": Array [],
-  "importCount": 1,
-  "status": "success",
-}
-`);
+      Object {
+        "failedImports": Array [],
+        "importCount": 1,
+        "status": "success",
+        "successfulImports": Array [
+          Object {
+            "id": "1",
+            "type": "a",
+          },
+        ],
+      }
+    `);
     const formData1 = getFormData(extractBodyFromCall(0));
     expect(formData1).toMatchInlineSnapshot(`
-Object {
-  "file": "undefined",
-  "retries": Array [
-    Object {
-      "id": "1",
-      "overwrite": false,
-      "replaceReferences": Array [
-        Object {
-          "from": "2",
-          "to": "3",
-          "type": "index-pattern",
-        },
-      ],
-      "type": "a",
-    },
-  ],
-}
-`);
+      Object {
+        "file": "undefined",
+        "retries": Array [
+          Object {
+            "id": "1",
+            "replaceReferences": Array [
+              Object {
+                "from": "2",
+                "to": "3",
+                "type": "index-pattern",
+              },
+            ],
+            "type": "a",
+          },
+        ],
+      }
+    `);
     const formData2 = getFormData(extractBodyFromCall(1));
     expect(formData2).toMatchInlineSnapshot(`
-Object {
-  "file": "undefined",
-  "retries": Array [
-    Object {
-      "id": "1",
-      "overwrite": true,
-      "replaceReferences": Array [
-        Object {
-          "from": "2",
-          "to": "3",
-          "type": "index-pattern",
-        },
-      ],
-      "type": "a",
-    },
-  ],
-}
-`);
+      Object {
+        "file": "undefined",
+        "retries": Array [
+          Object {
+            "id": "1",
+            "overwrite": true,
+            "replaceReferences": Array [
+              Object {
+                "from": "2",
+                "to": "3",
+                "type": "index-pattern",
+              },
+            ],
+            "type": "a",
+          },
+        ],
+      }
+    `);
   });
 });
diff --git a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
index ea29cc4884d00..3084d40b63be6 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_import_errors.ts
@@ -17,47 +17,102 @@
  * under the License.
  */
 
-import { HttpStart } from 'src/core/public';
-import { FailedImport } from './process_import_response';
+import {
+  HttpStart,
+  SavedObjectsImportConflictError,
+  SavedObjectsImportRetry,
+  SavedObjectsImportResponse,
+  SavedObjectsImportAmbiguousConflictError,
+} from 'src/core/public';
+import { Required } from '@kbn/utility-types';
+import { FailedImport, ProcessedImportResponse } from './process_import_response';
 
-interface RetryObject {
-  id: string;
+// the HTTP route requires type and ID; all other field are optional
+type RetryObject = Required<Partial<SavedObjectsImportRetry>, 'type' | 'id'>;
+
+interface Reference {
   type: string;
-  overwrite?: boolean;
-  replaceReferences?: any[];
+  from: string;
+  to: string;
+}
+
+export interface RetryDecision {
+  retry: boolean; // false == skip
+  options: { overwrite: boolean; destinationId?: string };
 }
 
-async function callResolveImportErrorsApi(http: HttpStart, file: File, retries: any) {
+const RESOLVABLE_ERRORS = ['conflict', 'ambiguous_conflict', 'missing_references'];
+export interface FailedImportConflict {
+  obj: FailedImport['obj'];
+  error: SavedObjectsImportConflictError | SavedObjectsImportAmbiguousConflictError;
+}
+const isConflict = (
+  failure: FailedImport
+): failure is { obj: FailedImport['obj']; error: SavedObjectsImportConflictError } =>
+  failure.error.type === 'conflict';
+const isAmbiguousConflict = (
+  failure: FailedImport
+): failure is { obj: FailedImport['obj']; error: SavedObjectsImportAmbiguousConflictError } =>
+  failure.error.type === 'ambiguous_conflict';
+const isAnyConflict = (failure: FailedImport): failure is FailedImportConflict =>
+  isConflict(failure) || isAmbiguousConflict(failure);
+
+/**
+ * The server-side code was updated to include missing_references errors and conflict/ambiguous_conflict errors for the same object in the
+ * same response. This client-side code was not built to handle multiple errors for a single import object, though. We simply filter out any
+ * conflicts if a missing_references error for the same object is present. This means that the missing_references error will get resolved
+ * or skipped first, and any conflicts still present will be returned again and resolved with another API call.
+ */
+const filterFailedImports = (failures: FailedImport[]) => {
+  const missingReferences = failures
+    .filter(({ error: { type } }) => type === 'missing_references')
+    .reduce((acc, { obj: { type, id } }) => acc.add(`${type}:${id}`), new Set<string>());
+  return failures.filter(
+    (failure) =>
+      !isAnyConflict(failure) ||
+      (isAnyConflict(failure) && !missingReferences.has(`${failure.obj.type}:${failure.obj.id}`))
+  );
+};
+
+async function callResolveImportErrorsApi(
+  http: HttpStart,
+  file: File,
+  retries: any,
+  createNewCopies: boolean
+): Promise<SavedObjectsImportResponse> {
   const formData = new FormData();
   formData.append('file', file);
   formData.append('retries', JSON.stringify(retries));
+  const query = createNewCopies ? { createNewCopies } : {};
   return http.post<any>('/api/saved_objects/_resolve_import_errors', {
     headers: {
       // Important to be undefined, it forces proper headers to be set for FormData
       'Content-Type': undefined,
     },
     body: formData,
+    query,
   });
 }
 
 function mapImportFailureToRetryObject({
   failure,
-  overwriteDecisionCache,
+  retryDecisionCache,
   replaceReferencesCache,
   state,
 }: {
   failure: FailedImport;
-  overwriteDecisionCache: Map<string, boolean>;
-  replaceReferencesCache: Map<string, any[]>;
-  state: any;
+  retryDecisionCache: Map<string, RetryDecision>;
+  replaceReferencesCache: Map<string, Reference[]>;
+  state: { unmatchedReferences?: ProcessedImportResponse['unmatchedReferences'] };
 }): RetryObject | undefined {
-  const { isOverwriteAllChecked, unmatchedReferences } = state;
-  const isOverwriteGranted =
-    isOverwriteAllChecked ||
-    overwriteDecisionCache.get(`${failure.obj.type}:${failure.obj.id}`) === true;
+  const { unmatchedReferences = [] } = state;
+  const retryDecision = retryDecisionCache.get(`${failure.obj.type}:${failure.obj.id}`);
 
-  // Conflicts wihtout overwrite granted are skipped
-  if (!isOverwriteGranted && failure.error.type === 'conflict') {
+  // Conflicts without a resolution are skipped
+  if (
+    !retryDecision?.retry &&
+    (failure.error.type === 'conflict' || failure.error.type === 'ambiguous_conflict')
+  ) {
     return;
   }
 
@@ -67,17 +122,19 @@ function mapImportFailureToRetryObject({
       replaceReferencesCache.get(`${failure.obj.type}:${failure.obj.id}`) || [];
     const indexPatternRefs = failure.error.references.filter((obj) => obj.type === 'index-pattern');
     for (const reference of indexPatternRefs) {
-      for (const unmatchedReference of unmatchedReferences) {
-        const hasNewValue = !!unmatchedReference.newIndexPatternId;
-        const matchesIndexPatternId = unmatchedReference.existingIndexPatternId === reference.id;
-        if (!hasNewValue || !matchesIndexPatternId) {
+      for (const { existingIndexPatternId: from, newIndexPatternId: to } of unmatchedReferences) {
+        const matchesIndexPatternId = from === reference.id;
+        if (!to || !matchesIndexPatternId) {
           continue;
         }
-        objReplaceReferences.push({
-          type: 'index-pattern',
-          from: unmatchedReference.existingIndexPatternId,
-          to: unmatchedReference.newIndexPatternId,
-        });
+        const type = 'index-pattern';
+        if (
+          !objReplaceReferences.some(
+            (ref) => ref.type === type && ref.from === from && ref.to === to
+          )
+        ) {
+          objReplaceReferences.push({ type, from, to });
+        }
       }
     }
     replaceReferencesCache.set(`${failure.obj.type}:${failure.obj.id}`, objReplaceReferences);
@@ -90,10 +147,8 @@ function mapImportFailureToRetryObject({
   return {
     id: failure.obj.id,
     type: failure.obj.type,
-    overwrite:
-      isOverwriteAllChecked ||
-      overwriteDecisionCache.get(`${failure.obj.type}:${failure.obj.id}`) === true,
-    replaceReferences: replaceReferencesCache.get(`${failure.obj.type}:${failure.obj.id}`) || [],
+    ...(retryDecision?.retry && retryDecision.options),
+    replaceReferences: replaceReferencesCache.get(`${failure.obj.type}:${failure.obj.id}`),
   };
 }
 
@@ -103,88 +158,114 @@ export async function resolveImportErrors({
   state,
 }: {
   http: HttpStart;
-  getConflictResolutions: (objects: any[]) => Promise<Record<string, boolean>>;
-  state: { importCount: number; failedImports?: FailedImport[] } & Record<string, any>;
+  getConflictResolutions: (
+    objects: FailedImportConflict[]
+  ) => Promise<Record<string, RetryDecision>>;
+  state: {
+    importCount: number;
+    unmatchedReferences?: ProcessedImportResponse['unmatchedReferences'];
+    failedImports?: ProcessedImportResponse['failedImports'];
+    successfulImports?: ProcessedImportResponse['successfulImports'];
+    file?: File;
+    importMode: { createNewCopies: boolean; overwrite: boolean };
+  };
 }) {
-  const overwriteDecisionCache = new Map();
-  const replaceReferencesCache = new Map();
-  let { importCount: successImportCount, failedImports: importFailures = [] } = state;
-  const { file, isOverwriteAllChecked } = state;
+  const retryDecisionCache = new Map<string, RetryDecision>();
+  const replaceReferencesCache = new Map<string, Reference[]>();
+  let { importCount, failedImports = [], successfulImports = [] } = state;
+  const {
+    file,
+    importMode: { createNewCopies, overwrite: isOverwriteAllChecked },
+  } = state;
 
-  const doesntHaveOverwriteDecision = ({ obj }: FailedImport) => {
-    return !overwriteDecisionCache.has(`${obj.type}:${obj.id}`);
+  const doesntHaveRetryDecision = ({ obj }: FailedImport) => {
+    return !retryDecisionCache.has(`${obj.type}:${obj.id}`);
   };
-  const getOverwriteDecision = ({ obj }: FailedImport) => {
-    return overwriteDecisionCache.get(`${obj.type}:${obj.id}`);
+  const getRetryDecision = ({ obj }: FailedImport) => {
+    return retryDecisionCache.get(`${obj.type}:${obj.id}`);
   };
   const callMapImportFailure = (failure: FailedImport) =>
     mapImportFailureToRetryObject({
       failure,
-      overwriteDecisionCache,
+      retryDecisionCache,
       replaceReferencesCache,
       state,
     });
   const isNotSkipped = (failure: FailedImport) => {
-    return (
-      (failure.error.type !== 'conflict' && failure.error.type !== 'missing_references') ||
-      getOverwriteDecision(failure)
-    );
+    const { type } = failure.error;
+    return !RESOLVABLE_ERRORS.includes(type) || getRetryDecision(failure)?.retry;
   };
 
   // Loop until all issues are resolved
-  while (
-    importFailures.some((failure) =>
-      ['conflict', 'missing_references'].includes(failure.error.type)
-    )
-  ) {
-    // Ask for overwrites
-    if (!isOverwriteAllChecked) {
-      const result = await getConflictResolutions(
-        importFailures
-          .filter(({ error }) => error.type === 'conflict')
-          .filter(doesntHaveOverwriteDecision)
-          .map(({ obj }) => obj)
-      );
-      for (const key of Object.keys(result)) {
-        overwriteDecisionCache.set(key, result[key]);
-      }
+  while (failedImports.some((failure) => RESOLVABLE_ERRORS.includes(failure.error.type))) {
+    // Filter out multiple errors for the same object
+    const filteredFailures = filterFailedImports(failedImports);
+
+    // Resolve regular conflicts
+    if (isOverwriteAllChecked) {
+      filteredFailures
+        .filter(isConflict)
+        .forEach(({ obj: { type, id }, error: { destinationId } }) =>
+          retryDecisionCache.set(`${type}:${id}`, {
+            retry: true,
+            options: {
+              overwrite: true,
+              ...(destinationId && { destinationId }),
+            },
+          })
+        );
+    }
+
+    // prompt the user for each conflict
+    const result = await getConflictResolutions(
+      isOverwriteAllChecked
+        ? filteredFailures.filter(isAmbiguousConflict).filter(doesntHaveRetryDecision)
+        : filteredFailures.filter(isAnyConflict).filter(doesntHaveRetryDecision)
+    );
+    for (const key of Object.keys(result)) {
+      retryDecisionCache.set(key, result[key]);
     }
 
     // Build retries array
-    const retries = importFailures
+    const failRetries = filteredFailures
       .map(callMapImportFailure)
       .filter((obj) => !!obj) as RetryObject[];
-    for (const { error, obj } of importFailures) {
-      if (error.type !== 'missing_references') {
-        continue;
-      }
-      if (!retries.some((retryObj) => retryObj.type === obj.type && retryObj.id === obj.id)) {
-        continue;
-      }
-      for (const { type, id } of error.blocking || []) {
-        retries.push({ type, id });
+    const successRetries = successfulImports.map<RetryObject>(
+      ({ type, id, overwrite, destinationId, createNewCopy }) => {
+        const replaceReferences = replaceReferencesCache.get(`${type}:${id}`);
+        return {
+          type,
+          id,
+          ...(overwrite && { overwrite }),
+          ...(replaceReferences && { replaceReferences }),
+          destinationId,
+          createNewCopy,
+        };
       }
-    }
+    );
+    const retries = [...failRetries, ...successRetries];
 
-    // Scenario where everything is skipped and nothing to retry
+    // Scenario where there were no success results, all errors were skipped, and nothing to retry
     if (retries.length === 0) {
       // Cancelled overwrites aren't failures anymore
-      importFailures = importFailures.filter(isNotSkipped);
+      failedImports = filteredFailures.filter(isNotSkipped);
       break;
     }
 
     // Call API
-    const response = await callResolveImportErrorsApi(http, file, retries);
-    successImportCount += response.successCount;
-    importFailures = [];
+    const response = await callResolveImportErrorsApi(http, file!, retries, createNewCopies);
+    importCount = response.successCount; // reset the success count since we retry all successful results each time
+    failedImports = [];
     for (const { error, ...obj } of response.errors || []) {
-      importFailures.push({ error, obj });
+      failedImports.push({ error, obj });
     }
+    successfulImports = response.successResults || [];
   }
 
   return {
     status: 'success',
-    importCount: successImportCount,
-    failedImports: importFailures,
+    importCount,
+    failedImports,
+    successfulImports,
   };
 }
diff --git a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
index 4339c2fa13c0f..09e9ac29d664b 100644
--- a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
@@ -92,6 +92,7 @@ export const mountManagementSection = async ({
                   dataStart={data}
                   serviceRegistry={serviceRegistry}
                   actionRegistry={pluginStart.actions}
+                  columnRegistry={pluginStart.columns}
                   allowedTypes={allowedObjectTypes}
                   setBreadcrumbs={setBreadcrumbs}
                 />
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
index 7d43158ad8878..139f9f2e8703d 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/__snapshots__/saved_objects_table.test.tsx.snap
@@ -268,6 +268,12 @@ exports[`SavedObjectsTable should render normally 1`] = `
       }
       canDelete={false}
       canGoInApp={[Function]}
+      columnRegistry={
+        Object {
+          "getAll": [MockFunction],
+          "has": [MockFunction],
+        }
+      }
       filterOptions={
         Array [
           Object {
@@ -351,6 +357,7 @@ exports[`SavedObjectsTable should render normally 1`] = `
           },
         ]
       }
+      onActionRefresh={[Function]}
       onDelete={[Function]}
       onExport={[Function]}
       onQueryChange={[Function]}
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
index 9f43ecdf0673a..9ad82723c1161 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
@@ -213,6 +213,10 @@ exports[`Flyout conflicts should allow conflict resolution 2`] = `
             "path": "/home/foo.ndjson",
           },
           "importCount": 0,
+          "importMode": Object {
+            "createNewCopies": false,
+            "overwrite": true,
+          },
           "indexPatterns": Array [
             Object {
               "id": "1",
@@ -222,9 +226,9 @@ exports[`Flyout conflicts should allow conflict resolution 2`] = `
             },
           ],
           "isLegacyFile": false,
-          "isOverwriteAllChecked": true,
           "loadingMessage": undefined,
           "status": "loading",
+          "successfulImports": Array [],
           "unmatchedReferences": Array [
             Object {
               "existingIndexPatternId": "MyIndexPattern*",
@@ -255,66 +259,6 @@ exports[`Flyout conflicts should allow conflict resolution 2`] = `
 }
 `;
 
-exports[`Flyout conflicts should handle errors 1`] = `
-<EuiCallOut
-  color="warning"
-  data-test-subj="importSavedObjectsFailedWarning"
-  iconType="help"
-  title={
-    <FormattedMessage
-      defaultMessage="Import failed"
-      id="savedObjectsManagement.objectsTable.flyout.importFailedTitle"
-      values={Object {}}
-    />
-  }
->
-  <p>
-    <FormattedMessage
-      defaultMessage="Failed to import {failedImportCount} of {totalImportCount} objects. Import failed"
-      id="savedObjectsManagement.objectsTable.flyout.importFailedDescription"
-      values={
-        Object {
-          "failedImportCount": 1,
-          "totalImportCount": 1,
-        }
-      }
-    />
-  </p>
-  <p />
-</EuiCallOut>
-`;
-
-exports[`Flyout errors should display unsupported type errors properly 1`] = `
-<EuiCallOut
-  color="warning"
-  data-test-subj="importSavedObjectsFailedWarning"
-  iconType="help"
-  title={
-    <FormattedMessage
-      defaultMessage="Import failed"
-      id="savedObjectsManagement.objectsTable.flyout.importFailedTitle"
-      values={Object {}}
-    />
-  }
->
-  <p>
-    <FormattedMessage
-      defaultMessage="Failed to import {failedImportCount} of {totalImportCount} objects. Import failed"
-      id="savedObjectsManagement.objectsTable.flyout.importFailedDescription"
-      values={
-        Object {
-          "failedImportCount": 1,
-          "totalImportCount": 1,
-        }
-      }
-    />
-  </p>
-  <p>
-    wigwags [id=1] unsupported type
-  </p>
-</EuiCallOut>
-`;
-
 exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
 <EuiFlyout
   onClose={[MockFunction]}
@@ -360,6 +304,9 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
           />
         </p>
       </EuiCallOut>
+      <EuiSpacer
+        size="m"
+      />
     </span>
     <span>
       <EuiSpacer
@@ -601,7 +548,7 @@ exports[`Flyout should render import step 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
+        fullWidth={true}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         label={
@@ -616,6 +563,7 @@ exports[`Flyout should render import step 1`] = `
         <EuiFilePicker
           compressed={false}
           display="large"
+          fullWidth={true}
           initialPromptText={
             <FormattedMessage
               defaultMessage="Import"
@@ -629,23 +577,20 @@ exports[`Flyout should render import step 1`] = `
       <EuiFormRow
         describedByIds={Array []}
         display="row"
-        fullWidth={false}
+        fullWidth={true}
         hasChildLabel={true}
         hasEmptyLabelSpace={false}
         labelType="label"
       >
-        <EuiSwitch
-          checked={true}
-          data-test-subj="importSavedObjectsOverwriteToggle"
-          label={
-            <FormattedMessage
-              defaultMessage="Automatically overwrite all saved objects?"
-              id="savedObjectsManagement.objectsTable.flyout.overwriteSavedObjectsLabel"
-              values={Object {}}
-            />
+        <ImportModeControl
+          initialValues={
+            Object {
+              "createNewCopies": false,
+              "overwrite": true,
+            }
           }
-          name="overwriteAll"
-          onChange={[Function]}
+          isLegacyFile={false}
+          updateSelection={[Function]}
         />
       </EuiFormRow>
     </EuiForm>
@@ -689,3 +634,10 @@ exports[`Flyout should render import step 1`] = `
   </EuiFlyoutFooter>
 </EuiFlyout>
 `;
+
+exports[`Flyout summary should display summary when import is complete 1`] = `
+<ImportSummary
+  failedImports={Symbol()}
+  successfulImports={Symbol()}
+/>
+`;
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
index 56fddc075a50c..67bbb46cfb607 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/table.test.tsx.snap
@@ -164,6 +164,7 @@ exports[`Table prevents saved objects from being deleted 1`] = `
               },
             ],
             "name": "Actions",
+            "width": "80px",
           },
         ]
       }
@@ -379,6 +380,7 @@ exports[`Table should render normally 1`] = `
               },
             ],
             "name": "Actions",
+            "width": "80px",
           },
         ]
       }
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
index e3bb53f9e48df..32462e1e2184d 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx
@@ -85,19 +85,6 @@ describe('Flyout', () => {
     expect(component).toMatchSnapshot();
   });
 
-  it('should toggle the overwrite all control', async () => {
-    const component = shallowRender(defaultProps);
-
-    // Ensure all promises resolve
-    await new Promise((resolve) => process.nextTick(resolve));
-    // Ensure the state changes are reflected
-    component.update();
-
-    expect(component.state('isOverwriteAllChecked')).toBe(true);
-    component.find('EuiSwitch').simulate('change');
-    expect(component.state('isOverwriteAllChecked')).toBe(false);
-  });
-
   it('should allow picking a file', async () => {
     const component = shallowRender(defaultProps);
 
@@ -191,7 +178,10 @@ describe('Flyout', () => {
       component.setState({ file: mockFile, isLegacyFile: false });
       await component.instance().import();
 
-      expect(importFileMock).toHaveBeenCalledWith(defaultProps.http, mockFile, true);
+      expect(importFileMock).toHaveBeenCalledWith(defaultProps.http, mockFile, {
+        createNewCopies: false,
+        overwrite: true,
+      });
       expect(component.state()).toMatchObject({
         conflictedIndexPatterns: undefined,
         conflictedSavedObjectsLinkedToSavedSearches: undefined,
@@ -242,61 +232,10 @@ describe('Flyout', () => {
       await new Promise((resolve) => process.nextTick(resolve));
       expect(resolveImportErrorsMock).toMatchSnapshot();
     });
-
-    it('should handle errors', async () => {
-      const component = shallowRender(defaultProps);
-
-      // Ensure all promises resolve
-      await new Promise((resolve) => process.nextTick(resolve));
-      // Ensure the state changes are reflected
-      component.update();
-
-      resolveImportErrorsMock.mockImplementation(() => ({
-        status: 'success',
-        importCount: 0,
-        failedImports: [
-          {
-            obj: {
-              type: 'visualization',
-              id: '1',
-            },
-            error: {
-              type: 'unknown',
-            },
-          },
-        ],
-      }));
-
-      component.setState({ file: mockFile, isLegacyFile: false });
-
-      // Go through the import flow
-      await component.instance().import();
-      component.update();
-      // Set a resolution
-      component.instance().onIndexChanged('MyIndexPattern*', { target: { value: '2' } });
-      await component
-        .find('EuiButton[data-test-subj="importSavedObjectsConfirmBtn"]')
-        .simulate('click');
-      // Ensure all promises resolve
-      await new Promise((resolve) => process.nextTick(resolve));
-
-      expect(component.state('failedImports')).toEqual([
-        {
-          error: {
-            type: 'unknown',
-          },
-          obj: {
-            id: '1',
-            type: 'visualization',
-          },
-        },
-      ]);
-      expect(component.find('EuiFlyoutBody EuiCallOut')).toMatchSnapshot();
-    });
   });
 
-  describe('errors', () => {
-    it('should display unsupported type errors properly', async () => {
+  describe('summary', () => {
+    it('should display summary when import is complete', async () => {
       const component = shallowRender(defaultProps);
 
       // Ensure all promises resolve
@@ -307,32 +246,14 @@ describe('Flyout', () => {
       importFileMock.mockImplementation(() => ({
         success: false,
         successCount: 0,
-        errors: [
-          {
-            id: '1',
-            type: 'wigwags',
-            title: 'My Title',
-            error: {
-              type: 'unsupported_type',
-            },
-          },
-        ],
       }));
+      const failedImports = Symbol();
+      const successfulImports = Symbol();
       resolveImportErrorsMock.mockImplementation(() => ({
         status: 'success',
         importCount: 0,
-        failedImports: [
-          {
-            error: {
-              type: 'unsupported_type',
-            },
-            obj: {
-              id: '1',
-              type: 'wigwags',
-              title: 'My Title',
-            },
-          },
-        ],
+        failedImports,
+        successfulImports,
       }));
 
       component.setState({ file: mockFile, isLegacyFile: false });
@@ -345,19 +266,7 @@ describe('Flyout', () => {
       await Promise.resolve();
 
       expect(component.state('status')).toBe('success');
-      expect(component.state('failedImports')).toEqual([
-        {
-          error: {
-            type: 'unsupported_type',
-          },
-          obj: {
-            id: '1',
-            type: 'wigwags',
-            title: 'My Title',
-          },
-        },
-      ]);
-      expect(component.find('EuiFlyout EuiCallOut')).toMatchSnapshot();
+      expect(component.find('EuiFlyout ImportSummary')).toMatchSnapshot();
     });
   });
 
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
index aac799da6ea67..eddca18f9e283 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import React, { Component, Fragment } from 'react';
+import React, { Component, Fragment, ReactNode } from 'react';
 import { take, get as getField } from 'lodash';
 import {
   EuiFlyout,
@@ -30,19 +30,15 @@ import {
   EuiTitle,
   EuiForm,
   EuiFormRow,
-  EuiSwitch,
   EuiFilePicker,
   EuiInMemoryTable,
   EuiSelect,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiLoadingKibana,
+  EuiLoadingElastic,
   EuiCallOut,
   EuiSpacer,
   EuiLink,
-  EuiConfirmModal,
-  EuiOverlayMask,
-  EUI_MODAL_CONFIRM_BUTTON,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -57,7 +53,6 @@ import {
   importLegacyFile,
   resolveImportErrors,
   logLegacyImport,
-  getDefaultTitle,
   processImportResponse,
   ProcessedImportResponse,
 } from '../../../lib';
@@ -68,6 +63,13 @@ import {
   saveObjects,
 } from '../../../lib/resolve_saved_objects';
 import { ISavedObjectsManagementServiceRegistry } from '../../../services';
+import { FailedImportConflict, RetryDecision } from '../../../lib/resolve_import_errors';
+import { OverwriteModal } from './overwrite_modal';
+import { ImportModeControl, ImportMode } from './import_mode_control';
+import { ImportSummary } from './import_summary';
+
+const CREATE_NEW_COPIES_DEFAULT = false;
+const OVERWRITE_ALL_DEFAULT = true;
 
 export interface FlyoutProps {
   serviceRegistry: ISavedObjectsManagementServiceRegistry;
@@ -87,22 +89,21 @@ export interface FlyoutState {
   conflictedSearchDocs?: any[];
   unmatchedReferences?: ProcessedImportResponse['unmatchedReferences'];
   failedImports?: ProcessedImportResponse['failedImports'];
+  successfulImports?: ProcessedImportResponse['successfulImports'];
   conflictingRecord?: ConflictingRecord;
   error?: string;
   file?: File;
   importCount: number;
   indexPatterns?: IIndexPattern[];
-  isOverwriteAllChecked: boolean;
+  importMode: ImportMode;
   loadingMessage?: string;
   isLegacyFile: boolean;
   status: string;
 }
 
 interface ConflictingRecord {
-  id: string;
-  type: string;
-  title: string;
-  done: (success: boolean) => void;
+  conflict: FailedImportConflict;
+  done: (result: [boolean, string | undefined]) => void;
 }
 
 export class Flyout extends Component<FlyoutProps, FlyoutState> {
@@ -119,7 +120,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
       file: undefined,
       importCount: 0,
       indexPatterns: undefined,
-      isOverwriteAllChecked: true,
+      importMode: { createNewCopies: CREATE_NEW_COPIES_DEFAULT, overwrite: OVERWRITE_ALL_DEFAULT },
       loadingMessage: undefined,
       isLegacyFile: false,
       status: 'idle',
@@ -135,10 +136,8 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
     this.setState({ indexPatterns } as any);
   };
 
-  changeOverwriteAll = () => {
-    this.setState((state) => ({
-      isOverwriteAllChecked: !state.isOverwriteAllChecked,
-    }));
+  changeImportMode = (importMode: FlyoutState['importMode']) => {
+    this.setState(() => ({ importMode }));
   };
 
   setImportFile = (files: FileList | null) => {
@@ -160,12 +159,12 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
    */
   import = async () => {
     const { http } = this.props;
-    const { file, isOverwriteAllChecked } = this.state;
+    const { file, importMode } = this.state;
     this.setState({ status: 'loading', error: undefined });
 
     // Import the file
     try {
-      const response = await importFile(http, file!, isOverwriteAllChecked);
+      const response = await importFile(http, file!, importMode);
       this.setState(processImportResponse(response), () => {
         // Resolve import errors right away if there's no index patterns to match
         // This will ask about overwriting each object, etc
@@ -189,23 +188,24 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
    *
    * Function iterates through the objects, displays a modal for each asking the user if they wish to overwrite it or not.
    *
-   * @param {array} objects List of objects to request the user if they wish to overwrite it
+   * @param {array} failures List of objects to request the user if they wish to overwrite it
    * @return {Promise<array>} An object with the key being "type:id" and value the resolution chosen by the user
    */
-  getConflictResolutions = async (objects: any[]) => {
-    const resolutions: Record<string, boolean> = {};
-    for (const { type, id, title } of objects) {
-      const overwrite = await new Promise<boolean>((resolve) => {
-        this.setState({
-          conflictingRecord: {
-            id,
-            type,
-            title,
-            done: resolve,
-          },
-        });
-      });
-      resolutions[`${type}:${id}`] = overwrite;
+  getConflictResolutions = async (failures: FailedImportConflict[]) => {
+    const resolutions: Record<string, RetryDecision> = {};
+    for (const conflict of failures) {
+      const [overwrite, destinationId] = await new Promise<[boolean, string | undefined]>(
+        (done) => {
+          this.setState({ conflictingRecord: { conflict, done } });
+        }
+      );
+      if (overwrite) {
+        const { type, id } = conflict.obj;
+        resolutions[`${type}:${id}`] = {
+          retry: true,
+          options: { overwrite: true, ...(destinationId && { destinationId }) },
+        };
+      }
       this.setState({ conflictingRecord: undefined });
     }
     return resolutions;
@@ -243,7 +243,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
 
   legacyImport = async () => {
     const { serviceRegistry, indexPatterns, overlays, http, allowedTypes } = this.props;
-    const { file, isOverwriteAllChecked } = this.state;
+    const { file, importMode } = this.state;
 
     this.setState({ status: 'loading', error: undefined });
 
@@ -295,7 +295,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
       failedImports,
     } = await resolveSavedObjects(
       contents,
-      isOverwriteAllChecked,
+      importMode.overwrite,
       serviceRegistry.all().map((e) => e.service),
       indexPatterns,
       overlays.openConfirm
@@ -360,7 +360,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
   confirmLegacyImport = async () => {
     const {
       conflictedIndexPatterns,
-      isOverwriteAllChecked,
+      importMode,
       conflictedSavedObjectsLinkedToSavedSearches,
       conflictedSearchDocs,
       failedImports,
@@ -391,11 +391,8 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
           importCount += await resolveIndexPatternConflicts(
             resolutions,
             conflictedIndexPatterns!,
-            isOverwriteAllChecked,
-            {
-              indexPatterns,
-              search,
-            }
+            importMode.overwrite,
+            { indexPatterns, search }
           );
         }
         this.setState({
@@ -406,7 +403,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
         });
         importCount += await saveObjects(
           conflictedSavedObjectsLinkedToSavedSearches!,
-          isOverwriteAllChecked
+          importMode.overwrite
         );
         this.setState({
           loadingMessage: i18n.translate(
@@ -418,7 +415,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
           conflictedSearchDocs!,
           serviceRegistry.all().map((e) => e.service),
           indexPatterns,
-          isOverwriteAllChecked
+          importMode.overwrite
         );
         this.setState({
           loadingMessage: i18n.translate(
@@ -428,7 +425,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
         });
         importCount += await saveObjects(
           failedImports!.map(({ obj }) => obj) as any[],
-          isOverwriteAllChecked
+          importMode.overwrite
         );
       } catch (e) {
         this.setState({
@@ -594,17 +591,18 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
     const {
       status,
       loadingMessage,
-      isOverwriteAllChecked,
       importCount,
       failedImports = [],
+      successfulImports = [],
       isLegacyFile,
+      importMode,
     } = this.state;
 
     if (status === 'loading') {
       return (
         <EuiFlexGroup justifyContent="spaceAround">
           <EuiFlexItem grow={false}>
-            <EuiLoadingKibana size="xl" />
+            <EuiLoadingElastic size="xl" />
             <EuiSpacer size="m" />
             <EuiText>
               <p>{loadingMessage}</p>
@@ -614,11 +612,12 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
       );
     }
 
-    // Kept backwards compatible logic
-    if (
-      failedImports.length &&
-      (!this.hasUnmatchedReferences || (isLegacyFile === false && status === 'success'))
-    ) {
+    if (isLegacyFile === false && status === 'success') {
+      return <ImportSummary failedImports={failedImports} successfulImports={successfulImports} />;
+    }
+
+    // Import summary for failed legacy import
+    if (failedImports.length && !this.hasUnmatchedReferences) {
       return (
         <EuiCallOut
           data-test-subj="importSavedObjectsFailedWarning"
@@ -679,6 +678,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
       );
     }
 
+    // Import summary for completed legacy import
     if (status === 'success') {
       if (importCount === 0) {
         return (
@@ -725,6 +725,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
     return (
       <EuiForm>
         <EuiFormRow
+          fullWidth
           label={
             <FormattedMessage
               id="savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel"
@@ -733,6 +734,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
           }
         >
           <EuiFilePicker
+            fullWidth
             initialPromptText={
               <FormattedMessage
                 id="savedObjectsManagement.objectsTable.flyout.importPromptText"
@@ -742,18 +744,11 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
             onChange={this.setImportFile}
           />
         </EuiFormRow>
-        <EuiFormRow>
-          <EuiSwitch
-            name="overwriteAll"
-            label={
-              <FormattedMessage
-                id="savedObjectsManagement.objectsTable.flyout.overwriteSavedObjectsLabel"
-                defaultMessage="Automatically overwrite all saved objects?"
-              />
-            }
-            data-test-subj="importSavedObjectsOverwriteToggle"
-            checked={isOverwriteAllChecked}
-            onChange={this.changeOverwriteAll}
+        <EuiFormRow fullWidth>
+          <ImportModeControl
+            initialValues={importMode}
+            isLegacyFile={isLegacyFile}
+            updateSelection={(newValues: ImportMode) => this.changeImportMode(newValues)}
           />
         </EuiFormRow>
       </EuiForm>
@@ -830,24 +825,27 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
     let legacyFileWarning;
     if (this.state.isLegacyFile) {
       legacyFileWarning = (
-        <EuiCallOut
-          data-test-subj="importSavedObjectsLegacyWarning"
-          title={
-            <FormattedMessage
-              id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle"
-              defaultMessage="Support for JSON files is going away"
-            />
-          }
-          color="warning"
-          iconType="help"
-        >
-          <p>
-            <FormattedMessage
-              id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody"
-              defaultMessage="Use our updated export to generate NDJSON files, and you'll be all set."
-            />
-          </p>
-        </EuiCallOut>
+        <>
+          <EuiCallOut
+            data-test-subj="importSavedObjectsLegacyWarning"
+            title={
+              <FormattedMessage
+                id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle"
+                defaultMessage="Support for JSON files is going away"
+              />
+            }
+            color="warning"
+            iconType="help"
+          >
+            <p>
+              <FormattedMessage
+                id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody"
+                defaultMessage="Use our updated export to generate NDJSON files, and you'll be all set."
+              />
+            </p>
+          </EuiCallOut>
+          <EuiSpacer size="m" />
+        </>
       );
     }
 
@@ -909,56 +907,16 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
     );
   }
 
-  overwriteConfirmed() {
-    this.state.conflictingRecord!.done(true);
-  }
-
-  overwriteSkipped() {
-    this.state.conflictingRecord!.done(false);
-  }
-
   render() {
     const { close } = this.props;
 
-    let confirmOverwriteModal;
-    if (this.state.conflictingRecord) {
-      confirmOverwriteModal = (
-        <EuiOverlayMask>
-          <EuiConfirmModal
-            title={i18n.translate(
-              'savedObjectsManagement.objectsTable.flyout.confirmOverwriteTitle',
-              {
-                defaultMessage: 'Overwrite {type}?',
-                values: { type: this.state.conflictingRecord.type },
-              }
-            )}
-            cancelButtonText={i18n.translate(
-              'savedObjectsManagement.objectsTable.flyout.confirmOverwriteCancelButtonText',
-              { defaultMessage: 'Cancel' }
-            )}
-            confirmButtonText={i18n.translate(
-              'savedObjectsManagement.objectsTable.flyout.confirmOverwriteOverwriteButtonText',
-              { defaultMessage: 'Overwrite' }
-            )}
-            buttonColor="danger"
-            onCancel={this.overwriteSkipped.bind(this)}
-            onConfirm={this.overwriteConfirmed.bind(this)}
-            defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
-          >
-            <p>
-              <FormattedMessage
-                id="savedObjectsManagement.objectsTable.flyout.confirmOverwriteBody"
-                defaultMessage="Are you sure you want to overwrite {title}?"
-                values={{
-                  title:
-                    this.state.conflictingRecord.title ||
-                    getDefaultTitle(this.state.conflictingRecord),
-                }}
-              />
-            </p>
-          </EuiConfirmModal>
-        </EuiOverlayMask>
-      );
+    let confirmOverwriteModal: ReactNode;
+    const { conflictingRecord } = this.state;
+    if (conflictingRecord) {
+      const { conflict } = conflictingRecord;
+      const onFinish = (overwrite: boolean, destinationId?: string) =>
+        conflictingRecord.done([overwrite, destinationId]);
+      confirmOverwriteModal = <OverwriteModal {...{ conflict, onFinish }} />;
     }
 
     return (
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.test.tsx
new file mode 100644
index 0000000000000..467347d95d1d7
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.test.tsx
@@ -0,0 +1,91 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { ReactWrapper } from 'enzyme';
+import { shallowWithI18nProvider, mountWithIntl } from 'test_utils/enzyme_helpers';
+import { ImportModeControl, ImportModeControlProps } from './import_mode_control';
+
+describe('ImportModeControl', () => {
+  const initialValues = { createNewCopies: false, overwrite: true }; // some test cases below make assumptions based on these initial values
+  const updateSelection = jest.fn();
+
+  const getOverwriteRadio = (wrapper: ReactWrapper) =>
+    wrapper.find(
+      'EuiRadioGroup[data-test-subj="savedObjectsManagement-importModeControl-overwriteRadioGroup"]'
+    );
+  const getOverwriteEnabled = (wrapper: ReactWrapper) =>
+    wrapper.find('input[id="overwriteEnabled"]');
+  const getOverwriteDisabled = (wrapper: ReactWrapper) =>
+    wrapper.find('input[id="overwriteDisabled"]');
+  const getCreateNewCopiesDisabled = (wrapper: ReactWrapper) =>
+    wrapper.find('input[id="createNewCopiesDisabled"]');
+  const getCreateNewCopiesEnabled = (wrapper: ReactWrapper) =>
+    wrapper.find('input[id="createNewCopiesEnabled"]');
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  const props: ImportModeControlProps = { initialValues, updateSelection, isLegacyFile: false };
+
+  it('returns partial import mode control when used with a legacy file', async () => {
+    const wrapper = shallowWithI18nProvider(<ImportModeControl {...props} isLegacyFile={true} />);
+    expect(wrapper.find('EuiFormFieldset')).toHaveLength(0);
+  });
+
+  it('returns full import mode control when used without a legacy file', async () => {
+    const wrapper = shallowWithI18nProvider(<ImportModeControl {...props} />);
+    expect(wrapper.find('EuiFormFieldset')).toHaveLength(1);
+  });
+
+  it('should allow the user to toggle `overwrite`', async () => {
+    const wrapper = mountWithIntl(<ImportModeControl {...props} />);
+
+    expect(updateSelection).not.toHaveBeenCalled();
+    const { createNewCopies } = initialValues;
+
+    getOverwriteDisabled(wrapper).simulate('change');
+    expect(updateSelection).toHaveBeenNthCalledWith(1, { createNewCopies, overwrite: false });
+
+    getOverwriteEnabled(wrapper).simulate('change');
+    expect(updateSelection).toHaveBeenNthCalledWith(2, { createNewCopies, overwrite: true });
+  });
+
+  it('should disable the Overwrite switch when `createNewCopies` is enabled', async () => {
+    const wrapper = mountWithIntl(<ImportModeControl {...props} />);
+
+    expect(getOverwriteRadio(wrapper).prop('disabled')).toBe(false);
+    getCreateNewCopiesEnabled(wrapper).simulate('change');
+    expect(getOverwriteRadio(wrapper).prop('disabled')).toBe(true);
+  });
+
+  it('should allow the user to toggle `createNewCopies`', async () => {
+    const wrapper = mountWithIntl(<ImportModeControl {...props} />);
+
+    expect(updateSelection).not.toHaveBeenCalled();
+    const { overwrite } = initialValues;
+
+    getCreateNewCopiesEnabled(wrapper).simulate('change');
+    expect(updateSelection).toHaveBeenNthCalledWith(1, { createNewCopies: true, overwrite });
+
+    getCreateNewCopiesDisabled(wrapper).simulate('change');
+    expect(updateSelection).toHaveBeenNthCalledWith(2, { createNewCopies: false, overwrite });
+  });
+});
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx
new file mode 100644
index 0000000000000..ac8099893d00e
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx
@@ -0,0 +1,160 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { useState } from 'react';
+import {
+  EuiFormFieldset,
+  EuiTitle,
+  EuiCheckableCard,
+  EuiRadioGroup,
+  EuiText,
+  EuiSpacer,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIconTip,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+export interface ImportModeControlProps {
+  initialValues: ImportMode;
+  isLegacyFile: boolean;
+  updateSelection: (result: ImportMode) => void;
+}
+
+export interface ImportMode {
+  createNewCopies: boolean;
+  overwrite: boolean;
+}
+
+const createNewCopiesDisabled = {
+  id: 'createNewCopiesDisabled',
+  text: i18n.translate(
+    'savedObjectsManagement.objectsTable.importModeControl.createNewCopies.disabledTitle',
+    { defaultMessage: 'Check for existing objects' }
+  ),
+  tooltip: i18n.translate(
+    'savedObjectsManagement.objectsTable.importModeControl.createNewCopies.disabledText',
+    {
+      defaultMessage:
+        'Check if each object was previously copied or imported into the destination space.',
+    }
+  ),
+};
+const createNewCopiesEnabled = {
+  id: 'createNewCopiesEnabled',
+  text: i18n.translate(
+    'savedObjectsManagement.objectsTable.importModeControl.createNewCopies.enabledTitle',
+    { defaultMessage: 'Create new objects with random IDs' }
+  ),
+  tooltip: i18n.translate(
+    'savedObjectsManagement.objectsTable.importModeControl.createNewCopies.enabledText',
+    { defaultMessage: 'All imported objects will be created with new random IDs.' }
+  ),
+};
+const overwriteEnabled = {
+  id: 'overwriteEnabled',
+  label: i18n.translate(
+    'savedObjectsManagement.objectsTable.importModeControl.overwrite.enabledLabel',
+    { defaultMessage: 'Automatically try to overwrite conflicts' }
+  ),
+};
+const overwriteDisabled = {
+  id: 'overwriteDisabled',
+  label: i18n.translate(
+    'savedObjectsManagement.objectsTable.importModeControl.overwrite.disabledLabel',
+    { defaultMessage: 'Request action when conflict occurs' }
+  ),
+};
+const importOptionsTitle = i18n.translate(
+  'savedObjectsManagement.objectsTable.importModeControl.importOptionsTitle',
+  { defaultMessage: 'Import options' }
+);
+
+const createLabel = ({ text, tooltip }: { text: string; tooltip: string }) => (
+  <EuiFlexGroup>
+    <EuiFlexItem>
+      <EuiText>{text}</EuiText>
+    </EuiFlexItem>
+    <EuiFlexItem grow={false}>
+      <EuiIconTip content={tooltip} position="left" type="iInCircle" />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
+
+export const ImportModeControl = ({
+  initialValues,
+  isLegacyFile,
+  updateSelection,
+}: ImportModeControlProps) => {
+  const [createNewCopies, setCreateNewCopies] = useState(initialValues.createNewCopies);
+  const [overwrite, setOverwrite] = useState(initialValues.overwrite);
+
+  const onChange = (partial: Partial<ImportMode>) => {
+    if (partial.createNewCopies !== undefined) {
+      setCreateNewCopies(partial.createNewCopies);
+    } else if (partial.overwrite !== undefined) {
+      setOverwrite(partial.overwrite);
+    }
+    updateSelection({ createNewCopies, overwrite, ...partial });
+  };
+
+  const overwriteRadio = (
+    <EuiRadioGroup
+      options={[overwriteEnabled, overwriteDisabled]}
+      idSelected={overwrite ? overwriteEnabled.id : overwriteDisabled.id}
+      onChange={(id: string) => onChange({ overwrite: id === overwriteEnabled.id })}
+      disabled={createNewCopies}
+      data-test-subj={'savedObjectsManagement-importModeControl-overwriteRadioGroup'}
+    />
+  );
+
+  if (isLegacyFile) {
+    return overwriteRadio;
+  }
+
+  return (
+    <EuiFormFieldset
+      legend={{
+        children: (
+          <EuiTitle size="xs">
+            <span>{importOptionsTitle}</span>
+          </EuiTitle>
+        ),
+      }}
+    >
+      <EuiCheckableCard
+        id={createNewCopiesDisabled.id}
+        label={createLabel(createNewCopiesDisabled)}
+        checked={!createNewCopies}
+        onChange={() => onChange({ createNewCopies: false })}
+      >
+        {overwriteRadio}
+      </EuiCheckableCard>
+
+      <EuiSpacer size="s" />
+
+      <EuiCheckableCard
+        id={createNewCopiesEnabled.id}
+        label={createLabel(createNewCopiesEnabled)}
+        checked={createNewCopies}
+        onChange={() => onChange({ createNewCopies: true })}
+      />
+    </EuiFormFieldset>
+  );
+};
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss
new file mode 100644
index 0000000000000..4b46c1244e246
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss
@@ -0,0 +1,20 @@
+.savedObjectsManagementImportSummary__row {
+  margin-bottom: $euiSizeXS;
+}
+
+.savedObjectsManagementImportSummary__title {
+  // Constrains title to the flex item, and allows for truncation when necessary
+  min-width: 0;
+}
+
+.savedObjectsManagementImportSummary__createdCount {
+  color: $euiColorSuccessText;
+}
+
+.savedObjectsManagementImportSummary__errorCount {
+  color: $euiColorDangerText;
+}
+
+.savedObjectsManagementImportSummary__icon {
+  margin-left: $euiSizeXS;
+}
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx
new file mode 100644
index 0000000000000..ed65131b0fc6b
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.test.tsx
@@ -0,0 +1,152 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { ShallowWrapper } from 'enzyme';
+import { shallowWithI18nProvider } from 'test_utils/enzyme_helpers';
+import { ImportSummary, ImportSummaryProps } from './import_summary';
+import { FailedImport } from '../../../lib';
+
+// @ts-expect-error
+import { findTestSubject } from '@elastic/eui/lib/test';
+
+describe('ImportSummary', () => {
+  const errorUnsupportedType: FailedImport = {
+    obj: { type: 'error-obj-type', id: 'error-obj-id', meta: { title: 'Error object' } },
+    error: { type: 'unsupported_type' },
+  };
+  const successNew = { type: 'dashboard', id: 'dashboard-id', meta: { title: 'New' } };
+  const successOverwritten = {
+    type: 'visualization',
+    id: 'viz-id',
+    meta: { title: 'Overwritten' },
+    overwrite: true,
+  };
+
+  const findHeader = (wrapper: ShallowWrapper) => wrapper.find('h3');
+  const findCountCreated = (wrapper: ShallowWrapper) =>
+    wrapper.find('h4.savedObjectsManagementImportSummary__createdCount');
+  const findCountOverwritten = (wrapper: ShallowWrapper) =>
+    wrapper.find('h4.savedObjectsManagementImportSummary__overwrittenCount');
+  const findCountError = (wrapper: ShallowWrapper) =>
+    wrapper.find('h4.savedObjectsManagementImportSummary__errorCount');
+  const findObjectRow = (wrapper: ShallowWrapper) =>
+    wrapper.find('.savedObjectsManagementImportSummary__row');
+
+  it('should render as expected with no results', async () => {
+    const props: ImportSummaryProps = { failedImports: [], successfulImports: [] };
+    const wrapper = shallowWithI18nProvider(<ImportSummary {...props} />);
+
+    expect(findHeader(wrapper).childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { importCount: 0 } })
+    );
+    expect(findCountCreated(wrapper)).toHaveLength(0);
+    expect(findCountOverwritten(wrapper)).toHaveLength(0);
+    expect(findCountError(wrapper)).toHaveLength(0);
+    expect(findObjectRow(wrapper)).toHaveLength(0);
+  });
+
+  it('should render as expected with a newly created object', async () => {
+    const props: ImportSummaryProps = {
+      failedImports: [],
+      successfulImports: [successNew],
+    };
+    const wrapper = shallowWithI18nProvider(<ImportSummary {...props} />);
+
+    expect(findHeader(wrapper).childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { importCount: 1 } })
+    );
+    const countCreated = findCountCreated(wrapper);
+    expect(countCreated).toHaveLength(1);
+    expect(countCreated.childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { createdCount: 1 } })
+    );
+    expect(findCountOverwritten(wrapper)).toHaveLength(0);
+    expect(findCountError(wrapper)).toHaveLength(0);
+    expect(findObjectRow(wrapper)).toHaveLength(1);
+  });
+
+  it('should render as expected with an overwritten object', async () => {
+    const props: ImportSummaryProps = {
+      failedImports: [],
+      successfulImports: [successOverwritten],
+    };
+    const wrapper = shallowWithI18nProvider(<ImportSummary {...props} />);
+
+    expect(findHeader(wrapper).childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { importCount: 1 } })
+    );
+    expect(findCountCreated(wrapper)).toHaveLength(0);
+    const countOverwritten = findCountOverwritten(wrapper);
+    expect(countOverwritten).toHaveLength(1);
+    expect(countOverwritten.childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { overwrittenCount: 1 } })
+    );
+    expect(findCountError(wrapper)).toHaveLength(0);
+    expect(findObjectRow(wrapper)).toHaveLength(1);
+  });
+
+  it('should render as expected with an error object', async () => {
+    const props: ImportSummaryProps = {
+      failedImports: [errorUnsupportedType],
+      successfulImports: [],
+    };
+    const wrapper = shallowWithI18nProvider(<ImportSummary {...props} />);
+
+    expect(findHeader(wrapper).childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { importCount: 1 } })
+    );
+    expect(findCountCreated(wrapper)).toHaveLength(0);
+    expect(findCountOverwritten(wrapper)).toHaveLength(0);
+    const countError = findCountError(wrapper);
+    expect(countError).toHaveLength(1);
+    expect(countError.childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { errorCount: 1 } })
+    );
+    expect(findObjectRow(wrapper)).toHaveLength(1);
+  });
+
+  it('should render as expected with mixed objects', async () => {
+    const props: ImportSummaryProps = {
+      failedImports: [errorUnsupportedType],
+      successfulImports: [successNew, successOverwritten],
+    };
+    const wrapper = shallowWithI18nProvider(<ImportSummary {...props} />);
+
+    expect(findHeader(wrapper).childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { importCount: 3 } })
+    );
+    const countCreated = findCountCreated(wrapper);
+    expect(countCreated).toHaveLength(1);
+    expect(countCreated.childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { createdCount: 1 } })
+    );
+    const countOverwritten = findCountOverwritten(wrapper);
+    expect(countOverwritten).toHaveLength(1);
+    expect(countOverwritten.childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { overwrittenCount: 1 } })
+    );
+    const countError = findCountError(wrapper);
+    expect(countError).toHaveLength(1);
+    expect(countError.childAt(0).props()).toEqual(
+      expect.objectContaining({ values: { errorCount: 1 } })
+    );
+    expect(findObjectRow(wrapper)).toHaveLength(3);
+  });
+});
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx
new file mode 100644
index 0000000000000..7949f7d18d350
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx
@@ -0,0 +1,237 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import './import_summary.scss';
+import _ from 'lodash';
+import React, { Fragment } from 'react';
+import {
+  EuiText,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiToolTip,
+  EuiIcon,
+  EuiIconTip,
+  EuiHorizontalRule,
+  EuiTitle,
+  EuiSpacer,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { SavedObjectsImportSuccess } from 'kibana/public';
+import { FailedImport } from '../../..';
+import { getDefaultTitle, getSavedObjectLabel } from '../../../lib';
+
+const DEFAULT_ICON = 'apps';
+
+export interface ImportSummaryProps {
+  failedImports: FailedImport[];
+  successfulImports: SavedObjectsImportSuccess[];
+}
+
+interface ImportItem {
+  type: string;
+  id: string;
+  title: string;
+  icon: string;
+  outcome: 'created' | 'overwritten' | 'error';
+  errorMessage?: string;
+}
+
+const unsupportedTypeErrorMessage = i18n.translate(
+  'savedObjectsManagement.objectsTable.importSummary.unsupportedTypeError',
+  { defaultMessage: 'Unsupported object type' }
+);
+
+const getErrorMessage = ({ error }: FailedImport) => {
+  if (error.type === 'unknown') {
+    return error.message;
+  } else if (error.type === 'unsupported_type') {
+    return unsupportedTypeErrorMessage;
+  }
+};
+
+const mapFailedImport = (failure: FailedImport): ImportItem => {
+  const { obj } = failure;
+  const { type, id, meta } = obj;
+  const title = meta.title || getDefaultTitle(obj);
+  const icon = meta.icon || DEFAULT_ICON;
+  const errorMessage = getErrorMessage(failure);
+  return { type, id, title, icon, outcome: 'error', errorMessage };
+};
+
+const mapImportSuccess = (obj: SavedObjectsImportSuccess): ImportItem => {
+  const { type, id, meta, overwrite } = obj;
+  const title = meta.title || getDefaultTitle(obj);
+  const icon = meta.icon || DEFAULT_ICON;
+  const outcome = overwrite ? 'overwritten' : 'created';
+  return { type, id, title, icon, outcome };
+};
+
+const getCountIndicators = (importItems: ImportItem[]) => {
+  if (!importItems.length) {
+    return null;
+  }
+
+  const outcomeCounts = importItems.reduce(
+    (acc, { outcome }) => acc.set(outcome, (acc.get(outcome) ?? 0) + 1),
+    new Map<ImportItem['outcome'], number>()
+  );
+  const createdCount = outcomeCounts.get('created');
+  const overwrittenCount = outcomeCounts.get('overwritten');
+  const errorCount = outcomeCounts.get('error');
+
+  return (
+    <EuiFlexGroup>
+      {createdCount && (
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="xs">
+            <h4 className="savedObjectsManagementImportSummary__createdCount">
+              <FormattedMessage
+                id="savedObjectsManagement.importSummary.createdCountHeader"
+                defaultMessage="{createdCount} new"
+                values={{ createdCount }}
+              />
+            </h4>
+          </EuiTitle>
+        </EuiFlexItem>
+      )}
+      {overwrittenCount && (
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="xs">
+            <h4 className="savedObjectsManagementImportSummary__overwrittenCount">
+              <FormattedMessage
+                id="savedObjectsManagement.importSummary.overwrittenCountHeader"
+                defaultMessage="{overwrittenCount} overwritten"
+                values={{ overwrittenCount }}
+              />
+            </h4>
+          </EuiTitle>
+        </EuiFlexItem>
+      )}
+      {errorCount && (
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="xs">
+            <h4 className="savedObjectsManagementImportSummary__errorCount">
+              <FormattedMessage
+                id="savedObjectsManagement.importSummary.errorCountHeader"
+                defaultMessage="{errorCount} error"
+                values={{ errorCount }}
+              />
+            </h4>
+          </EuiTitle>
+        </EuiFlexItem>
+      )}
+    </EuiFlexGroup>
+  );
+};
+
+const getStatusIndicator = ({ outcome, errorMessage }: ImportItem) => {
+  switch (outcome) {
+    case 'created':
+      return (
+        <EuiIconTip
+          type={'checkInCircleFilled'}
+          color={'success'}
+          content={i18n.translate('savedObjectsManagement.importSummary.createdOutcomeLabel', {
+            defaultMessage: 'Created',
+          })}
+        />
+      );
+    case 'overwritten':
+      return (
+        <EuiIconTip
+          type={'check'}
+          content={i18n.translate('savedObjectsManagement.importSummary.overwrittenOutcomeLabel', {
+            defaultMessage: 'Overwritten',
+          })}
+        />
+      );
+    case 'error':
+      return (
+        <EuiIconTip
+          type={'alert'}
+          color={'danger'}
+          content={i18n.translate('savedObjectsManagement.importSummary.errorOutcomeLabel', {
+            defaultMessage: 'Error{message}',
+            values: { message: errorMessage ? `: ${errorMessage}` : '' },
+          })}
+        />
+      );
+  }
+};
+
+export const ImportSummary = ({ failedImports, successfulImports }: ImportSummaryProps) => {
+  const importItems: ImportItem[] = _.sortBy(
+    [
+      ...failedImports.map((x) => mapFailedImport(x)),
+      ...successfulImports.map((x) => mapImportSuccess(x)),
+    ],
+    ['type', 'title']
+  );
+
+  return (
+    <Fragment>
+      <EuiTitle
+        size="s"
+        data-test-subj={
+          importItems.length ? 'importSavedObjectsSuccess' : 'importSavedObjectsSuccessNoneImported'
+        }
+      >
+        <h3>
+          <FormattedMessage
+            id="savedObjectsManagement.importSummary.headerLabel"
+            defaultMessage="{importCount} object(s) imported"
+            values={{ importCount: importItems.length }}
+          />
+        </h3>
+      </EuiTitle>
+      <EuiSpacer size="m" />
+      {getCountIndicators(importItems)}
+      <EuiHorizontalRule />
+      {importItems.map((item, index) => {
+        const { type, title, icon } = item;
+        return (
+          <EuiFlexGroup
+            responsive={false}
+            key={index}
+            alignItems="center"
+            gutterSize="s"
+            className="savedObjectsManagementImportSummary__row"
+          >
+            <EuiFlexItem grow={false}>
+              <EuiToolTip position="top" content={getSavedObjectLabel(type)}>
+                <EuiIcon aria-label={getSavedObjectLabel(type)} type={icon} size="s" />
+              </EuiToolTip>
+            </EuiFlexItem>
+            <EuiFlexItem className="savedObjectsManagementImportSummary__title">
+              <EuiText size="s">
+                <p className="eui-textTruncate" title={title}>
+                  {title}
+                </p>
+              </EuiText>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <div className="eui-textRight">{getStatusIndicator(item)}</div>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        );
+      })}
+    </Fragment>
+  );
+};
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.test.tsx
new file mode 100644
index 0000000000000..c93bc9e5038df
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.test.tsx
@@ -0,0 +1,107 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React from 'react';
+import { shallowWithI18nProvider, mountWithIntl } from 'test_utils/enzyme_helpers';
+import { OverwriteModalProps, OverwriteModal } from './overwrite_modal';
+import { findTestSubject } from '@elastic/eui/lib/test';
+
+describe('OverwriteModal', () => {
+  const obj = { type: 'foo', id: 'bar', meta: { title: 'baz' } };
+  const onFinish = jest.fn();
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('with a regular conflict', () => {
+    const props: OverwriteModalProps = {
+      conflict: { obj, error: { type: 'conflict', destinationId: 'qux' } },
+      onFinish,
+    };
+
+    it('should render as expected', async () => {
+      const wrapper = shallowWithI18nProvider(<OverwriteModal {...props} />);
+
+      expect(wrapper.find('p').text()).toMatchInlineSnapshot(
+        `"\\"baz\\" conflicts with an existing object, are you sure you want to overwrite it?"`
+      );
+      expect(wrapper.find('EuiSuperSelect')).toHaveLength(0);
+    });
+
+    it('should call onFinish with expected args when Skip is clicked', async () => {
+      const wrapper = mountWithIntl(<OverwriteModal {...props} />);
+
+      expect(onFinish).not.toHaveBeenCalled();
+      findTestSubject(wrapper, 'confirmModalCancelButton').simulate('click');
+      expect(onFinish).toHaveBeenCalledWith(false);
+    });
+
+    it('should call onFinish with expected args when Overwrite is clicked', async () => {
+      const wrapper = mountWithIntl(<OverwriteModal {...props} />);
+
+      expect(onFinish).not.toHaveBeenCalled();
+      findTestSubject(wrapper, 'confirmModalConfirmButton').simulate('click');
+      expect(onFinish).toHaveBeenCalledWith(true, 'qux');
+    });
+  });
+
+  describe('with an ambiguous conflict', () => {
+    const props: OverwriteModalProps = {
+      conflict: {
+        obj,
+        error: {
+          type: 'ambiguous_conflict',
+          destinations: [
+            // TODO: change one of these to have an actual `updatedAt` date string, and mock Moment for the snapshot below
+            { id: 'qux', title: 'some title', updatedAt: undefined },
+            { id: 'quux', title: 'another title', updatedAt: undefined },
+          ],
+        },
+      },
+      onFinish,
+    };
+
+    it('should render as expected', async () => {
+      const wrapper = shallowWithI18nProvider(<OverwriteModal {...props} />);
+
+      expect(wrapper.find('p').text()).toMatchInlineSnapshot(
+        `"\\"baz\\" conflicts with multiple existing objects, do you want to overwrite one of them?"`
+      );
+      expect(wrapper.find('EuiSuperSelect')).toHaveLength(1);
+    });
+
+    it('should call onFinish with expected args when Skip is clicked', async () => {
+      const wrapper = mountWithIntl(<OverwriteModal {...props} />);
+
+      expect(onFinish).not.toHaveBeenCalled();
+      findTestSubject(wrapper, 'confirmModalCancelButton').simulate('click');
+      expect(onFinish).toHaveBeenCalledWith(false);
+    });
+
+    it('should call onFinish with expected args when Overwrite is clicked', async () => {
+      const wrapper = mountWithIntl(<OverwriteModal {...props} />);
+
+      expect(onFinish).not.toHaveBeenCalled();
+      findTestSubject(wrapper, 'confirmModalConfirmButton').simulate('click');
+      // first destination is selected by default
+      expect(onFinish).toHaveBeenCalledWith(true, 'qux');
+    });
+  });
+});
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx
new file mode 100644
index 0000000000000..dbe95161cbeae
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx
@@ -0,0 +1,139 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import React, { useState, Fragment, ReactNode } from 'react';
+import {
+  EuiOverlayMask,
+  EuiConfirmModal,
+  EUI_MODAL_CONFIRM_BUTTON,
+  EuiText,
+  EuiSuperSelect,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import moment from 'moment';
+import { FailedImportConflict } from '../../../lib/resolve_import_errors';
+import { getDefaultTitle } from '../../../lib';
+
+export interface OverwriteModalProps {
+  conflict: FailedImportConflict;
+  onFinish: (overwrite: boolean, destinationId?: string) => void;
+}
+
+export const OverwriteModal = ({ conflict, onFinish }: OverwriteModalProps) => {
+  const { obj, error } = conflict;
+  let initialDestinationId: string | undefined;
+  let selectControl: ReactNode = null;
+  if (error.type === 'conflict') {
+    initialDestinationId = error.destinationId;
+  } else {
+    // ambiguous conflict must have at least two destinations; default to the first one
+    initialDestinationId = error.destinations[0].id;
+  }
+  const [destinationId, setDestinationId] = useState(initialDestinationId);
+
+  if (error.type === 'ambiguous_conflict') {
+    const selectProps = {
+      options: error.destinations.map((destination) => {
+        const header = destination.title ?? `${type} [id=${destination.id}]`;
+        const lastUpdated = destination.updatedAt
+          ? moment(destination.updatedAt).fromNow()
+          : 'never';
+        const idText = `ID: ${destination.id}`;
+        const lastUpdatedText = `Last updated: ${lastUpdated}`;
+        return {
+          value: destination.id,
+          inputDisplay: destination.id,
+          dropdownDisplay: (
+            <Fragment>
+              <strong>{header}</strong>
+              <EuiText size="s" color="subdued">
+                <p className="euiTextColor--subdued">
+                  {idText}
+                  <br />
+                  {lastUpdatedText}
+                </p>
+              </EuiText>
+            </Fragment>
+          ),
+        };
+      }),
+      onChange: (value: string) => {
+        setDestinationId(value);
+      },
+    };
+    selectControl = (
+      <EuiSuperSelect
+        options={selectProps.options}
+        valueOfSelected={destinationId}
+        onChange={selectProps.onChange}
+        prepend={i18n.translate(
+          'savedObjectsManagement.objectsTable.overwriteModal.selectControlLabel',
+          { defaultMessage: 'Object ID' }
+        )}
+        hasDividers
+        fullWidth
+        compressed
+      />
+    );
+  }
+
+  const { type, meta } = obj;
+  const title = meta.title || getDefaultTitle(obj);
+  const bodyText =
+    error.type === 'conflict'
+      ? i18n.translate('savedObjectsManagement.objectsTable.overwriteModal.body.conflict', {
+          defaultMessage:
+            '"{title}" conflicts with an existing object, are you sure you want to overwrite it?',
+          values: { title },
+        })
+      : i18n.translate(
+          'savedObjectsManagement.objectsTable.overwriteModal.body.ambiguousConflict',
+          {
+            defaultMessage:
+              '"{title}" conflicts with multiple existing objects, do you want to overwrite one of them?',
+            values: { title },
+          }
+        );
+  return (
+    <EuiOverlayMask>
+      <EuiConfirmModal
+        title={i18n.translate('savedObjectsManagement.objectsTable.overwriteModal.title', {
+          defaultMessage: 'Overwrite {type}?',
+          values: { type },
+        })}
+        cancelButtonText={i18n.translate(
+          'savedObjectsManagement.objectsTable.overwriteModal.cancelButtonText',
+          { defaultMessage: 'Skip' }
+        )}
+        confirmButtonText={i18n.translate(
+          'savedObjectsManagement.objectsTable.overwriteModal.overwriteButtonText',
+          { defaultMessage: 'Overwrite' }
+        )}
+        buttonColor="danger"
+        onCancel={() => onFinish(false)}
+        onConfirm={() => onFinish(true, destinationId)}
+        defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
+        maxWidth="500px"
+      >
+        <p>{bodyText}</p>
+        {selectControl}
+      </EuiConfirmModal>
+    </EuiOverlayMask>
+  );
+};
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
index 2e545b372f781..ead2738973074 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.test.tsx
@@ -87,7 +87,7 @@ describe('Relationships', () => {
     const component = shallowWithI18nProvider(<Relationships {...props} />);
 
     // Make sure we are showing loading
-    expect(component.find('EuiLoadingKibana').length).toBe(1);
+    expect(component.find('EuiLoadingElastic').length).toBe(1);
 
     // Ensure all promises resolve
     await new Promise((resolve) => process.nextTick(resolve));
@@ -154,7 +154,7 @@ describe('Relationships', () => {
     const component = shallowWithI18nProvider(<Relationships {...props} />);
 
     // Make sure we are showing loading
-    expect(component.find('EuiLoadingKibana').length).toBe(1);
+    expect(component.find('EuiLoadingElastic').length).toBe(1);
 
     // Ensure all promises resolve
     await new Promise((resolve) => process.nextTick(resolve));
@@ -221,7 +221,7 @@ describe('Relationships', () => {
     const component = shallowWithI18nProvider(<Relationships {...props} />);
 
     // Make sure we are showing loading
-    expect(component.find('EuiLoadingKibana').length).toBe(1);
+    expect(component.find('EuiLoadingElastic').length).toBe(1);
 
     // Ensure all promises resolve
     await new Promise((resolve) => process.nextTick(resolve));
@@ -288,7 +288,7 @@ describe('Relationships', () => {
     const component = shallowWithI18nProvider(<Relationships {...props} />);
 
     // Make sure we are showing loading
-    expect(component.find('EuiLoadingKibana').length).toBe(1);
+    expect(component.find('EuiLoadingElastic').length).toBe(1);
 
     // Ensure all promises resolve
     await new Promise((resolve) => process.nextTick(resolve));
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
index cc654f9717bd6..194733433ce29 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
@@ -26,7 +26,7 @@ import {
   EuiLink,
   EuiIcon,
   EuiCallOut,
-  EuiLoadingKibana,
+  EuiLoadingElastic,
   EuiInMemoryTable,
   EuiToolTip,
   EuiText,
@@ -119,7 +119,7 @@ export class Relationships extends Component<RelationshipsProps, RelationshipsSt
     }
 
     if (isLoading) {
-      return <EuiLoadingKibana size="xl" />;
+      return <EuiLoadingElastic size="xl" />;
     }
 
     const columns = [
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
index 0c7bf64ca011d..7733a587ca9a7 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.test.tsx
@@ -23,11 +23,14 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { keys } from '@elastic/eui';
 import { httpServiceMock } from '../../../../../../core/public/mocks';
 import { actionServiceMock } from '../../../services/action_service.mock';
+import { columnServiceMock } from '../../../services/column_service.mock';
+import { SavedObjectsManagementAction } from '../../..';
 import { Table, TableProps } from './table';
 
 const defaultProps: TableProps = {
   basePath: httpServiceMock.createSetupContract().basePath,
   actionRegistry: actionServiceMock.createStart(),
+  columnRegistry: columnServiceMock.createStart(),
   selectedSavedObjects: [
     {
       id: '1',
@@ -50,6 +53,7 @@ const defaultProps: TableProps = {
   },
   filterOptions: [{ value: 2 }],
   onDelete: () => {},
+  onActionRefresh: () => {},
   onExport: () => {},
   goInspectObject: () => {},
   canGoInApp: () => true,
@@ -122,4 +126,32 @@ describe('Table', () => {
 
     expect(component).toMatchSnapshot();
   });
+
+  it(`allows for automatic refreshing after an action`, () => {
+    const actionRegistry = actionServiceMock.createStart();
+    actionRegistry.getAll.mockReturnValue([
+      {
+        // minimal action mock to exercise this test case
+        id: 'someAction',
+        render: () => <div>action!</div>,
+        refreshOnFinish: () => true,
+        euiAction: { name: 'foo', description: 'bar', icon: 'beaker', type: 'icon' },
+        registerOnFinishCallback: (callback: Function) => callback(), // call the callback immediately for this test
+      } as SavedObjectsManagementAction,
+    ]);
+    const onActionRefresh = jest.fn();
+    const customizedProps = { ...defaultProps, actionRegistry, onActionRefresh };
+    const component = shallowWithI18nProvider(<Table {...customizedProps} />);
+
+    const table = component.find('EuiBasicTable');
+    const columns = table.prop('columns') as any[];
+    const actionColumn = columns.find((x) => x.hasOwnProperty('actions')) as { actions: any[] };
+    const someAction = actionColumn.actions.find(
+      (x) => x['data-test-subj'] === 'savedObjectsTableAction-someAction'
+    );
+
+    expect(onActionRefresh).not.toHaveBeenCalled();
+    someAction.onClick();
+    expect(onActionRefresh).toHaveBeenCalled();
+  });
 });
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
index 719729cee2602..0ce7e6e38962a 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/table.tsx
@@ -42,11 +42,13 @@ import { SavedObjectWithMetadata } from '../../../types';
 import {
   SavedObjectsManagementActionServiceStart,
   SavedObjectsManagementAction,
+  SavedObjectsManagementColumnServiceStart,
 } from '../../../services';
 
 export interface TableProps {
   basePath: IBasePath;
   actionRegistry: SavedObjectsManagementActionServiceStart;
+  columnRegistry: SavedObjectsManagementColumnServiceStart;
   selectedSavedObjects: SavedObjectWithMetadata[];
   selectionConfig: {
     onSelectionChange: (selection: SavedObjectWithMetadata[]) => void;
@@ -54,6 +56,7 @@ export interface TableProps {
   filterOptions: any[];
   canDelete: boolean;
   onDelete: () => void;
+  onActionRefresh: (object: SavedObjectWithMetadata) => void;
   onExport: (includeReferencesDeep: boolean) => void;
   goInspectObject: (obj: SavedObjectWithMetadata) => void;
   pageIndex: number;
@@ -74,6 +77,7 @@ interface TableState {
   isExportPopoverOpen: boolean;
   isIncludeReferencesDeepChecked: boolean;
   activeAction?: SavedObjectsManagementAction;
+  isColumnDataLoaded: boolean;
 }
 
 export class Table extends PureComponent<TableProps, TableState> {
@@ -83,12 +87,22 @@ export class Table extends PureComponent<TableProps, TableState> {
     isExportPopoverOpen: false,
     isIncludeReferencesDeepChecked: true,
     activeAction: undefined,
+    isColumnDataLoaded: false,
   };
 
   constructor(props: TableProps) {
     super(props);
   }
 
+  componentDidMount() {
+    this.loadColumnData();
+  }
+
+  loadColumnData = async () => {
+    await Promise.all(this.props.columnRegistry.getAll().map((column) => column.loadData()));
+    this.setState({ isColumnDataLoaded: true });
+  };
+
   onChange = ({ query, error }: any) => {
     if (error) {
       this.setState({
@@ -139,12 +153,14 @@ export class Table extends PureComponent<TableProps, TableState> {
       filterOptions,
       selectionConfig: selection,
       onDelete,
+      onActionRefresh,
       selectedSavedObjects,
       onTableChange,
       goInspectObject,
       onShowRelationships,
       basePath,
       actionRegistry,
+      columnRegistry,
     } = this.props;
 
     const pagination = {
@@ -224,10 +240,18 @@ export class Table extends PureComponent<TableProps, TableState> {
           );
         },
       } as EuiTableFieldDataColumnType<SavedObjectWithMetadata<any>>,
+      ...columnRegistry.getAll().map((column) => {
+        return {
+          ...column.euiColumn,
+          sortable: false,
+          'data-test-subj': `savedObjectsTableColumn-${column.id}`,
+        };
+      }),
       {
         name: i18n.translate('savedObjectsManagement.objectsTable.table.columnActionsName', {
           defaultMessage: 'Actions',
         }),
+        width: '80px',
         actions: [
           {
             name: i18n.translate(
@@ -274,6 +298,10 @@ export class Table extends PureComponent<TableProps, TableState> {
                   this.setState({
                     activeAction: undefined,
                   });
+                  const { refreshOnFinish = () => false } = action;
+                  if (refreshOnFinish()) {
+                    onActionRefresh(object);
+                  }
                 });
 
                 if (action.euiAction.onClick) {
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
index 3719dac24e6e7..1bc3dc8066520 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.test.tsx
@@ -41,6 +41,7 @@ import {
 import { dataPluginMock } from '../../../../data/public/mocks';
 import { serviceRegistryMock } from '../../services/service_registry.mock';
 import { actionServiceMock } from '../../services/action_service.mock';
+import { columnServiceMock } from '../../services/column_service.mock';
 import {
   SavedObjectsTable,
   SavedObjectsTableProps,
@@ -134,6 +135,7 @@ describe('SavedObjectsTable', () => {
       allowedTypes,
       serviceRegistry: serviceRegistryMock.create(),
       actionRegistry: actionServiceMock.createStart(),
+      columnRegistry: columnServiceMock.createStart(),
       savedObjectsClient: savedObjects.client,
       indexPatterns: dataPluginMock.createStartContract().indexPatterns,
       http,
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
index 340c0e3237f91..d879a71cc2269 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/saved_objects_table.tsx
@@ -27,7 +27,7 @@ import {
   EuiInMemoryTable,
   EuiIcon,
   EuiConfirmModal,
-  EuiLoadingKibana,
+  EuiLoadingElastic,
   EuiOverlayMask,
   EUI_MODAL_CONFIRM_BUTTON,
   EuiCheckboxGroup,
@@ -65,6 +65,7 @@ import {
   fetchExportObjects,
   fetchExportByTypeAndSearch,
   findObjects,
+  findObject,
   extractExportDetails,
   SavedObjectsExportResultDetails,
 } from '../../lib';
@@ -72,6 +73,7 @@ import { SavedObjectWithMetadata } from '../../types';
 import {
   ISavedObjectsManagementServiceRegistry,
   SavedObjectsManagementActionServiceStart,
+  SavedObjectsManagementColumnServiceStart,
 } from '../../services';
 import { Header, Table, Flyout, Relationships } from './components';
 import { DataPublicPluginStart } from '../../../../../plugins/data/public';
@@ -85,6 +87,7 @@ export interface SavedObjectsTableProps {
   allowedTypes: string[];
   serviceRegistry: ISavedObjectsManagementServiceRegistry;
   actionRegistry: SavedObjectsManagementActionServiceStart;
+  columnRegistry: SavedObjectsManagementColumnServiceStart;
   savedObjectsClient: SavedObjectsClientContract;
   indexPatterns: IndexPatternsContract;
   http: HttpStart;
@@ -157,7 +160,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
 
   componentWillUnmount() {
     this._isMounted = false;
-    this.debouncedFetch.cancel();
+    this.debouncedFetchObjects.cancel();
   }
 
   fetchCounts = async () => {
@@ -202,15 +205,14 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
   };
 
   fetchSavedObjects = () => {
-    this.setState(
-      {
-        isSearching: true,
-      },
-      this.debouncedFetch
-    );
+    this.setState({ isSearching: true }, this.debouncedFetchObjects);
   };
 
-  debouncedFetch = debounce(async () => {
+  fetchSavedObject = (type: string, id: string) => {
+    this.setState({ isSearching: true }, () => this.debouncedFetchObject(type, id));
+  };
+
+  debouncedFetchObjects = debounce(async () => {
     const { activeQuery: query, page, perPage } = this.state;
     const { notifications, http, allowedTypes } = this.props;
     const { queryText, visibleTypes } = parseQuery(query);
@@ -261,10 +263,48 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
     }
   }, 300);
 
-  refreshData = async () => {
+  debouncedFetchObject = debounce(async (type: string, id: string) => {
+    const { notifications, http } = this.props;
+    try {
+      const resp = await findObject(http, type, id);
+      if (!this._isMounted) {
+        return;
+      }
+
+      this.setState(({ savedObjects, filteredItemCount }) => {
+        const refreshedSavedObjects = savedObjects.map((object) =>
+          object.type === type && object.id === id ? resp : object
+        );
+        return {
+          savedObjects: refreshedSavedObjects,
+          filteredItemCount,
+          isSearching: false,
+        };
+      });
+    } catch (error) {
+      if (this._isMounted) {
+        this.setState({
+          isSearching: false,
+        });
+      }
+      notifications.toasts.addDanger({
+        title: i18n.translate(
+          'savedObjectsManagement.objectsTable.unableFindSavedObjectNotificationMessage',
+          { defaultMessage: 'Unable to find saved object' }
+        ),
+        text: `${error}`,
+      });
+    }
+  }, 300);
+
+  refreshObjects = async () => {
     await Promise.all([this.fetchSavedObjects(), this.fetchCounts()]);
   };
 
+  refreshObject = async ({ type, id }: SavedObjectWithMetadata) => {
+    await this.fetchSavedObject(type, id);
+  };
+
   onSelectionChanged = (selection: SavedObjectWithMetadata[]) => {
     this.setState({ selectedSavedObjects: selection });
   };
@@ -505,7 +545,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
 
     if (isDeleting) {
       // Block the user from interacting with the table while its contents are being deleted.
-      modal = <EuiLoadingKibana size="xl" />;
+      modal = <EuiLoadingElastic size="xl" />;
     } else {
       const onCancel = () => {
         this.setState({ isShowingDeleteConfirmModal: false });
@@ -731,7 +771,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
         <Header
           onExportAll={() => this.setState({ isShowingExportAllOptionsModal: true })}
           onImport={this.showImportFlyout}
-          onRefresh={this.refreshData}
+          onRefresh={this.refreshObjects}
           filteredCount={filteredItemCount}
         />
         <EuiSpacer size="xs" />
@@ -740,6 +780,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
             basePath={http.basePath}
             itemId={'id'}
             actionRegistry={this.props.actionRegistry}
+            columnRegistry={this.props.columnRegistry}
             selectionConfig={selectionConfig}
             selectedSavedObjects={selectedSavedObjects}
             onQueryChange={this.onQueryChange}
@@ -748,6 +789,7 @@ export class SavedObjectsTable extends Component<SavedObjectsTableProps, SavedOb
             onExport={this.onExport}
             canDelete={applications.capabilities.savedObjectsManagement.delete as boolean}
             onDelete={this.onDelete}
+            onActionRefresh={this.refreshObject}
             goInspectObject={this.props.goInspectObject}
             pageIndex={page}
             pageSize={perPage}
diff --git a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
index dbbea4012aba9..d788a25eb7d6f 100644
--- a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx
@@ -25,6 +25,7 @@ import { DataPublicPluginStart } from '../../../data/public';
 import {
   ISavedObjectsManagementServiceRegistry,
   SavedObjectsManagementActionServiceStart,
+  SavedObjectsManagementColumnServiceStart,
 } from '../services';
 import { SavedObjectsTable } from './objects_table';
 
@@ -34,6 +35,7 @@ const SavedObjectsTablePage = ({
   allowedTypes,
   serviceRegistry,
   actionRegistry,
+  columnRegistry,
   setBreadcrumbs,
 }: {
   coreStart: CoreStart;
@@ -41,6 +43,7 @@ const SavedObjectsTablePage = ({
   allowedTypes: string[];
   serviceRegistry: ISavedObjectsManagementServiceRegistry;
   actionRegistry: SavedObjectsManagementActionServiceStart;
+  columnRegistry: SavedObjectsManagementColumnServiceStart;
   setBreadcrumbs: (crumbs: ChromeBreadcrumb[]) => void;
 }) => {
   const capabilities = coreStart.application.capabilities;
@@ -62,6 +65,7 @@ const SavedObjectsTablePage = ({
       allowedTypes={allowedTypes}
       serviceRegistry={serviceRegistry}
       actionRegistry={actionRegistry}
+      columnRegistry={columnRegistry}
       savedObjectsClient={coreStart.savedObjects.client}
       indexPatterns={dataStart.indexPatterns}
       search={dataStart.search}
diff --git a/src/plugins/saved_objects_management/public/mocks.ts b/src/plugins/saved_objects_management/public/mocks.ts
index 1de3de8e85302..3bd5a70884d85 100644
--- a/src/plugins/saved_objects_management/public/mocks.ts
+++ b/src/plugins/saved_objects_management/public/mocks.ts
@@ -18,12 +18,14 @@
  */
 
 import { actionServiceMock } from './services/action_service.mock';
+import { columnServiceMock } from './services/column_service.mock';
 import { serviceRegistryMock } from './services/service_registry.mock';
 import { SavedObjectsManagementPluginSetup, SavedObjectsManagementPluginStart } from './plugin';
 
 const createSetupContractMock = (): jest.Mocked<SavedObjectsManagementPluginSetup> => {
   const mock = {
     actions: actionServiceMock.createSetup(),
+    columns: columnServiceMock.createSetup(),
     serviceRegistry: serviceRegistryMock.create(),
   };
   return mock;
@@ -32,6 +34,7 @@ const createSetupContractMock = (): jest.Mocked<SavedObjectsManagementPluginSetu
 const createStartContractMock = (): jest.Mocked<SavedObjectsManagementPluginStart> => {
   const mock = {
     actions: actionServiceMock.createStart(),
+    columns: columnServiceMock.createStart(),
   };
   return mock;
 };
diff --git a/src/plugins/saved_objects_management/public/plugin.ts b/src/plugins/saved_objects_management/public/plugin.ts
index ac30c63409760..907352f52699e 100644
--- a/src/plugins/saved_objects_management/public/plugin.ts
+++ b/src/plugins/saved_objects_management/public/plugin.ts
@@ -29,6 +29,9 @@ import {
   SavedObjectsManagementActionService,
   SavedObjectsManagementActionServiceSetup,
   SavedObjectsManagementActionServiceStart,
+  SavedObjectsManagementColumnService,
+  SavedObjectsManagementColumnServiceSetup,
+  SavedObjectsManagementColumnServiceStart,
   SavedObjectsManagementServiceRegistry,
   ISavedObjectsManagementServiceRegistry,
 } from './services';
@@ -36,11 +39,13 @@ import { registerServices } from './register_services';
 
 export interface SavedObjectsManagementPluginSetup {
   actions: SavedObjectsManagementActionServiceSetup;
+  columns: SavedObjectsManagementColumnServiceSetup;
   serviceRegistry: ISavedObjectsManagementServiceRegistry;
 }
 
 export interface SavedObjectsManagementPluginStart {
   actions: SavedObjectsManagementActionServiceStart;
+  columns: SavedObjectsManagementColumnServiceStart;
 }
 
 export interface SetupDependencies {
@@ -64,6 +69,7 @@ export class SavedObjectsManagementPlugin
       StartDependencies
     > {
   private actionService = new SavedObjectsManagementActionService();
+  private columnService = new SavedObjectsManagementColumnService();
   private serviceRegistry = new SavedObjectsManagementServiceRegistry();
 
   public setup(
@@ -71,6 +77,7 @@ export class SavedObjectsManagementPlugin
     { home, management }: SetupDependencies
   ): SavedObjectsManagementPluginSetup {
     const actionSetup = this.actionService.setup();
+    const columnSetup = this.columnService.setup();
 
     if (home) {
       home.featureCatalogue.register({
@@ -111,15 +118,18 @@ export class SavedObjectsManagementPlugin
 
     return {
       actions: actionSetup,
+      columns: columnSetup,
       serviceRegistry: this.serviceRegistry,
     };
   }
 
   public start(core: CoreStart, { data }: StartDependencies) {
     const actionStart = this.actionService.start();
+    const columnStart = this.columnService.start();
 
     return {
       actions: actionStart,
+      columns: columnStart,
     };
   }
 }
diff --git a/src/plugins/saved_objects_management/public/services/column_service.mock.ts b/src/plugins/saved_objects_management/public/services/column_service.mock.ts
new file mode 100644
index 0000000000000..977b2099771ba
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/services/column_service.mock.ts
@@ -0,0 +1,57 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import {
+  SavedObjectsManagementColumnService,
+  SavedObjectsManagementColumnServiceSetup,
+  SavedObjectsManagementColumnServiceStart,
+} from './column_service';
+
+const createSetupMock = (): jest.Mocked<SavedObjectsManagementColumnServiceSetup> => {
+  const mock = {
+    register: jest.fn(),
+  };
+  return mock;
+};
+
+const createStartMock = (): jest.Mocked<SavedObjectsManagementColumnServiceStart> => {
+  const mock = {
+    has: jest.fn(),
+    getAll: jest.fn(),
+  };
+
+  mock.has.mockReturnValue(true);
+  mock.getAll.mockReturnValue([]);
+
+  return mock;
+};
+
+const createServiceMock = (): jest.Mocked<PublicMethodsOf<SavedObjectsManagementColumnService>> => {
+  const mock = {
+    setup: jest.fn().mockReturnValue(createSetupMock()),
+    start: jest.fn().mockReturnValue(createStartMock()),
+  };
+  return mock;
+};
+
+export const columnServiceMock = {
+  create: createServiceMock,
+  createSetup: createSetupMock,
+  createStart: createStartMock,
+};
diff --git a/src/plugins/saved_objects_management/public/services/column_service.test.ts b/src/plugins/saved_objects_management/public/services/column_service.test.ts
new file mode 100644
index 0000000000000..367422b0bbe11
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/services/column_service.test.ts
@@ -0,0 +1,66 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import {
+  SavedObjectsManagementColumnService,
+  SavedObjectsManagementColumnServiceSetup,
+} from './column_service';
+import { SavedObjectsManagementColumn } from './types';
+
+class DummyColumn implements SavedObjectsManagementColumn<unknown> {
+  constructor(public id: string) {}
+
+  public euiColumn = {
+    field: 'id',
+    name: 'name',
+  };
+
+  public loadData = async () => {};
+}
+
+describe('SavedObjectsManagementColumnRegistry', () => {
+  let service: SavedObjectsManagementColumnService;
+  let setup: SavedObjectsManagementColumnServiceSetup;
+
+  const createColumn = (id: string): SavedObjectsManagementColumn<unknown> => {
+    return new DummyColumn(id);
+  };
+
+  beforeEach(() => {
+    service = new SavedObjectsManagementColumnService();
+    setup = service.setup();
+  });
+
+  describe('#register', () => {
+    it('allows columns to be registered and retrieved', () => {
+      const column = createColumn('foo');
+      setup.register(column);
+      const start = service.start();
+      expect(start.getAll()).toContain(column);
+    });
+
+    it('does not allow columns with duplicate ids to be registered', () => {
+      const column = createColumn('my-column');
+      setup.register(column);
+      expect(() => setup.register(column)).toThrowErrorMatchingInlineSnapshot(
+        `"Saved Objects Management Column with id 'my-column' already exists"`
+      );
+    });
+  });
+});
diff --git a/src/plugins/saved_objects_management/public/services/column_service.ts b/src/plugins/saved_objects_management/public/services/column_service.ts
new file mode 100644
index 0000000000000..5006d9df813cf
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/services/column_service.ts
@@ -0,0 +1,55 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectsManagementColumn } from './types';
+
+export interface SavedObjectsManagementColumnServiceSetup {
+  /**
+   * register given column in the registry.
+   */
+  register: (column: SavedObjectsManagementColumn<unknown>) => void;
+}
+
+export interface SavedObjectsManagementColumnServiceStart {
+  /**
+   * return all {@link SavedObjectsManagementColumn | columns} currently registered.
+   */
+  getAll: () => Array<SavedObjectsManagementColumn<unknown>>;
+}
+
+export class SavedObjectsManagementColumnService {
+  private readonly columns = new Map<string, SavedObjectsManagementColumn<unknown>>();
+
+  setup(): SavedObjectsManagementColumnServiceSetup {
+    return {
+      register: (column) => {
+        if (this.columns.has(column.id)) {
+          throw new Error(`Saved Objects Management Column with id '${column.id}' already exists`);
+        }
+        this.columns.set(column.id, column);
+      },
+    };
+  }
+
+  start(): SavedObjectsManagementColumnServiceStart {
+    return {
+      getAll: () => [...this.columns.values()],
+    };
+  }
+}
diff --git a/src/plugins/saved_objects_management/public/services/index.ts b/src/plugins/saved_objects_management/public/services/index.ts
index a59ad9012c402..f3379a3e29702 100644
--- a/src/plugins/saved_objects_management/public/services/index.ts
+++ b/src/plugins/saved_objects_management/public/services/index.ts
@@ -22,9 +22,18 @@ export {
   SavedObjectsManagementActionServiceStart,
   SavedObjectsManagementActionServiceSetup,
 } from './action_service';
+export {
+  SavedObjectsManagementColumnService,
+  SavedObjectsManagementColumnServiceStart,
+  SavedObjectsManagementColumnServiceSetup,
+} from './column_service';
 export {
   SavedObjectsManagementServiceRegistry,
   ISavedObjectsManagementServiceRegistry,
   SavedObjectsManagementServiceRegistryEntry,
 } from './service_registry';
-export { SavedObjectsManagementAction, SavedObjectsManagementRecord } from './types';
+export {
+  SavedObjectsManagementAction,
+  SavedObjectsManagementColumn,
+  SavedObjectsManagementRecord,
+} from './types';
diff --git a/src/plugins/saved_objects_management/public/services/types.ts b/src/plugins/saved_objects_management/public/services/types/action.ts
similarity index 86%
rename from src/plugins/saved_objects_management/public/services/types.ts
rename to src/plugins/saved_objects_management/public/services/types/action.ts
index c2f807f63b1b9..2ead55d1f4338 100644
--- a/src/plugins/saved_objects_management/public/services/types.ts
+++ b/src/plugins/saved_objects_management/public/services/types/action.ts
@@ -17,18 +17,8 @@
  * under the License.
  */
 
-import { ReactNode } from 'react';
-import { SavedObjectReference } from 'src/core/public';
-
-export interface SavedObjectsManagementRecord {
-  type: string;
-  id: string;
-  meta: {
-    icon: string;
-    title: string;
-  };
-  references: SavedObjectReference[];
-}
+import { ReactNode } from '@elastic/eui/node_modules/@types/react';
+import { SavedObjectsManagementRecord } from '.';
 
 export abstract class SavedObjectsManagementAction {
   public abstract render: () => ReactNode;
@@ -43,6 +33,7 @@ export abstract class SavedObjectsManagementAction {
     onClick?: (item: SavedObjectsManagementRecord) => void;
     render?: (item: SavedObjectsManagementRecord) => any;
   };
+  public refreshOnFinish?: () => boolean;
 
   private callbacks: Function[] = [];
 
diff --git a/src/plugins/saved_objects_management/public/services/types/column.ts b/src/plugins/saved_objects_management/public/services/types/column.ts
new file mode 100644
index 0000000000000..79ee4d649177f
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/services/types/column.ts
@@ -0,0 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { EuiTableFieldDataColumnType } from '@elastic/eui';
+import { SavedObjectsManagementRecord } from '.';
+
+export interface SavedObjectsManagementColumn<T> {
+  id: string;
+  euiColumn: Omit<EuiTableFieldDataColumnType<SavedObjectsManagementRecord>, 'sortable'>;
+
+  data?: T;
+  loadData: () => Promise<T>;
+}
diff --git a/src/plugins/saved_objects_management/public/services/types/index.ts b/src/plugins/saved_objects_management/public/services/types/index.ts
new file mode 100644
index 0000000000000..667ba8a683d8d
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/services/types/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { SavedObjectsManagementAction } from './action';
+export { SavedObjectsManagementColumn } from './column';
+export { SavedObjectsManagementRecord } from './record';
diff --git a/src/plugins/saved_objects_management/public/services/types/record.ts b/src/plugins/saved_objects_management/public/services/types/record.ts
new file mode 100644
index 0000000000000..9e00935e674ad
--- /dev/null
+++ b/src/plugins/saved_objects_management/public/services/types/record.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectReference, SavedObjectsNamespaceType } from 'src/core/public';
+
+export interface SavedObjectsManagementRecord {
+  type: string;
+  id: string;
+  meta: {
+    icon: string;
+    title: string;
+    namespaceType: SavedObjectsNamespaceType;
+  };
+  references: SavedObjectReference[];
+  namespaces?: string[];
+}
diff --git a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts
index 0c0f9d8feb506..11e685bd198e4 100644
--- a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts
+++ b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.test.ts
@@ -34,6 +34,7 @@ describe('injectMetaAttributes', () => {
       path: 'path',
       uiCapabilitiesPath: 'uiCapabilitiesPath',
     });
+    managementService.getNamespaceType.mockReturnValue('single');
   });
 
   it('inject the metadata to the obj', () => {
@@ -58,6 +59,7 @@ describe('injectMetaAttributes', () => {
           path: 'path',
           uiCapabilitiesPath: 'uiCapabilitiesPath',
         },
+        namespaceType: 'single',
       },
     });
   });
diff --git a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts
index 615caffd3b60b..54cad2d54e60a 100644
--- a/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts
+++ b/src/plugins/saved_objects_management/server/lib/inject_meta_attributes.ts
@@ -35,6 +35,7 @@ export function injectMetaAttributes<T = unknown>(
   result.meta.title = savedObjectsManagement.getTitle(savedObject);
   result.meta.editUrl = savedObjectsManagement.getEditUrl(savedObject);
   result.meta.inAppUrl = savedObjectsManagement.getInAppUrl(savedObject);
+  result.meta.namespaceType = savedObjectsManagement.getNamespaceType(savedObject);
 
   return result;
 }
diff --git a/src/plugins/saved_objects_management/server/routes/get.ts b/src/plugins/saved_objects_management/server/routes/get.ts
new file mode 100644
index 0000000000000..a2c12a3970523
--- /dev/null
+++ b/src/plugins/saved_objects_management/server/routes/get.ts
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { IRouter } from 'src/core/server';
+import { injectMetaAttributes } from '../lib';
+import { ISavedObjectsManagement } from '../services';
+
+export const registerGetRoute = (
+  router: IRouter,
+  managementServicePromise: Promise<ISavedObjectsManagement>
+) => {
+  router.get(
+    {
+      path: '/api/kibana/management/saved_objects/{type}/{id}',
+      validate: {
+        params: schema.object({
+          type: schema.string(),
+          id: schema.string(),
+        }),
+      },
+    },
+    router.handleLegacyErrors(async (context, req, res) => {
+      const managementService = await managementServicePromise;
+      const { client } = context.core.savedObjects;
+
+      const { type, id } = req.params;
+      const findResponse = await client.get<any>(type, id);
+
+      const enhancedSavedObject = injectMetaAttributes(findResponse, managementService);
+
+      return res.ok({ body: enhancedSavedObject });
+    })
+  );
+};
diff --git a/src/plugins/saved_objects_management/server/routes/index.test.ts b/src/plugins/saved_objects_management/server/routes/index.test.ts
index 237760444f04e..b39262f0c8b3c 100644
--- a/src/plugins/saved_objects_management/server/routes/index.test.ts
+++ b/src/plugins/saved_objects_management/server/routes/index.test.ts
@@ -34,7 +34,7 @@ describe('registerRoutes', () => {
     });
 
     expect(httpSetup.createRouter).toHaveBeenCalledTimes(1);
-    expect(router.get).toHaveBeenCalledTimes(3);
+    expect(router.get).toHaveBeenCalledTimes(4);
     expect(router.post).toHaveBeenCalledTimes(2);
 
     expect(router.get).toHaveBeenCalledWith(
@@ -43,6 +43,12 @@ describe('registerRoutes', () => {
       }),
       expect.any(Function)
     );
+    expect(router.get).toHaveBeenCalledWith(
+      expect.objectContaining({
+        path: '/api/kibana/management/saved_objects/{type}/{id}',
+      }),
+      expect.any(Function)
+    );
     expect(router.get).toHaveBeenCalledWith(
       expect.objectContaining({
         path: '/api/kibana/management/saved_objects/relationships/{type}/{id}',
diff --git a/src/plugins/saved_objects_management/server/routes/index.ts b/src/plugins/saved_objects_management/server/routes/index.ts
index 0929de56b215e..e074a0d5cbee2 100644
--- a/src/plugins/saved_objects_management/server/routes/index.ts
+++ b/src/plugins/saved_objects_management/server/routes/index.ts
@@ -20,6 +20,7 @@
 import { HttpServiceSetup } from 'src/core/server';
 import { ISavedObjectsManagement } from '../services';
 import { registerFindRoute } from './find';
+import { registerGetRoute } from './get';
 import { registerScrollForCountRoute } from './scroll_count';
 import { registerScrollForExportRoute } from './scroll_export';
 import { registerRelationshipsRoute } from './relationships';
@@ -33,6 +34,7 @@ interface RegisterRouteOptions {
 export function registerRoutes({ http, managementServicePromise }: RegisterRouteOptions) {
   const router = http.createRouter();
   registerFindRoute(router, managementServicePromise);
+  registerGetRoute(router, managementServicePromise);
   registerScrollForCountRoute(router);
   registerScrollForExportRoute(router);
   registerRelationshipsRoute(router, managementServicePromise);
diff --git a/src/plugins/saved_objects_management/server/services/management.mock.ts b/src/plugins/saved_objects_management/server/services/management.mock.ts
index 2099cc0f77bcc..85c2d3e4b08d9 100644
--- a/src/plugins/saved_objects_management/server/services/management.mock.ts
+++ b/src/plugins/saved_objects_management/server/services/management.mock.ts
@@ -28,6 +28,7 @@ const createManagementMock = () => {
     getTitle: jest.fn(),
     getEditUrl: jest.fn(),
     getInAppUrl: jest.fn(),
+    getNamespaceType: jest.fn(),
   };
   return mocked;
 };
diff --git a/src/plugins/saved_objects_management/server/services/management.test.ts b/src/plugins/saved_objects_management/server/services/management.test.ts
index 3625a3f913444..7ddde312767de 100644
--- a/src/plugins/saved_objects_management/server/services/management.test.ts
+++ b/src/plugins/saved_objects_management/server/services/management.test.ts
@@ -198,4 +198,28 @@ describe('SavedObjectsManagement', () => {
       expect(result).toEqual({ path: 'called', uiCapabilitiesPath: 'my.path' });
     });
   });
+
+  describe('getNamespaceType()', () => {
+    it('returns empty for unknown type', () => {
+      const result = management.getNamespaceType({
+        id: '1',
+        type: 'foo',
+        attributes: {},
+        references: [],
+      });
+      expect(result).toEqual(undefined);
+    });
+
+    it('returns explicit value', () => {
+      registerType({ name: 'foo', namespaceType: 'single' });
+
+      const result = management.getNamespaceType({
+        id: '1',
+        type: 'foo',
+        attributes: {},
+        references: [],
+      });
+      expect(result).toEqual('single');
+    });
+  });
 });
diff --git a/src/plugins/saved_objects_management/server/services/management.ts b/src/plugins/saved_objects_management/server/services/management.ts
index 7aee974182497..499f37990c346 100644
--- a/src/plugins/saved_objects_management/server/services/management.ts
+++ b/src/plugins/saved_objects_management/server/services/management.ts
@@ -50,4 +50,8 @@ export class SavedObjectsManagement {
     const getInAppUrl = this.registry.getType(savedObject.type)?.management?.getInAppUrl;
     return getInAppUrl ? getInAppUrl(savedObject) : undefined;
   }
+
+  public getNamespaceType(savedObject: SavedObject) {
+    return this.registry.getType(savedObject.type)?.namespaceType;
+  }
 }
diff --git a/test/api_integration/apis/saved_objects/import.js b/test/api_integration/apis/saved_objects/import.js
index fbacfe458d976..1666df2c83e5a 100644
--- a/test/api_integration/apis/saved_objects/import.js
+++ b/test/api_integration/apis/saved_objects/import.js
@@ -25,25 +25,33 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('import', () => {
+    // mock success results including metadata
+    const indexPattern = {
+      type: 'index-pattern',
+      id: '91200a00-9efd-11e7-acb3-3dab96693fab',
+      meta: { title: 'logstash-*', icon: 'indexPatternApp' },
+    };
+    const visualization = {
+      type: 'visualization',
+      id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+      meta: { title: 'Count of requests', icon: 'visualizeApp' },
+    };
+    const dashboard = {
+      type: 'dashboard',
+      id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+      meta: { title: 'Requests', icon: 'dashboardApp' },
+    };
+    const createError = (object, type) => ({
+      ...object,
+      title: object.meta.title,
+      error: { type },
+    });
+
     describe('with kibana index', () => {
       describe('with basic data existing', () => {
         before(() => esArchiver.load('saved_objects/basic'));
         after(() => esArchiver.unload('saved_objects/basic'));
 
-        it('should return 200', async () => {
-          await supertest
-            .post('/api/saved_objects/_import')
-            .query({ overwrite: true })
-            .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                success: true,
-                successCount: 3,
-              });
-            });
-        });
-
         it('should return 415 when no file passed in', async () => {
           await supertest
             .post('/api/saved_objects/_import')
@@ -67,30 +75,9 @@ export default function ({ getService }) {
                 success: false,
                 successCount: 0,
                 errors: [
-                  {
-                    id: '91200a00-9efd-11e7-acb3-3dab96693fab',
-                    type: 'index-pattern',
-                    title: 'logstash-*',
-                    error: {
-                      type: 'conflict',
-                    },
-                  },
-                  {
-                    id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-                    type: 'visualization',
-                    title: 'Count of requests',
-                    error: {
-                      type: 'conflict',
-                    },
-                  },
-                  {
-                    id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-                    type: 'dashboard',
-                    title: 'Requests',
-                    error: {
-                      type: 'conflict',
-                    },
-                  },
+                  createError(indexPattern, 'conflict'),
+                  createError(visualization, 'conflict'),
+                  createError(dashboard, 'conflict'),
                 ],
               });
             });
@@ -99,15 +86,18 @@ export default function ({ getService }) {
         it('should return 200 when conflicts exist but overwrite is passed in', async () => {
           await supertest
             .post('/api/saved_objects/_import')
-            .query({
-              overwrite: true,
-            })
+            .query({ overwrite: true })
             .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
             .expect(200)
             .then((resp) => {
               expect(resp.body).to.eql({
                 success: true,
                 successCount: 3,
+                successResults: [
+                  { ...indexPattern, overwrite: true },
+                  { ...visualization, overwrite: true },
+                  { ...dashboard, overwrite: true },
+                ],
               });
             });
         });
@@ -130,9 +120,8 @@ export default function ({ getService }) {
                     id: '1',
                     type: 'wigwags',
                     title: 'my title',
-                    error: {
-                      type: 'unsupported_type',
-                    },
+                    meta: { title: 'my title' },
+                    error: { type: 'unsupported_type' },
                   },
                 ],
               });
@@ -162,7 +151,7 @@ export default function ({ getService }) {
             JSON.stringify({
               type: 'visualization',
               id: '1',
-              attributes: {},
+              attributes: { title: 'My visualization' },
               references: [
                 {
                   name: 'ref_0',
@@ -189,9 +178,10 @@ export default function ({ getService }) {
                   {
                     type: 'visualization',
                     id: '1',
+                    title: 'My visualization',
+                    meta: { title: 'My visualization', icon: 'visualizeApp' },
                     error: {
                       type: 'missing_references',
-                      blocking: [],
                       references: [
                         {
                           type: 'index-pattern',
diff --git a/test/api_integration/apis/saved_objects/resolve_import_errors.js b/test/api_integration/apis/saved_objects/resolve_import_errors.js
index aacfcd4382fac..5380e9c3d11d8 100644
--- a/test/api_integration/apis/saved_objects/resolve_import_errors.js
+++ b/test/api_integration/apis/saved_objects/resolve_import_errors.js
@@ -25,6 +25,23 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('resolve_import_errors', () => {
+    // mock success results including metadata
+    const indexPattern = {
+      type: 'index-pattern',
+      id: '91200a00-9efd-11e7-acb3-3dab96693fab',
+      meta: { title: 'logstash-*', icon: 'indexPatternApp' },
+    };
+    const visualization = {
+      type: 'visualization',
+      id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+      meta: { title: 'Count of requests', icon: 'visualizeApp' },
+    };
+    const dashboard = {
+      type: 'dashboard',
+      id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+      meta: { title: 'Requests', icon: 'dashboardApp' },
+    };
+
     describe('without kibana index', () => {
       // Cleanup data that got created in import
       after(() => esArchiver.unload('saved_objects/basic'));
@@ -72,6 +89,11 @@ export default function ({ getService }) {
             expect(resp.body).to.eql({
               success: true,
               successCount: 3,
+              successResults: [
+                { ...indexPattern, overwrite: true },
+                { ...visualization, overwrite: true },
+                { ...dashboard, overwrite: true },
+              ],
             });
           });
       });
@@ -109,9 +131,8 @@ export default function ({ getService }) {
                   id: '1',
                   type: 'wigwags',
                   title: 'my title',
-                  error: {
-                    type: 'unsupported_type',
-                  },
+                  meta: { title: 'my title' },
+                  error: { type: 'unsupported_type' },
                 },
               ],
             });
@@ -175,9 +196,9 @@ export default function ({ getService }) {
                   id: '1',
                   type: 'visualization',
                   title: 'My favorite vis',
+                  meta: { title: 'My favorite vis', icon: 'visualizeApp' },
                   error: {
                     type: 'missing_references',
-                    blocking: [],
                     references: [
                       {
                         type: 'index-pattern',
@@ -234,7 +255,15 @@ export default function ({ getService }) {
             .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
             .expect(200)
             .then((resp) => {
-              expect(resp.body).to.eql({ success: true, successCount: 3 });
+              expect(resp.body).to.eql({
+                success: true,
+                successCount: 3,
+                successResults: [
+                  { ...indexPattern, overwrite: true },
+                  { ...visualization, overwrite: true },
+                  { ...dashboard, overwrite: true },
+                ],
+              });
             });
         });
 
@@ -254,7 +283,11 @@ export default function ({ getService }) {
             .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
             .expect(200)
             .then((resp) => {
-              expect(resp.body).to.eql({ success: true, successCount: 1 });
+              expect(resp.body).to.eql({
+                success: true,
+                successCount: 1,
+                successResults: [{ ...visualization, overwrite: true }],
+              });
             });
         });
 
@@ -298,6 +331,13 @@ export default function ({ getService }) {
               expect(resp.body).to.eql({
                 success: true,
                 successCount: 1,
+                successResults: [
+                  {
+                    type: 'visualization',
+                    id: '1',
+                    meta: { title: 'My favorite vis', icon: 'visualizeApp' },
+                  },
+                ],
               });
             });
           await supertest
diff --git a/test/api_integration/apis/saved_objects_management/find.ts b/test/api_integration/apis/saved_objects_management/find.ts
index 08c4327d7c0c4..c1c78570d8fe1 100644
--- a/test/api_integration/apis/saved_objects_management/find.ts
+++ b/test/api_integration/apis/saved_objects_management/find.ts
@@ -68,6 +68,7 @@ export default function ({ getService }: FtrProviderContext) {
                       uiCapabilitiesPath: 'visualize.show',
                     },
                     title: 'Count of requests',
+                    namespaceType: 'single',
                   },
                 },
               ],
@@ -225,6 +226,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/discover#/view/960372e0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'discover.show',
               },
+              namespaceType: 'single',
             });
           }));
 
@@ -243,6 +245,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/dashboards#/view/b70c7ae0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'dashboard.show',
               },
+              namespaceType: 'single',
             });
           }));
 
@@ -261,6 +264,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/visualize#/edit/a42c0580-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'visualize.show',
               },
+              namespaceType: 'single',
             });
             expect(resp.body.saved_objects[1].meta).to.eql({
               icon: 'visualizeApp',
@@ -271,6 +275,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/visualize#/edit/add810b0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'visualize.show',
               },
+              namespaceType: 'single',
             });
           }));
 
@@ -290,6 +295,7 @@ export default function ({ getService }: FtrProviderContext) {
                   '/app/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'management.kibana.indexPatterns',
               },
+              namespaceType: 'single',
             });
           }));
     });
diff --git a/test/api_integration/apis/saved_objects_management/get.ts b/test/api_integration/apis/saved_objects_management/get.ts
new file mode 100644
index 0000000000000..8eb4cd7ab9a43
--- /dev/null
+++ b/test/api_integration/apis/saved_objects_management/get.ts
@@ -0,0 +1,69 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import expect from '@kbn/expect';
+import { Response } from 'supertest';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService }: FtrProviderContext) {
+  const es = getService('legacyEs');
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('get', () => {
+    const existingObject = 'visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab';
+    const nonexistentObject = 'wigwags/foo';
+
+    describe('with kibana index', () => {
+      before(() => esArchiver.load('saved_objects/basic'));
+      after(() => esArchiver.unload('saved_objects/basic'));
+
+      it('should return 200 for object that exists and inject metadata', async () =>
+        await supertest
+          .get(`/api/kibana/management/saved_objects/${existingObject}`)
+          .expect(200)
+          .then((resp: Response) => {
+            const { body } = resp;
+            const { type, id, meta } = body;
+            expect(type).to.eql('visualization');
+            expect(id).to.eql('dd7caf20-9efd-11e7-acb3-3dab96693fab');
+            expect(meta).to.not.equal(undefined);
+          }));
+
+      it('should return 404 for object that does not exist', async () =>
+        await supertest
+          .get(`/api/kibana/management/saved_objects/${nonexistentObject}`)
+          .expect(404));
+    });
+
+    describe('without kibana index', () => {
+      before(
+        async () =>
+          // just in case the kibana server has recreated it
+          await es.indices.delete({
+            index: '.kibana',
+            ignore: [404],
+          })
+      );
+
+      it('should return 404 for object that no longer exists', async () =>
+        await supertest.get(`/api/kibana/management/saved_objects/${existingObject}`).expect(404));
+    });
+  });
+}
diff --git a/test/api_integration/apis/saved_objects_management/index.ts b/test/api_integration/apis/saved_objects_management/index.ts
index 9f13e4fc5975d..a5db29a6200f3 100644
--- a/test/api_integration/apis/saved_objects_management/index.ts
+++ b/test/api_integration/apis/saved_objects_management/index.ts
@@ -22,6 +22,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('saved objects management apis', () => {
     loadTestFile(require.resolve('./find'));
+    loadTestFile(require.resolve('./get'));
     loadTestFile(require.resolve('./relationships'));
     loadTestFile(require.resolve('./scroll_count'));
   });
diff --git a/test/api_integration/apis/saved_objects_management/relationships.ts b/test/api_integration/apis/saved_objects_management/relationships.ts
index a1ea65645c13f..8b7837f80ee44 100644
--- a/test/api_integration/apis/saved_objects_management/relationships.ts
+++ b/test/api_integration/apis/saved_objects_management/relationships.ts
@@ -38,6 +38,7 @@ export default function ({ getService }: FtrProviderContext) {
           path: schema.string(),
           uiCapabilitiesPath: schema.string(),
         }),
+        namespaceType: schema.string(),
       }),
     })
   );
@@ -89,6 +90,7 @@ export default function ({ getService }: FtrProviderContext) {
                   '/app/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'management.kibana.indexPatterns',
               },
+              namespaceType: 'single',
             },
           },
           {
@@ -104,6 +106,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/visualize#/edit/a42c0580-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'visualize.show',
               },
+              namespaceType: 'single',
             },
           },
         ]);
@@ -130,6 +133,7 @@ export default function ({ getService }: FtrProviderContext) {
                   '/app/management/kibana/indexPatterns/patterns/8963ca30-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'management.kibana.indexPatterns',
               },
+              namespaceType: 'single',
             },
             relationship: 'child',
           },
@@ -145,6 +149,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/visualize#/edit/a42c0580-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'visualize.show',
               },
+              namespaceType: 'single',
             },
             relationship: 'parent',
           },
@@ -189,6 +194,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/visualize#/edit/add810b0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'visualize.show',
               },
+              namespaceType: 'single',
             },
           },
           {
@@ -204,6 +210,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/visualize#/edit/a42c0580-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'visualize.show',
               },
+              namespaceType: 'single',
             },
           },
         ]);
@@ -227,6 +234,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/visualize#/edit/add810b0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'visualize.show',
               },
+              namespaceType: 'single',
             },
             relationship: 'child',
           },
@@ -242,6 +250,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/visualize#/edit/a42c0580-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'visualize.show',
               },
+              namespaceType: 'single',
             },
             relationship: 'child',
           },
@@ -286,6 +295,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/discover#/view/960372e0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'discover.show',
               },
+              namespaceType: 'single',
             },
           },
           {
@@ -301,6 +311,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/dashboards#/view/b70c7ae0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'dashboard.show',
               },
+              namespaceType: 'single',
             },
           },
         ]);
@@ -326,6 +337,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/discover#/view/960372e0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'discover.show',
               },
+              namespaceType: 'single',
             },
             relationship: 'child',
           },
@@ -369,6 +381,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/discover#/view/960372e0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'discover.show',
               },
+              namespaceType: 'single',
             },
           },
           {
@@ -384,6 +397,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/visualize#/edit/add810b0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'visualize.show',
               },
+              namespaceType: 'single',
             },
           },
         ]);
@@ -409,6 +423,7 @@ export default function ({ getService }: FtrProviderContext) {
                 path: '/app/discover#/view/960372e0-3224-11e8-a572-ffca06da1357',
                 uiCapabilitiesPath: 'discover.show',
               },
+              namespaceType: 'single',
             },
             relationship: 'parent',
           },
diff --git a/test/functional/page_objects/management/saved_objects_page.ts b/test/functional/page_objects/management/saved_objects_page.ts
index ad82ea9b6fbc1..e165341dbd63d 100644
--- a/test/functional/page_objects/management/saved_objects_page.ts
+++ b/test/functional/page_objects/management/saved_objects_page.ts
@@ -48,7 +48,13 @@ export function SavedObjectsPageProvider({ getService, getPageObjects }: FtrProv
 
       if (!overwriteAll) {
         log.debug(`Toggling overwriteAll`);
-        await testSubjects.click('importSavedObjectsOverwriteToggle');
+        const radio = await testSubjects.find(
+          'savedObjectsManagement-importModeControl-overwriteRadioGroup'
+        );
+        // a radio button consists of a div tag that contains an input, a div, and a label
+        // we can't click the input directly, need to go up one level and click the parent div
+        const div = await radio.findByXpath("//div[input[@id='overwriteDisabled']]");
+        await div.click();
       } else {
         log.debug(`Leaving overwriteAll alone`);
       }
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
index 5d4ea5a6370e4..f8d66b8ecac27 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts
@@ -42,6 +42,19 @@ beforeEach(() => {
 
 afterEach(() => jest.clearAllMocks());
 
+describe('#checkConflicts', () => {
+  it('redirects request to underlying base client', async () => {
+    const objects = [{ type: 'foo', id: 'bar' }];
+    const options = { namespace: 'some-namespace' };
+    const mockedResponse = { errors: [] };
+    mockBaseClient.checkConflicts.mockResolvedValue(mockedResponse);
+
+    await expect(wrapper.checkConflicts(objects, options)).resolves.toEqual(mockedResponse);
+    expect(mockBaseClient.checkConflicts).toHaveBeenCalledTimes(1);
+    expect(mockBaseClient.checkConflicts).toHaveBeenCalledWith(objects, options);
+  });
+});
+
 describe('#create', () => {
   it('redirects request to underlying base client if type is not registered', async () => {
     const attributes = { attrOne: 'one', attrSecret: 'secret', attrThree: 'three' };
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
index 3246457179f68..a2725cbc6a274 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts
@@ -13,6 +13,7 @@ import {
   SavedObjectsBulkUpdateObject,
   SavedObjectsBulkResponse,
   SavedObjectsBulkUpdateResponse,
+  SavedObjectsCheckConflictsObject,
   SavedObjectsClientContract,
   SavedObjectsCreateOptions,
   SavedObjectsFindOptions,
@@ -48,6 +49,13 @@ export class EncryptedSavedObjectsClientWrapper implements SavedObjectsClientCon
     public readonly errors = options.baseClient.errors
   ) {}
 
+  public async checkConflicts(
+    objects: SavedObjectsCheckConflictsObject[] = [],
+    options?: SavedObjectsBaseOptions
+  ) {
+    return await this.options.baseClient.checkConflicts(objects, options);
+  }
+
   public async create<T>(
     type: string,
     attributes: T = {} as T,
diff --git a/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap b/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
index bfbc8b68c3d2c..e4014cf49778c 100644
--- a/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
+++ b/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
@@ -323,6 +323,7 @@ Array [
         "edit",
         "delete",
         "copyIntoSpace",
+        "shareIntoSpace",
       ],
     },
     "privilegeId": "all",
diff --git a/x-pack/plugins/features/server/oss_features.ts b/x-pack/plugins/features/server/oss_features.ts
index 9df042b45a32e..e37c7491de5dc 100644
--- a/x-pack/plugins/features/server/oss_features.ts
+++ b/x-pack/plugins/features/server/oss_features.ts
@@ -349,7 +349,7 @@ export const buildOSSFeatures = ({ savedObjectTypes, includeTimelion }: BuildOSS
             all: [...savedObjectTypes],
             read: [],
           },
-          ui: ['read', 'edit', 'delete', 'copyIntoSpace'],
+          ui: ['read', 'edit', 'delete', 'copyIntoSpace', 'shareIntoSpace'],
         },
         read: {
           app: ['kibana'],
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/kibana/assets/install.ts b/x-pack/plugins/ingest_manager/server/services/epm/kibana/assets/install.ts
index ff1a91b00d84f..201003629e5ea 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/kibana/assets/install.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/kibana/assets/install.ts
@@ -14,7 +14,7 @@ import * as Registry from '../../registry';
 import { AssetType, KibanaAssetType, AssetReference } from '../../../../types';
 import { savedObjectTypes } from '../../packages';
 
-type SavedObjectToBe = Required<Omit<SavedObjectsBulkCreateObject, 'version'>> & {
+type SavedObjectToBe = Required<Pick<SavedObjectsBulkCreateObject, keyof ArchiveAsset>> & {
   type: AssetType;
 };
 export type ArchiveAsset = Pick<
diff --git a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
index ca191602dcf44..7f7f969e8b480 100644
--- a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
+++ b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.test.ts
@@ -62,7 +62,7 @@ const expectGeneralError = async (fn: Function, args: Record<string, any>) => {
  * Requires that function args are passed in as key/value pairs
  * The argument properties must be in the correct order to be spread properly
  */
-const expectForbiddenError = async (fn: Function, args: Record<string, any>) => {
+const expectForbiddenError = async (fn: Function, args: Record<string, any>, action?: string) => {
   clientOpts.checkSavedObjectsPrivilegesAsCurrentUser.mockImplementation(
     getMockCheckPrivilegesFailure
   );
@@ -87,7 +87,7 @@ const expectForbiddenError = async (fn: Function, args: Record<string, any>) =>
   expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledTimes(1);
   expect(clientOpts.auditLogger.savedObjectsAuthorizationFailure).toHaveBeenCalledWith(
     USERNAME,
-    ACTION,
+    action ?? ACTION,
     types,
     spaceIds,
     missing,
@@ -96,7 +96,7 @@ const expectForbiddenError = async (fn: Function, args: Record<string, any>) =>
   expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).not.toHaveBeenCalled();
 };
 
-const expectSuccess = async (fn: Function, args: Record<string, any>) => {
+const expectSuccess = async (fn: Function, args: Record<string, any>, action?: string) => {
   const result = await fn.bind(client)(...Object.values(args));
   const getCalls = (clientOpts.actions.savedObject.get as jest.MockedFunction<
     SavedObjectActions['get']
@@ -109,7 +109,7 @@ const expectSuccess = async (fn: Function, args: Record<string, any>) => {
   expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledTimes(1);
   expect(clientOpts.auditLogger.savedObjectsAuthorizationSuccess).toHaveBeenCalledWith(
     USERNAME,
-    ACTION,
+    action ?? ACTION,
     types,
     spaceIds,
     args
@@ -492,6 +492,40 @@ describe('#bulkUpdate', () => {
   });
 });
 
+describe('#checkConflicts', () => {
+  const obj1 = Object.freeze({ type: 'foo', id: 'foo-id' });
+  const obj2 = Object.freeze({ type: 'bar', id: 'bar-id' });
+  const options = Object.freeze({ namespace: 'some-ns' });
+
+  test(`throws decorated GeneralError when checkPrivileges.globally rejects promise`, async () => {
+    const objects = [obj1, obj2];
+    await expectGeneralError(client.checkConflicts, { objects });
+  });
+
+  test(`throws decorated ForbiddenError when unauthorized`, async () => {
+    const objects = [obj1, obj2];
+    await expectForbiddenError(client.checkConflicts, { objects, options }, 'checkConflicts');
+  });
+
+  test(`returns result of baseClient.create when authorized`, async () => {
+    const apiCallReturnValue = Symbol();
+    clientOpts.baseClient.checkConflicts.mockResolvedValue(apiCallReturnValue as any);
+
+    const objects = [obj1, obj2];
+    const result = await expectSuccess(
+      client.checkConflicts,
+      { objects, options },
+      'checkConflicts'
+    );
+    expect(result).toBe(apiCallReturnValue);
+  });
+
+  test(`checks privileges for user, actions, and namespace`, async () => {
+    const objects = [obj1, obj2];
+    await expectPrivilegeCheck(client.checkConflicts, { objects, options });
+  });
+});
+
 describe('#create', () => {
   const type = 'foo';
   const attributes = { some_attr: 's' };
diff --git a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
index 9fd8a732c4eab..68fe65d204d6d 100644
--- a/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
+++ b/x-pack/plugins/security/server/saved_objects/secure_saved_objects_client_wrapper.ts
@@ -9,6 +9,7 @@ import {
   SavedObjectsBulkCreateObject,
   SavedObjectsBulkGetObject,
   SavedObjectsBulkUpdateObject,
+  SavedObjectsCheckConflictsObject,
   SavedObjectsClientContract,
   SavedObjectsCreateOptions,
   SavedObjectsFindOptions,
@@ -77,6 +78,18 @@ export class SecureSavedObjectsClientWrapper implements SavedObjectsClientContra
     return await this.redactSavedObjectNamespaces(savedObject);
   }
 
+  public async checkConflicts(
+    objects: SavedObjectsCheckConflictsObject[] = [],
+    options: SavedObjectsBaseOptions = {}
+  ) {
+    const types = this.getUniqueObjectTypes(objects);
+    const args = { objects, options };
+    await this.ensureAuthorized(types, 'bulk_create', options.namespace, args, 'checkConflicts');
+
+    const response = await this.baseClient.checkConflicts(objects, options);
+    return response;
+  }
+
   public async bulkCreate<T = unknown>(
     objects: Array<SavedObjectsBulkCreateObject<T>>,
     options: SavedObjectsBaseOptions = {}
diff --git a/x-pack/plugins/spaces/common/model/types.ts b/x-pack/plugins/spaces/common/model/types.ts
index 30004c739ee7a..aad77f2bbcef9 100644
--- a/x-pack/plugins/spaces/common/model/types.ts
+++ b/x-pack/plugins/spaces/common/model/types.ts
@@ -4,4 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export type GetSpacePurpose = 'any' | 'copySavedObjectsIntoSpace' | 'findSavedObjects';
+export type GetSpacePurpose =
+  | 'any'
+  | 'copySavedObjectsIntoSpace'
+  | 'findSavedObjects'
+  | 'shareSavedObjectsIntoSpace';
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.test.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.test.tsx
new file mode 100644
index 0000000000000..4e49a2da3e534
--- /dev/null
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.test.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { ReactWrapper } from 'enzyme';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { CopyModeControl, CopyModeControlProps } from './copy_mode_control';
+
+describe('CopyModeControl', () => {
+  const initialValues = { createNewCopies: false, overwrite: true }; // some test cases below make assumptions based on these initial values
+  const updateSelection = jest.fn();
+
+  const getOverwriteRadio = (wrapper: ReactWrapper) =>
+    wrapper.find('EuiRadioGroup[data-test-subj="cts-copyModeControl-overwriteRadioGroup"]');
+  const getOverwriteEnabled = (wrapper: ReactWrapper) =>
+    wrapper.find('input[id="overwriteEnabled"]');
+  const getOverwriteDisabled = (wrapper: ReactWrapper) =>
+    wrapper.find('input[id="overwriteDisabled"]');
+  const getCreateNewCopiesDisabled = (wrapper: ReactWrapper) =>
+    wrapper.find('input[id="createNewCopiesDisabled"]');
+  const getCreateNewCopiesEnabled = (wrapper: ReactWrapper) =>
+    wrapper.find('input[id="createNewCopiesEnabled"]');
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  const props: CopyModeControlProps = { initialValues, updateSelection };
+
+  it('should allow the user to toggle `overwrite`', async () => {
+    const wrapper = mountWithIntl(<CopyModeControl {...props} />);
+
+    expect(updateSelection).not.toHaveBeenCalled();
+    const { createNewCopies } = initialValues;
+
+    getOverwriteDisabled(wrapper).simulate('change');
+    expect(updateSelection).toHaveBeenNthCalledWith(1, { createNewCopies, overwrite: false });
+
+    getOverwriteEnabled(wrapper).simulate('change');
+    expect(updateSelection).toHaveBeenNthCalledWith(2, { createNewCopies, overwrite: true });
+  });
+
+  it('should disable the Overwrite switch when `createNewCopies` is enabled', async () => {
+    const wrapper = mountWithIntl(<CopyModeControl {...props} />);
+
+    expect(getOverwriteRadio(wrapper).prop('disabled')).toBe(false);
+    getCreateNewCopiesEnabled(wrapper).simulate('change');
+    expect(getOverwriteRadio(wrapper).prop('disabled')).toBe(true);
+  });
+
+  it('should allow the user to toggle `createNewCopies`', async () => {
+    const wrapper = mountWithIntl(<CopyModeControl {...props} />);
+
+    expect(updateSelection).not.toHaveBeenCalled();
+    const { overwrite } = initialValues;
+
+    getCreateNewCopiesEnabled(wrapper).simulate('change');
+    expect(updateSelection).toHaveBeenNthCalledWith(1, { createNewCopies: true, overwrite });
+
+    getCreateNewCopiesDisabled(wrapper).simulate('change');
+    expect(updateSelection).toHaveBeenNthCalledWith(2, { createNewCopies: false, overwrite });
+  });
+});
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.tsx
new file mode 100644
index 0000000000000..42fbf8954396e
--- /dev/null
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.tsx
@@ -0,0 +1,174 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState } from 'react';
+import {
+  EuiFormFieldset,
+  EuiTitle,
+  EuiCheckableCard,
+  EuiRadioGroup,
+  EuiText,
+  EuiSpacer,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIconTip,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+export interface CopyModeControlProps {
+  initialValues: CopyMode;
+  updateSelection: (result: CopyMode) => void;
+}
+
+export interface CopyMode {
+  createNewCopies: boolean;
+  overwrite: boolean;
+}
+
+const createNewCopiesDisabled = {
+  id: 'createNewCopiesDisabled',
+  text: i18n.translate(
+    'xpack.spaces.management.copyToSpace.copyModeControl.createNewCopies.disabledTitle',
+    { defaultMessage: 'Check for existing objects' }
+  ),
+  tooltip: i18n.translate(
+    'xpack.spaces.management.copyToSpace.copyModeControl.createNewCopies.disabledText',
+    {
+      defaultMessage:
+        'Check if each object was previously copied or imported into the destination space.',
+    }
+  ),
+};
+const createNewCopiesEnabled = {
+  id: 'createNewCopiesEnabled',
+  text: i18n.translate(
+    'xpack.spaces.management.copyToSpace.copyModeControl.createNewCopies.enabledTitle',
+    { defaultMessage: 'Create new objects with random IDs' }
+  ),
+  tooltip: i18n.translate(
+    'xpack.spaces.management.copyToSpace.copyModeControl.createNewCopies.enabledText',
+    { defaultMessage: 'All copied objects will be created with new random IDs.' }
+  ),
+};
+const overwriteEnabled = {
+  id: 'overwriteEnabled',
+  label: i18n.translate(
+    'xpack.spaces.management.copyToSpace.copyModeControl.overwrite.enabledLabel',
+    { defaultMessage: 'Automatically try to overwrite conflicts' }
+  ),
+};
+const overwriteDisabled = {
+  id: 'overwriteDisabled',
+  label: i18n.translate(
+    'xpack.spaces.management.copyToSpace.copyModeControl.overwrite.disabledLabel',
+    { defaultMessage: 'Request action when conflict occurs' }
+  ),
+};
+const includeRelated = {
+  id: 'includeRelated',
+  text: i18n.translate('xpack.spaces.management.copyToSpace.copyModeControl.includeRelated.title', {
+    defaultMessage: 'Include related saved objects',
+  }),
+  tooltip: i18n.translate(
+    'xpack.spaces.management.copyToSpace.copyModeControl.includeRelated.text',
+    {
+      defaultMessage:
+        'This will copy any other objects this has references to -- for example, a dashboard may have references to multiple visualizations.',
+    }
+  ),
+};
+const copyOptionsTitle = i18n.translate(
+  'xpack.spaces.management.copyToSpace.copyModeControl.copyOptionsTitle',
+  { defaultMessage: 'Copy options' }
+);
+const relationshipOptionsTitle = i18n.translate(
+  'xpack.spaces.management.copyToSpace.copyModeControl.relationshipOptionsTitle',
+  { defaultMessage: 'Relationship options' }
+);
+
+const createLabel = ({ text, tooltip }: { text: string; tooltip: string }) => (
+  <EuiFlexGroup>
+    <EuiFlexItem>
+      <EuiText>{text}</EuiText>
+    </EuiFlexItem>
+    <EuiFlexItem grow={false}>
+      <EuiIconTip content={tooltip} position="left" type="iInCircle" />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
+
+export const CopyModeControl = ({ initialValues, updateSelection }: CopyModeControlProps) => {
+  const [createNewCopies, setCreateNewCopies] = useState(initialValues.createNewCopies);
+  const [overwrite, setOverwrite] = useState(initialValues.overwrite);
+
+  const onChange = (partial: Partial<CopyMode>) => {
+    if (partial.createNewCopies !== undefined) {
+      setCreateNewCopies(partial.createNewCopies);
+    } else if (partial.overwrite !== undefined) {
+      setOverwrite(partial.overwrite);
+    }
+    updateSelection({ createNewCopies, overwrite, ...partial });
+  };
+
+  return (
+    <>
+      <EuiFormFieldset
+        legend={{
+          children: (
+            <EuiTitle size="xs">
+              <span>{copyOptionsTitle}</span>
+            </EuiTitle>
+          ),
+        }}
+      >
+        <EuiCheckableCard
+          id={createNewCopiesDisabled.id}
+          label={createLabel(createNewCopiesDisabled)}
+          checked={!createNewCopies}
+          onChange={() => onChange({ createNewCopies: false })}
+        >
+          <EuiRadioGroup
+            options={[overwriteEnabled, overwriteDisabled]}
+            idSelected={overwrite ? overwriteEnabled.id : overwriteDisabled.id}
+            onChange={(id: string) => onChange({ overwrite: id === overwriteEnabled.id })}
+            disabled={createNewCopies}
+            data-test-subj={'cts-copyModeControl-overwriteRadioGroup'}
+          />
+        </EuiCheckableCard>
+
+        <EuiSpacer size="s" />
+
+        <EuiCheckableCard
+          id={createNewCopiesEnabled.id}
+          label={createLabel(createNewCopiesEnabled)}
+          checked={createNewCopies}
+          onChange={() => onChange({ createNewCopies: true })}
+        />
+      </EuiFormFieldset>
+
+      <EuiSpacer size="m" />
+
+      <EuiFormFieldset
+        legend={{
+          children: (
+            <EuiTitle size="xs">
+              <span>{relationshipOptionsTitle}</span>
+            </EuiTitle>
+          ),
+        }}
+      >
+        <EuiCheckableCard
+          id={includeRelated.id}
+          label={createLabel(includeRelated)}
+          checkableType="checkbox"
+          checked={true}
+          onChange={() => {}} // noop
+          disabled
+        />
+      </EuiFormFieldset>
+    </>
+  );
+};
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
index 62f9503443951..158d7a9a43ef6 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
@@ -4,20 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import { EuiLoadingSpinner, EuiText, EuiIconTip } from '@elastic/eui';
+import React, { Fragment } from 'react';
+import { EuiLoadingSpinner, EuiIconTip, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { ImportRetry } from '../types';
 import { SummarizedCopyToSpaceResult, SummarizedSavedObjectResult } from '..';
 
 interface Props {
   summarizedCopyResult: SummarizedCopyToSpaceResult;
   object: { type: string; id: string };
-  overwritePending: boolean;
+  pendingObjectRetry?: ImportRetry;
   conflictResolutionInProgress: boolean;
 }
 
 export const CopyStatusIndicator = (props: Props) => {
-  const { summarizedCopyResult, conflictResolutionInProgress } = props;
+  const { summarizedCopyResult, conflictResolutionInProgress, pendingObjectRetry } = props;
   if (summarizedCopyResult.processing || conflictResolutionInProgress) {
     return <EuiLoadingSpinner />;
   }
@@ -25,32 +26,55 @@ export const CopyStatusIndicator = (props: Props) => {
   const objectResult = summarizedCopyResult.objects.find(
     (o) => o.type === props.object!.type && o.id === props.object!.id
   ) as SummarizedSavedObjectResult;
+  const { conflict, hasMissingReferences, hasUnresolvableErrors, overwrite } = objectResult;
+  const hasConflicts = conflict && !pendingObjectRetry?.overwrite;
+  const successful = !hasMissingReferences && !hasUnresolvableErrors && !hasConflicts;
 
-  const successful =
-    !objectResult.hasUnresolvableErrors &&
-    (objectResult.conflicts.length === 0 || props.overwritePending === true);
-  const successColor = props.overwritePending ? 'warning' : 'success';
-  const hasConflicts = objectResult.conflicts.length > 0;
-  const hasUnresolvableErrors = objectResult.hasUnresolvableErrors;
-
-  if (successful) {
-    const message = props.overwritePending ? (
+  if (successful && !pendingObjectRetry) {
+    // there is no retry pending, so this object was actually copied
+    const message = overwrite ? (
+      // the object was overwritten
       <FormattedMessage
-        id="xpack.spaces.management.copyToSpace.copyStatus.pendingOverwriteMessage"
-        defaultMessage="Saved object will be overwritten. Click 'Skip' to cancel this operation."
+        id="xpack.spaces.management.copyToSpace.copyStatus.successAutomaticOverwriteMessage"
+        defaultMessage="Saved object overwritten successfully."
       />
     ) : (
+      // the object was not overwritten
       <FormattedMessage
         id="xpack.spaces.management.copyToSpace.copyStatus.successMessage"
         defaultMessage="Saved object copied successfully."
       />
     );
-    return <EuiIconTip type={'check'} color={successColor} content={message} />;
+    return <EuiIconTip type={'checkInCircleFilled'} color={'success'} content={message} />;
   }
+
+  if (successful && pendingObjectRetry) {
+    const message = overwrite ? (
+      // this is an "automatic overwrite", e.g., the "Overwrite all conflicts" option was selected
+      <FormattedMessage
+        id="xpack.spaces.management.copyToSpace.copyStatus.pendingAutomaticOverwriteMessage"
+        defaultMessage="Saved object will be overwritten."
+      />
+    ) : pendingObjectRetry?.overwrite ? (
+      // this is a manual overwrite, e.g., the individual "Overwrite?" switch was enabled
+      <FormattedMessage
+        id="xpack.spaces.management.copyToSpace.copyStatus.pendingOverwriteMessage"
+        defaultMessage="Saved object will be overwritten. Disable 'Overwrite' to cancel this operation."
+      />
+    ) : (
+      // this object is pending success, but it will not result in an overwrite
+      <FormattedMessage
+        id="xpack.spaces.management.copyToSpace.copyStatus.pendingMessage"
+        defaultMessage="Saved object will be copied."
+      />
+    );
+    return <EuiIconTip type={'check'} color={'warning'} content={message} />;
+  }
+
   if (hasUnresolvableErrors) {
     return (
       <EuiIconTip
-        type={'cross'}
+        type={'alert'}
         color={'danger'}
         data-test-subj={`cts-object-result-error-${objectResult.id}`}
         content={
@@ -62,32 +86,55 @@ export const CopyStatusIndicator = (props: Props) => {
       />
     );
   }
+
   if (hasConflicts) {
     return (
       <EuiIconTip
         type={'alert'}
         color={'warning'}
         content={
-          <EuiText>
-            <p>
-              <FormattedMessage
-                id="xpack.spaces.management.copyToSpace.copyStatus.conflictsMessage"
-                defaultMessage="A saved object with a matching id ({id}) already exists in this space."
-                values={{
-                  id: objectResult.conflicts[0].obj.id,
-                }}
-              />
-            </p>
-            <p>
-              <FormattedMessage
-                id="xpack.spaces.management.copyToSpace.copyStatus.conflictsOverwriteMessage"
-                defaultMessage="Click 'Overwrite' to replace this version with the copied one."
-              />
-            </p>
-          </EuiText>
+          <Fragment>
+            <FormattedMessage
+              id="xpack.spaces.management.copyToSpace.copyStatus.conflictsMessage"
+              defaultMessage="A saved object with a matching id ({id}) already exists in this space."
+              values={{
+                id: objectResult.conflict!.obj.id,
+              }}
+            />
+            <EuiSpacer />
+            <FormattedMessage
+              id="xpack.spaces.management.copyToSpace.copyStatus.conflictsOverwriteMessage"
+              defaultMessage="Enable 'Overwrite' to replace this version with the copied one."
+            />
+          </Fragment>
         }
       />
     );
   }
-  return null;
+
+  return hasMissingReferences ? (
+    <EuiIconTip
+      type={'link'}
+      color={'warning'}
+      data-test-subj={`cts-object-result-missing-references-${objectResult.id}`}
+      content={
+        overwrite ? (
+          <FormattedMessage
+            id="xpack.spaces.management.copyToSpace.copyStatus.missingReferencesAutomaticOverwriteMessage"
+            defaultMessage="This object has missing references; it will be overwritten, but one or more of its references are broken."
+          />
+        ) : conflict ? (
+          <FormattedMessage
+            id="xpack.spaces.management.copyToSpace.copyStatus.missingReferencesOverwriteMessage"
+            defaultMessage="This object has missing references; it will be overwritten, but one or more of its references are broken. Disable 'Overwrite' to cancel this operation."
+          />
+        ) : (
+          <FormattedMessage
+            id="xpack.spaces.management.copyToSpace.copyStatus.missingReferencesMessage"
+            defaultMessage="Saved object has missing references; it will be copied, but one or more of its references are broken."
+          />
+        )
+      }
+    />
+  ) : null;
 };
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.scss b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.scss
new file mode 100644
index 0000000000000..d1c3cbbd2b6af
--- /dev/null
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.scss
@@ -0,0 +1,7 @@
+.spcCopyToSpace__summaryCountBadge {
+  margin-left: $euiSizeXS;
+}
+
+.spcCopyToSpace__missingReferencesIcon {
+  margin-left: $euiSizeXS;
+}
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
index 9d73c216c73ce..4bc7e5cfaf31a 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_summary_indicator.tsx
@@ -4,30 +4,50 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import { EuiLoadingSpinner, EuiIconTip } from '@elastic/eui';
+import './copy_status_summary_indicator.scss';
+import React, { Fragment } from 'react';
+import { EuiLoadingSpinner, EuiIconTip, EuiBadge } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Space } from '../../../common/model/space';
+import { ImportRetry } from '../types';
+import { ResolveAllConflicts } from './resolve_all_conflicts';
 import { SummarizedCopyToSpaceResult } from '..';
 
 interface Props {
   space: Space;
   summarizedCopyResult: SummarizedCopyToSpaceResult;
   conflictResolutionInProgress: boolean;
+  retries: ImportRetry[];
+  onRetriesChange: (retries: ImportRetry[]) => void;
+  onDestinationMapChange: (value?: Map<string, string>) => void;
 }
 
-export const CopyStatusSummaryIndicator = (props: Props) => {
-  const { summarizedCopyResult } = props;
-  const getDataTestSubj = (status: string) => `cts-summary-indicator-${status}-${props.space.id}`;
+const renderIcon = (props: Props) => {
+  const {
+    space,
+    summarizedCopyResult,
+    conflictResolutionInProgress,
+    retries,
+    onRetriesChange,
+    onDestinationMapChange,
+  } = props;
+  const getDataTestSubj = (status: string) => `cts-summary-indicator-${status}-${space.id}`;
 
-  if (summarizedCopyResult.processing || props.conflictResolutionInProgress) {
+  if (summarizedCopyResult.processing || conflictResolutionInProgress) {
     return <EuiLoadingSpinner data-test-subj={getDataTestSubj('loading')} />;
   }
 
-  if (summarizedCopyResult.successful) {
+  const {
+    successful,
+    hasUnresolvableErrors,
+    hasMissingReferences,
+    hasConflicts,
+  } = summarizedCopyResult;
+
+  if (successful) {
     return (
       <EuiIconTip
-        type={'check'}
+        type={'checkInCircleFilled'}
         color={'success'}
         iconProps={{
           'data-test-subj': getDataTestSubj('success'),
@@ -36,16 +56,17 @@ export const CopyStatusSummaryIndicator = (props: Props) => {
           <FormattedMessage
             id="xpack.spaces.management.copyToSpace.copyStatusSummary.successMessage"
             defaultMessage="Copied successfully to the {space} space."
-            values={{ space: props.space.name }}
+            values={{ space: space.name }}
           />
         }
       />
     );
   }
-  if (summarizedCopyResult.hasUnresolvableErrors) {
+
+  if (hasUnresolvableErrors) {
     return (
       <EuiIconTip
-        type={'cross'}
+        type={'alert'}
         color={'danger'}
         iconProps={{
           'data-test-subj': getDataTestSubj('failed'),
@@ -54,29 +75,72 @@ export const CopyStatusSummaryIndicator = (props: Props) => {
           <FormattedMessage
             id="xpack.spaces.management.copyToSpace.copyStatusSummary.failedMessage"
             defaultMessage="Copy to the {space} space failed. Expand this section for details."
-            values={{ space: props.space.name }}
+            values={{ space: space.name }}
           />
         }
       />
     );
   }
-  if (summarizedCopyResult.hasConflicts) {
-    return (
+
+  const missingReferences = hasMissingReferences ? (
+    <span className="spcCopyToSpace__missingReferencesIcon">
       <EuiIconTip
-        type={'alert'}
+        type={'link'}
         color={'warning'}
         iconProps={{
-          'data-test-subj': getDataTestSubj('conflicts'),
+          'data-test-subj': getDataTestSubj('missingReferences'),
         }}
         content={
           <FormattedMessage
-            id="xpack.spaces.management.copyToSpace.copyStatusSummary.conflictsMessage"
-            defaultMessage="One or more conflicts detected in the {space} space. Expand this section to resolve."
-            values={{ space: props.space.name }}
+            id="xpack.spaces.management.copyToSpace.copyStatusSummary.missingReferencesMessage"
+            defaultMessage="One or more missing references detected in the {space} space. Expand this section for details."
+            values={{ space: space.name }}
           />
         }
       />
+    </span>
+  ) : null;
+
+  if (hasConflicts) {
+    return (
+      <Fragment>
+        <ResolveAllConflicts
+          summarizedCopyResult={summarizedCopyResult}
+          retries={retries}
+          onRetriesChange={onRetriesChange}
+          onDestinationMapChange={onDestinationMapChange}
+        />
+        <EuiIconTip
+          type={'alert'}
+          color={'warning'}
+          iconProps={{
+            'data-test-subj': getDataTestSubj('conflicts'),
+          }}
+          content={
+            <FormattedMessage
+              id="xpack.spaces.management.copyToSpace.copyStatusSummary.conflictsMessage"
+              defaultMessage="One or more conflicts detected in the {space} space. Expand this section to resolve."
+              values={{ space: space.name }}
+            />
+          }
+        />
+        {missingReferences}
+      </Fragment>
     );
   }
-  return null;
+
+  return missingReferences;
+};
+
+export const CopyStatusSummaryIndicator = (props: Props) => {
+  const { summarizedCopyResult } = props;
+
+  return (
+    <Fragment>
+      {renderIcon(props)}
+      <EuiBadge color="#DDD" className="spcCopyToSpace__summaryCountBadge">
+        {summarizedCopyResult.objects.length}
+      </EuiBadge>
+    </Fragment>
+  );
 };
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
index 99b4e184c071a..dfc908d81887a 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
@@ -17,6 +17,7 @@ import { ProcessingCopyToSpace } from './processing_copy_to_space';
 import { spacesManagerMock } from '../../spaces_manager/mocks';
 import { SpacesManager } from '../../spaces_manager';
 import { ToastsApi } from 'src/core/public';
+import { SavedObjectsManagementRecord } from 'src/plugins/saved_objects_management/public';
 
 interface SetupOpts {
   mockSpaces?: Space[];
@@ -73,8 +74,8 @@ const setup = async (opts: SetupOpts = {}) => {
         name: 'My Viz',
       },
     ],
-    meta: { icon: 'dashboard', title: 'foo' },
-  };
+    meta: { icon: 'dashboard', title: 'foo', namespaceType: 'single' },
+  } as SavedObjectsManagementRecord;
 
   const wrapper = mountWithIntl(
     <CopySavedObjectsToSpaceFlyout
@@ -184,11 +185,13 @@ describe('CopyToSpaceFlyout', () => {
             type: 'index-pattern',
             id: 'conflicting-ip',
             error: { type: 'conflict' },
+            meta: {},
           },
           {
             type: 'visualization',
             id: 'my-viz',
             error: { type: 'conflict' },
+            meta: {},
           },
         ],
       },
@@ -223,8 +226,12 @@ describe('CopyToSpaceFlyout', () => {
     const spaceResult = findTestSubject(wrapper, `cts-space-result-space-2`);
     spaceResult.simulate('click');
 
-    const overwriteButton = findTestSubject(wrapper, `cts-overwrite-conflict-conflicting-ip`);
-    overwriteButton.simulate('click');
+    const overwriteSwitch = findTestSubject(
+      wrapper,
+      `cts-overwrite-conflict-index-pattern:conflicting-ip`
+    );
+    expect(overwriteSwitch.props()['aria-checked']).toEqual(false);
+    overwriteSwitch.simulate('click');
 
     const finishButton = findTestSubject(wrapper, 'cts-finish-button');
 
@@ -282,6 +289,7 @@ describe('CopyToSpaceFlyout', () => {
       [{ type: savedObjectToCopy.type, id: savedObjectToCopy.id }],
       ['space-1', 'space-2'],
       true,
+      false,
       true
     );
 
@@ -309,21 +317,45 @@ describe('CopyToSpaceFlyout', () => {
     mockSpacesManager.copySavedObjects.mockResolvedValue({
       'space-1': {
         success: true,
-        successCount: 3,
+        successCount: 5,
       },
       'space-2': {
         success: false,
         successCount: 1,
         errors: [
+          // regular conflict without destinationId
           {
             type: 'index-pattern',
             id: 'conflicting-ip',
             error: { type: 'conflict' },
+            meta: {},
+          },
+          // regular conflict with destinationId
+          {
+            type: 'search',
+            id: 'conflicting-search',
+            error: { type: 'conflict', destinationId: 'another-search' },
+            meta: {},
+          },
+          // ambiguous conflict
+          {
+            type: 'canvas-workpad',
+            id: 'conflicting-canvas',
+            error: {
+              type: 'ambiguous_conflict',
+              destinations: [
+                { id: 'another-canvas', title: 'foo', updatedAt: undefined },
+                { id: 'yet-another-canvas', title: 'bar', updatedAt: undefined },
+              ],
+            },
+            meta: {},
           },
+          // negative test case (skip)
           {
             type: 'visualization',
             id: 'my-viz',
             error: { type: 'conflict' },
+            meta: {},
           },
         ],
       },
@@ -358,8 +390,15 @@ describe('CopyToSpaceFlyout', () => {
     const spaceResult = findTestSubject(wrapper, `cts-space-result-space-2`);
     spaceResult.simulate('click');
 
-    const overwriteButton = findTestSubject(wrapper, `cts-overwrite-conflict-conflicting-ip`);
-    overwriteButton.simulate('click');
+    [
+      'index-pattern:conflicting-ip',
+      'search:conflicting-search',
+      'canvas-workpad:conflicting-canvas',
+    ].forEach((id) => {
+      const overwriteSwitch = findTestSubject(wrapper, `cts-overwrite-conflict-${id}`);
+      expect(overwriteSwitch.props()['aria-checked']).toEqual(false);
+      overwriteSwitch.simulate('click');
+    });
 
     const finishButton = findTestSubject(wrapper, 'cts-finish-button');
 
@@ -372,16 +411,148 @@ describe('CopyToSpaceFlyout', () => {
     expect(mockSpacesManager.resolveCopySavedObjectsErrors).toHaveBeenCalledWith(
       [{ type: savedObjectToCopy.type, id: savedObjectToCopy.id }],
       {
-        'space-2': [{ type: 'index-pattern', id: 'conflicting-ip', overwrite: true }],
+        'space-1': [],
+        'space-2': [
+          { type: 'index-pattern', id: 'conflicting-ip', overwrite: true },
+          {
+            type: 'search',
+            id: 'conflicting-search',
+            overwrite: true,
+            destinationId: 'another-search',
+          },
+          {
+            type: 'canvas-workpad',
+            id: 'conflicting-canvas',
+            overwrite: true,
+            destinationId: 'another-canvas',
+          },
+        ],
       },
-      true
+      true,
+      false
+    );
+
+    expect(onClose).toHaveBeenCalledTimes(1);
+    expect(mockToastNotifications.addError).not.toHaveBeenCalled();
+  });
+
+  it('displays a warning when missing references are encountered', async () => {
+    const {
+      wrapper,
+      onClose,
+      mockSpacesManager,
+      mockToastNotifications,
+      savedObjectToCopy,
+    } = await setup();
+
+    mockSpacesManager.copySavedObjects.mockResolvedValue({
+      'space-1': {
+        success: false,
+        successCount: 1,
+        errors: [
+          // my-viz-1 just has a missing_references error
+          {
+            type: 'visualization',
+            id: 'my-viz-1',
+            error: {
+              type: 'missing_references',
+              references: [{ type: 'index-pattern', id: 'missing-index-pattern' }],
+            },
+            meta: {},
+          },
+          // my-viz-2 has both a missing_references error and a conflict error
+          {
+            type: 'visualization',
+            id: 'my-viz-2',
+            error: {
+              type: 'missing_references',
+              references: [{ type: 'index-pattern', id: 'missing-index-pattern' }],
+            },
+            meta: {},
+          },
+          {
+            type: 'visualization',
+            id: 'my-viz-2',
+            error: { type: 'conflict' },
+            meta: {},
+          },
+        ],
+        successResults: [{ type: savedObjectToCopy.type, id: savedObjectToCopy.id, meta: {} }],
+      },
+    });
+
+    // Using props callback instead of simulating clicks,
+    // because EuiSelectable uses a virtualized list, which isn't easily testable via test subjects
+    const spaceSelector = wrapper.find(SelectableSpacesControl);
+
+    act(() => {
+      spaceSelector.props().onChange(['space-1']);
+    });
+
+    const startButton = findTestSubject(wrapper, 'cts-initiate-button');
+
+    await act(async () => {
+      startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find(CopyToSpaceForm)).toHaveLength(0);
+    expect(wrapper.find(ProcessingCopyToSpace)).toHaveLength(1);
+
+    const spaceResult = findTestSubject(wrapper, `cts-space-result-space-1`);
+    spaceResult.simulate('click');
+
+    const errorIconTip1 = spaceResult.find(
+      'EuiIconTip[data-test-subj="cts-object-result-missing-references-my-viz-1"]'
+    );
+    expect(errorIconTip1.props()).toMatchInlineSnapshot(`
+      Object {
+        "color": "warning",
+        "content": <FormattedMessage
+          defaultMessage="Saved object has missing references; it will be copied, but one or more of its references are broken."
+          id="xpack.spaces.management.copyToSpace.copyStatus.missingReferencesMessage"
+          values={Object {}}
+        />,
+        "data-test-subj": "cts-object-result-missing-references-my-viz-1",
+        "type": "link",
+      }
+    `);
+
+    const myViz2Icon = 'EuiIconTip[data-test-subj="cts-object-result-missing-references-my-viz-2"]';
+    expect(spaceResult.find(myViz2Icon)).toHaveLength(0);
+
+    // TODO: test for a missing references icon by selecting overwrite for the my-viz-2 conflict
+
+    const finishButton = findTestSubject(wrapper, 'cts-finish-button');
+    await act(async () => {
+      finishButton.simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(mockSpacesManager.resolveCopySavedObjectsErrors).toHaveBeenCalledWith(
+      [{ type: savedObjectToCopy.type, id: savedObjectToCopy.id }],
+      {
+        'space-1': [
+          { type: 'dashboard', id: 'my-dash', overwrite: false },
+          {
+            type: 'visualization',
+            id: 'my-viz-1',
+            overwrite: false,
+            ignoreMissingReferences: true,
+          },
+        ],
+      },
+      true,
+      false
     );
 
     expect(onClose).toHaveBeenCalledTimes(1);
     expect(mockToastNotifications.addError).not.toHaveBeenCalled();
   });
 
-  it('displays an error when missing references are encountered', async () => {
+  it('displays an error when an unresolvable error is encountered', async () => {
     const { wrapper, onClose, mockSpacesManager, mockToastNotifications } = await setup();
 
     mockSpacesManager.copySavedObjects.mockResolvedValue({
@@ -396,11 +567,8 @@ describe('CopyToSpaceFlyout', () => {
           {
             type: 'visualization',
             id: 'my-viz',
-            error: {
-              type: 'missing_references',
-              blocking: [],
-              references: [{ type: 'index-pattern', id: 'missing-index-pattern' }],
-            },
+            error: { type: 'unknown', message: 'some error message', statusCode: 400 },
+            meta: {},
           },
         ],
       },
@@ -441,7 +609,7 @@ describe('CopyToSpaceFlyout', () => {
           values={Object {}}
         />,
         "data-test-subj": "cts-object-result-error-my-viz",
-        "type": "cross",
+        "type": "alert",
       }
     `);
 
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
index 47fc603ee46e8..f9b81be2d6b4b 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.tsx
@@ -22,17 +22,17 @@ import { mapValues } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { ToastsStart } from 'src/core/public';
-import { SavedObjectsManagementRecord } from '../../../../../../src/plugins/saved_objects_management/public';
+import {
+  ProcessedImportResponse,
+  processImportResponse,
+  SavedObjectsManagementRecord,
+} from '../../../../../../src/plugins/saved_objects_management/public';
 import { Space } from '../../../common/model/space';
 import { SpacesManager } from '../../spaces_manager';
 import { ProcessingCopyToSpace } from './processing_copy_to_space';
 import { CopyToSpaceFlyoutFooter } from './copy_to_space_flyout_footer';
 import { CopyToSpaceForm } from './copy_to_space_form';
 import { CopyOptions, ImportRetry } from '../types';
-import {
-  ProcessedImportResponse,
-  processImportResponse,
-} from '../../../../../../src/plugins/saved_objects_management/public';
 
 interface Props {
   onClose: () => void;
@@ -41,11 +41,16 @@ interface Props {
   toastNotifications: ToastsStart;
 }
 
+const INCLUDE_RELATED_DEFAULT = true;
+const CREATE_NEW_COPIES_DEFAULT = false;
+const OVERWRITE_ALL_DEFAULT = true;
+
 export const CopySavedObjectsToSpaceFlyout = (props: Props) => {
   const { onClose, savedObject, spacesManager, toastNotifications } = props;
   const [copyOptions, setCopyOptions] = useState<CopyOptions>({
-    includeRelated: true,
-    overwrite: true,
+    includeRelated: INCLUDE_RELATED_DEFAULT,
+    createNewCopies: CREATE_NEW_COPIES_DEFAULT,
+    overwrite: OVERWRITE_ALL_DEFAULT,
     selectedSpaceIds: [],
   });
 
@@ -90,18 +95,48 @@ export const CopySavedObjectsToSpaceFlyout = (props: Props) => {
     setCopyResult({});
     try {
       const copySavedObjectsResult = await spacesManager.copySavedObjects(
-        [
-          {
-            type: savedObject.type,
-            id: savedObject.id,
-          },
-        ],
+        [{ type: savedObject.type, id: savedObject.id }],
         copyOptions.selectedSpaceIds,
         copyOptions.includeRelated,
+        copyOptions.createNewCopies,
         copyOptions.overwrite
       );
       const processedResult = mapValues(copySavedObjectsResult, processImportResponse);
       setCopyResult(processedResult);
+
+      // retry all successful imports
+      const getAutomaticRetries = (response: ProcessedImportResponse): ImportRetry[] => {
+        const { failedImports, successfulImports } = response;
+        if (!failedImports.length) {
+          // if no imports failed for this space, return an empty array
+          return [];
+        }
+
+        // get missing references failures that do not also have a conflict
+        const nonMissingReferencesFailures = failedImports
+          .filter(({ error }) => error.type !== 'missing_references')
+          .reduce((acc, { obj: { type, id } }) => acc.add(`${type}:${id}`), new Set<string>());
+        const missingReferencesToRetry = failedImports.filter(
+          ({ obj: { type, id }, error }) =>
+            error.type === 'missing_references' &&
+            !nonMissingReferencesFailures.has(`${type}:${id}`)
+        );
+
+        // otherwise, some imports failed for this space, so retry any successful imports (if any)
+        return [
+          ...successfulImports.map(({ type, id, overwrite, destinationId, createNewCopy }) => {
+            return { type, id, overwrite: overwrite === true, destinationId, createNewCopy };
+          }),
+          ...missingReferencesToRetry.map(({ obj: { type, id } }) => ({
+            type,
+            id,
+            overwrite: false,
+            ignoreMissingReferences: true,
+          })),
+        ];
+      };
+      const automaticRetries = mapValues(processedResult, getAutomaticRetries);
+      setRetries(automaticRetries);
     } catch (e) {
       setCopyInProgress(false);
       toastNotifications.addError(e, {
@@ -113,27 +148,22 @@ export const CopySavedObjectsToSpaceFlyout = (props: Props) => {
   }
 
   async function finishCopy() {
-    const needsConflictResolution = Object.values(retries).some((spaceRetry) =>
-      spaceRetry.some((retry) => retry.overwrite)
-    );
+    // if any retries are present, attempt to resolve errors again
+    const needsErrorResolution = Object.values(retries).some((spaceRetry) => spaceRetry.length);
 
-    if (needsConflictResolution) {
+    if (needsErrorResolution) {
       setConflictResolutionInProgress(true);
       try {
         await spacesManager.resolveCopySavedObjectsErrors(
-          [
-            {
-              type: savedObject.type,
-              id: savedObject.id,
-            },
-          ],
+          [{ type: savedObject.type, id: savedObject.id }],
           retries,
-          copyOptions.includeRelated
+          copyOptions.includeRelated,
+          copyOptions.createNewCopies
         );
 
         toastNotifications.addSuccess(
           i18n.translate('xpack.spaces.management.copyToSpace.resolveCopySuccessTitle', {
-            defaultMessage: 'Overwrite successful',
+            defaultMessage: 'Copy successful',
           })
         );
 
@@ -184,7 +214,12 @@ export const CopySavedObjectsToSpaceFlyout = (props: Props) => {
     // Step 2: Copy has not been initiated yet; User must fill out form to continue.
     if (!copyInProgress) {
       return (
-        <CopyToSpaceForm spaces={spaces} copyOptions={copyOptions} onUpdate={setCopyOptions} />
+        <CopyToSpaceForm
+          savedObject={savedObject}
+          spaces={spaces}
+          copyOptions={copyOptions}
+          onUpdate={setCopyOptions}
+        />
       );
     }
 
@@ -208,14 +243,14 @@ export const CopySavedObjectsToSpaceFlyout = (props: Props) => {
       <EuiFlyoutHeader hasBorder>
         <EuiFlexGroup alignItems="center" gutterSize="m">
           <EuiFlexItem grow={false}>
-            <EuiIcon size="m" type="spacesApp" />
+            <EuiIcon size="m" type="copy" />
           </EuiFlexItem>
           <EuiFlexItem>
             <EuiTitle size="m">
               <h2>
                 <FormattedMessage
                   id="xpack.spaces.management.copyToSpaceFlyoutHeader"
-                  defaultMessage="Copy saved object to space"
+                  defaultMessage="Copy to space"
                 />
               </h2>
             </EuiTitle>
@@ -247,6 +282,7 @@ export const CopySavedObjectsToSpaceFlyout = (props: Props) => {
           copyResult={copyResult}
           numberOfSelectedSpaces={copyOptions.selectedSpaceIds.length}
           retries={retries}
+          onClose={onClose}
           onCopyStart={startCopy}
           onCopyFinish={finishCopy}
         />
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
index d7ded819771fc..524361bf6ef1d 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout_footer.tsx
@@ -5,11 +5,18 @@
  */
 
 import React, { Fragment } from 'react';
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiStat, EuiHorizontalRule } from '@elastic/eui';
+import {
+  EuiButton,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiStat,
+  EuiHorizontalRule,
+} from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
+import { ProcessedImportResponse, FailedImport } from 'src/plugins/saved_objects_management/public';
 import { ImportRetry } from '../types';
-import { ProcessedImportResponse } from '../../../../../../src/plugins/saved_objects_management/public';
 
 interface Props {
   copyInProgress: boolean;
@@ -18,33 +25,54 @@ interface Props {
   copyResult: Record<string, ProcessedImportResponse>;
   retries: Record<string, ImportRetry[]>;
   numberOfSelectedSpaces: number;
+  onClose: () => void;
   onCopyStart: () => void;
   onCopyFinish: () => void;
 }
+
+const isResolvableError = ({ error: { type } }: FailedImport) =>
+  ['conflict', 'ambiguous_conflict', 'missing_references'].includes(type);
+const isUnresolvableError = (failure: FailedImport) => !isResolvableError(failure);
+
 export const CopyToSpaceFlyoutFooter = (props: Props) => {
-  const { copyInProgress, initialCopyFinished, copyResult, retries } = props;
+  const {
+    copyInProgress,
+    conflictResolutionInProgress,
+    initialCopyFinished,
+    copyResult,
+    retries,
+  } = props;
 
   let summarizedResults = {
     successCount: 0,
-    overwriteConflictCount: 0,
-    conflictCount: 0,
-    unresolvableErrorCount: 0,
+    pendingCount: 0,
+    skippedCount: 0,
+    errorCount: 0,
   };
   if (copyResult) {
     summarizedResults = Object.entries(copyResult).reduce((acc, result) => {
       const [spaceId, spaceResult] = result;
-      const overwriteCount = (retries[spaceId] || []).filter((c) => c.overwrite).length;
+      let successCount = 0;
+      let pendingCount = 0;
+      let skippedCount = 0;
+      let errorCount = 0;
+      if (spaceResult.status === 'success') {
+        successCount = spaceResult.importCount;
+      } else {
+        const uniqueResolvableErrors = spaceResult.failedImports
+          .filter(isResolvableError)
+          .reduce((set, { obj: { type, id } }) => set.add(`${type}:${id}`), new Set<string>());
+        pendingCount = (retries[spaceId] || []).length;
+        skippedCount =
+          uniqueResolvableErrors.size + spaceResult.successfulImports.length - pendingCount;
+        errorCount = spaceResult.failedImports.filter(isUnresolvableError).length;
+      }
       return {
         loading: false,
-        successCount: acc.successCount + spaceResult.importCount,
-        overwriteConflictCount: acc.overwriteConflictCount + overwriteCount,
-        conflictCount:
-          acc.conflictCount +
-          spaceResult.failedImports.filter((i) => i.error.type === 'conflict').length -
-          overwriteCount,
-        unresolvableErrorCount:
-          acc.unresolvableErrorCount +
-          spaceResult.failedImports.filter((i) => i.error.type !== 'conflict').length,
+        successCount: acc.successCount + successCount,
+        pendingCount: acc.pendingCount + pendingCount,
+        skippedCount: acc.skippedCount + skippedCount,
+        errorCount: acc.errorCount + errorCount,
       };
     }, summarizedResults);
   }
@@ -52,13 +80,13 @@ export const CopyToSpaceFlyoutFooter = (props: Props) => {
   const getButton = () => {
     let actionButton;
     if (initialCopyFinished) {
-      const hasPendingOverwrites = summarizedResults.overwriteConflictCount > 0;
+      const hasPendingRetries = summarizedResults.pendingCount > 0;
 
-      const buttonText = hasPendingOverwrites ? (
+      const buttonText = hasPendingRetries ? (
         <FormattedMessage
           id="xpack.spaces.management.copyToSpace.finishPendingOverwritesCopyToSpacesButton"
-          defaultMessage="Overwrite {overwriteCount} objects"
-          values={{ overwriteCount: summarizedResults.overwriteConflictCount }}
+          defaultMessage="Copy {overwriteCount} objects"
+          values={{ overwriteCount: summarizedResults.pendingCount }}
         />
       ) : (
         <FormattedMessage
@@ -69,10 +97,10 @@ export const CopyToSpaceFlyoutFooter = (props: Props) => {
       actionButton = (
         <EuiButton
           fill
-          isLoading={props.conflictResolutionInProgress}
+          isLoading={conflictResolutionInProgress}
           aria-live="assertive"
           aria-label={
-            props.conflictResolutionInProgress
+            conflictResolutionInProgress
               ? i18n.translate('xpack.spaces.management.copyToSpace.inProgressButtonLabel', {
                   defaultMessage: 'Copy is in progress. Please wait.',
                 })
@@ -112,7 +140,24 @@ export const CopyToSpaceFlyoutFooter = (props: Props) => {
     }
 
     return (
-      <EuiFlexGroup justifyContent="flexEnd">
+      <EuiFlexGroup justifyContent="spaceBetween">
+        <EuiFlexItem grow={false}>
+          <EuiButtonEmpty
+            onClick={() => props.onClose()}
+            data-test-subj="cts-cancel-button"
+            disabled={
+              // Cannot cancel while the operation is in progress, or after some objects have already been created
+              (copyInProgress && !initialCopyFinished) ||
+              conflictResolutionInProgress ||
+              summarizedResults.successCount > 0
+            }
+          >
+            <FormattedMessage
+              id="xpack.spaces.management.copyToSpace.cancelButton"
+              defaultMessage="Cancel"
+            />
+          </EuiButtonEmpty>
+        </EuiFlexItem>
         <EuiFlexItem grow={false}>{actionButton}</EuiFlexItem>
       </EuiFlexGroup>
     );
@@ -141,35 +186,33 @@ export const CopyToSpaceFlyoutFooter = (props: Props) => {
             }
           />
         </EuiFlexItem>
-        {summarizedResults.overwriteConflictCount > 0 && (
-          <EuiFlexItem>
-            <EuiStat
-              data-test-subj={`cts-summary-overwrite-count`}
-              title={summarizedResults.overwriteConflictCount}
-              titleSize="s"
-              titleColor={summarizedResults.overwriteConflictCount > 0 ? 'primary' : 'subdued'}
-              isLoading={!initialCopyFinished}
-              textAlign="center"
-              description={
-                <FormattedMessage
-                  id="xpack.spaces.management.copyToSpaceFlyoutFooter.pendingCount"
-                  defaultMessage="Pending"
-                />
-              }
-            />
-          </EuiFlexItem>
-        )}
         <EuiFlexItem>
           <EuiStat
-            data-test-subj={`cts-summary-conflict-count`}
-            title={summarizedResults.conflictCount}
+            data-test-subj={`cts-summary-pending-count`}
+            title={summarizedResults.pendingCount}
+            titleSize="s"
+            titleColor={summarizedResults.pendingCount > 0 ? 'primary' : 'subdued'}
+            isLoading={!initialCopyFinished}
+            textAlign="center"
+            description={
+              <FormattedMessage
+                id="xpack.spaces.management.copyToSpaceFlyoutFooter.pendingCount"
+                defaultMessage="Pending"
+              />
+            }
+          />
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiStat
+            data-test-subj={`cts-summary-skipped-count`}
+            title={summarizedResults.skippedCount}
             titleSize="s"
-            titleColor={summarizedResults.conflictCount > 0 ? 'primary' : 'subdued'}
+            titleColor={summarizedResults.skippedCount > 0 ? 'primary' : 'subdued'}
             isLoading={!initialCopyFinished}
             textAlign="center"
             description={
               <FormattedMessage
-                id="xpack.spaces.management.copyToSpaceFlyoutFooter.conflictCount"
+                id="xpack.spaces.management.copyToSpaceFlyoutFooter.skippedCount"
                 defaultMessage="Skipped"
               />
             }
@@ -178,9 +221,9 @@ export const CopyToSpaceFlyoutFooter = (props: Props) => {
         <EuiFlexItem>
           <EuiStat
             data-test-subj={`cts-summary-error-count`}
-            title={summarizedResults.unresolvableErrorCount}
+            title={summarizedResults.errorCount}
             titleSize="s"
-            titleColor={summarizedResults.unresolvableErrorCount > 0 ? 'danger' : 'subdued'}
+            titleColor={summarizedResults.errorCount > 0 ? 'danger' : 'subdued'}
             isLoading={!initialCopyFinished}
             textAlign="center"
             description={
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
index 0df2a7720e587..fdc8d8c73e324 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.tsx
@@ -4,78 +4,62 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import './copy_to_space_form.scss';
 import React from 'react';
-import {
-  EuiSwitch,
-  EuiSpacer,
-  EuiHorizontalRule,
-  EuiFormRow,
-  EuiListGroup,
-  EuiListGroupItem,
-} from '@elastic/eui';
+import { EuiSpacer, EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { CopyOptions } from '../types';
+import { SavedObjectsManagementRecord } from '../../../../../../src/plugins/saved_objects_management/public';
 import { Space } from '../../../common/model/space';
 import { SelectableSpacesControl } from './selectable_spaces_control';
+import { CopyModeControl, CopyMode } from './copy_mode_control';
 
 interface Props {
+  savedObject: SavedObjectsManagementRecord;
   spaces: Space[];
   onUpdate: (copyOptions: CopyOptions) => void;
   copyOptions: CopyOptions;
 }
 
 export const CopyToSpaceForm = (props: Props) => {
-  const setOverwrite = (overwrite: boolean) => props.onUpdate({ ...props.copyOptions, overwrite });
+  const { savedObject, spaces, onUpdate, copyOptions } = props;
+
+  // if the user is not creating new copies, prevent them from copying objects an object into a space where it already exists
+  const getDisabledSpaceIds = (createNewCopies: boolean) =>
+    createNewCopies
+      ? new Set<string>()
+      : (savedObject.namespaces ?? []).reduce((acc, cur) => acc.add(cur), new Set<string>());
+
+  const changeCopyMode = ({ createNewCopies, overwrite }: CopyMode) => {
+    const disabled = getDisabledSpaceIds(createNewCopies);
+    const selectedSpaceIds = copyOptions.selectedSpaceIds.filter((x) => !disabled.has(x));
+    onUpdate({ ...copyOptions, createNewCopies, overwrite, selectedSpaceIds });
+  };
 
   const setSelectedSpaceIds = (selectedSpaceIds: string[]) =>
-    props.onUpdate({ ...props.copyOptions, selectedSpaceIds });
+    onUpdate({ ...copyOptions, selectedSpaceIds });
 
   return (
     <div data-test-subj="copy-to-space-form">
-      <EuiListGroup className="spcCopyToSpaceOptionsView" flush>
-        <EuiListGroupItem
-          className="spcCopyToSpaceIncludeRelated"
-          iconType={'check'}
-          label={
-            <span className="spcCopyToSpaceIncludeRelated__label">
-              <FormattedMessage
-                id="xpack.spaces.management.copyToSpace.includeRelatedFormLabel"
-                defaultMessage="Including related saved objects"
-              />
-            </span>
-          }
-        />
-      </EuiListGroup>
-
-      <EuiSpacer />
-
-      <EuiSwitch
-        data-test-subj="cts-form-overwrite"
-        label={
-          <FormattedMessage
-            id="xpack.spaces.management.copyToSpace.automaticallyOverwrite"
-            defaultMessage="Automatically overwrite all saved objects"
-          />
-        }
-        checked={props.copyOptions.overwrite}
-        onChange={(e) => setOverwrite(e.target.checked)}
+      <CopyModeControl
+        initialValues={copyOptions}
+        updateSelection={(newValues: CopyMode) => changeCopyMode(newValues)}
       />
 
-      <EuiHorizontalRule margin="m" />
+      <EuiSpacer />
 
       <EuiFormRow
         label={
           <FormattedMessage
             id="xpack.spaces.management.copyToSpace.selectSpacesLabel"
-            defaultMessage="Select spaces to copy into"
+            defaultMessage="Select space(s):"
           />
         }
         fullWidth
       >
         <SelectableSpacesControl
-          spaces={props.spaces}
-          selectedSpaceIds={props.copyOptions.selectedSpaceIds}
+          spaces={spaces}
+          selectedSpaceIds={copyOptions.selectedSpaceIds}
+          disabledSpaceIds={getDisabledSpaceIds(copyOptions.createNewCopies)}
           onChange={(selection) => setSelectedSpaceIds(selection)}
         />
       </EuiFormRow>
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
index 255268d388eb8..ceaa1dc9f5e21 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
@@ -19,7 +19,7 @@ import {
 } from 'src/plugins/saved_objects_management/public';
 import { Space } from '../../../common/model/space';
 import { CopyOptions, ImportRetry } from '../types';
-import { SpaceResult } from './space_result';
+import { SpaceResult, SpaceResultProcessing } from './space_result';
 import { summarizeCopyResult } from '..';
 
 interface Props {
@@ -33,6 +33,52 @@ interface Props {
   copyOptions: CopyOptions;
 }
 
+const renderCopyOptions = ({ createNewCopies, overwrite, includeRelated }: CopyOptions) => {
+  const createNewCopiesLabel = createNewCopies ? (
+    <FormattedMessage
+      id="xpack.spaces.management.copyToSpace.createNewCopiesLabel"
+      defaultMessage="Create new objects with random IDs"
+    />
+  ) : (
+    <FormattedMessage
+      id="xpack.spaces.management.copyToSpace.dontCreateNewCopiesLabel"
+      defaultMessage="Check for existing objects"
+    />
+  );
+  const overwriteLabel = overwrite ? (
+    <FormattedMessage
+      id="xpack.spaces.management.copyToSpace.overwriteLabel"
+      defaultMessage="Automatically try to overwrite conflicts"
+    />
+  ) : (
+    <FormattedMessage
+      id="xpack.spaces.management.copyToSpace.dontOverwriteLabel"
+      defaultMessage="Do not automatically try to overwrite conflicts"
+    />
+  );
+  const includeRelatedLabel = includeRelated ? (
+    <FormattedMessage
+      id="xpack.spaces.management.copyToSpace.includeRelatedLabel"
+      defaultMessage="Include related saved objects"
+    />
+  ) : (
+    <FormattedMessage
+      id="xpack.spaces.management.copyToSpace.dontIncludeRelatedLabel"
+      defaultMessage="Do not include related saved objects"
+    />
+  );
+
+  return (
+    <EuiListGroup className="spcCopyToSpaceOptionsView" flush>
+      <EuiListGroupItem iconType="copy" label={createNewCopiesLabel} />
+      {!createNewCopies && (
+        <EuiListGroupItem iconType={overwrite ? 'check' : 'cross'} label={overwriteLabel} />
+      )}
+      <EuiListGroupItem iconType={includeRelated ? 'check' : 'cross'} label={includeRelatedLabel} />
+    </EuiListGroup>
+  );
+};
+
 export const ProcessingCopyToSpace = (props: Props) => {
   function updateRetries(spaceId: string, updatedRetries: ImportRetry[]) {
     props.onRetriesChange({
@@ -43,46 +89,13 @@ export const ProcessingCopyToSpace = (props: Props) => {
 
   return (
     <div data-test-subj="copy-to-space-processing">
-      <EuiListGroup className="spcCopyToSpaceOptionsView" flush>
-        <EuiListGroupItem
-          iconType={props.copyOptions.includeRelated ? 'check' : 'cross'}
-          label={
-            props.copyOptions.includeRelated ? (
-              <FormattedMessage
-                id="xpack.spaces.management.copyToSpace.includeRelatedLabel"
-                defaultMessage="Including related saved objects"
-              />
-            ) : (
-              <FormattedMessage
-                id="xpack.spaces.management.copyToSpace.dontIncludeRelatedLabel"
-                defaultMessage="Not including related saved objects"
-              />
-            )
-          }
-        />
-        <EuiListGroupItem
-          iconType={props.copyOptions.overwrite ? 'check' : 'cross'}
-          label={
-            props.copyOptions.overwrite ? (
-              <FormattedMessage
-                id="xpack.spaces.management.copyToSpace.overwriteLabel"
-                defaultMessage="Automatically overwriting saved objects"
-              />
-            ) : (
-              <FormattedMessage
-                id="xpack.spaces.management.copyToSpace.dontOverwriteLabel"
-                defaultMessage="Not overwriting saved objects"
-              />
-            )
-          }
-        />
-      </EuiListGroup>
+      {renderCopyOptions(props.copyOptions)}
       <EuiHorizontalRule margin="m" />
       <EuiText size="s">
         <h5>
           <FormattedMessage
             id="xpack.spaces.management.copyToSpace.copyResultsLabel"
-            defaultMessage="Copy results"
+            defaultMessage="Results"
           />
         </h5>
       </EuiText>
@@ -90,22 +103,22 @@ export const ProcessingCopyToSpace = (props: Props) => {
       {props.copyOptions.selectedSpaceIds.map((id) => {
         const space = props.spaces.find((s) => s.id === id) as Space;
         const spaceCopyResult = props.copyResult[space.id];
-        const summarizedSpaceCopyResult = summarizeCopyResult(
-          props.savedObject,
-          spaceCopyResult,
-          props.copyOptions.includeRelated
-        );
+        const summarizedSpaceCopyResult = summarizeCopyResult(props.savedObject, spaceCopyResult);
 
         return (
           <Fragment key={id}>
-            <SpaceResult
-              savedObject={props.savedObject}
-              space={space}
-              summarizedCopyResult={summarizedSpaceCopyResult}
-              retries={props.retries[space.id] || []}
-              onRetriesChange={(retries) => updateRetries(space.id, retries)}
-              conflictResolutionInProgress={props.conflictResolutionInProgress}
-            />
+            {summarizedSpaceCopyResult.processing ? (
+              <SpaceResultProcessing space={space} />
+            ) : (
+              <SpaceResult
+                savedObject={props.savedObject}
+                space={space}
+                summarizedCopyResult={summarizedSpaceCopyResult}
+                retries={props.retries[space.id] || []}
+                onRetriesChange={(retries) => updateRetries(space.id, retries)}
+                conflictResolutionInProgress={props.conflictResolutionInProgress}
+              />
+            )}
             <EuiSpacer size="s" />
           </Fragment>
         );
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.scss b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.scss
new file mode 100644
index 0000000000000..ce019d17ceaf7
--- /dev/null
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.scss
@@ -0,0 +1,4 @@
+.spcCopyToSpace__resolveAllConflictsLink {
+  font-size: $euiFontSizeS;
+  margin-right: $euiSizeS;
+}
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.test.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.test.tsx
new file mode 100644
index 0000000000000..7da265d8f9958
--- /dev/null
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.test.tsx
@@ -0,0 +1,158 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { ReactWrapper } from 'enzyme';
+import { act } from '@testing-library/react';
+import { shallowWithIntl, mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
+import { findTestSubject } from 'test_utils/find_test_subject';
+import { ResolveAllConflicts, ResolveAllConflictsProps } from './resolve_all_conflicts';
+import { SummarizedCopyToSpaceResult } from '..';
+import { ImportRetry } from '../types';
+describe('ResolveAllConflicts', () => {
+  const summarizedCopyResult = ({
+    objects: [
+      // these objects have minimal attributes to exercise test scenarios; these are not fully realistic results
+      { type: 'type-1', id: 'id-1', conflict: undefined }, // not a conflict
+      { type: 'type-2', id: 'id-2', conflict: { error: { type: 'conflict' } } }, // conflict without a destinationId
+      {
+        // conflict with a destinationId
+        type: 'type-3',
+        id: 'id-3',
+        conflict: { error: { type: 'conflict', destinationId: 'dest-3' } },
+      },
+      {
+        // ambiguous conflict with two destinations
+        type: 'type-4',
+        id: 'id-4',
+        conflict: {
+          error: {
+            type: 'ambiguous_conflict',
+            destinations: [{ id: 'dest-4a' }, { id: 'dest-4b' }],
+          },
+        },
+      },
+      {
+        // ambiguous conflict with two destinations (a retry already exists for dest-5b)
+        type: 'type-5',
+        id: 'id-5',
+        conflict: {
+          error: {
+            type: 'ambiguous_conflict',
+            destinations: [{ id: 'dest-5a' }, { id: 'dest-5b' }],
+          },
+        },
+      },
+    ],
+  } as unknown) as SummarizedCopyToSpaceResult;
+  const retries: ImportRetry[] = [
+    { type: 'type-1', id: 'id-1', overwrite: false },
+    { type: 'type-5', id: 'id-5', overwrite: true, destinationId: 'dest-5b' },
+  ];
+  const onRetriesChange = jest.fn();
+  const onDestinationMapChange = jest.fn();
+
+  const getOverwriteOption = (wrapper: ReactWrapper) =>
+    findTestSubject(wrapper, 'cts-resolve-all-conflicts-overwrite');
+  const getSkipOption = (wrapper: ReactWrapper) =>
+    findTestSubject(wrapper, 'cts-resolve-all-conflicts-skip');
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  const props: ResolveAllConflictsProps = {
+    summarizedCopyResult,
+    retries,
+    onRetriesChange,
+    onDestinationMapChange,
+  };
+  const openPopover = async (wrapper: ReactWrapper) => {
+    await act(async () => {
+      wrapper.setState({ isPopoverOpen: true });
+      await nextTick();
+      wrapper.update();
+    });
+  };
+
+  it('should render as expected', async () => {
+    const wrapper = shallowWithIntl(<ResolveAllConflicts {...props} />);
+
+    expect(wrapper).toMatchInlineSnapshot(`
+      <EuiPopover
+        anchorPosition="downLeft"
+        button={
+          <EuiLink
+            className="spcCopyToSpace__resolveAllConflictsLink"
+            onClick={[Function]}
+          >
+            <FormattedMessage
+              defaultMessage="(resolve all)"
+              id="xpack.spaces.management.copyToSpace.resolveAllConflictsLink"
+              values={Object {}}
+            />
+          </EuiLink>
+        }
+        closePopover={[Function]}
+        display="inlineBlock"
+        hasArrow={true}
+        id="resolveAllConflictsVisibilityPopover"
+        isOpen={false}
+        ownFocus={false}
+        panelPaddingSize="none"
+      >
+        <EuiContextMenuPanel
+          hasFocus={true}
+          items={
+            Array [
+              <EuiContextMenuItem
+                data-test-subj="cts-resolve-all-conflicts-overwrite"
+                onClick={[Function]}
+              >
+                Overwrite all
+              </EuiContextMenuItem>,
+              <EuiContextMenuItem
+                data-test-subj="cts-resolve-all-conflicts-skip"
+                onClick={[Function]}
+              >
+                Skip all
+              </EuiContextMenuItem>,
+            ]
+          }
+        />
+      </EuiPopover>
+    `);
+  });
+
+  it('should add overwrite retries when "Overwrite all" is selected', async () => {
+    const wrapper = mountWithIntl(<ResolveAllConflicts {...props} />);
+    await openPopover(wrapper);
+    expect(onRetriesChange).not.toHaveBeenCalled();
+
+    getOverwriteOption(wrapper).simulate('click');
+    expect(onRetriesChange).toHaveBeenCalledWith([
+      { type: 'type-1', id: 'id-1', overwrite: false }, // unchanged
+      { type: 'type-5', id: 'id-5', overwrite: true, destinationId: 'dest-5b' }, // unchanged
+      { type: 'type-2', id: 'id-2', overwrite: true }, // added without a destinationId
+      { type: 'type-3', id: 'id-3', overwrite: true, destinationId: 'dest-3' }, // added with the destinationId
+      { type: 'type-4', id: 'id-4', overwrite: true, destinationId: 'dest-4a' }, // added with the first destinationId
+    ]);
+    expect(onDestinationMapChange).not.toHaveBeenCalled();
+  });
+
+  it('should remove overwrite retries when "Skip all" is selected', async () => {
+    const wrapper = mountWithIntl(<ResolveAllConflicts {...props} />);
+    await openPopover(wrapper);
+    expect(onRetriesChange).not.toHaveBeenCalled();
+    expect(onDestinationMapChange).not.toHaveBeenCalled();
+
+    getSkipOption(wrapper).simulate('click');
+    expect(onRetriesChange).toHaveBeenCalledWith([
+      { type: 'type-1', id: 'id-1', overwrite: false }, // unchanged
+    ]);
+    expect(onDestinationMapChange).toHaveBeenCalledWith(undefined);
+  });
+});
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.tsx
new file mode 100644
index 0000000000000..a4ded022debe8
--- /dev/null
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/resolve_all_conflicts.tsx
@@ -0,0 +1,135 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import './resolve_all_conflicts.scss';
+
+import { EuiContextMenuItem, EuiContextMenuPanel, EuiLink, EuiPopover } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { Component } from 'react';
+import { ImportRetry } from '../types';
+import { SummarizedCopyToSpaceResult } from '..';
+
+export interface ResolveAllConflictsProps {
+  summarizedCopyResult: SummarizedCopyToSpaceResult;
+  retries: ImportRetry[];
+  onRetriesChange: (retries: ImportRetry[]) => void;
+  onDestinationMapChange: (value?: Map<string, string>) => void;
+}
+
+interface State {
+  isPopoverOpen: boolean;
+}
+
+interface ResolveOption {
+  id: 'overwrite' | 'skip';
+  text: string;
+}
+
+const options: ResolveOption[] = [
+  {
+    id: 'overwrite',
+    text: i18n.translate('xpack.spaces.management.copyToSpace.overwriteAllConflictsText', {
+      defaultMessage: 'Overwrite all',
+    }),
+  },
+  {
+    id: 'skip',
+    text: i18n.translate('xpack.spaces.management.copyToSpace.skipAllConflictsText', {
+      defaultMessage: 'Skip all',
+    }),
+  },
+];
+
+export class ResolveAllConflicts extends Component<ResolveAllConflictsProps, State> {
+  public state = {
+    isPopoverOpen: false,
+  };
+
+  public render() {
+    const button = (
+      <EuiLink onClick={this.onButtonClick} className={'spcCopyToSpace__resolveAllConflictsLink'}>
+        <FormattedMessage
+          id="xpack.spaces.management.copyToSpace.resolveAllConflictsLink"
+          defaultMessage="(resolve all)"
+        />
+      </EuiLink>
+    );
+
+    const items = options.map((item) => {
+      return (
+        <EuiContextMenuItem
+          data-test-subj={`cts-resolve-all-conflicts-${item.id}`}
+          key={item.id}
+          onClick={() => {
+            this.onSelect(item.id);
+          }}
+        >
+          {item.text}
+        </EuiContextMenuItem>
+      );
+    });
+
+    return (
+      <EuiPopover
+        id={'resolveAllConflictsVisibilityPopover'}
+        button={button}
+        isOpen={this.state.isPopoverOpen}
+        closePopover={this.closePopover}
+        panelPaddingSize="none"
+        anchorPosition="downLeft"
+      >
+        <EuiContextMenuPanel items={items} />
+      </EuiPopover>
+    );
+  }
+
+  private onSelect = (selection: ResolveOption['id']) => {
+    const { summarizedCopyResult, retries, onRetriesChange, onDestinationMapChange } = this.props;
+    const overwrite = selection === 'overwrite';
+
+    if (overwrite) {
+      const existingOverwrites = retries.filter((retry) => retry.overwrite === true);
+      const newOverwrites = summarizedCopyResult.objects.reduce((acc, { type, id, conflict }) => {
+        if (
+          conflict &&
+          !existingOverwrites.some((retry) => retry.type === type && retry.id === id)
+        ) {
+          const { error } = conflict;
+          // if this is a regular conflict, use its destinationId if it has one;
+          // otherwise, this is an ambiguous conflict, so use the first destinationId available
+          const destinationId =
+            error.type === 'conflict' ? error.destinationId : error.destinations[0].id;
+          return [...acc, { type, id, overwrite, ...(destinationId && { destinationId }) }];
+        }
+        return acc;
+      }, new Array<ImportRetry>());
+      onRetriesChange([...retries, ...newOverwrites]);
+    } else {
+      const objectsToSkip = summarizedCopyResult.objects.reduce(
+        (acc, { type, id, conflict }) => (conflict ? acc.add(`${type}:${id}`) : acc),
+        new Set<string>()
+      );
+      const filtered = retries.filter(({ type, id }) => !objectsToSkip.has(`${type}:${id}`));
+      onRetriesChange(filtered);
+      onDestinationMapChange(undefined);
+    }
+
+    this.setState({ isPopoverOpen: false });
+  };
+
+  private onButtonClick = () => {
+    this.setState({
+      isPopoverOpen: !this.state.isPopoverOpen,
+    });
+  };
+
+  private closePopover = () => {
+    this.setState({
+      isPopoverOpen: false,
+    });
+  };
+}
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
index 9db045f4f068a..2a8b5e660f38c 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/selectable_spaces_control.tsx
@@ -5,42 +5,53 @@
  */
 
 import './selectable_spaces_control.scss';
-import React, { Fragment, useState } from 'react';
-import { EuiSelectable, EuiLoadingSpinner } from '@elastic/eui';
+import React, { Fragment } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiSelectable, EuiSelectableOption, EuiLoadingSpinner, EuiIconTip } from '@elastic/eui';
 import { SpaceAvatar } from '../../space_avatar';
 import { Space } from '../../../common/model/space';
 
 interface Props {
   spaces: Space[];
   selectedSpaceIds: string[];
+  disabledSpaceIds: Set<string>;
   onChange: (selectedSpaceIds: string[]) => void;
   disabled?: boolean;
 }
 
-interface SpaceOption {
-  label: string;
-  prepend?: any;
-  checked: 'on' | 'off' | null;
-  ['data-space-id']: string;
-  disabled?: boolean;
-}
+type SpaceOption = EuiSelectableOption & { ['data-space-id']: string };
 
 export const SelectableSpacesControl = (props: Props) => {
-  const [options, setOptions] = useState<SpaceOption[]>([]);
-
-  //  TODO: update once https://github.com/elastic/eui/issues/2071 is fixed
-  if (options.length === 0) {
-    setOptions(
-      props.spaces.map((space) => ({
-        label: space.name,
-        prepend: <SpaceAvatar space={space} size={'s'} />,
-        checked: props.selectedSpaceIds.includes(space.id) ? 'on' : null,
-        ['data-space-id']: space.id,
-        ['data-test-subj']: `cts-space-selector-row-${space.id}`,
-      }))
-    );
+  if (props.spaces.length === 0) {
+    return <EuiLoadingSpinner />;
   }
 
+  const disabledIndicator = (
+    <EuiIconTip
+      content={
+        <FormattedMessage
+          id="xpack.spaces.management.copyToSpace.selectSpacesControl.disabledTooltip"
+          defaultMessage="The object already exists in this space and cannot be copied here"
+        />
+      }
+      position="left"
+      type="iInCircle"
+    />
+  );
+
+  const options = props.spaces.map<SpaceOption>((space) => {
+    const disabled = props.disabledSpaceIds.has(space.id);
+    return {
+      label: space.name,
+      prepend: <SpaceAvatar space={space} size={'s'} />,
+      append: disabled ? disabledIndicator : null,
+      checked: props.selectedSpaceIds.includes(space.id) ? 'on' : undefined,
+      disabled,
+      ['data-space-id']: space.id,
+      ['data-test-subj']: `cts-space-selector-row-${space.id}`,
+    };
+  });
+
   function updateSelectedSpaces(selectedOptions: SpaceOption[]) {
     if (props.disabled) return;
 
@@ -49,17 +60,11 @@ export const SelectableSpacesControl = (props: Props) => {
       .map((opt) => opt['data-space-id']);
 
     props.onChange(selectedSpaceIds);
-    // TODO: remove once https://github.com/elastic/eui/issues/2071 is fixed
-    setOptions(selectedOptions);
-  }
-
-  if (options.length === 0) {
-    return <EuiLoadingSpinner />;
   }
 
   return (
     <EuiSelectable
-      options={options as any[]}
+      options={options}
       onChange={(newOptions) => updateSelectedSpaces(newOptions as SpaceOption[])}
       listProps={{
         bordered: true,
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
index f1a8f64a61449..eefd9f8ea2467 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result.tsx
@@ -5,8 +5,15 @@
  */
 
 import './space_result.scss';
-import React from 'react';
-import { EuiAccordion, EuiFlexGroup, EuiFlexItem, EuiText, EuiSpacer } from '@elastic/eui';
+import React, { useState } from 'react';
+import {
+  EuiAccordion,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiText,
+  EuiSpacer,
+  EuiLoadingSpinner,
+} from '@elastic/eui';
 import { SavedObjectsManagementRecord } from '../../../../../../src/plugins/saved_objects_management/public';
 import { SummarizedCopyToSpaceResult } from '../index';
 import { SpaceAvatar } from '../../space_avatar';
@@ -24,6 +31,39 @@ interface Props {
   conflictResolutionInProgress: boolean;
 }
 
+const getInitialDestinationMap = (objects: SummarizedCopyToSpaceResult['objects']) =>
+  objects.reduce((acc, { type, id, conflict }) => {
+    if (conflict?.error.type === 'ambiguous_conflict') {
+      acc.set(`${type}:${id}`, conflict.error.destinations[0].id);
+    }
+    return acc;
+  }, new Map<string, string>());
+
+export const SpaceResultProcessing = (props: Pick<Props, 'space'>) => {
+  const { space } = props;
+  return (
+    <EuiAccordion
+      id={`copyToSpace-${space.id}`}
+      data-test-subj={`cts-space-result-${space.id}`}
+      className="spcCopyToSpaceResult"
+      buttonContent={
+        <EuiFlexGroup responsive={false}>
+          <EuiFlexItem grow={false}>
+            <SpaceAvatar space={space} size="s" />
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiText>{space.name}</EuiText>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      }
+      extraAction={<EuiLoadingSpinner />}
+    >
+      <EuiSpacer size="s" />
+      <EuiLoadingSpinner />
+    </EuiAccordion>
+  );
+};
+
 export const SpaceResult = (props: Props) => {
   const {
     space,
@@ -33,7 +73,12 @@ export const SpaceResult = (props: Props) => {
     savedObject,
     conflictResolutionInProgress,
   } = props;
+  const { objects } = summarizedCopyResult;
   const spaceHasPendingOverwrites = retries.some((r) => r.overwrite);
+  const [destinationMap, setDestinationMap] = useState(getInitialDestinationMap(objects));
+  const onDestinationMapChange = (value?: Map<string, string>) => {
+    setDestinationMap(value || getInitialDestinationMap(objects));
+  };
 
   return (
     <EuiAccordion
@@ -53,6 +98,9 @@ export const SpaceResult = (props: Props) => {
       extraAction={
         <CopyStatusSummaryIndicator
           space={space}
+          retries={retries}
+          onRetriesChange={onRetriesChange}
+          onDestinationMapChange={onDestinationMapChange}
           summarizedCopyResult={summarizedCopyResult}
           conflictResolutionInProgress={conflictResolutionInProgress && spaceHasPendingOverwrites}
         />
@@ -65,6 +113,8 @@ export const SpaceResult = (props: Props) => {
         space={space}
         retries={retries}
         onRetriesChange={onRetriesChange}
+        destinationMap={destinationMap}
+        onDestinationMapChange={onDestinationMapChange}
         conflictResolutionInProgress={conflictResolutionInProgress && spaceHasPendingOverwrites}
       />
     </EuiAccordion>
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.scss b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.scss
index 7702987220282..bca07da9eae42 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.scss
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.scss
@@ -11,3 +11,28 @@
   // Constrains name to the flex item, and allows for truncation when necessary
   min-width: 0;
 }
+
+.spcCopyToSpaceResultDetails__selectControl {
+  margin-left: $euiSizeL;
+}
+
+.spcCopyToSpaceResultDetails__selectControl__childWrapper {
+  // Derived from euiAccordion
+  visibility: hidden;
+  opacity: 0;
+  height: 0;
+  overflow: hidden;
+  transform: translatez(0);
+  // sass-lint:disable-block indentation
+  transition:
+    height $euiAnimSpeedNormal $euiAnimSlightResistance,
+    opacity $euiAnimSpeedNormal $euiAnimSlightResistance;
+}
+
+.spcCopyToSpaceResultDetails__selectControl.spcCopyToSpaceResultDetails__selectControl-isOpen {
+  .spcCopyToSpaceResultDetails__selectControl__childWrapper {
+    visibility: visible;
+    opacity: 1;
+    height: auto;
+  }
+}
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
index ef7931260e643..776ed99c41120 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/space_result_details.tsx
@@ -5,9 +5,23 @@
  */
 
 import './space_result_details.scss';
-import React from 'react';
-import { EuiText, EuiFlexGroup, EuiFlexItem, EuiButtonEmpty } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
+import React, { Fragment } from 'react';
+import {
+  EuiText,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSwitch,
+  EuiSwitchEvent,
+  EuiToolTip,
+  EuiIcon,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import {
+  SavedObjectsImportConflictError,
+  SavedObjectsImportAmbiguousConflictError,
+} from 'kibana/public';
+import { EuiSuperSelect } from '@elastic/eui';
+import moment from 'moment';
 import { SummarizedCopyToSpaceResult } from '../index';
 import { SavedObjectsManagementRecord } from '../../../../../../src/plugins/saved_objects_management/public';
 import { Space } from '../../../common/model/space';
@@ -20,104 +34,161 @@ interface Props {
   space: Space;
   retries: ImportRetry[];
   onRetriesChange: (retries: ImportRetry[]) => void;
+  destinationMap: Map<string, string>;
+  onDestinationMapChange: (value?: Map<string, string>) => void;
   conflictResolutionInProgress: boolean;
 }
 
-export const SpaceCopyResultDetails = (props: Props) => {
-  const onOverwriteClick = (object: { type: string; id: string }) => {
-    const retry = props.retries.find((r) => r.type === object.type && r.id === object.id);
-
-    props.onRetriesChange([
-      ...props.retries.filter((r) => r !== retry),
-      {
-        type: object.type,
-        id: object.id,
-        overwrite: retry ? !retry.overwrite : true,
-      },
-    ]);
-  };
-
-  const hasPendingOverwrite = (object: { type: string; id: string }) => {
-    const retry = props.retries.find((r) => r.type === object.type && r.id === object.id);
+function getSavedObjectLabel(type: string) {
+  switch (type) {
+    case 'index-pattern':
+    case 'index-patterns':
+    case 'indexPatterns':
+      return 'index patterns';
+    default:
+      return type;
+  }
+}
 
-    return Boolean(retry && retry.overwrite);
-  };
+const isAmbiguousConflictError = (
+  error: SavedObjectsImportConflictError | SavedObjectsImportAmbiguousConflictError
+): error is SavedObjectsImportAmbiguousConflictError => error.type === 'ambiguous_conflict';
 
-  const { objects } = props.summarizedCopyResult;
+export const SpaceCopyResultDetails = (props: Props) => {
+  const { destinationMap, onDestinationMapChange, summarizedCopyResult } = props;
+  const { objects } = summarizedCopyResult;
 
   return (
     <div className="spcCopyToSpaceResultDetails">
       {objects.map((object, index) => {
-        const objectOverwritePending = hasPendingOverwrite(object);
+        const { type, id, name, icon, conflict } = object;
+        const pendingObjectRetry = props.retries.find((r) => r.type === type && r.id === id);
+        const isOverwritePending = Boolean(pendingObjectRetry?.overwrite);
+        const switchProps = {
+          show: conflict && !props.conflictResolutionInProgress,
+          label: i18n.translate('xpack.spaces.management.copyToSpace.copyDetail.overwriteSwitch', {
+            defaultMessage: 'Overwrite?',
+          }),
+          onChange: ({ target: { checked } }: EuiSwitchEvent) => {
+            const filtered = props.retries.filter((r) => r.type !== type || r.id !== id);
+            const { error } = conflict!;
 
-        const showOverwriteButton =
-          object.conflicts.length > 0 &&
-          !objectOverwritePending &&
-          !props.conflictResolutionInProgress;
-
-        const showSkipButton =
-          !showOverwriteButton && objectOverwritePending && !props.conflictResolutionInProgress;
+            if (!checked) {
+              props.onRetriesChange(filtered);
+              if (isAmbiguousConflictError(error)) {
+                // reset the selection to the first entry
+                const value = error.destinations[0].id;
+                onDestinationMapChange(new Map(destinationMap.set(`${type}:${id}`, value)));
+              }
+            } else {
+              const destinationId = isAmbiguousConflictError(error)
+                ? destinationMap.get(`${type}:${id}`)
+                : error.destinationId;
+              const retry = { type, id, overwrite: true, ...(destinationId && { destinationId }) };
+              props.onRetriesChange([...filtered, retry]);
+            }
+          },
+        };
+        const selectProps = {
+          options:
+            conflict?.error && isAmbiguousConflictError(conflict.error)
+              ? conflict.error.destinations.map((destination) => {
+                  const header = destination.title ?? `${type} [id=${destination.id}]`;
+                  const lastUpdated = destination.updatedAt
+                    ? moment(destination.updatedAt).fromNow()
+                    : 'never';
+                  return {
+                    value: destination.id,
+                    inputDisplay: destination.id,
+                    dropdownDisplay: (
+                      <Fragment>
+                        <strong>{header}</strong>
+                        <EuiText size="s" color="subdued">
+                          <p className="euiTextColor--subdued">
+                            ID: {destination.id}
+                            <br />
+                            Last updated: {lastUpdated}
+                          </p>
+                        </EuiText>
+                      </Fragment>
+                    ),
+                  };
+                })
+              : [],
+          onChange: (value: string) => {
+            onDestinationMapChange(new Map(destinationMap.set(`${type}:${id}`, value)));
+            const filtered = props.retries.filter((r) => r.type !== type || r.id !== id);
+            const retry = { type, id, overwrite: true, destinationId: value };
+            props.onRetriesChange([...filtered, retry]);
+          },
+        };
+        const selectContainerClass =
+          selectProps.options.length > 0 && isOverwritePending
+            ? ' spcCopyToSpaceResultDetails__selectControl-isOpen'
+            : '';
 
         return (
-          <EuiFlexGroup
-            responsive={false}
-            key={index}
-            alignItems="center"
-            gutterSize="s"
-            className="spcCopyToSpaceResultDetails__row"
-          >
-            <EuiFlexItem grow={5} className="spcCopyToSpaceResultDetails__savedObjectName">
-              <EuiText size="s">
-                <p className="eui-textTruncate" title={object.name || object.id}>
-                  {object.type}: {object.name || object.id}
-                </p>
-              </EuiText>
-            </EuiFlexItem>
-            {showOverwriteButton && (
-              <EuiFlexItem grow={1}>
-                <EuiText size="s">
-                  <EuiButtonEmpty
-                    onClick={() => onOverwriteClick(object)}
-                    size="xs"
-                    data-test-subj={`cts-overwrite-conflict-${object.id}`}
-                  >
-                    <FormattedMessage
-                      id="xpack.spaces.management.copyToSpace.copyDetail.overwriteButton"
-                      defaultMessage="Overwrite"
-                    />
-                  </EuiButtonEmpty>
-                </EuiText>
+          <Fragment key={index}>
+            <EuiFlexGroup
+              responsive={false}
+              key={index}
+              alignItems="center"
+              gutterSize="s"
+              className="spcCopyToSpaceResultDetails__row"
+            >
+              <EuiFlexItem grow={false}>
+                <EuiToolTip position="top" content={getSavedObjectLabel(type)}>
+                  <EuiIcon aria-label={getSavedObjectLabel(type)} type={icon} size="s" />
+                </EuiToolTip>
               </EuiFlexItem>
-            )}
-            {showSkipButton && (
-              <EuiFlexItem grow={1}>
+              <EuiFlexItem grow={5} className="spcCopyToSpaceResultDetails__savedObjectName">
                 <EuiText size="s">
-                  <EuiButtonEmpty
-                    onClick={() => onOverwriteClick(object)}
-                    size="xs"
-                    data-test-subj={`cts-skip-conflict-${object.id}`}
-                  >
-                    <FormattedMessage
-                      id="xpack.spaces.management.copyToSpace.copyDetail.skipOverwriteButton"
-                      defaultMessage="Skip"
-                    />
-                  </EuiButtonEmpty>
+                  <p className="eui-textTruncate" title={name}>
+                    {name}
+                  </p>
                 </EuiText>
               </EuiFlexItem>
-            )}
-            <EuiFlexItem className="spcCopyToSpaceResultDetails__statusIndicator" grow={1}>
-              <div className="eui-textRight">
-                <CopyStatusIndicator
-                  summarizedCopyResult={props.summarizedCopyResult}
-                  object={object}
-                  overwritePending={hasPendingOverwrite(object)}
-                  conflictResolutionInProgress={
-                    props.conflictResolutionInProgress && objectOverwritePending
-                  }
+              {switchProps.show && (
+                <EuiFlexItem grow={false}>
+                  <EuiSwitch
+                    label={switchProps.label}
+                    compressed={true}
+                    checked={isOverwritePending}
+                    onChange={switchProps.onChange}
+                    data-test-subj={`cts-overwrite-conflict-${type}:${id}`}
+                  />
+                </EuiFlexItem>
+              )}
+              <EuiFlexItem className="spcCopyToSpaceResultDetails__statusIndicator" grow={false}>
+                <div className="eui-textRight">
+                  <CopyStatusIndicator
+                    summarizedCopyResult={props.summarizedCopyResult}
+                    object={object}
+                    pendingObjectRetry={pendingObjectRetry}
+                    conflictResolutionInProgress={
+                      props.conflictResolutionInProgress && isOverwritePending
+                    }
+                  />
+                </div>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+            <div className={'spcCopyToSpaceResultDetails__selectControl' + selectContainerClass}>
+              <div className="spcCopyToSpaceResultDetails__selectControl__childWrapper">
+                <EuiSuperSelect
+                  options={selectProps.options}
+                  valueOfSelected={destinationMap.get(`${type}:${id}`)}
+                  onChange={selectProps.onChange}
+                  prepend={i18n.translate(
+                    'xpack.spaces.management.copyToSpace.copyDetail.selectControlLabel',
+                    { defaultMessage: 'Object ID' }
+                  )}
+                  hasDividers
+                  fullWidth
+                  compressed
                 />
               </div>
-            </EuiFlexItem>
-          </EuiFlexGroup>
+            </div>
+          </Fragment>
         );
       })}
     </div>
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
index 28b48044a1783..9bbde31ff6fea 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/copy_saved_objects_to_space_action.tsx
@@ -21,10 +21,13 @@ export class CopyToSpaceSavedObjectsManagementAction extends SavedObjectsManagem
       defaultMessage: 'Copy to space',
     }),
     description: i18n.translate('xpack.spaces.management.copyToSpace.actionDescription', {
-      defaultMessage: 'Copy this saved object to one or more spaces',
+      defaultMessage: 'Make a copy of this saved object in one or more spaces',
     }),
-    icon: 'spacesApp',
+    icon: 'copy',
     type: 'icon',
+    available: (object: SavedObjectsManagementRecord) => {
+      return object.meta.namespaceType !== 'agnostic';
+    },
     onClick: (object: SavedObjectsManagementRecord) => {
       this.start(object);
     },
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
index a8ecd7c7b9d9f..b8fc89f47a3e0 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.test.ts
@@ -5,50 +5,123 @@
  */
 
 import { summarizeCopyResult } from './summarize_copy_result';
-import { ProcessedImportResponse } from 'src/plugins/saved_objects_management/public';
+import {
+  ProcessedImportResponse,
+  FailedImport,
+  SavedObjectsManagementRecord,
+} from 'src/plugins/saved_objects_management/public';
 
-const createSavedObjectsManagementRecord = () => ({
-  type: 'dashboard',
-  id: 'foo',
-  meta: { icon: 'foo-icon', title: 'my-dashboard' },
-  references: [
-    {
-      type: 'visualization',
-      id: 'foo-viz',
-      name: 'Foo Viz',
-    },
-    {
-      type: 'visualization',
-      id: 'bar-viz',
-      name: 'Bar Viz',
-    },
-  ],
-});
+// Sample data references:
+//
+//             /-> Visualization bar -> Index pattern foo
+// My dashboard
+//             \-> Visualization baz -> Index pattern bar
+//
+// Dashboard has references to visualizations, and transitive references to index patterns
+
+const OBJECTS = {
+  MY_DASHBOARD: {
+    type: 'dashboard',
+    id: 'foo',
+    meta: { title: 'my-dashboard-title', icon: 'dashboardApp', namespaceType: 'single' },
+    references: [
+      { type: 'visualization', id: 'foo', name: 'Visualization foo' },
+      { type: 'visualization', id: 'bar', name: 'Visualization bar' },
+    ],
+  } as SavedObjectsManagementRecord,
+  VISUALIZATION_FOO: {
+    type: 'visualization',
+    id: 'bar',
+    meta: { title: 'visualization-foo-title', icon: 'visualizeApp', namespaceType: 'single' },
+    references: [{ type: 'index-pattern', id: 'foo', name: 'Index pattern foo' }],
+  } as SavedObjectsManagementRecord,
+  VISUALIZATION_BAR: {
+    type: 'visualization',
+    id: 'baz',
+    meta: { title: 'visualization-bar-title', icon: 'visualizeApp', namespaceType: 'single' },
+    references: [{ type: 'index-pattern', id: 'bar', name: 'Index pattern bar' }],
+  } as SavedObjectsManagementRecord,
+  INDEX_PATTERN_FOO: {
+    type: 'index-pattern',
+    id: 'foo',
+    meta: { title: 'index-pattern-foo-title', icon: 'indexPatternApp', namespaceType: 'single' },
+    references: [],
+  } as SavedObjectsManagementRecord,
+  INDEX_PATTERN_BAR: {
+    type: 'index-pattern',
+    id: 'bar',
+    meta: { title: 'index-pattern-bar-title', icon: 'indexPatternApp', namespaceType: 'single' },
+    references: [],
+  } as SavedObjectsManagementRecord,
+};
+
+interface ObjectProperties {
+  type: string;
+  id: string;
+  meta: { title?: string; icon?: string };
+}
+const createSuccessResult = ({ type, id, meta }: ObjectProperties) => {
+  return { type, id, meta };
+};
+const createFailureConflict = ({ type, id, meta }: ObjectProperties): FailedImport => {
+  return { obj: { type, id, meta }, error: { type: 'conflict' } };
+};
+const createFailureMissingReferences = ({ type, id, meta }: ObjectProperties): FailedImport => {
+  return {
+    obj: { type, id, meta },
+    error: { type: 'missing_references', references: [] },
+  };
+};
+const createFailureUnresolvable = ({ type, id, meta }: ObjectProperties): FailedImport => {
+  return {
+    obj: { type, id, meta },
+    // currently, unresolvable errors are 'unsupported_type' and 'unknown'; either would work for this test case
+    error: { type: 'unknown', message: 'some error message', statusCode: 400 },
+  };
+};
 
 const createCopyResult = (
-  opts: { withConflicts?: boolean; withUnresolvableError?: boolean } = {}
+  opts: {
+    withConflicts?: boolean;
+    withMissingReferencesError?: boolean;
+    withUnresolvableError?: boolean;
+    overwrite?: boolean;
+  } = {}
 ) => {
-  const failedImports: ProcessedImportResponse['failedImports'] = [];
+  let successfulImports: ProcessedImportResponse['successfulImports'] = [
+    createSuccessResult(OBJECTS.MY_DASHBOARD),
+  ];
+  let failedImports: ProcessedImportResponse['failedImports'] = [];
   if (opts.withConflicts) {
-    failedImports.push(
-      {
-        obj: { type: 'visualization', id: 'foo-viz' },
-        error: { type: 'conflict' },
-      },
-      {
-        obj: { type: 'index-pattern', id: 'transient-index-pattern-conflict' },
-        error: { type: 'conflict' },
-      }
-    );
+    failedImports.push(createFailureConflict(OBJECTS.VISUALIZATION_FOO));
+  } else {
+    successfulImports.push(createSuccessResult(OBJECTS.VISUALIZATION_FOO));
   }
   if (opts.withUnresolvableError) {
-    failedImports.push({
-      obj: { type: 'visualization', id: 'bar-viz' },
-      error: { type: 'missing_references', blocking: [], references: [] },
-    });
+    failedImports.push(createFailureUnresolvable(OBJECTS.INDEX_PATTERN_FOO));
+  } else {
+    successfulImports.push(createSuccessResult(OBJECTS.INDEX_PATTERN_FOO));
+  }
+  if (opts.withMissingReferencesError) {
+    failedImports.push(createFailureMissingReferences(OBJECTS.VISUALIZATION_BAR));
+    // INDEX_PATTERN_BAR is not present in the source space, therefore VISUALIZATION_BAR resulted in a missing_references error
+  } else {
+    successfulImports.push(
+      createSuccessResult(OBJECTS.VISUALIZATION_BAR),
+      createSuccessResult(OBJECTS.INDEX_PATTERN_BAR)
+    );
+  }
+
+  if (opts.overwrite) {
+    failedImports = failedImports.map(({ obj, error }) => ({
+      obj: { ...obj, overwrite: true },
+      error,
+    }));
+    successfulImports = successfulImports.map((obj) => ({ ...obj, overwrite: true }));
   }
 
   const copyResult: ProcessedImportResponse = {
+    successfulImports,
     failedImports,
   } as ProcessedImportResponse;
 
@@ -57,109 +130,101 @@ const createCopyResult = (
 
 describe('summarizeCopyResult', () => {
   it('indicates the result is processing when not provided', () => {
-    const SavedObjectsManagementRecord = createSavedObjectsManagementRecord();
     const copyResult = undefined;
-    const includeRelated = true;
-
-    const summarizedResult = summarizeCopyResult(
-      SavedObjectsManagementRecord,
-      copyResult,
-      includeRelated
-    );
+    const summarizedResult = summarizeCopyResult(OBJECTS.MY_DASHBOARD, copyResult);
 
     expect(summarizedResult).toMatchInlineSnapshot(`
       Object {
         "objects": Array [
           Object {
-            "conflicts": Array [],
+            "conflict": undefined,
+            "hasMissingReferences": false,
             "hasUnresolvableErrors": false,
+            "icon": "dashboardApp",
             "id": "foo",
-            "name": "my-dashboard",
+            "name": "my-dashboard-title",
+            "overwrite": false,
             "type": "dashboard",
           },
-          Object {
-            "conflicts": Array [],
-            "hasUnresolvableErrors": false,
-            "id": "foo-viz",
-            "name": "Foo Viz",
-            "type": "visualization",
-          },
-          Object {
-            "conflicts": Array [],
-            "hasUnresolvableErrors": false,
-            "id": "bar-viz",
-            "name": "Bar Viz",
-            "type": "visualization",
-          },
         ],
         "processing": true,
       }
     `);
   });
 
-  it('processes failedImports to extract conflicts, including transient conflicts', () => {
-    const SavedObjectsManagementRecord = createSavedObjectsManagementRecord();
+  it('processes failedImports to extract conflicts, including transitive conflicts', () => {
     const copyResult = createCopyResult({ withConflicts: true });
-    const includeRelated = true;
+    const summarizedResult = summarizeCopyResult(OBJECTS.MY_DASHBOARD, copyResult);
 
-    const summarizedResult = summarizeCopyResult(
-      SavedObjectsManagementRecord,
-      copyResult,
-      includeRelated
-    );
     expect(summarizedResult).toMatchInlineSnapshot(`
       Object {
         "hasConflicts": true,
+        "hasMissingReferences": false,
         "hasUnresolvableErrors": false,
         "objects": Array [
           Object {
-            "conflicts": Array [],
+            "conflict": undefined,
+            "hasMissingReferences": false,
             "hasUnresolvableErrors": false,
+            "icon": "dashboardApp",
             "id": "foo",
-            "name": "my-dashboard",
+            "name": "my-dashboard-title",
+            "overwrite": false,
             "type": "dashboard",
           },
           Object {
-            "conflicts": Array [
-              Object {
-                "error": Object {
-                  "type": "conflict",
-                },
-                "obj": Object {
-                  "id": "foo-viz",
-                  "type": "visualization",
+            "conflict": Object {
+              "error": Object {
+                "type": "conflict",
+              },
+              "obj": Object {
+                "id": "bar",
+                "meta": Object {
+                  "icon": "visualizeApp",
+                  "namespaceType": "single",
+                  "title": "visualization-foo-title",
                 },
+                "type": "visualization",
               },
-            ],
+            },
+            "hasMissingReferences": false,
             "hasUnresolvableErrors": false,
-            "id": "foo-viz",
-            "name": "Foo Viz",
+            "icon": "visualizeApp",
+            "id": "bar",
+            "name": "visualization-foo-title",
+            "overwrite": false,
             "type": "visualization",
           },
           Object {
-            "conflicts": Array [],
+            "conflict": undefined,
+            "hasMissingReferences": false,
             "hasUnresolvableErrors": false,
-            "id": "bar-viz",
-            "name": "Bar Viz",
-            "type": "visualization",
+            "icon": "indexPatternApp",
+            "id": "foo",
+            "name": "index-pattern-foo-title",
+            "overwrite": false,
+            "type": "index-pattern",
           },
           Object {
-            "conflicts": Array [
-              Object {
-                "error": Object {
-                  "type": "conflict",
-                },
-                "obj": Object {
-                  "id": "transient-index-pattern-conflict",
-                  "type": "index-pattern",
-                },
-              },
-            ],
+            "conflict": undefined,
+            "hasMissingReferences": false,
             "hasUnresolvableErrors": false,
-            "id": "transient-index-pattern-conflict",
-            "name": "transient-index-pattern-conflict",
+            "icon": "indexPatternApp",
+            "id": "bar",
+            "name": "index-pattern-bar-title",
+            "overwrite": false,
             "type": "index-pattern",
           },
+          Object {
+            "conflict": undefined,
+            "hasMissingReferences": false,
+            "hasUnresolvableErrors": false,
+            "icon": "visualizeApp",
+            "id": "baz",
+            "name": "visualization-bar-title",
+            "overwrite": false,
+            "type": "visualization",
+          },
         ],
         "processing": false,
         "successful": false,
@@ -167,40 +232,54 @@ describe('summarizeCopyResult', () => {
     `);
   });
 
-  it('processes failedImports to extract unresolvable errors', () => {
-    const SavedObjectsManagementRecord = createSavedObjectsManagementRecord();
-    const copyResult = createCopyResult({ withUnresolvableError: true });
-    const includeRelated = true;
+  it('processes failedImports to extract missing references errors', () => {
+    const copyResult = createCopyResult({ withMissingReferencesError: true });
+    const summarizedResult = summarizeCopyResult(OBJECTS.MY_DASHBOARD, copyResult);
 
-    const summarizedResult = summarizeCopyResult(
-      SavedObjectsManagementRecord,
-      copyResult,
-      includeRelated
-    );
     expect(summarizedResult).toMatchInlineSnapshot(`
       Object {
         "hasConflicts": false,
-        "hasUnresolvableErrors": true,
+        "hasMissingReferences": true,
+        "hasUnresolvableErrors": false,
         "objects": Array [
           Object {
-            "conflicts": Array [],
+            "conflict": undefined,
+            "hasMissingReferences": false,
             "hasUnresolvableErrors": false,
+            "icon": "dashboardApp",
             "id": "foo",
-            "name": "my-dashboard",
+            "name": "my-dashboard-title",
+            "overwrite": false,
             "type": "dashboard",
           },
           Object {
-            "conflicts": Array [],
+            "conflict": undefined,
+            "hasMissingReferences": true,
             "hasUnresolvableErrors": false,
-            "id": "foo-viz",
-            "name": "Foo Viz",
+            "icon": "visualizeApp",
+            "id": "baz",
+            "name": "visualization-bar-title",
+            "overwrite": false,
             "type": "visualization",
           },
           Object {
-            "conflicts": Array [],
-            "hasUnresolvableErrors": true,
-            "id": "bar-viz",
-            "name": "Bar Viz",
+            "conflict": undefined,
+            "hasMissingReferences": false,
+            "hasUnresolvableErrors": false,
+            "icon": "indexPatternApp",
+            "id": "foo",
+            "name": "index-pattern-foo-title",
+            "overwrite": false,
+            "type": "index-pattern",
+          },
+          Object {
+            "conflict": undefined,
+            "hasMissingReferences": false,
+            "hasUnresolvableErrors": false,
+            "icon": "visualizeApp",
+            "id": "bar",
+            "name": "visualization-foo-title",
+            "overwrite": false,
             "type": "visualization",
           },
         ],
@@ -210,75 +289,147 @@ describe('summarizeCopyResult', () => {
     `);
   });
 
-  it('processes a result without errors', () => {
-    const SavedObjectsManagementRecord = createSavedObjectsManagementRecord();
-    const copyResult = createCopyResult();
-    const includeRelated = true;
+  it('processes failedImports to extract unresolvable errors', () => {
+    const copyResult = createCopyResult({ withUnresolvableError: true });
+    const summarizedResult = summarizeCopyResult(OBJECTS.MY_DASHBOARD, copyResult);
 
-    const summarizedResult = summarizeCopyResult(
-      SavedObjectsManagementRecord,
-      copyResult,
-      includeRelated
-    );
     expect(summarizedResult).toMatchInlineSnapshot(`
       Object {
         "hasConflicts": false,
-        "hasUnresolvableErrors": false,
+        "hasMissingReferences": false,
+        "hasUnresolvableErrors": true,
         "objects": Array [
           Object {
-            "conflicts": Array [],
+            "conflict": undefined,
+            "hasMissingReferences": false,
             "hasUnresolvableErrors": false,
+            "icon": "dashboardApp",
             "id": "foo",
-            "name": "my-dashboard",
+            "name": "my-dashboard-title",
+            "overwrite": false,
             "type": "dashboard",
           },
           Object {
-            "conflicts": Array [],
+            "conflict": undefined,
+            "hasMissingReferences": false,
+            "hasUnresolvableErrors": true,
+            "icon": "indexPatternApp",
+            "id": "foo",
+            "name": "index-pattern-foo-title",
+            "overwrite": false,
+            "type": "index-pattern",
+          },
+          Object {
+            "conflict": undefined,
+            "hasMissingReferences": false,
             "hasUnresolvableErrors": false,
-            "id": "foo-viz",
-            "name": "Foo Viz",
+            "icon": "indexPatternApp",
+            "id": "bar",
+            "name": "index-pattern-bar-title",
+            "overwrite": false,
+            "type": "index-pattern",
+          },
+          Object {
+            "conflict": undefined,
+            "hasMissingReferences": false,
+            "hasUnresolvableErrors": false,
+            "icon": "visualizeApp",
+            "id": "bar",
+            "name": "visualization-foo-title",
+            "overwrite": false,
             "type": "visualization",
           },
           Object {
-            "conflicts": Array [],
+            "conflict": undefined,
+            "hasMissingReferences": false,
             "hasUnresolvableErrors": false,
-            "id": "bar-viz",
-            "name": "Bar Viz",
+            "icon": "visualizeApp",
+            "id": "baz",
+            "name": "visualization-bar-title",
+            "overwrite": false,
             "type": "visualization",
           },
         ],
         "processing": false,
-        "successful": true,
+        "successful": false,
       }
     `);
   });
 
-  it('does not include references unless requested', () => {
-    const SavedObjectsManagementRecord = createSavedObjectsManagementRecord();
+  it('processes a result without errors', () => {
     const copyResult = createCopyResult();
-    const includeRelated = false;
+    const summarizedResult = summarizeCopyResult(OBJECTS.MY_DASHBOARD, copyResult);
 
-    const summarizedResult = summarizeCopyResult(
-      SavedObjectsManagementRecord,
-      copyResult,
-      includeRelated
-    );
     expect(summarizedResult).toMatchInlineSnapshot(`
       Object {
         "hasConflicts": false,
+        "hasMissingReferences": false,
         "hasUnresolvableErrors": false,
         "objects": Array [
           Object {
-            "conflicts": Array [],
+            "conflict": undefined,
+            "hasMissingReferences": false,
             "hasUnresolvableErrors": false,
+            "icon": "dashboardApp",
             "id": "foo",
-            "name": "my-dashboard",
+            "name": "my-dashboard-title",
+            "overwrite": false,
             "type": "dashboard",
           },
+          Object {
+            "conflict": undefined,
+            "hasMissingReferences": false,
+            "hasUnresolvableErrors": false,
+            "icon": "indexPatternApp",
+            "id": "foo",
+            "name": "index-pattern-foo-title",
+            "overwrite": false,
+            "type": "index-pattern",
+          },
+          Object {
+            "conflict": undefined,
+            "hasMissingReferences": false,
+            "hasUnresolvableErrors": false,
+            "icon": "indexPatternApp",
+            "id": "bar",
+            "name": "index-pattern-bar-title",
+            "overwrite": false,
+            "type": "index-pattern",
+          },
+          Object {
+            "conflict": undefined,
+            "hasMissingReferences": false,
+            "hasUnresolvableErrors": false,
+            "icon": "visualizeApp",
+            "id": "bar",
+            "name": "visualization-foo-title",
+            "overwrite": false,
+            "type": "visualization",
+          },
+          Object {
+            "conflict": undefined,
+            "hasMissingReferences": false,
+            "hasUnresolvableErrors": false,
+            "icon": "visualizeApp",
+            "id": "baz",
+            "name": "visualization-bar-title",
+            "overwrite": false,
+            "type": "visualization",
+          },
         ],
         "processing": false,
         "successful": true,
       }
     `);
   });
+
+  it('indicates when successes and failures have been overwritten', () => {
+    const copyResult = createCopyResult({ withMissingReferencesError: true, overwrite: true });
+    const summarizedResult = summarizeCopyResult(OBJECTS.MY_DASHBOARD, copyResult);
+
+    expect(summarizedResult.objects).toHaveLength(4);
+    for (const obj of summarizedResult.objects) {
+      expect(obj.overwrite).toBe(true);
+    }
+  });
 });
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
index 518e89df579a6..0c07d1a5da7eb 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/summarize_copy_result.ts
@@ -7,19 +7,28 @@
 import {
   SavedObjectsManagementRecord,
   ProcessedImportResponse,
+  FailedImport,
 } from 'src/plugins/saved_objects_management/public';
+import {
+  SavedObjectsImportConflictError,
+  SavedObjectsImportAmbiguousConflictError,
+} from 'kibana/public';
 
 export interface SummarizedSavedObjectResult {
   type: string;
   id: string;
   name: string;
-  conflicts: ProcessedImportResponse['failedImports'];
+  icon: string;
+  conflict?: FailedImportConflict;
+  hasMissingReferences: boolean;
   hasUnresolvableErrors: boolean;
+  overwrite: boolean;
 }
 
 interface SuccessfulResponse {
   successful: true;
   hasConflicts: false;
+  hasMissingReferences: false;
   hasUnresolvableErrors: false;
   objects: SummarizedSavedObjectResult[];
   processing: false;
@@ -27,6 +36,7 @@ interface SuccessfulResponse {
 interface UnsuccessfulResponse {
   successful: false;
   hasConflicts: boolean;
+  hasMissingReferences: boolean;
   hasUnresolvableErrors: boolean;
   objects: SummarizedSavedObjectResult[];
   processing: false;
@@ -37,6 +47,19 @@ interface ProcessingResponse {
   processing: true;
 }
 
+interface FailedImportConflict {
+  obj: FailedImport['obj'];
+  error: SavedObjectsImportConflictError | SavedObjectsImportAmbiguousConflictError;
+}
+
+const isAnyConflict = (failure: FailedImport): failure is FailedImportConflict =>
+  failure.error.type === 'conflict' || failure.error.type === 'ambiguous_conflict';
+const isMissingReferences = (failure: FailedImport) => failure.error.type === 'missing_references';
+const isUnresolvableError = (failure: FailedImport) =>
+  !isAnyConflict(failure) && !isMissingReferences(failure);
+const typeComparator = (a: { type: string }, b: { type: string }) =>
+  a.type > b.type ? 1 : a.type < b.type ? -1 : 0;
+
 export type SummarizedCopyToSpaceResult =
   | SuccessfulResponse
   | UnsuccessfulResponse
@@ -44,69 +67,61 @@ export type SummarizedCopyToSpaceResult =
 
 export function summarizeCopyResult(
   savedObject: SavedObjectsManagementRecord,
-  copyResult: ProcessedImportResponse | undefined,
-  includeRelated: boolean
+  copyResult: ProcessedImportResponse | undefined
 ): SummarizedCopyToSpaceResult {
-  const successful = Boolean(copyResult && copyResult.failedImports.length === 0);
-
-  const conflicts = copyResult
-    ? copyResult.failedImports.filter((failed) => failed.error.type === 'conflict')
-    : [];
-
-  const unresolvableErrors = copyResult
-    ? copyResult.failedImports.filter((failed) => failed.error.type !== 'conflict')
-    : [];
-
-  const hasConflicts = conflicts.length > 0;
-
-  const hasUnresolvableErrors = Boolean(
-    copyResult && copyResult.failedImports.some((failed) => failed.error.type !== 'conflict')
-  );
+  const conflicts = copyResult?.failedImports.filter(isAnyConflict) ?? [];
+  const missingReferences = copyResult?.failedImports.filter(isMissingReferences) ?? [];
+  const unresolvableErrors =
+    copyResult?.failedImports.filter((failed) => isUnresolvableError(failed)) ?? [];
+  const getExtraFields = ({ type, id }: { type: string; id: string }) => {
+    const conflict = conflicts.find(({ obj }) => obj.type === type && obj.id === id);
+    const missingReference = missingReferences.find(
+      ({ obj }) => obj.type === type && obj.id === id
+    );
+    const hasMissingReferences = missingReference !== undefined;
+    const hasUnresolvableErrors = unresolvableErrors.some(
+      ({ obj }) => obj.type === type && obj.id === id
+    );
+    const overwrite = conflict
+      ? false
+      : missingReference
+      ? missingReference.obj.overwrite === true
+      : copyResult?.successfulImports.some(
+          (obj) => obj.type === type && obj.id === id && obj.overwrite
+        ) === true;
+
+    return { conflict, hasMissingReferences, hasUnresolvableErrors, overwrite };
+  };
 
-  const objectMap = new Map();
+  const objectMap = new Map<string, SummarizedSavedObjectResult>();
   objectMap.set(`${savedObject.type}:${savedObject.id}`, {
     type: savedObject.type,
     id: savedObject.id,
     name: savedObject.meta.title,
-    conflicts: conflicts.filter(
-      (c) => c.obj.type === savedObject.type && c.obj.id === savedObject.id
-    ),
-    hasUnresolvableErrors: unresolvableErrors.some(
-      (e) => e.obj.type === savedObject.type && e.obj.id === savedObject.id
-    ),
+    icon: savedObject.meta.icon,
+    ...getExtraFields(savedObject),
   });
 
-  if (includeRelated) {
-    savedObject.references.forEach((ref) => {
-      objectMap.set(`${ref.type}:${ref.id}`, {
-        type: ref.type,
-        id: ref.id,
-        name: ref.name,
-        conflicts: conflicts.filter((c) => c.obj.type === ref.type && c.obj.id === ref.id),
-        hasUnresolvableErrors: unresolvableErrors.some(
-          (e) => e.obj.type === ref.type && e.obj.id === ref.id
-        ),
-      });
-    });
-
-    // The `savedObject.references` array only includes the direct references. It does not include any references of references.
-    // Therefore, if there are conflicts detected in these transitive references, we need to include them here so that they are visible
-    // in the UI as resolvable conflicts.
-    const transitiveConflicts = conflicts.filter(
-      (c) => !objectMap.has(`${c.obj.type}:${c.obj.id}`)
-    );
-    transitiveConflicts.forEach((conflict) => {
-      objectMap.set(`${conflict.obj.type}:${conflict.obj.id}`, {
-        type: conflict.obj.type,
-        id: conflict.obj.id,
-        name: conflict.obj.title || conflict.obj.id,
-        conflicts: conflicts.filter((c) => c.obj.type === conflict.obj.type && conflict.obj.id),
-        hasUnresolvableErrors: unresolvableErrors.some(
-          (e) => e.obj.type === conflict.obj.type && e.obj.id === conflict.obj.id
-        ),
+  const addObjectsToMap = (
+    objects: Array<{ id: string; type: string; meta: { title?: string; icon?: string } }>
+  ) => {
+    objects.forEach((obj) => {
+      const { type, id, meta } = obj;
+      objectMap.set(`${type}:${id}`, {
+        type,
+        id,
+        name: meta.title || `${type} [id=${id}]`,
+        icon: meta.icon || 'apps',
+        ...getExtraFields(obj),
       });
     });
-  }
+  };
+  const failedImports = (copyResult?.failedImports ?? [])
+    .map(({ obj }) => obj)
+    .sort(typeComparator);
+  addObjectsToMap(failedImports);
+  const successfulImports = (copyResult?.successfulImports ?? []).sort(typeComparator);
+  addObjectsToMap(successfulImports);
 
   if (typeof copyResult === 'undefined') {
     return {
@@ -115,20 +130,26 @@ export function summarizeCopyResult(
     };
   }
 
+  const successful = Boolean(copyResult && copyResult.failedImports.length === 0);
   if (successful) {
     return {
       successful,
       hasConflicts: false,
       objects: Array.from(objectMap.values()),
+      hasMissingReferences: false,
       hasUnresolvableErrors: false,
       processing: false,
     };
   }
 
+  const hasConflicts = conflicts.length > 0;
+  const hasMissingReferences = missingReferences.length > 0;
+  const hasUnresolvableErrors = unresolvableErrors.length > 0;
   return {
     successful,
     hasConflicts,
     objects: Array.from(objectMap.values()),
+    hasMissingReferences,
     hasUnresolvableErrors,
     processing: false,
   };
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts
index 9fcc5a89736cc..2310f6c96937c 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts
+++ b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/types.ts
@@ -8,6 +8,7 @@ import { SavedObjectsImportRetry, SavedObjectsImportResponse } from 'src/core/pu
 
 export interface CopyOptions {
   includeRelated: boolean;
+  createNewCopies: boolean;
   overwrite: boolean;
   selectedSpaceIds: string[];
 }
diff --git a/x-pack/plugins/spaces/public/plugin.tsx b/x-pack/plugins/spaces/public/plugin.tsx
index 8589993a97e02..cd31a4aa17fc3 100644
--- a/x-pack/plugins/spaces/public/plugin.tsx
+++ b/x-pack/plugins/spaces/public/plugin.tsx
@@ -15,6 +15,7 @@ import { SpacesManager } from './spaces_manager';
 import { initSpacesNavControl } from './nav_control';
 import { createSpacesFeatureCatalogueEntry } from './create_feature_catalogue_entry';
 import { CopySavedObjectsToSpaceService } from './copy_saved_objects_to_space';
+import { ShareSavedObjectsToSpaceService } from './share_saved_objects_to_space';
 import { AdvancedSettingsService } from './advanced_settings';
 import { ManagementService } from './management';
 import { spaceSelectorApp } from './space_selector';
@@ -67,6 +68,12 @@ export class SpacesPlugin implements Plugin<SpacesPluginSetup, SpacesPluginStart
     }
 
     if (plugins.savedObjectsManagement) {
+      const shareSavedObjectsToSpaceService = new ShareSavedObjectsToSpaceService();
+      shareSavedObjectsToSpaceService.setup({
+        spacesManager: this.spacesManager,
+        notificationsSetup: core.notifications,
+        savedObjectsManagementSetup: plugins.savedObjectsManagement,
+      });
       const copySavedObjectsToSpaceService = new CopySavedObjectsToSpaceService();
       copySavedObjectsToSpaceService.setup({
         spacesManager: this.spacesManager,
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/index.ts b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/index.ts
new file mode 100644
index 0000000000000..cf143dcc07975
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ShareSavedObjectsToSpaceFlyout } from './share_to_space_flyout';
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.scss b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.scss
new file mode 100644
index 0000000000000..8f135b1bced28
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.scss
@@ -0,0 +1,3 @@
+.spcShareToSpace__spacesList {
+  margin-top: $euiSizeXS;
+}
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
new file mode 100644
index 0000000000000..82a30dabe5beb
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/selectable_spaces_control.tsx
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import './selectable_spaces_control.scss';
+import React, { Fragment } from 'react';
+import { EuiBadge, EuiSelectable, EuiSelectableOption, EuiLoadingSpinner } from '@elastic/eui';
+import { SpaceAvatar } from '../../space_avatar';
+import { SpaceTarget } from '../types';
+
+interface Props {
+  spaces: SpaceTarget[];
+  selectedSpaceIds: string[];
+  onChange: (selectedSpaceIds: string[]) => void;
+  disabled?: boolean;
+}
+
+type SpaceOption = EuiSelectableOption & { ['data-space-id']: string };
+
+const activeSpaceProps = {
+  append: <EuiBadge color="hollow">Current</EuiBadge>,
+  disabled: true,
+  checked: 'on' as 'on',
+};
+
+export const SelectableSpacesControl = (props: Props) => {
+  if (props.spaces.length === 0) {
+    return <EuiLoadingSpinner />;
+  }
+
+  const options = props.spaces
+    .sort((a, b) => (a.isActiveSpace ? -1 : b.isActiveSpace ? 1 : 0))
+    .map<SpaceOption>((space) => ({
+      label: space.name,
+      prepend: <SpaceAvatar space={space} size={'s'} />,
+      checked: props.selectedSpaceIds.includes(space.id) ? 'on' : undefined,
+      ['data-space-id']: space.id,
+      ['data-test-subj']: `sts-space-selector-row-${space.id}`,
+      ...(space.isActiveSpace ? activeSpaceProps : {}),
+    }));
+
+  function updateSelectedSpaces(selectedOptions: SpaceOption[]) {
+    if (props.disabled) return;
+
+    const selectedSpaceIds = selectedOptions
+      .filter((opt) => opt.checked && !opt.disabled)
+      .map((opt) => opt['data-space-id']);
+
+    props.onChange(selectedSpaceIds);
+  }
+
+  return (
+    <EuiSelectable
+      options={options}
+      onChange={(newOptions) => updateSelectedSpaces(newOptions as SpaceOption[])}
+      listProps={{
+        bordered: true,
+        rowHeight: 40,
+        className: 'spcShareToSpace__spacesList',
+        'data-test-subj': 'sts-form-space-selector',
+      }}
+      searchable
+    >
+      {(list, search) => {
+        return (
+          <Fragment>
+            {search}
+            {list}
+          </Fragment>
+        );
+      }}
+    </EuiSelectable>
+  );
+};
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.test.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.test.tsx
new file mode 100644
index 0000000000000..c17a2dcb1a831
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.test.tsx
@@ -0,0 +1,371 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import Boom from 'boom';
+import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
+import { ShareSavedObjectsToSpaceFlyout } from './share_to_space_flyout';
+import { ShareToSpaceForm } from './share_to_space_form';
+import { EuiLoadingSpinner, EuiEmptyPrompt } from '@elastic/eui';
+import { Space } from '../../../common/model/space';
+import { findTestSubject } from 'test_utils/find_test_subject';
+import { SelectableSpacesControl } from './selectable_spaces_control';
+import { act } from '@testing-library/react';
+import { spacesManagerMock } from '../../spaces_manager/mocks';
+import { SpacesManager } from '../../spaces_manager';
+import { ToastsApi } from 'src/core/public';
+import { EuiCallOut } from '@elastic/eui';
+import { CopySavedObjectsToSpaceFlyout } from '../../copy_saved_objects_to_space/components';
+import { SavedObjectsManagementRecord } from 'src/plugins/saved_objects_management/public';
+
+interface SetupOpts {
+  mockSpaces?: Space[];
+  namespaces?: string[];
+  returnBeforeSpacesLoad?: boolean;
+}
+
+const setup = async (opts: SetupOpts = {}) => {
+  const onClose = jest.fn();
+  const onObjectUpdated = jest.fn();
+
+  const mockSpacesManager = spacesManagerMock.create();
+
+  mockSpacesManager.getActiveSpace.mockResolvedValue({
+    id: 'my-active-space',
+    name: 'my active space',
+    disabledFeatures: [],
+  });
+
+  mockSpacesManager.getSpaces.mockResolvedValue(
+    opts.mockSpaces || [
+      {
+        id: 'space-1',
+        name: 'Space 1',
+        disabledFeatures: [],
+      },
+      {
+        id: 'space-2',
+        name: 'Space 2',
+        disabledFeatures: [],
+      },
+      {
+        id: 'space-3',
+        name: 'Space 3',
+        disabledFeatures: [],
+      },
+      {
+        id: 'my-active-space',
+        name: 'my active space',
+        disabledFeatures: [],
+      },
+    ]
+  );
+
+  const mockToastNotifications = {
+    addError: jest.fn(),
+    addSuccess: jest.fn(),
+  };
+  const savedObjectToShare = {
+    type: 'dashboard',
+    id: 'my-dash',
+    references: [
+      {
+        type: 'visualization',
+        id: 'my-viz',
+        name: 'My Viz',
+      },
+    ],
+    meta: { icon: 'dashboard', title: 'foo' },
+    namespaces: opts.namespaces || ['my-active-space', 'space-1'],
+  } as SavedObjectsManagementRecord;
+
+  const wrapper = mountWithIntl(
+    <ShareSavedObjectsToSpaceFlyout
+      savedObject={savedObjectToShare}
+      spacesManager={(mockSpacesManager as unknown) as SpacesManager}
+      toastNotifications={(mockToastNotifications as unknown) as ToastsApi}
+      onClose={onClose}
+      onObjectUpdated={onObjectUpdated}
+    />
+  );
+
+  if (!opts.returnBeforeSpacesLoad) {
+    // Wait for spaces manager to complete and flyout to rerender
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+  }
+
+  return { wrapper, onClose, mockSpacesManager, mockToastNotifications, savedObjectToShare };
+};
+
+describe('ShareToSpaceFlyout', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  it('waits for spaces to load', async () => {
+    const { wrapper } = await setup({ returnBeforeSpacesLoad: true });
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(0);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(1);
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(1);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(0);
+  });
+
+  it('shows a message within an EuiEmptyPrompt when no spaces are available', async () => {
+    const { wrapper, onClose } = await setup({ mockSpaces: [] });
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(0);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(1);
+    expect(onClose).toHaveBeenCalledTimes(0);
+  });
+
+  it('shows a message within an EuiEmptyPrompt when only the active space is available', async () => {
+    const { wrapper, onClose } = await setup({
+      mockSpaces: [{ id: 'my-active-space', name: '', disabledFeatures: [] }],
+    });
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(0);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(1);
+    expect(onClose).toHaveBeenCalledTimes(0);
+  });
+
+  it('does not show a warning callout when the saved object has multiple namespaces', async () => {
+    const { wrapper, onClose } = await setup();
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(1);
+    expect(wrapper.find(EuiCallOut)).toHaveLength(0);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(onClose).toHaveBeenCalledTimes(0);
+  });
+
+  it('shows a warning callout when the saved object only has one namespace', async () => {
+    const { wrapper, onClose } = await setup({ namespaces: ['my-active-space'] });
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(1);
+    expect(wrapper.find(EuiCallOut)).toHaveLength(1);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(onClose).toHaveBeenCalledTimes(0);
+  });
+
+  it('does not show the Copy flyout by default', async () => {
+    const { wrapper, onClose } = await setup({ namespaces: ['my-active-space'] });
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(1);
+    expect(wrapper.find(CopySavedObjectsToSpaceFlyout)).toHaveLength(0);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(onClose).toHaveBeenCalledTimes(0);
+  });
+
+  it('shows the Copy flyout if the the "Make a copy" button is clicked', async () => {
+    const { wrapper, onClose } = await setup({ namespaces: ['my-active-space'] });
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(1);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(0);
+
+    const copyButton = findTestSubject(wrapper, 'sts-copy-button'); // this button is only present in the warning callout
+
+    await act(async () => {
+      copyButton.simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find(CopySavedObjectsToSpaceFlyout)).toHaveLength(1);
+    expect(onClose).toHaveBeenCalledTimes(0);
+  });
+
+  it('handles errors thrown from shareSavedObjectsAdd API call', async () => {
+    const { wrapper, mockSpacesManager, mockToastNotifications } = await setup();
+
+    mockSpacesManager.shareSavedObjectAdd.mockImplementation(() => {
+      return Promise.reject(Boom.serverUnavailable('Something bad happened'));
+    });
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(1);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(0);
+
+    // Using props callback instead of simulating clicks,
+    // because EuiSelectable uses a virtualized list, which isn't easily testable via test subjects
+    const spaceSelector = wrapper.find(SelectableSpacesControl);
+    act(() => {
+      spaceSelector.props().onChange(['space-2', 'space-3']);
+    });
+
+    const startButton = findTestSubject(wrapper, 'sts-initiate-button');
+
+    await act(async () => {
+      startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(mockSpacesManager.shareSavedObjectAdd).toHaveBeenCalled();
+    expect(mockSpacesManager.shareSavedObjectRemove).not.toHaveBeenCalled();
+    expect(mockToastNotifications.addError).toHaveBeenCalled();
+  });
+
+  it('handles errors thrown from shareSavedObjectsRemove API call', async () => {
+    const { wrapper, mockSpacesManager, mockToastNotifications } = await setup();
+
+    mockSpacesManager.shareSavedObjectRemove.mockImplementation(() => {
+      return Promise.reject(Boom.serverUnavailable('Something bad happened'));
+    });
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(1);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(0);
+
+    // Using props callback instead of simulating clicks,
+    // because EuiSelectable uses a virtualized list, which isn't easily testable via test subjects
+    const spaceSelector = wrapper.find(SelectableSpacesControl);
+    act(() => {
+      spaceSelector.props().onChange(['space-2', 'space-3']);
+    });
+
+    const startButton = findTestSubject(wrapper, 'sts-initiate-button');
+
+    await act(async () => {
+      startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(mockSpacesManager.shareSavedObjectAdd).toHaveBeenCalled();
+    expect(mockSpacesManager.shareSavedObjectRemove).toHaveBeenCalled();
+    expect(mockToastNotifications.addError).toHaveBeenCalled();
+  });
+
+  it('allows the form to be filled out to add a space', async () => {
+    const {
+      wrapper,
+      onClose,
+      mockSpacesManager,
+      mockToastNotifications,
+      savedObjectToShare,
+    } = await setup();
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(1);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(0);
+
+    // Using props callback instead of simulating clicks,
+    // because EuiSelectable uses a virtualized list, which isn't easily testable via test subjects
+    const spaceSelector = wrapper.find(SelectableSpacesControl);
+
+    act(() => {
+      spaceSelector.props().onChange(['space-1', 'space-2', 'space-3']);
+    });
+
+    const startButton = findTestSubject(wrapper, 'sts-initiate-button');
+
+    await act(async () => {
+      startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    const { type, id } = savedObjectToShare;
+    const { shareSavedObjectAdd, shareSavedObjectRemove } = mockSpacesManager;
+    expect(shareSavedObjectAdd).toHaveBeenCalledWith({ type, id }, ['space-2', 'space-3']);
+    expect(shareSavedObjectRemove).not.toHaveBeenCalled();
+
+    expect(mockToastNotifications.addSuccess).toHaveBeenCalledTimes(1);
+    expect(mockToastNotifications.addError).not.toHaveBeenCalled();
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+
+  it('allows the form to be filled out to remove a space', async () => {
+    const {
+      wrapper,
+      onClose,
+      mockSpacesManager,
+      mockToastNotifications,
+      savedObjectToShare,
+    } = await setup();
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(1);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(0);
+
+    // Using props callback instead of simulating clicks,
+    // because EuiSelectable uses a virtualized list, which isn't easily testable via test subjects
+    const spaceSelector = wrapper.find(SelectableSpacesControl);
+
+    act(() => {
+      spaceSelector.props().onChange([]);
+    });
+
+    const startButton = findTestSubject(wrapper, 'sts-initiate-button');
+
+    await act(async () => {
+      startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    const { type, id } = savedObjectToShare;
+    const { shareSavedObjectAdd, shareSavedObjectRemove } = mockSpacesManager;
+    expect(shareSavedObjectAdd).not.toHaveBeenCalled();
+    expect(shareSavedObjectRemove).toHaveBeenCalledWith({ type, id }, ['space-1']);
+
+    expect(mockToastNotifications.addSuccess).toHaveBeenCalledTimes(1);
+    expect(mockToastNotifications.addError).not.toHaveBeenCalled();
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+
+  it('allows the form to be filled out to add and remove a space', async () => {
+    const {
+      wrapper,
+      onClose,
+      mockSpacesManager,
+      mockToastNotifications,
+      savedObjectToShare,
+    } = await setup();
+
+    expect(wrapper.find(ShareToSpaceForm)).toHaveLength(1);
+    expect(wrapper.find(EuiLoadingSpinner)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(0);
+
+    // Using props callback instead of simulating clicks,
+    // because EuiSelectable uses a virtualized list, which isn't easily testable via test subjects
+    const spaceSelector = wrapper.find(SelectableSpacesControl);
+
+    act(() => {
+      spaceSelector.props().onChange(['space-2', 'space-3']);
+    });
+
+    const startButton = findTestSubject(wrapper, 'sts-initiate-button');
+
+    await act(async () => {
+      startButton.simulate('click');
+      await nextTick();
+      wrapper.update();
+    });
+
+    const { type, id } = savedObjectToShare;
+    const { shareSavedObjectAdd, shareSavedObjectRemove } = mockSpacesManager;
+    expect(shareSavedObjectAdd).toHaveBeenCalledWith({ type, id }, ['space-2', 'space-3']);
+    expect(shareSavedObjectRemove).toHaveBeenCalledWith({ type, id }, ['space-1']);
+
+    expect(mockToastNotifications.addSuccess).toHaveBeenCalledTimes(2);
+    expect(mockToastNotifications.addError).not.toHaveBeenCalled();
+    expect(onClose).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.tsx
new file mode 100644
index 0000000000000..10cc5777cdcff
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.tsx
@@ -0,0 +1,268 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { useState, useEffect } from 'react';
+import {
+  EuiFlyout,
+  EuiIcon,
+  EuiFlyoutHeader,
+  EuiTitle,
+  EuiText,
+  EuiFlyoutBody,
+  EuiFlyoutFooter,
+  EuiLoadingSpinner,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
+  EuiEmptyPrompt,
+  EuiButton,
+  EuiButtonEmpty,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { ToastsStart } from 'src/core/public';
+import { SavedObjectsManagementRecord } from '../../../../../../src/plugins/saved_objects_management/public';
+import { Space } from '../../../common/model/space';
+import { SpacesManager } from '../../spaces_manager';
+import { ShareToSpaceForm } from './share_to_space_form';
+import { ShareOptions, SpaceTarget } from '../types';
+import { CopySavedObjectsToSpaceFlyout } from '../../copy_saved_objects_to_space/components';
+
+interface Props {
+  onClose: () => void;
+  onObjectUpdated: () => void;
+  savedObject: SavedObjectsManagementRecord;
+  spacesManager: SpacesManager;
+  toastNotifications: ToastsStart;
+}
+
+const arraysAreEqual = (a: unknown[], b: unknown[]) =>
+  a.every((x) => b.includes(x)) && b.every((x) => a.includes(x));
+
+export const ShareSavedObjectsToSpaceFlyout = (props: Props) => {
+  const { onClose, onObjectUpdated, savedObject, spacesManager, toastNotifications } = props;
+  const { namespaces: currentNamespaces = [] } = savedObject;
+  const [shareOptions, setShareOptions] = useState<ShareOptions>({ selectedSpaceIds: [] });
+  const [showMakeCopy, setShowMakeCopy] = useState<boolean>(false);
+
+  const [{ isLoading, spaces }, setSpacesState] = useState<{
+    isLoading: boolean;
+    spaces: SpaceTarget[];
+  }>({ isLoading: true, spaces: [] });
+  useEffect(() => {
+    const getSpaces = spacesManager.getSpaces('shareSavedObjectsIntoSpace');
+    const getActiveSpace = spacesManager.getActiveSpace();
+    Promise.all([getSpaces, getActiveSpace])
+      .then(([allSpaces, activeSpace]) => {
+        const createSpaceTarget = (space: Space): SpaceTarget => ({
+          ...space,
+          isActiveSpace: space.id === activeSpace.id,
+        });
+        setSpacesState({
+          isLoading: false,
+          spaces: allSpaces.map((space) => createSpaceTarget(space)),
+        });
+        setShareOptions({
+          selectedSpaceIds: currentNamespaces.filter((spaceId) => spaceId !== activeSpace.id),
+        });
+      })
+      .catch((e) => {
+        toastNotifications.addError(e, {
+          title: i18n.translate('xpack.spaces.management.shareToSpace.spacesLoadErrorTitle', {
+            defaultMessage: 'Error loading available spaces',
+          }),
+        });
+      });
+  }, [currentNamespaces, spacesManager, toastNotifications]);
+
+  const getSelectionChanges = () => {
+    const activeSpace = spaces.find((space) => space.isActiveSpace);
+    if (!activeSpace) {
+      return { changed: false, spacesToAdd: [], spacesToRemove: [] };
+    }
+    const initialSelection = currentNamespaces.filter(
+      (spaceId) => spaceId !== activeSpace.id && spaceId !== '?'
+    );
+    const { selectedSpaceIds } = shareOptions;
+    const changed = !arraysAreEqual(initialSelection, selectedSpaceIds);
+    const spacesToAdd = selectedSpaceIds.filter((spaceId) => !initialSelection.includes(spaceId));
+    const spacesToRemove = initialSelection.filter(
+      (spaceId) => !selectedSpaceIds.includes(spaceId)
+    );
+    return { changed, spacesToAdd, spacesToRemove };
+  };
+  const { changed: isSelectionChanged, spacesToAdd, spacesToRemove } = getSelectionChanges();
+
+  const [shareInProgress, setShareInProgress] = useState(false);
+
+  async function startShare() {
+    setShareInProgress(true);
+    try {
+      const { type, id, meta } = savedObject;
+      const title =
+        currentNamespaces.length === 1
+          ? i18n.translate('xpack.spaces.management.shareToSpace.shareNewSuccessTitle', {
+              defaultMessage: 'Saved Object is now shared!',
+            })
+          : i18n.translate('xpack.spaces.management.shareToSpace.shareEditSuccessTitle', {
+              defaultMessage: 'Saved Object updated',
+            });
+      if (spacesToAdd.length > 0) {
+        await spacesManager.shareSavedObjectAdd({ type, id }, spacesToAdd);
+        const spaceNames = spacesToAdd.map(
+          (spaceId) => spaces.find((space) => space.id === spaceId)!.name
+        );
+        const text = i18n.translate('xpack.spaces.management.shareToSpace.shareAddSuccessText', {
+          defaultMessage: `'{object}' was added to the following spaces:\n{spaces}`,
+          values: { object: meta.title, spaces: spaceNames.join(', ') },
+        });
+        toastNotifications.addSuccess({ title, text });
+      }
+      if (spacesToRemove.length > 0) {
+        await spacesManager.shareSavedObjectRemove({ type, id }, spacesToRemove);
+        const spaceNames = spacesToRemove.map(
+          (spaceId) => spaces.find((space) => space.id === spaceId)!.name
+        );
+        const text = i18n.translate('xpack.spaces.management.shareToSpace.shareRemoveSuccessText', {
+          defaultMessage: `'{object}' was removed from the following spaces:\n{spaces}`,
+          values: { object: meta.title, spaces: spaceNames.join(', ') },
+        });
+        toastNotifications.addSuccess({ title, text });
+      }
+      onObjectUpdated();
+      onClose();
+    } catch (e) {
+      setShareInProgress(false);
+      toastNotifications.addError(e, {
+        title: i18n.translate('xpack.spaces.management.shareToSpace.shareErrorTitle', {
+          defaultMessage: 'Error updating saved object',
+        }),
+      });
+    }
+  }
+
+  const getFlyoutBody = () => {
+    // Step 1: loading assets for main form
+    if (isLoading) {
+      return <EuiLoadingSpinner />;
+    }
+
+    // Step 1a: assets loaded, but no spaces are available for share.
+    // The `spaces` array includes the current space, so at minimum it will have a length of 1.
+    if (spaces.length < 2) {
+      return (
+        <EuiEmptyPrompt
+          body={
+            <p>
+              <FormattedMessage
+                id="xpack.spaces.management.shareToSpace.noSpacesBody"
+                defaultMessage="There are no eligible spaces to share into."
+              />
+            </p>
+          }
+          title={
+            <h3>
+              <FormattedMessage
+                id="xpack.spaces.management.shareToSpace.noSpacesTitle"
+                defaultMessage="No spaces available"
+              />
+            </h3>
+          }
+        />
+      );
+    }
+
+    const showShareWarning = currentNamespaces.length === 1;
+    // Step 2: Share has not been initiated yet; User must fill out form to continue.
+    return (
+      <ShareToSpaceForm
+        spaces={spaces}
+        shareOptions={shareOptions}
+        onUpdate={setShareOptions}
+        showShareWarning={showShareWarning}
+        makeCopy={() => setShowMakeCopy(true)}
+      />
+    );
+  };
+
+  if (showMakeCopy) {
+    return (
+      <CopySavedObjectsToSpaceFlyout
+        onClose={onClose}
+        savedObject={savedObject}
+        spacesManager={spacesManager}
+        toastNotifications={toastNotifications}
+      />
+    );
+  }
+
+  return (
+    <EuiFlyout onClose={onClose} maxWidth={460} data-test-subj="share-to-space-flyout">
+      <EuiFlyoutHeader hasBorder>
+        <EuiFlexGroup alignItems="center" gutterSize="m">
+          <EuiFlexItem grow={false}>
+            <EuiIcon size="m" type="share" />
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiTitle size="m">
+              <h2>
+                <FormattedMessage
+                  id="xpack.spaces.management.shareToSpaceFlyoutHeader"
+                  defaultMessage="Share saved object to space"
+                />
+              </h2>
+            </EuiTitle>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <EuiFlexGroup alignItems="center" gutterSize="m">
+          <EuiFlexItem grow={false}>
+            <EuiIcon type={savedObject.meta.icon || 'apps'} />
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiText>
+              <p>{savedObject.meta.title}</p>
+            </EuiText>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+
+        <EuiHorizontalRule margin="m" />
+
+        {getFlyoutBody()}
+      </EuiFlyoutBody>
+
+      <EuiFlyoutFooter>
+        <EuiFlexGroup justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              onClick={() => onClose()}
+              data-test-subj="sts-cancel-button"
+              disabled={shareInProgress}
+            >
+              <FormattedMessage
+                id="xpack.spaces.management.shareToSpace.cancelButton"
+                defaultMessage="Cancel"
+              />
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButton
+              fill
+              onClick={() => startShare()}
+              data-test-subj="sts-initiate-button"
+              disabled={!isSelectionChanged || shareInProgress}
+            >
+              <FormattedMessage
+                id="xpack.spaces.management.shareToSpace.shareToSpacesButton"
+                defaultMessage="Share"
+              />
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutFooter>
+    </EuiFlyout>
+  );
+};
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.scss b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.scss
similarity index 74%
rename from x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.scss
rename to x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.scss
index 87af5d83629a9..41a9c907de745 100644
--- a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_form.scss
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.scss
@@ -1,10 +1,10 @@
 // make icon occupy the same space as an EuiSwitch
 // icon is size m, which is the native $euiSize value
 // see @elastic/eui/src/components/icon/_variables.scss
-.spcCopyToSpaceIncludeRelated .euiIcon {
+.spcShareToSpaceIncludeRelated .euiIcon {
   margin-right: $euiSwitchWidth - $euiSize;
 }
 
-.spcCopyToSpaceIncludeRelated__label {
+.spcShareToSpaceIncludeRelated__label {
   font-size: $euiFontSizeS;
 }
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx
new file mode 100644
index 0000000000000..24402fec8d771
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import './share_to_space_form.scss';
+import React, { Fragment } from 'react';
+import { EuiHorizontalRule, EuiFormRow, EuiCallOut, EuiButton, EuiSpacer } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { ShareOptions, SpaceTarget } from '../types';
+import { SelectableSpacesControl } from './selectable_spaces_control';
+
+interface Props {
+  spaces: SpaceTarget[];
+  onUpdate: (shareOptions: ShareOptions) => void;
+  shareOptions: ShareOptions;
+  showShareWarning: boolean;
+  makeCopy: () => void;
+}
+
+export const ShareToSpaceForm = (props: Props) => {
+  const setSelectedSpaceIds = (selectedSpaceIds: string[]) =>
+    props.onUpdate({ ...props.shareOptions, selectedSpaceIds });
+
+  const getShareWarning = () => {
+    if (!props.showShareWarning) {
+      return null;
+    }
+
+    return (
+      <Fragment>
+        <EuiCallOut
+          size="s"
+          title={
+            <FormattedMessage
+              id="xpack.spaces.management.shareToSpace.shareWarningTitle"
+              defaultMessage="Any changes made to one space will be reflected in all spaces."
+            />
+          }
+          color="warning"
+        >
+          <FormattedMessage
+            id="xpack.spaces.management.shareToSpace.shareWarningBody"
+            defaultMessage="To avoid changes across spaces, make a copy instead."
+          />
+          <EuiSpacer size="s" />
+          <EuiButton
+            onClick={() => props.makeCopy()}
+            color="warning"
+            data-test-subj="sts-copy-button"
+            size="s"
+          >
+            <FormattedMessage
+              id="xpack.spaces.management.shareToSpace.shareWarningButton"
+              defaultMessage="Make a copy"
+            />
+          </EuiButton>
+        </EuiCallOut>
+
+        <EuiHorizontalRule margin="m" />
+      </Fragment>
+    );
+  };
+
+  return (
+    <div data-test-subj="share-to-space-form">
+      {getShareWarning()}
+
+      <EuiFormRow
+        label={
+          <FormattedMessage
+            id="xpack.spaces.management.shareToSpace.selectSpacesLabel"
+            defaultMessage="Select spaces to share into"
+          />
+        }
+        labelAppend={
+          <FormattedMessage
+            id="xpack.spaces.management.shareToSpace.selectSpacesLabelAppend"
+            defaultMessage="{selectedCount} selected"
+            values={{ selectedCount: props.shareOptions.selectedSpaceIds.length }}
+          />
+        }
+        fullWidth
+      >
+        <SelectableSpacesControl
+          spaces={props.spaces}
+          selectedSpaceIds={props.shareOptions.selectedSpaceIds}
+          onChange={(selection) => setSelectedSpaceIds(selection)}
+        />
+      </EuiFormRow>
+    </div>
+  );
+};
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/index.ts b/x-pack/plugins/spaces/public/share_saved_objects_to_space/index.ts
new file mode 100644
index 0000000000000..037fcb684b47d
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { ShareSavedObjectsToSpaceService } from './share_saved_objects_to_space_service';
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_action.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_action.tsx
new file mode 100644
index 0000000000000..ba9a6473999df
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_action.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { NotificationsStart } from 'src/core/public';
+import {
+  SavedObjectsManagementAction,
+  SavedObjectsManagementRecord,
+} from '../../../../../src/plugins/saved_objects_management/public';
+import { ShareSavedObjectsToSpaceFlyout } from './components';
+import { SpacesManager } from '../spaces_manager';
+
+export class ShareToSpaceSavedObjectsManagementAction extends SavedObjectsManagementAction {
+  public id: string = 'share_saved_objects_to_space';
+
+  public euiAction = {
+    name: i18n.translate('xpack.spaces.management.shareToSpace.actionTitle', {
+      defaultMessage: 'Share to space',
+    }),
+    description: i18n.translate('xpack.spaces.management.shareToSpace.actionDescription', {
+      defaultMessage: 'Share this saved object to one or more spaces',
+    }),
+    icon: 'share',
+    type: 'icon',
+    available: (object: SavedObjectsManagementRecord) => {
+      return object.meta.namespaceType === 'multiple';
+    },
+    onClick: (object: SavedObjectsManagementRecord) => {
+      this.isDataChanged = false;
+      this.start(object);
+    },
+  };
+  public refreshOnFinish = () => this.isDataChanged;
+
+  private isDataChanged: boolean = false;
+
+  constructor(
+    private readonly spacesManager: SpacesManager,
+    private readonly notifications: NotificationsStart
+  ) {
+    super();
+  }
+
+  public render = () => {
+    if (!this.record) {
+      throw new Error('No record available! `render()` was likely called before `start()`.');
+    }
+
+    return (
+      <ShareSavedObjectsToSpaceFlyout
+        onClose={this.onClose}
+        onObjectUpdated={() => (this.isDataChanged = true)}
+        savedObject={this.record}
+        spacesManager={this.spacesManager}
+        toastNotifications={this.notifications.toasts}
+      />
+    );
+  };
+
+  private onClose = () => {
+    this.finish();
+  };
+}
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_column.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_column.tsx
new file mode 100644
index 0000000000000..e8649faa120be
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_column.tsx
@@ -0,0 +1,142 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { useState, ReactNode } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiBadge } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
+import { EuiButtonEmpty } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  SavedObjectsManagementColumn,
+  SavedObjectsManagementRecord,
+} from '../../../../../src/plugins/saved_objects_management/public';
+import { SpaceTarget } from './types';
+import { SpacesManager } from '../spaces_manager';
+import { getSpaceColor } from '..';
+
+const SPACES_DISPLAY_COUNT = 5;
+
+type SpaceMap = Map<string, SpaceTarget>;
+interface ColumnDataProps {
+  namespaces?: string[];
+  data?: SpaceMap;
+}
+
+const ColumnDisplay = ({ namespaces, data }: ColumnDataProps) => {
+  const [isExpanded, setIsExpanded] = useState(false);
+
+  if (!data) {
+    return null;
+  }
+
+  const authorized = namespaces?.filter((namespace) => namespace !== '?') ?? [];
+  const authorizedSpaceTargets: SpaceTarget[] = [];
+  authorized.forEach((namespace) => {
+    const spaceTarget = data.get(namespace);
+    if (spaceTarget === undefined) {
+      // in the event that a new space was created after this page has loaded, fall back to displaying the space ID
+      authorizedSpaceTargets.push({
+        id: namespace,
+        name: namespace,
+        disabledFeatures: [],
+        isActiveSpace: false,
+      });
+    } else if (!spaceTarget.isActiveSpace) {
+      authorizedSpaceTargets.push(spaceTarget);
+    }
+  });
+  const unauthorizedCount = (namespaces?.filter((namespace) => namespace === '?') ?? []).length;
+  const unauthorizedTooltip = i18n.translate(
+    'xpack.spaces.management.shareToSpace.columnUnauthorizedLabel',
+    { defaultMessage: 'You do not have permission to view these spaces' }
+  );
+
+  const displayedSpaces = isExpanded
+    ? authorizedSpaceTargets
+    : authorizedSpaceTargets.slice(0, SPACES_DISPLAY_COUNT);
+  const showButton = authorizedSpaceTargets.length > SPACES_DISPLAY_COUNT;
+
+  const unauthorizedCountBadge =
+    (isExpanded || !showButton) && unauthorizedCount > 0 ? (
+      <EuiFlexItem grow={false}>
+        <EuiToolTip content={unauthorizedTooltip}>
+          <EuiBadge color="#DDD">+{unauthorizedCount}</EuiBadge>
+        </EuiToolTip>
+      </EuiFlexItem>
+    ) : null;
+
+  let button: ReactNode = null;
+  if (showButton) {
+    button = isExpanded ? (
+      <EuiButtonEmpty size="xs" onClick={() => setIsExpanded(false)}>
+        <FormattedMessage
+          id="xpack.spaces.management.shareToSpace.showLessSpacesLink"
+          defaultMessage="show less"
+        />
+      </EuiButtonEmpty>
+    ) : (
+      <EuiButtonEmpty size="xs" onClick={() => setIsExpanded(true)}>
+        <FormattedMessage
+          id="xpack.spaces.management.shareToSpace.showMoreSpacesLink"
+          defaultMessage="+{count} more"
+          values={{
+            count: authorizedSpaceTargets.length + unauthorizedCount - displayedSpaces.length,
+          }}
+        />
+      </EuiButtonEmpty>
+    );
+  }
+
+  return (
+    <EuiFlexGroup wrap responsive={false} gutterSize="xs">
+      {displayedSpaces.map(({ id, name, color }) => (
+        <EuiFlexItem grow={false} key={id}>
+          <EuiBadge color={color || 'hollow'}>{name}</EuiBadge>
+        </EuiFlexItem>
+      ))}
+      {unauthorizedCountBadge}
+      {button}
+    </EuiFlexGroup>
+  );
+};
+
+export class ShareToSpaceSavedObjectsManagementColumn
+  implements SavedObjectsManagementColumn<SpaceMap> {
+  public id: string = 'share_saved_objects_to_space';
+  public data: Map<string, SpaceTarget> | undefined;
+
+  public euiColumn = {
+    field: 'namespaces',
+    name: i18n.translate('xpack.spaces.management.shareToSpace.columnTitle', {
+      defaultMessage: 'Shared spaces',
+    }),
+    description: i18n.translate('xpack.spaces.management.shareToSpace.columnDescription', {
+      defaultMessage: 'The other spaces that this object is currently shared to',
+    }),
+    render: (namespaces: string[] | undefined, _object: SavedObjectsManagementRecord) => (
+      <ColumnDisplay namespaces={namespaces} data={this.data} />
+    ),
+  };
+
+  constructor(private readonly spacesManager: SpacesManager) {}
+
+  public loadData = () => {
+    this.data = undefined;
+    return Promise.all([this.spacesManager.getSpaces(), this.spacesManager.getActiveSpace()]).then(
+      ([spaces, activeSpace]) => {
+        this.data = spaces
+          .map<SpaceTarget>((space) => ({
+            ...space,
+            isActiveSpace: space.id === activeSpace.id,
+            color: getSpaceColor(space),
+          }))
+          .reduce((acc, cur) => acc.set(cur.id, cur), new Map<string, SpaceTarget>());
+        return this.data;
+      }
+    );
+  };
+}
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.test.ts b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.test.ts
new file mode 100644
index 0000000000000..0f0fa7d22214f
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.test.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ShareToSpaceSavedObjectsManagementAction } from './share_saved_objects_to_space_action';
+// import { ShareToSpaceSavedObjectsManagementColumn } from './share_saved_objects_to_space_column';
+import { spacesManagerMock } from '../spaces_manager/mocks';
+import { ShareSavedObjectsToSpaceService } from '.';
+import { notificationServiceMock } from 'src/core/public/mocks';
+import { savedObjectsManagementPluginMock } from '../../../../../src/plugins/saved_objects_management/public/mocks';
+
+describe('ShareSavedObjectsToSpaceService', () => {
+  describe('#setup', () => {
+    it('registers the ShareToSpaceSavedObjectsManagement Action and Column', () => {
+      const deps = {
+        spacesManager: spacesManagerMock.create(),
+        notificationsSetup: notificationServiceMock.createSetupContract(),
+        savedObjectsManagementSetup: savedObjectsManagementPluginMock.createSetupContract(),
+      };
+
+      const service = new ShareSavedObjectsToSpaceService();
+      service.setup(deps);
+
+      expect(deps.savedObjectsManagementSetup.actions.register).toHaveBeenCalledTimes(1);
+      expect(deps.savedObjectsManagementSetup.actions.register).toHaveBeenCalledWith(
+        expect.any(ShareToSpaceSavedObjectsManagementAction)
+      );
+
+      // expect(deps.savedObjectsManagementSetup.columns.register).toHaveBeenCalledTimes(1);
+      // expect(deps.savedObjectsManagementSetup.columns.register).toHaveBeenCalledWith(
+      //   expect.any(ShareToSpaceSavedObjectsManagementColumn)
+      // );
+      expect(deps.savedObjectsManagementSetup.columns.register).not.toHaveBeenCalled(); // ensure this test fails after column code is uncommented
+    });
+  });
+});
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.ts b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.ts
new file mode 100644
index 0000000000000..9f6e57c355380
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/share_saved_objects_to_space_service.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { NotificationsSetup } from 'src/core/public';
+import { SavedObjectsManagementPluginSetup } from 'src/plugins/saved_objects_management/public';
+import { ShareToSpaceSavedObjectsManagementAction } from './share_saved_objects_to_space_action';
+// import { ShareToSpaceSavedObjectsManagementColumn } from './share_saved_objects_to_space_column';
+import { SpacesManager } from '../spaces_manager';
+
+interface SetupDeps {
+  spacesManager: SpacesManager;
+  savedObjectsManagementSetup: SavedObjectsManagementPluginSetup;
+  notificationsSetup: NotificationsSetup;
+}
+
+export class ShareSavedObjectsToSpaceService {
+  public setup({ spacesManager, savedObjectsManagementSetup, notificationsSetup }: SetupDeps) {
+    const action = new ShareToSpaceSavedObjectsManagementAction(spacesManager, notificationsSetup);
+    savedObjectsManagementSetup.actions.register(action);
+    // Note: this column is hidden for now because no saved objects are shareable. It should be uncommented when at least one saved object type is multi-namespace.
+    // const column = new ShareToSpaceSavedObjectsManagementColumn(spacesManager);
+    // savedObjectsManagementSetup.columns.register(column);
+  }
+}
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts b/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts
new file mode 100644
index 0000000000000..fe41f4a5fadc8
--- /dev/null
+++ b/x-pack/plugins/spaces/public/share_saved_objects_to_space/types.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObjectsImportRetry, SavedObjectsImportResponse } from 'src/core/public';
+import { Space } from '..';
+
+export interface ShareOptions {
+  selectedSpaceIds: string[];
+}
+
+export type ImportRetry = Omit<SavedObjectsImportRetry, 'replaceReferences'>;
+
+export interface ShareSavedObjectsToSpaceResponse {
+  [spaceId: string]: SavedObjectsImportResponse;
+}
+
+export interface SpaceTarget extends Space {
+  isActiveSpace: boolean;
+}
diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
index 6186ac7fd93be..f666c823bd365 100644
--- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
+++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.mock.ts
@@ -18,6 +18,8 @@ function createSpacesManagerMock() {
     updateSpace: jest.fn().mockResolvedValue(undefined),
     deleteSpace: jest.fn().mockResolvedValue(undefined),
     copySavedObjects: jest.fn().mockResolvedValue(undefined),
+    shareSavedObjectAdd: jest.fn().mockResolvedValue(undefined),
+    shareSavedObjectRemove: jest.fn().mockResolvedValue(undefined),
     resolveCopySavedObjectsErrors: jest.fn().mockResolvedValue(undefined),
     redirectToSpaceSelector: jest.fn().mockResolvedValue(undefined),
   } as unknown) as jest.Mocked<SpacesManager>;
diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
index ac5cb56084cfc..2daf9ab420efc 100644
--- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
+++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
@@ -11,6 +11,8 @@ import { Space } from '../../common/model/space';
 import { GetSpacePurpose } from '../../common/model/types';
 import { CopySavedObjectsToSpaceResponse } from '../copy_saved_objects_to_space/types';
 
+type SavedObject = Pick<SavedObjectsManagementRecord, 'type' | 'id'>;
+
 export class SpacesManager {
   private activeSpace$: BehaviorSubject<Space | null> = new BehaviorSubject<Space | null>(null);
 
@@ -72,9 +74,10 @@ export class SpacesManager {
   }
 
   public async copySavedObjects(
-    objects: Array<Pick<SavedObjectsManagementRecord, 'type' | 'id'>>,
+    objects: SavedObject[],
     spaces: string[],
     includeReferences: boolean,
+    createNewCopies: boolean,
     overwrite: boolean
   ): Promise<CopySavedObjectsToSpaceResponse> {
     return this.http.post('/api/spaces/_copy_saved_objects', {
@@ -82,25 +85,39 @@ export class SpacesManager {
         objects,
         spaces,
         includeReferences,
-        overwrite,
+        ...(createNewCopies ? { createNewCopies } : { overwrite }),
       }),
     });
   }
 
   public async resolveCopySavedObjectsErrors(
-    objects: Array<Pick<SavedObjectsManagementRecord, 'type' | 'id'>>,
+    objects: SavedObject[],
     retries: unknown,
-    includeReferences: boolean
+    includeReferences: boolean,
+    createNewCopies: boolean
   ): Promise<CopySavedObjectsToSpaceResponse> {
     return this.http.post(`/api/spaces/_resolve_copy_saved_objects_errors`, {
       body: JSON.stringify({
         objects,
         includeReferences,
+        createNewCopies,
         retries,
       }),
     });
   }
 
+  public async shareSavedObjectAdd(object: SavedObject, spaces: string[]): Promise<void> {
+    return this.http.post(`/api/spaces/_share_saved_object_add`, {
+      body: JSON.stringify({ object, spaces }),
+    });
+  }
+
+  public async shareSavedObjectRemove(object: SavedObject, spaces: string[]): Promise<void> {
+    return this.http.post(`/api/spaces/_share_saved_object_remove`, {
+      body: JSON.stringify({ object, spaces }),
+    });
+  }
+
   public redirectToSpaceSelector() {
     window.location.href = `${this.serverBasePath}/spaces/space_selector`;
   }
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
index 9679dd8c52523..d49dfa2015dc6 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.test.ts
@@ -3,14 +3,20 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { Readable } from 'stream';
 import {
   SavedObjectsImportResponse,
   SavedObjectsImportOptions,
   SavedObjectsExportOptions,
+  SavedObjectsImportSuccess,
 } from 'src/core/server';
+import {
+  coreMock,
+  httpServerMock,
+  savedObjectsTypeRegistryMock,
+  savedObjectsClientMock,
+} from 'src/core/server/mocks';
 import { copySavedObjectsToSpacesFactory } from './copy_to_spaces';
-import { Readable } from 'stream';
-import { coreMock, savedObjectsTypeRegistryMock, httpServerMock } from 'src/core/server/mocks';
 
 jest.mock('../../../../../../src/core/server', () => {
   return {
@@ -31,6 +37,8 @@ interface SetupOpts {
   ) => Promise<SavedObjectsImportResponse>;
 }
 
+const EXPORT_LIMIT = 1000;
+
 const expectStreamToContainObjects = async (
   stream: Readable,
   expectedObjects: SetupOpts['objects']
@@ -50,23 +58,29 @@ const expectStreamToContainObjects = async (
 };
 
 describe('copySavedObjectsToSpaces', () => {
+  const mockExportResults = [
+    { type: 'dashboard', id: 'my-dashboard', attributes: {} },
+    { type: 'visualization', id: 'my-viz', attributes: {} },
+    { type: 'index-pattern', id: 'my-index-pattern', attributes: {} },
+    { type: 'globaltype', id: 'my-globaltype', attributes: {} },
+  ];
+
   const setup = (setupOpts: SetupOpts) => {
     const coreStart = coreMock.createStart();
 
+    const savedObjectsClient = savedObjectsClientMock.create();
     const typeRegistry = savedObjectsTypeRegistryMock.create();
-    typeRegistry.getAllTypes.mockReturnValue([
+    coreStart.savedObjects.getScopedClient.mockReturnValue(savedObjectsClient);
+    coreStart.savedObjects.getTypeRegistry.mockReturnValue(typeRegistry);
+
+    typeRegistry.getImportableAndExportableTypes.mockReturnValue([
+      // don't need to include all types, just need a positive case (agnostic) and a negative case (non-agnostic)
       {
         name: 'dashboard',
         namespaceType: 'single',
         hidden: false,
         mappings: { properties: {} },
       },
-      {
-        name: 'visualization',
-        namespaceType: 'single',
-        hidden: false,
-        mappings: { properties: {} },
-      },
       {
         name: 'globaltype',
         namespaceType: 'agnostic',
@@ -74,13 +88,12 @@ describe('copySavedObjectsToSpaces', () => {
         mappings: { properties: {} },
       },
     ]);
-
     typeRegistry.isNamespaceAgnostic.mockImplementation((type: string) =>
-      typeRegistry.getAllTypes().some((t) => t.name === type && t.namespaceType === 'agnostic')
+      typeRegistry
+        .getImportableAndExportableTypes()
+        .some((t) => t.name === type && t.namespaceType === 'agnostic')
     );
 
-    coreStart.savedObjects.getTypeRegistry.mockReturnValue(typeRegistry);
-
     (exportSavedObjectsToStream as jest.Mock).mockImplementation(
       async (opts: SavedObjectsExportOptions) => {
         return (
@@ -100,10 +113,15 @@ describe('copySavedObjectsToSpaces', () => {
     (importSavedObjectsFromStream as jest.Mock).mockImplementation(
       async (opts: SavedObjectsImportOptions) => {
         const defaultImpl = async () => {
-          await expectStreamToContainObjects(opts.readStream, setupOpts.objects);
+          // namespace-agnostic types should be filtered out before import
+          const filteredObjects = setupOpts.objects.filter(({ type }) => type !== 'globaltype');
+          await expectStreamToContainObjects(opts.readStream, filteredObjects);
           const response: SavedObjectsImportResponse = {
             success: true,
-            successCount: setupOpts.objects.length,
+            successCount: filteredObjects.length,
+            successResults: [
+              ('Some success(es) occurred!' as unknown) as SavedObjectsImportSuccess,
+            ],
           };
 
           return Promise.resolve(response);
@@ -115,261 +133,95 @@ describe('copySavedObjectsToSpaces', () => {
 
     return {
       savedObjects: coreStart.savedObjects,
+      savedObjectsClient,
+      typeRegistry,
     };
   };
 
   it('uses the Saved Objects Service to perform an export followed by a series of imports', async () => {
-    const { savedObjects } = setup({
-      objects: [
-        {
-          type: 'dashboard',
-          id: 'my-dashboard',
-          attributes: {},
-        },
-        {
-          type: 'visualization',
-          id: 'my-viz',
-          attributes: {},
-        },
-        {
-          type: 'index-pattern',
-          id: 'my-index-pattern',
-          attributes: {},
-        },
-      ],
+    const { savedObjects, savedObjectsClient, typeRegistry } = setup({
+      objects: mockExportResults,
     });
 
     const request = httpServerMock.createKibanaRequest();
 
     const copySavedObjectsToSpaces = copySavedObjectsToSpacesFactory(
       savedObjects,
-      () => 1000,
+      () => EXPORT_LIMIT,
       request
     );
 
-    const result = await copySavedObjectsToSpaces('sourceSpace', ['destination1', 'destination2'], {
+    const namespace = 'sourceSpace';
+    const objects = [{ type: 'dashboard', id: 'my-dashboard' }];
+    const result = await copySavedObjectsToSpaces(namespace, ['destination1', 'destination2'], {
       includeReferences: true,
       overwrite: true,
-      objects: [
-        {
-          type: 'dashboard',
-          id: 'my-dashboard',
-        },
-      ],
+      objects,
+      createNewCopies: false,
     });
 
     expect(result).toMatchInlineSnapshot(`
-                                                                        Object {
-                                                                          "destination1": Object {
-                                                                            "errors": undefined,
-                                                                            "success": true,
-                                                                            "successCount": 3,
-                                                                          },
-                                                                          "destination2": Object {
-                                                                            "errors": undefined,
-                                                                            "success": true,
-                                                                            "successCount": 3,
-                                                                          },
-                                                                        }
-                                                `);
-
-    expect((exportSavedObjectsToStream as jest.Mock).mock.calls).toMatchInlineSnapshot(`
-      Array [
-        Array [
-          Object {
-            "excludeExportDetails": true,
-            "exportSizeLimit": 1000,
-            "includeReferencesDeep": true,
-            "namespace": "sourceSpace",
-            "objects": Array [
-              Object {
-                "id": "my-dashboard",
-                "type": "dashboard",
-              },
-            ],
-            "savedObjectsClient": Object {
-              "addToNamespaces": [MockFunction],
-              "bulkCreate": [MockFunction],
-              "bulkGet": [MockFunction],
-              "bulkUpdate": [MockFunction],
-              "create": [MockFunction],
-              "delete": [MockFunction],
-              "deleteFromNamespaces": [MockFunction],
-              "errors": [Function],
-              "find": [MockFunction],
-              "get": [MockFunction],
-              "update": [MockFunction],
-            },
-          },
-        ],
-      ]
+      Object {
+        "destination1": Object {
+          "errors": undefined,
+          "success": true,
+          "successCount": 3,
+          "successResults": Array [
+            "Some success(es) occurred!",
+          ],
+        },
+        "destination2": Object {
+          "errors": undefined,
+          "success": true,
+          "successCount": 3,
+          "successResults": Array [
+            "Some success(es) occurred!",
+          ],
+        },
+      }
     `);
 
-    expect((importSavedObjectsFromStream as jest.Mock).mock.calls).toMatchInlineSnapshot(`
-      Array [
-        Array [
-          Object {
-            "namespace": "destination1",
-            "objectLimit": 1000,
-            "overwrite": true,
-            "readStream": Readable {
-              "_events": Object {
-                "data": [Function],
-                "end": [Function],
-                "error": [Function],
-              },
-              "_eventsCount": 3,
-              "_maxListeners": undefined,
-              "_read": [Function],
-              "_readableState": ReadableState {
-                "autoDestroy": false,
-                "awaitDrain": 0,
-                "buffer": BufferList {
-                  "head": null,
-                  "length": 0,
-                  "tail": null,
-                },
-                "decoder": null,
-                "defaultEncoding": "utf8",
-                "destroyed": false,
-                "emitClose": true,
-                "emittedReadable": false,
-                "encoding": null,
-                "endEmitted": true,
-                "ended": true,
-                "flowing": true,
-                "highWaterMark": 16,
-                "length": 0,
-                "needReadable": false,
-                "objectMode": true,
-                "paused": false,
-                "pipes": null,
-                "pipesCount": 0,
-                "readableListening": false,
-                "reading": false,
-                "readingMore": false,
-                "resumeScheduled": false,
-                "sync": false,
-              },
-              "readable": false,
-            },
-            "savedObjectsClient": Object {
-              "addToNamespaces": [MockFunction],
-              "bulkCreate": [MockFunction],
-              "bulkGet": [MockFunction],
-              "bulkUpdate": [MockFunction],
-              "create": [MockFunction],
-              "delete": [MockFunction],
-              "deleteFromNamespaces": [MockFunction],
-              "errors": [Function],
-              "find": [MockFunction],
-              "get": [MockFunction],
-              "update": [MockFunction],
-            },
-            "supportedTypes": Array [
-              "dashboard",
-              "visualization",
-            ],
-          },
-        ],
-        Array [
-          Object {
-            "namespace": "destination2",
-            "objectLimit": 1000,
-            "overwrite": true,
-            "readStream": Readable {
-              "_events": Object {
-                "data": [Function],
-                "end": [Function],
-                "error": [Function],
-              },
-              "_eventsCount": 3,
-              "_maxListeners": undefined,
-              "_read": [Function],
-              "_readableState": ReadableState {
-                "autoDestroy": false,
-                "awaitDrain": 0,
-                "buffer": BufferList {
-                  "head": null,
-                  "length": 0,
-                  "tail": null,
-                },
-                "decoder": null,
-                "defaultEncoding": "utf8",
-                "destroyed": false,
-                "emitClose": true,
-                "emittedReadable": false,
-                "encoding": null,
-                "endEmitted": true,
-                "ended": true,
-                "flowing": true,
-                "highWaterMark": 16,
-                "length": 0,
-                "needReadable": false,
-                "objectMode": true,
-                "paused": false,
-                "pipes": null,
-                "pipesCount": 0,
-                "readableListening": false,
-                "reading": false,
-                "readingMore": false,
-                "resumeScheduled": false,
-                "sync": false,
-              },
-              "readable": false,
-            },
-            "savedObjectsClient": Object {
-              "addToNamespaces": [MockFunction],
-              "bulkCreate": [MockFunction],
-              "bulkGet": [MockFunction],
-              "bulkUpdate": [MockFunction],
-              "create": [MockFunction],
-              "delete": [MockFunction],
-              "deleteFromNamespaces": [MockFunction],
-              "errors": [Function],
-              "find": [MockFunction],
-              "get": [MockFunction],
-              "update": [MockFunction],
-            },
-            "supportedTypes": Array [
-              "dashboard",
-              "visualization",
-            ],
-          },
-        ],
-      ]
-    `);
+    expect(exportSavedObjectsToStream).toHaveBeenCalledWith({
+      excludeExportDetails: true,
+      exportSizeLimit: EXPORT_LIMIT,
+      includeReferencesDeep: true,
+      namespace,
+      objects,
+      savedObjectsClient,
+    });
+
+    const importOptions = {
+      createNewCopies: false,
+      objectLimit: EXPORT_LIMIT,
+      overwrite: true,
+      readStream: expect.any(Readable),
+      savedObjectsClient,
+      typeRegistry,
+    };
+    expect(importSavedObjectsFromStream).toHaveBeenNthCalledWith(1, {
+      ...importOptions,
+      namespace: 'destination1',
+    });
+    expect(importSavedObjectsFromStream).toHaveBeenNthCalledWith(2, {
+      ...importOptions,
+      namespace: 'destination2',
+    });
   });
 
   it(`doesn't stop copy if some spaces fail`, async () => {
-    const objects = [
-      {
-        type: 'dashboard',
-        id: 'my-dashboard',
-        attributes: {},
-      },
-      {
-        type: 'visualization',
-        id: 'my-viz',
-        attributes: {},
-      },
-      {
-        type: 'index-pattern',
-        id: 'my-index-pattern',
-        attributes: {},
-      },
-    ];
-
     const { savedObjects } = setup({
-      objects,
+      objects: mockExportResults,
       importSavedObjectsFromStreamImpl: async (opts) => {
         if (opts.namespace === 'failure-space') {
           throw new Error(`Some error occurred!`);
         }
-        await expectStreamToContainObjects(opts.readStream, objects);
+        // namespace-agnostic types should be filtered out before import
+        const filteredObjects = mockExportResults.filter(({ type }) => type !== 'globaltype');
+        await expectStreamToContainObjects(opts.readStream, filteredObjects);
         return Promise.resolve({
           success: true,
-          successCount: 3,
+          successCount: filteredObjects.length,
+          successResults: [('Some success(es) occurred!' as unknown) as SavedObjectsImportSuccess],
         });
       },
     });
@@ -378,7 +230,7 @@ describe('copySavedObjectsToSpaces', () => {
 
     const copySavedObjectsToSpaces = copySavedObjectsToSpacesFactory(
       savedObjects,
-      () => 1000,
+      () => EXPORT_LIMIT,
       request
     );
 
@@ -388,58 +240,44 @@ describe('copySavedObjectsToSpaces', () => {
       {
         includeReferences: true,
         overwrite: true,
-        objects: [
-          {
-            type: 'dashboard',
-            id: 'my-dashboard',
-          },
-        ],
+        objects: [{ type: 'dashboard', id: 'my-dashboard' }],
+        createNewCopies: false,
       }
     );
 
     expect(result).toMatchInlineSnapshot(`
-                        Object {
-                          "failure-space": Object {
-                            "errors": Array [
-                              [Error: Some error occurred!],
-                            ],
-                            "success": false,
-                            "successCount": 0,
-                          },
-                          "marketing": Object {
-                            "errors": undefined,
-                            "success": true,
-                            "successCount": 3,
-                          },
-                          "non-existent-space": Object {
-                            "errors": undefined,
-                            "success": true,
-                            "successCount": 3,
-                          },
-                        }
-                `);
+      Object {
+        "failure-space": Object {
+          "errors": Array [
+            [Error: Some error occurred!],
+          ],
+          "success": false,
+          "successCount": 0,
+        },
+        "marketing": Object {
+          "errors": undefined,
+          "success": true,
+          "successCount": 3,
+          "successResults": Array [
+            "Some success(es) occurred!",
+          ],
+        },
+        "non-existent-space": Object {
+          "errors": undefined,
+          "success": true,
+          "successCount": 3,
+          "successResults": Array [
+            "Some success(es) occurred!",
+          ],
+        },
+      }
+    `);
   });
 
   it(`handles stream read errors`, async () => {
     const { savedObjects } = setup({
-      objects: [
-        {
-          type: 'dashboard',
-          id: 'my-dashboard',
-          attributes: {},
-        },
-        {
-          type: 'visualization',
-          id: 'my-viz',
-          attributes: {},
-        },
-        {
-          type: 'index-pattern',
-          id: 'my-index-pattern',
-          attributes: {},
-        },
-      ],
-      exportSavedObjectsToStreamImpl: (opts) => {
+      objects: mockExportResults,
+      exportSavedObjectsToStreamImpl: (_opts) => {
         return Promise.resolve(
           new Readable({
             objectMode: true,
@@ -455,7 +293,7 @@ describe('copySavedObjectsToSpaces', () => {
 
     const copySavedObjectsToSpaces = copySavedObjectsToSpacesFactory(
       savedObjects,
-      () => 1000,
+      () => EXPORT_LIMIT,
       request
     );
 
@@ -466,12 +304,8 @@ describe('copySavedObjectsToSpaces', () => {
         {
           includeReferences: true,
           overwrite: true,
-          objects: [
-            {
-              type: 'dashboard',
-              id: 'my-dashboard',
-            },
-          ],
+          objects: [{ type: 'dashboard', id: 'my-dashboard' }],
+          createNewCopies: false,
         }
       )
     ).rejects.toThrowErrorMatchingInlineSnapshot(
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts
index dca6f2a6206ab..5575052d7bbb8 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/copy_to_spaces.ts
@@ -12,11 +12,11 @@ import {
 } from '../../../../../../src/core/server';
 import { spaceIdToNamespace } from '../utils/namespace';
 import { CopyOptions, CopyResponse } from './types';
-import { getEligibleTypes } from './lib/get_eligible_types';
 import { createReadableStreamFromArray } from './lib/readable_stream_from_array';
 import { createEmptyFailureResponse } from './lib/create_empty_failure_response';
 import { readStreamToCompletion } from './lib/read_stream_to_completion';
 import { COPY_TO_SPACES_SAVED_OBJECTS_CLIENT_OPTS } from './lib/saved_objects_client_opts';
+import { getIneligibleTypes } from './lib/get_ineligible_types';
 
 export function copySavedObjectsToSpacesFactory(
   savedObjects: CoreStart['savedObjects'],
@@ -27,8 +27,6 @@ export function copySavedObjectsToSpacesFactory(
 
   const savedObjectsClient = getScopedClient(request, COPY_TO_SPACES_SAVED_OBJECTS_CLIENT_OPTS);
 
-  const eligibleTypes = getEligibleTypes(getTypeRegistry());
-
   const exportRequestedObjects = async (
     sourceSpaceId: string,
     options: Pick<CopyOptions, 'includeReferences' | 'objects'>
@@ -56,13 +54,15 @@ export function copySavedObjectsToSpacesFactory(
         objectLimit: getImportExportObjectLimit(),
         overwrite: options.overwrite,
         savedObjectsClient,
-        supportedTypes: eligibleTypes,
+        typeRegistry: getTypeRegistry(),
         readStream: objectsStream,
+        createNewCopies: options.createNewCopies,
       });
 
       return {
         success: importResponse.success,
         successCount: importResponse.successCount,
+        successResults: importResponse.successResults,
         errors: importResponse.errors,
       };
     } catch (error) {
@@ -78,11 +78,15 @@ export function copySavedObjectsToSpacesFactory(
     const response: CopyResponse = {};
 
     const exportedSavedObjects = await exportRequestedObjects(sourceSpaceId, options);
+    const ineligibleTypes = getIneligibleTypes(getTypeRegistry());
+    const filteredObjects = exportedSavedObjects.filter(
+      ({ type }) => !ineligibleTypes.includes(type)
+    );
 
     for (const spaceId of destinationSpaceIds) {
       response[spaceId] = await importObjectsToSpace(
         spaceId,
-        createReadableStreamFromArray(exportedSavedObjects),
+        createReadableStreamFromArray(filteredObjects),
         options
       );
     }
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_eligible_types.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_eligible_types.ts
deleted file mode 100644
index e5f2c5b18bd00..0000000000000
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_eligible_types.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { SavedObjectTypeRegistry } from 'src/core/server';
-
-export function getEligibleTypes(
-  typeRegistry: Pick<SavedObjectTypeRegistry, 'getAllTypes' | 'isNamespaceAgnostic'>
-) {
-  return typeRegistry
-    .getAllTypes()
-    .filter((type) => !typeRegistry.isNamespaceAgnostic(type.name))
-    .map((type) => type.name);
-}
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts
new file mode 100644
index 0000000000000..91d4cb13b98eb
--- /dev/null
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/lib/get_ineligible_types.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObjectTypeRegistry } from 'src/core/server';
+
+/**
+ * This function returns any importable/exportable saved object types that are namespace-agnostic. Even if these are eligible for
+ * import/export, we should not include them in the copy operation because it will result in a conflict that needs to overwrite itself to be
+ * resolved.
+ */
+export function getIneligibleTypes(
+  typeRegistry: Pick<
+    SavedObjectTypeRegistry,
+    'getImportableAndExportableTypes' | 'isNamespaceAgnostic'
+  >
+) {
+  return typeRegistry
+    .getImportableAndExportableTypes()
+    .filter((type) => typeRegistry.isNamespaceAgnostic(type.name))
+    .map((type) => type.name);
+}
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
index 7bb4c61ed51a0..6a77bf7397cb5 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.test.ts
@@ -3,13 +3,19 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { Readable } from 'stream';
 import {
   SavedObjectsImportResponse,
   SavedObjectsResolveImportErrorsOptions,
   SavedObjectsExportOptions,
+  SavedObjectsImportSuccess,
 } from 'src/core/server';
-import { coreMock, savedObjectsTypeRegistryMock, httpServerMock } from 'src/core/server/mocks';
-import { Readable } from 'stream';
+import {
+  coreMock,
+  httpServerMock,
+  savedObjectsTypeRegistryMock,
+  savedObjectsClientMock,
+} from 'src/core/server/mocks';
 import { resolveCopySavedObjectsToSpacesConflictsFactory } from './resolve_copy_conflicts';
 
 jest.mock('../../../../../../src/core/server', () => {
@@ -31,6 +37,8 @@ interface SetupOpts {
   ) => Promise<SavedObjectsImportResponse>;
 }
 
+const EXPORT_LIMIT = 1000;
+
 const expectStreamToContainObjects = async (
   stream: Readable,
   expectedObjects: SetupOpts['objects']
@@ -50,23 +58,28 @@ const expectStreamToContainObjects = async (
 };
 
 describe('resolveCopySavedObjectsToSpacesConflicts', () => {
+  const mockExportResults = [
+    { type: 'dashboard', id: 'my-dashboard', attributes: {} },
+    { type: 'visualization', id: 'my-viz', attributes: {} },
+    { type: 'index-pattern', id: 'my-index-pattern', attributes: {} },
+  ];
+
   const setup = (setupOpts: SetupOpts) => {
     const coreStart = coreMock.createStart();
 
+    const savedObjectsClient = savedObjectsClientMock.create();
     const typeRegistry = savedObjectsTypeRegistryMock.create();
-    typeRegistry.getAllTypes.mockReturnValue([
+    coreStart.savedObjects.getScopedClient.mockReturnValue(savedObjectsClient);
+    coreStart.savedObjects.getTypeRegistry.mockReturnValue(typeRegistry);
+
+    typeRegistry.getImportableAndExportableTypes.mockReturnValue([
+      // don't need to include all types, just need a positive case (agnostic) and a negative case (non-agnostic)
       {
         name: 'dashboard',
         namespaceType: 'single',
         hidden: false,
         mappings: { properties: {} },
       },
-      {
-        name: 'visualization',
-        namespaceType: 'single',
-        hidden: false,
-        mappings: { properties: {} },
-      },
       {
         name: 'globaltype',
         namespaceType: 'agnostic',
@@ -74,13 +87,12 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
         mappings: { properties: {} },
       },
     ]);
-
     typeRegistry.isNamespaceAgnostic.mockImplementation((type: string) =>
-      typeRegistry.getAllTypes().some((t) => t.name === type && t.namespaceType === 'agnostic')
+      typeRegistry
+        .getImportableAndExportableTypes()
+        .some((t) => t.name === type && t.namespaceType === 'agnostic')
     );
 
-    coreStart.savedObjects.getTypeRegistry.mockReturnValue(typeRegistry);
-
     (exportSavedObjectsToStream as jest.Mock).mockImplementation(
       async (opts: SavedObjectsExportOptions) => {
         return (
@@ -100,11 +112,16 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
     (resolveSavedObjectsImportErrors as jest.Mock).mockImplementation(
       async (opts: SavedObjectsResolveImportErrorsOptions) => {
         const defaultImpl = async () => {
-          await expectStreamToContainObjects(opts.readStream, setupOpts.objects);
+          // namespace-agnostic types should be filtered out before import
+          const filteredObjects = setupOpts.objects.filter(({ type }) => type !== 'globaltype');
+          await expectStreamToContainObjects(opts.readStream, filteredObjects);
 
           const response: SavedObjectsImportResponse = {
             success: true,
-            successCount: setupOpts.objects.length,
+            successCount: filteredObjects.length,
+            successResults: [
+              ('Some success(es) occurred!' as unknown) as SavedObjectsImportSuccess,
+            ],
           };
 
           return response;
@@ -116,290 +133,100 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
 
     return {
       savedObjects: coreStart.savedObjects,
+      savedObjectsClient,
+      typeRegistry,
     };
   };
 
   it('uses the Saved Objects Service to perform an export followed by a series of conflict resolution calls', async () => {
-    const { savedObjects } = setup({
-      objects: [
-        {
-          type: 'dashboard',
-          id: 'my-dashboard',
-          attributes: {},
-        },
-        {
-          type: 'visualization',
-          id: 'my-viz',
-          attributes: {},
-        },
-        {
-          type: 'index-pattern',
-          id: 'my-index-pattern',
-          attributes: {},
-        },
-      ],
+    const { savedObjects, savedObjectsClient, typeRegistry } = setup({
+      objects: mockExportResults,
     });
 
     const request = httpServerMock.createKibanaRequest();
 
     const resolveCopySavedObjectsToSpacesConflicts = resolveCopySavedObjectsToSpacesConflictsFactory(
       savedObjects,
-      () => 1000,
+      () => EXPORT_LIMIT,
       request
     );
 
-    const result = await resolveCopySavedObjectsToSpacesConflicts('sourceSpace', {
+    const namespace = 'sourceSpace';
+    const objects = [{ type: 'dashboard', id: 'my-dashboard' }];
+    const retries = {
+      destination1: [{ type: 'visualization', id: 'my-visualization', overwrite: true }],
+      destination2: [{ type: 'visualization', id: 'my-visualization', overwrite: false }],
+    };
+    const result = await resolveCopySavedObjectsToSpacesConflicts(namespace, {
       includeReferences: true,
-      objects: [
-        {
-          type: 'dashboard',
-          id: 'my-dashboard',
-        },
-      ],
-      retries: {
-        destination1: [
-          {
-            type: 'visualization',
-            id: 'my-visualization',
-            overwrite: true,
-          },
-        ],
-        destination2: [
-          {
-            type: 'visualization',
-            id: 'my-visualization',
-            overwrite: false,
-          },
-        ],
-      },
+      objects,
+      retries,
+      createNewCopies: false,
     });
 
     expect(result).toMatchInlineSnapshot(`
-                                                Object {
-                                                  "destination1": Object {
-                                                    "errors": undefined,
-                                                    "success": true,
-                                                    "successCount": 3,
-                                                  },
-                                                  "destination2": Object {
-                                                    "errors": undefined,
-                                                    "success": true,
-                                                    "successCount": 3,
-                                                  },
-                                                }
-                                `);
-
-    expect((exportSavedObjectsToStream as jest.Mock).mock.calls).toMatchInlineSnapshot(`
-      Array [
-        Array [
-          Object {
-            "excludeExportDetails": true,
-            "exportSizeLimit": 1000,
-            "includeReferencesDeep": true,
-            "namespace": "sourceSpace",
-            "objects": Array [
-              Object {
-                "id": "my-dashboard",
-                "type": "dashboard",
-              },
-            ],
-            "savedObjectsClient": Object {
-              "addToNamespaces": [MockFunction],
-              "bulkCreate": [MockFunction],
-              "bulkGet": [MockFunction],
-              "bulkUpdate": [MockFunction],
-              "create": [MockFunction],
-              "delete": [MockFunction],
-              "deleteFromNamespaces": [MockFunction],
-              "errors": [Function],
-              "find": [MockFunction],
-              "get": [MockFunction],
-              "update": [MockFunction],
-            },
-          },
-        ],
-      ]
+      Object {
+        "destination1": Object {
+          "errors": undefined,
+          "success": true,
+          "successCount": 3,
+          "successResults": Array [
+            "Some success(es) occurred!",
+          ],
+        },
+        "destination2": Object {
+          "errors": undefined,
+          "success": true,
+          "successCount": 3,
+          "successResults": Array [
+            "Some success(es) occurred!",
+          ],
+        },
+      }
     `);
 
-    expect((resolveSavedObjectsImportErrors as jest.Mock).mock.calls).toMatchInlineSnapshot(`
-      Array [
-        Array [
-          Object {
-            "namespace": "destination1",
-            "objectLimit": 1000,
-            "readStream": Readable {
-              "_events": Object {
-                "data": [Function],
-                "end": [Function],
-                "error": [Function],
-              },
-              "_eventsCount": 3,
-              "_maxListeners": undefined,
-              "_read": [Function],
-              "_readableState": ReadableState {
-                "autoDestroy": false,
-                "awaitDrain": 0,
-                "buffer": BufferList {
-                  "head": null,
-                  "length": 0,
-                  "tail": null,
-                },
-                "decoder": null,
-                "defaultEncoding": "utf8",
-                "destroyed": false,
-                "emitClose": true,
-                "emittedReadable": false,
-                "encoding": null,
-                "endEmitted": true,
-                "ended": true,
-                "flowing": true,
-                "highWaterMark": 16,
-                "length": 0,
-                "needReadable": false,
-                "objectMode": true,
-                "paused": false,
-                "pipes": null,
-                "pipesCount": 0,
-                "readableListening": false,
-                "reading": false,
-                "readingMore": false,
-                "resumeScheduled": false,
-                "sync": false,
-              },
-              "readable": false,
-            },
-            "retries": Array [
-              Object {
-                "id": "my-visualization",
-                "overwrite": true,
-                "replaceReferences": Array [],
-                "type": "visualization",
-              },
-            ],
-            "savedObjectsClient": Object {
-              "addToNamespaces": [MockFunction],
-              "bulkCreate": [MockFunction],
-              "bulkGet": [MockFunction],
-              "bulkUpdate": [MockFunction],
-              "create": [MockFunction],
-              "delete": [MockFunction],
-              "deleteFromNamespaces": [MockFunction],
-              "errors": [Function],
-              "find": [MockFunction],
-              "get": [MockFunction],
-              "update": [MockFunction],
-            },
-            "supportedTypes": Array [
-              "dashboard",
-              "visualization",
-            ],
-          },
-        ],
-        Array [
-          Object {
-            "namespace": "destination2",
-            "objectLimit": 1000,
-            "readStream": Readable {
-              "_events": Object {
-                "data": [Function],
-                "end": [Function],
-                "error": [Function],
-              },
-              "_eventsCount": 3,
-              "_maxListeners": undefined,
-              "_read": [Function],
-              "_readableState": ReadableState {
-                "autoDestroy": false,
-                "awaitDrain": 0,
-                "buffer": BufferList {
-                  "head": null,
-                  "length": 0,
-                  "tail": null,
-                },
-                "decoder": null,
-                "defaultEncoding": "utf8",
-                "destroyed": false,
-                "emitClose": true,
-                "emittedReadable": false,
-                "encoding": null,
-                "endEmitted": true,
-                "ended": true,
-                "flowing": true,
-                "highWaterMark": 16,
-                "length": 0,
-                "needReadable": false,
-                "objectMode": true,
-                "paused": false,
-                "pipes": null,
-                "pipesCount": 0,
-                "readableListening": false,
-                "reading": false,
-                "readingMore": false,
-                "resumeScheduled": false,
-                "sync": false,
-              },
-              "readable": false,
-            },
-            "retries": Array [
-              Object {
-                "id": "my-visualization",
-                "overwrite": false,
-                "replaceReferences": Array [],
-                "type": "visualization",
-              },
-            ],
-            "savedObjectsClient": Object {
-              "addToNamespaces": [MockFunction],
-              "bulkCreate": [MockFunction],
-              "bulkGet": [MockFunction],
-              "bulkUpdate": [MockFunction],
-              "create": [MockFunction],
-              "delete": [MockFunction],
-              "deleteFromNamespaces": [MockFunction],
-              "errors": [Function],
-              "find": [MockFunction],
-              "get": [MockFunction],
-              "update": [MockFunction],
-            },
-            "supportedTypes": Array [
-              "dashboard",
-              "visualization",
-            ],
-          },
-        ],
-      ]
-    `);
+    expect(exportSavedObjectsToStream).toHaveBeenCalledWith({
+      excludeExportDetails: true,
+      exportSizeLimit: EXPORT_LIMIT,
+      includeReferencesDeep: true,
+      namespace,
+      objects,
+      savedObjectsClient,
+    });
+
+    const importOptions = {
+      createNewCopies: false,
+      objectLimit: EXPORT_LIMIT,
+      readStream: expect.any(Readable),
+      savedObjectsClient,
+      typeRegistry,
+    };
+    expect(resolveSavedObjectsImportErrors).toHaveBeenNthCalledWith(1, {
+      ...importOptions,
+      namespace: 'destination1',
+      retries: [{ ...retries.destination1[0], replaceReferences: [] }],
+    });
+    expect(resolveSavedObjectsImportErrors).toHaveBeenNthCalledWith(2, {
+      ...importOptions,
+      namespace: 'destination2',
+      retries: [{ ...retries.destination2[0], replaceReferences: [] }],
+    });
   });
 
   it(`doesn't stop resolution if some spaces fail`, async () => {
-    const objects = [
-      {
-        type: 'dashboard',
-        id: 'my-dashboard',
-        attributes: {},
-      },
-      {
-        type: 'visualization',
-        id: 'my-viz',
-        attributes: {},
-      },
-      {
-        type: 'index-pattern',
-        id: 'my-index-pattern',
-        attributes: {},
-      },
-    ];
-
     const { savedObjects } = setup({
-      objects,
+      objects: mockExportResults,
       resolveSavedObjectsImportErrorsImpl: async (opts) => {
         if (opts.namespace === 'failure-space') {
           throw new Error(`Some error occurred!`);
         }
-        await expectStreamToContainObjects(opts.readStream, objects);
+        // namespace-agnostic types should be filtered out before import
+        const filteredObjects = mockExportResults.filter(({ type }) => type !== 'globaltype');
+        await expectStreamToContainObjects(opts.readStream, filteredObjects);
         return Promise.resolve({
           success: true,
-          successCount: 3,
+          successCount: filteredObjects.length,
+          successResults: [('Some success(es) occurred!' as unknown) as SavedObjectsImportSuccess],
         });
       },
     });
@@ -408,64 +235,50 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
 
     const resolveCopySavedObjectsToSpacesConflicts = resolveCopySavedObjectsToSpacesConflictsFactory(
       savedObjects,
-      () => 1000,
+      () => EXPORT_LIMIT,
       request
     );
 
     const result = await resolveCopySavedObjectsToSpacesConflicts('sourceSpace', {
       includeReferences: true,
-      objects: [
-        {
-          type: 'dashboard',
-          id: 'my-dashboard',
-        },
-      ],
+      objects: [{ type: 'dashboard', id: 'my-dashboard' }],
       retries: {
-        ['failure-space']: [
-          {
-            type: 'visualization',
-            id: 'my-visualization',
-            overwrite: true,
-          },
-        ],
+        ['failure-space']: [{ type: 'visualization', id: 'my-visualization', overwrite: true }],
         ['non-existent-space']: [
-          {
-            type: 'visualization',
-            id: 'my-visualization',
-            overwrite: false,
-          },
-        ],
-        ['marketing']: [
-          {
-            type: 'visualization',
-            id: 'my-visualization',
-            overwrite: true,
-          },
+          { type: 'visualization', id: 'my-visualization', overwrite: false },
         ],
+        marketing: [{ type: 'visualization', id: 'my-visualization', overwrite: true }],
       },
+      createNewCopies: false,
     });
 
     expect(result).toMatchInlineSnapshot(`
-                  Object {
-                    "failure-space": Object {
-                      "errors": Array [
-                        [Error: Some error occurred!],
-                      ],
-                      "success": false,
-                      "successCount": 0,
-                    },
-                    "marketing": Object {
-                      "errors": undefined,
-                      "success": true,
-                      "successCount": 3,
-                    },
-                    "non-existent-space": Object {
-                      "errors": undefined,
-                      "success": true,
-                      "successCount": 3,
-                    },
-                  }
-            `);
+      Object {
+        "failure-space": Object {
+          "errors": Array [
+            [Error: Some error occurred!],
+          ],
+          "success": false,
+          "successCount": 0,
+        },
+        "marketing": Object {
+          "errors": undefined,
+          "success": true,
+          "successCount": 3,
+          "successResults": Array [
+            "Some success(es) occurred!",
+          ],
+        },
+        "non-existent-space": Object {
+          "errors": undefined,
+          "success": true,
+          "successCount": 3,
+          "successResults": Array [
+            "Some success(es) occurred!",
+          ],
+        },
+      }
+    `);
   });
 
   it(`handles stream read errors`, async () => {
@@ -487,7 +300,7 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
 
     const resolveCopySavedObjectsToSpacesConflicts = resolveCopySavedObjectsToSpacesConflictsFactory(
       savedObjects,
-      () => 1000,
+      () => EXPORT_LIMIT,
       request
     );
 
@@ -496,6 +309,7 @@ describe('resolveCopySavedObjectsToSpacesConflicts', () => {
         includeReferences: true,
         objects: [],
         retries: {},
+        createNewCopies: false,
       })
     ).rejects.toThrowErrorMatchingInlineSnapshot(
       `"Something went wrong while reading this stream"`
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts
index a355d19b305a3..d433712bb9412 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/resolve_copy_conflicts.ts
@@ -5,18 +5,18 @@
  */
 
 import { Readable } from 'stream';
-import { SavedObject, CoreStart, KibanaRequest } from 'src/core/server';
+import { SavedObject, CoreStart, KibanaRequest, SavedObjectsImportRetry } from 'src/core/server';
 import {
   exportSavedObjectsToStream,
   resolveSavedObjectsImportErrors,
 } from '../../../../../../src/core/server';
 import { spaceIdToNamespace } from '../utils/namespace';
 import { CopyOptions, ResolveConflictsOptions, CopyResponse } from './types';
-import { getEligibleTypes } from './lib/get_eligible_types';
 import { createEmptyFailureResponse } from './lib/create_empty_failure_response';
 import { readStreamToCompletion } from './lib/read_stream_to_completion';
 import { createReadableStreamFromArray } from './lib/readable_stream_from_array';
 import { COPY_TO_SPACES_SAVED_OBJECTS_CLIENT_OPTS } from './lib/saved_objects_client_opts';
+import { getIneligibleTypes } from './lib/get_ineligible_types';
 
 export function resolveCopySavedObjectsToSpacesConflictsFactory(
   savedObjects: CoreStart['savedObjects'],
@@ -27,8 +27,6 @@ export function resolveCopySavedObjectsToSpacesConflictsFactory(
 
   const savedObjectsClient = getScopedClient(request, COPY_TO_SPACES_SAVED_OBJECTS_CLIENT_OPTS);
 
-  const eligibleTypes = getEligibleTypes(getTypeRegistry());
-
   const exportRequestedObjects = async (
     sourceSpaceId: string,
     options: Pick<CopyOptions, 'includeReferences' | 'objects'>
@@ -47,26 +45,24 @@ export function resolveCopySavedObjectsToSpacesConflictsFactory(
   const resolveConflictsForSpace = async (
     spaceId: string,
     objectsStream: Readable,
-    retries: Array<{
-      type: string;
-      id: string;
-      overwrite: boolean;
-      replaceReferences: Array<{ type: string; from: string; to: string }>;
-    }>
+    retries: SavedObjectsImportRetry[],
+    createNewCopies: boolean
   ) => {
     try {
       const importResponse = await resolveSavedObjectsImportErrors({
         namespace: spaceIdToNamespace(spaceId),
         objectLimit: getImportExportObjectLimit(),
         savedObjectsClient,
-        supportedTypes: eligibleTypes,
+        typeRegistry: getTypeRegistry(),
         readStream: objectsStream,
         retries,
+        createNewCopies,
       });
 
       return {
         success: importResponse.success,
         successCount: importResponse.successCount,
+        successResults: importResponse.successResults,
         errors: importResponse.errors,
       };
     } catch (error) {
@@ -84,6 +80,10 @@ export function resolveCopySavedObjectsToSpacesConflictsFactory(
       includeReferences: options.includeReferences,
       objects: options.objects,
     });
+    const ineligibleTypes = getIneligibleTypes(getTypeRegistry());
+    const filteredObjects = exportedSavedObjects.filter(
+      ({ type }) => !ineligibleTypes.includes(type)
+    );
 
     for (const entry of Object.entries(options.retries)) {
       const [spaceId, entryRetries] = entry;
@@ -92,8 +92,9 @@ export function resolveCopySavedObjectsToSpacesConflictsFactory(
 
       response[spaceId] = await resolveConflictsForSpace(
         spaceId,
-        createReadableStreamFromArray(exportedSavedObjects),
-        retries
+        createReadableStreamFromArray(filteredObjects),
+        retries,
+        options.createNewCopies
       );
     }
 
diff --git a/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts b/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts
index 1bbe5aa6625b0..8d4169f972795 100644
--- a/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts
+++ b/x-pack/plugins/spaces/server/lib/copy_to_spaces/types.ts
@@ -5,26 +5,33 @@
  */
 
 import { Payload } from 'boom';
-import { SavedObjectsImportError } from 'src/core/server';
+import {
+  SavedObjectsImportSuccess,
+  SavedObjectsImportError,
+  SavedObjectsImportRetry,
+} from 'src/core/server';
 
 export interface CopyOptions {
   objects: Array<{ type: string; id: string }>;
   overwrite: boolean;
   includeReferences: boolean;
+  createNewCopies: boolean;
 }
 
 export interface ResolveConflictsOptions {
   objects: Array<{ type: string; id: string }>;
   includeReferences: boolean;
   retries: {
-    [spaceId: string]: Array<{ type: string; id: string; overwrite: boolean }>;
+    [spaceId: string]: Array<Omit<SavedObjectsImportRetry, 'replaceReferences'>>;
   };
+  createNewCopies: boolean;
 }
 
 export interface CopyResponse {
   [spaceId: string]: {
     success: boolean;
     successCount: number;
+    successResults?: SavedObjectsImportSuccess[];
     errors?: Array<SavedObjectsImportError | Payload>;
   };
 }
diff --git a/x-pack/plugins/spaces/server/lib/spaces_client/__snapshots__/spaces_client.test.ts.snap b/x-pack/plugins/spaces/server/lib/spaces_client/__snapshots__/spaces_client.test.ts.snap
index c2df94a0a2936..9544d7e8bb481 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_client/__snapshots__/spaces_client.test.ts.snap
+++ b/x-pack/plugins/spaces/server/lib/spaces_client/__snapshots__/spaces_client.test.ts.snap
@@ -28,6 +28,8 @@ exports[`#getAll useRbacForRequest is true with purpose='copySavedObjectsIntoSpa
 
 exports[`#getAll useRbacForRequest is true with purpose='findSavedObjects' throws Boom.forbidden when user isn't authorized for any spaces 1`] = `"Forbidden"`;
 
+exports[`#getAll useRbacForRequest is true with purpose='shareSavedObjectsIntoSpace' throws Boom.forbidden when user isn't authorized for any spaces 1`] = `"Forbidden"`;
+
 exports[`#getAll useRbacForRequest is true with purpose='undefined' throws Boom.forbidden when user isn't authorized for any spaces 1`] = `"Forbidden"`;
 
 exports[`#update useRbacForRequest is true throws Boom.forbidden when user isn't authorized at space 1`] = `"Unauthorized to update spaces"`;
diff --git a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts
index 61b1985c5a0b9..90ce2b01bfd20 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.test.ts
@@ -242,6 +242,11 @@ describe('#getAll', () => {
         expectedPrivilege: (mockAuthorization: SecurityPluginSetup['authz']) =>
           mockAuthorization.actions.savedObject.get('config', 'find'),
       },
+      {
+        purpose: 'shareSavedObjectsIntoSpace' as GetSpacePurpose,
+        expectedPrivilege: (mockAuthorization: SecurityPluginSetup['authz']) =>
+          mockAuthorization.actions.ui.get('savedObjectsManagement', 'shareIntoSpace'),
+      },
     ].forEach((scenario) => {
       describe(`with purpose='${scenario.purpose}'`, () => {
         test(`throws Boom.forbidden when user isn't authorized for any spaces`, async () => {
diff --git a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts
index dd2e0d40f31ed..b1d6e3200ab3a 100644
--- a/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts
+++ b/x-pack/plugins/spaces/server/lib/spaces_client/spaces_client.ts
@@ -17,6 +17,7 @@ const SUPPORTED_GET_SPACE_PURPOSES: GetSpacePurpose[] = [
   'any',
   'copySavedObjectsIntoSpace',
   'findSavedObjects',
+  'shareSavedObjectsIntoSpace',
 ];
 
 const PURPOSE_PRIVILEGE_MAP: Record<
@@ -30,6 +31,9 @@ const PURPOSE_PRIVILEGE_MAP: Record<
   findSavedObjects: (authorization) => {
     return [authorization.actions.savedObject.get('config', 'find')];
   },
+  shareSavedObjectsIntoSpace: (authorization) => [
+    authorization.actions.ui.get('savedObjectsManagement', 'shareIntoSpace'),
+  ],
 };
 
 export class SpacesClient {
diff --git a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts
index 034d212a33035..ce93591f492f1 100644
--- a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts
+++ b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_mock_so_service.ts
@@ -43,41 +43,6 @@ export const createMockSavedObjectsService = (spaces: any[] = []) => {
   const { savedObjects } = coreMock.createStart();
 
   const typeRegistry = savedObjectsTypeRegistryMock.create();
-  typeRegistry.getAllTypes.mockReturnValue([
-    {
-      name: 'visualization',
-      namespaceType: 'single',
-      hidden: false,
-      mappings: { properties: {} },
-    },
-    {
-      name: 'dashboard',
-      namespaceType: 'single',
-      hidden: false,
-      mappings: { properties: {} },
-    },
-    {
-      name: 'index-pattern',
-      namespaceType: 'single',
-      hidden: false,
-      mappings: { properties: {} },
-    },
-    {
-      name: 'globalType',
-      namespaceType: 'agnostic',
-      hidden: false,
-      mappings: { properties: {} },
-    },
-    {
-      name: 'space',
-      namespaceType: 'agnostic',
-      hidden: true,
-      mappings: { properties: {} },
-    },
-  ]);
-  typeRegistry.isNamespaceAgnostic.mockImplementation((type: string) =>
-    typeRegistry.getAllTypes().some((t) => t.name === type && t.namespaceType === 'agnostic')
-  );
   savedObjects.getTypeRegistry.mockReturnValue(typeRegistry);
 
   savedObjects.getScopedClient.mockReturnValue(mockSavedObjectsClientContract);
diff --git a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
index b604554cbc59a..bec3a5dcb0b71 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.test.ts
@@ -191,54 +191,35 @@ describe('copy to space', () => {
       );
     });
 
-    it(`requires objects to be unique`, async () => {
+    it(`does not allow "overwrite" to be used with "createNewCopies"`, async () => {
       const payload = {
         spaces: ['a-space'],
-        objects: [
-          { type: 'foo', id: 'bar' },
-          { type: 'foo', id: 'bar' },
-        ],
+        objects: [{ type: 'foo', id: 'bar' }],
+        overwrite: true,
+        createNewCopies: true,
       };
 
       const { copyToSpace } = await setup();
 
       expect(() =>
         (copyToSpace.routeValidation.body as ObjectType).validate(payload)
-      ).toThrowErrorMatchingInlineSnapshot(`"[objects]: duplicate objects are not allowed"`);
+      ).toThrowErrorMatchingInlineSnapshot(`"cannot use [overwrite] with [createNewCopies]"`);
     });
 
-    it('does not allow namespace agnostic types to be copied (via "supportedTypes" property)', async () => {
+    it(`requires objects to be unique`, async () => {
       const payload = {
         spaces: ['a-space'],
         objects: [
-          { type: 'globalType', id: 'bar' },
-          { type: 'visualization', id: 'bar' },
+          { type: 'foo', id: 'bar' },
+          { type: 'foo', id: 'bar' },
         ],
       };
 
       const { copyToSpace } = await setup();
 
-      const request = httpServerMock.createKibanaRequest({
-        body: payload,
-        method: 'post',
-      });
-
-      const response = await copyToSpace.routeHandler(
-        mockRouteContext,
-        request,
-        kibanaResponseFactory
-      );
-
-      const { status } = response;
-
-      expect(status).toEqual(200);
-      expect(importSavedObjectsFromStream).toHaveBeenCalledTimes(1);
-      const [importCallOptions] = (importSavedObjectsFromStream as jest.Mock).mock.calls[0];
-
-      expect(importCallOptions).toMatchObject({
-        namespace: 'a-space',
-        supportedTypes: ['visualization', 'dashboard', 'index-pattern'],
-      });
+      expect(() =>
+        (copyToSpace.routeValidation.body as ObjectType).validate(payload)
+      ).toThrowErrorMatchingInlineSnapshot(`"[objects]: duplicate objects are not allowed"`);
     });
 
     it('copies to multiple spaces', async () => {
@@ -365,58 +346,6 @@ describe('copy to space', () => {
       );
     });
 
-    it('does not allow namespace agnostic types to be copied (via "supportedTypes" property)', async () => {
-      const payload = {
-        retries: {
-          ['a-space']: [
-            {
-              type: 'visualization',
-              id: 'bar',
-              overwrite: true,
-            },
-            {
-              type: 'globalType',
-              id: 'bar',
-              overwrite: true,
-            },
-          ],
-        },
-        objects: [
-          {
-            type: 'globalType',
-            id: 'bar',
-          },
-          { type: 'visualization', id: 'bar' },
-        ],
-      };
-
-      const { resolveConflicts } = await setup();
-
-      const request = httpServerMock.createKibanaRequest({
-        body: payload,
-        method: 'post',
-      });
-
-      const response = await resolveConflicts.routeHandler(
-        mockRouteContext,
-        request,
-        kibanaResponseFactory
-      );
-
-      const { status } = response;
-
-      expect(status).toEqual(200);
-      expect(resolveSavedObjectsImportErrors).toHaveBeenCalledTimes(1);
-      const [
-        resolveImportErrorsCallOptions,
-      ] = (resolveSavedObjectsImportErrors as jest.Mock).mock.calls[0];
-
-      expect(resolveImportErrorsCallOptions).toMatchObject({
-        namespace: 'a-space',
-        supportedTypes: ['visualization', 'dashboard', 'index-pattern'],
-      });
-    });
-
     it('resolves conflicts for multiple spaces', async () => {
       const payload = {
         objects: [{ type: 'visualization', id: 'bar' }],
@@ -459,19 +388,13 @@ describe('copy to space', () => {
         resolveImportErrorsFirstCallOptions,
       ] = (resolveSavedObjectsImportErrors as jest.Mock).mock.calls[0];
 
-      expect(resolveImportErrorsFirstCallOptions).toMatchObject({
-        namespace: 'a-space',
-        supportedTypes: ['visualization', 'dashboard', 'index-pattern'],
-      });
+      expect(resolveImportErrorsFirstCallOptions).toMatchObject({ namespace: 'a-space' });
 
       const [
         resolveImportErrorsSecondCallOptions,
       ] = (resolveSavedObjectsImportErrors as jest.Mock).mock.calls[1];
 
-      expect(resolveImportErrorsSecondCallOptions).toMatchObject({
-        namespace: 'b-space',
-        supportedTypes: ['visualization', 'dashboard', 'index-pattern'],
-      });
+      expect(resolveImportErrorsSecondCallOptions).toMatchObject({ namespace: 'b-space' });
     });
   });
 });
diff --git a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts
index 87c2fee4ea9bf..fef1646067fde 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/copy_to_space.ts
@@ -30,39 +30,49 @@ export function initCopyToSpacesApi(deps: ExternalRouteDeps) {
         tags: ['access:copySavedObjectsToSpaces'],
       },
       validate: {
-        body: schema.object({
-          spaces: schema.arrayOf(
-            schema.string({
-              validate: (value) => {
-                if (!SPACE_ID_REGEX.test(value)) {
-                  return `lower case, a-z, 0-9, "_", and "-" are allowed`;
-                }
-              },
-            }),
-            {
-              validate: (spaceIds) => {
-                if (_.uniq(spaceIds).length !== spaceIds.length) {
-                  return 'duplicate space ids are not allowed';
-                }
-              },
-            }
-          ),
-          objects: schema.arrayOf(
-            schema.object({
-              type: schema.string(),
-              id: schema.string(),
-            }),
-            {
-              validate: (objects) => {
-                if (!areObjectsUnique(objects)) {
-                  return 'duplicate objects are not allowed';
-                }
-              },
-            }
-          ),
-          includeReferences: schema.boolean({ defaultValue: false }),
-          overwrite: schema.boolean({ defaultValue: false }),
-        }),
+        body: schema.object(
+          {
+            spaces: schema.arrayOf(
+              schema.string({
+                validate: (value) => {
+                  if (!SPACE_ID_REGEX.test(value)) {
+                    return `lower case, a-z, 0-9, "_", and "-" are allowed`;
+                  }
+                },
+              }),
+              {
+                validate: (spaceIds) => {
+                  if (_.uniq(spaceIds).length !== spaceIds.length) {
+                    return 'duplicate space ids are not allowed';
+                  }
+                },
+              }
+            ),
+            objects: schema.arrayOf(
+              schema.object({
+                type: schema.string(),
+                id: schema.string(),
+              }),
+              {
+                validate: (objects) => {
+                  if (!areObjectsUnique(objects)) {
+                    return 'duplicate objects are not allowed';
+                  }
+                },
+              }
+            ),
+            includeReferences: schema.boolean({ defaultValue: false }),
+            overwrite: schema.boolean({ defaultValue: false }),
+            createNewCopies: schema.boolean({ defaultValue: false }),
+          },
+          {
+            validate: (object) => {
+              if (object.overwrite && object.createNewCopies) {
+                return 'cannot use [overwrite] with [createNewCopies]';
+              }
+            },
+          }
+        ),
       },
     },
     createLicensedRouteHandler(async (context, request, response) => {
@@ -73,12 +83,19 @@ export function initCopyToSpacesApi(deps: ExternalRouteDeps) {
         getImportExportObjectLimit,
         request
       );
-      const { spaces: destinationSpaceIds, objects, includeReferences, overwrite } = request.body;
+      const {
+        spaces: destinationSpaceIds,
+        objects,
+        includeReferences,
+        overwrite,
+        createNewCopies,
+      } = request.body;
       const sourceSpaceId = spacesService.getSpaceId(request);
       const copyResponse = await copySavedObjectsToSpaces(sourceSpaceId, destinationSpaceIds, {
         objects,
         includeReferences,
         overwrite,
+        createNewCopies,
       });
       return response.ok({ body: copyResponse });
     })
@@ -105,6 +122,9 @@ export function initCopyToSpacesApi(deps: ExternalRouteDeps) {
                 type: schema.string(),
                 id: schema.string(),
                 overwrite: schema.boolean({ defaultValue: false }),
+                destinationId: schema.maybe(schema.string()),
+                createNewCopy: schema.maybe(schema.boolean()),
+                ignoreMissingReferences: schema.maybe(schema.boolean()),
               })
             )
           ),
@@ -122,6 +142,7 @@ export function initCopyToSpacesApi(deps: ExternalRouteDeps) {
             }
           ),
           includeReferences: schema.boolean({ defaultValue: false }),
+          createNewCopies: schema.boolean({ defaultValue: false }),
         }),
       },
     },
@@ -133,7 +154,7 @@ export function initCopyToSpacesApi(deps: ExternalRouteDeps) {
         getImportExportObjectLimit,
         request
       );
-      const { objects, includeReferences, retries } = request.body;
+      const { objects, includeReferences, retries, createNewCopies } = request.body;
       const sourceSpaceId = spacesService.getSpaceId(request);
       const resolveConflictsResponse = await resolveCopySavedObjectsToSpacesConflicts(
         sourceSpaceId,
@@ -141,6 +162,7 @@ export function initCopyToSpacesApi(deps: ExternalRouteDeps) {
           objects,
           includeReferences,
           retries,
+          createNewCopies,
         }
       );
       return response.ok({ body: resolveConflictsResponse });
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts b/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
index ec841808f771d..a9b701a8ea395 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_all.test.ts
@@ -119,6 +119,22 @@ describe('GET /spaces/space', () => {
     expect(response.payload).toEqual(spaces);
   });
 
+  it(`returns all available spaces with the 'shareSavedObjectsIntoSpace' purpose`, async () => {
+    const { routeHandler } = await setup();
+
+    const request = httpServerMock.createKibanaRequest({
+      query: {
+        purpose: 'shareSavedObjectsIntoSpace',
+      },
+      method: 'get',
+    });
+
+    const response = await routeHandler(mockRouteContext, request, kibanaResponseFactory);
+
+    expect(response.status).toEqual(200);
+    expect(response.payload).toEqual(spaces);
+  });
+
   it(`returns http/403 when the license is invalid`, async () => {
     const { routeHandler } = await setup();
 
diff --git a/x-pack/plugins/spaces/server/routes/api/external/get_all.ts b/x-pack/plugins/spaces/server/routes/api/external/get_all.ts
index cd1e03eb10b0a..088409471fa55 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/get_all.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/get_all.ts
@@ -19,7 +19,11 @@ export function initGetAllSpacesApi(deps: ExternalRouteDeps) {
       validate: {
         query: schema.object({
           purpose: schema.oneOf(
-            [schema.literal('any'), schema.literal('copySavedObjectsIntoSpace')],
+            [
+              schema.literal('any'),
+              schema.literal('copySavedObjectsIntoSpace'),
+              schema.literal('shareSavedObjectsIntoSpace'),
+            ],
             {
               defaultValue: 'any',
             }
diff --git a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
index 51c59212bef16..c9c17d091cd55 100644
--- a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.test.ts
@@ -90,7 +90,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const type = Symbol();
         const id = Symbol();
         const options = Object.freeze({ foo: 'bar' });
-        // @ts-ignore
+        // @ts-expect-error
         const actualReturnValue = await client.get(type, id, options);
 
         expect(actualReturnValue).toBe(expectedReturnValue);
@@ -117,7 +117,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
 
         const objects = [{ type: 'foo' }];
         const options = Object.freeze({ foo: 'bar' });
-        // @ts-ignore
+        // @ts-expect-error
         const actualReturnValue = await client.bulkGet(objects, options);
 
         expect(actualReturnValue).toBe(expectedReturnValue);
@@ -263,6 +263,34 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
       });
     });
 
+    describe('#checkConflicts', () => {
+      test(`throws error if options.namespace is specified`, async () => {
+        const { client } = await createSpacesSavedObjectsClient();
+
+        await expect(
+          // @ts-expect-error
+          client.checkConflicts(null, { namespace: 'bar' })
+        ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
+      });
+
+      test(`supplements options with the current namespace`, async () => {
+        const { client, baseClient } = await createSpacesSavedObjectsClient();
+        const expectedReturnValue = { errors: [] };
+        baseClient.checkConflicts.mockReturnValue(Promise.resolve(expectedReturnValue));
+
+        const objects = Symbol();
+        const options = Object.freeze({ foo: 'bar' });
+        // @ts-expect-error
+        const actualReturnValue = await client.checkConflicts(objects, options);
+
+        expect(actualReturnValue).toBe(expectedReturnValue);
+        expect(baseClient.checkConflicts).toHaveBeenCalledWith(objects, {
+          foo: 'bar',
+          namespace: currentSpace.expectedNamespace,
+        });
+      });
+    });
+
     describe('#create', () => {
       test(`throws error if options.namespace is specified`, async () => {
         const { client } = await createSpacesSavedObjectsClient();
@@ -280,7 +308,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const type = Symbol();
         const attributes = Symbol();
         const options = Object.freeze({ foo: 'bar' });
-        // @ts-ignore
+        // @ts-expect-error
         const actualReturnValue = await client.create(type, attributes, options);
 
         expect(actualReturnValue).toBe(expectedReturnValue);
@@ -307,7 +335,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
 
         const objects = [{ type: 'foo' }];
         const options = Object.freeze({ foo: 'bar' });
-        // @ts-ignore
+        // @ts-expect-error
         const actualReturnValue = await client.bulkCreate(objects, options);
 
         expect(actualReturnValue).toBe(expectedReturnValue);
@@ -323,7 +351,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const { client } = await createSpacesSavedObjectsClient();
 
         await expect(
-          // @ts-ignore
+          // @ts-expect-error
           client.update(null, null, null, { namespace: 'bar' })
         ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
       });
@@ -337,7 +365,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const id = Symbol();
         const attributes = Symbol();
         const options = Object.freeze({ foo: 'bar' });
-        // @ts-ignore
+        // @ts-expect-error
         const actualReturnValue = await client.update(type, id, attributes, options);
 
         expect(actualReturnValue).toBe(expectedReturnValue);
@@ -353,7 +381,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const { client } = await createSpacesSavedObjectsClient();
 
         await expect(
-          // @ts-ignore
+          // @ts-expect-error
           client.bulkUpdate(null, { namespace: 'bar' })
         ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
       });
@@ -387,7 +415,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const { client } = await createSpacesSavedObjectsClient();
 
         await expect(
-          // @ts-ignore
+          // @ts-expect-error
           client.delete(null, null, { namespace: 'bar' })
         ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
       });
@@ -400,7 +428,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const type = Symbol();
         const id = Symbol();
         const options = Object.freeze({ foo: 'bar' });
-        // @ts-ignore
+        // @ts-expect-error
         const actualReturnValue = await client.delete(type, id, options);
 
         expect(actualReturnValue).toBe(expectedReturnValue);
@@ -416,7 +444,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const { client } = await createSpacesSavedObjectsClient();
 
         await expect(
-          // @ts-ignore
+          // @ts-expect-error
           client.addToNamespaces(null, null, null, { namespace: 'bar' })
         ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
       });
@@ -430,7 +458,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const id = Symbol();
         const namespaces = Symbol();
         const options = Object.freeze({ foo: 'bar' });
-        // @ts-ignore
+        // @ts-expect-error
         const actualReturnValue = await client.addToNamespaces(type, id, namespaces, options);
 
         expect(actualReturnValue).toBe(expectedReturnValue);
@@ -446,7 +474,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const { client } = await createSpacesSavedObjectsClient();
 
         await expect(
-          // @ts-ignore
+          // @ts-expect-error
           client.deleteFromNamespaces(null, null, null, { namespace: 'bar' })
         ).rejects.toThrow(ERROR_NAMESPACE_SPECIFIED);
       });
@@ -460,7 +488,7 @@ const ERROR_NAMESPACE_SPECIFIED = 'Spaces currently determines the namespaces';
         const id = Symbol();
         const namespaces = Symbol();
         const options = Object.freeze({ foo: 'bar' });
-        // @ts-ignore
+        // @ts-expect-error
         const actualReturnValue = await client.deleteFromNamespaces(type, id, namespaces, options);
 
         expect(actualReturnValue).toBe(expectedReturnValue);
diff --git a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
index 7e2b302d7cff5..4e830d6149537 100644
--- a/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/spaces_saved_objects_client.ts
@@ -9,6 +9,7 @@ import {
   SavedObjectsBulkCreateObject,
   SavedObjectsBulkGetObject,
   SavedObjectsBulkUpdateObject,
+  SavedObjectsCheckConflictsObject,
   SavedObjectsClientContract,
   SavedObjectsCreateOptions,
   SavedObjectsFindOptions,
@@ -59,6 +60,25 @@ export class SpacesSavedObjectsClient implements SavedObjectsClientContract {
     this.errors = baseClient.errors;
   }
 
+  /**
+   * Check what conflicts will result when creating a given array of saved objects. This includes "unresolvable conflicts", which are
+   * multi-namespace objects that exist in a different namespace; such conflicts cannot be resolved/overwritten.
+   *
+   * @param objects
+   * @param options
+   */
+  public async checkConflicts(
+    objects: SavedObjectsCheckConflictsObject[] = [],
+    options: SavedObjectsBaseOptions = {}
+  ) {
+    throwErrorIfNamespaceSpecified(options);
+
+    return await this.client.checkConflicts(objects, {
+      ...options,
+      namespace: spaceIdToNamespace(this.spaceId),
+    });
+  }
+
   /**
    * Persists an object
    *
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 92cc35e9e78ca..70e2b34d06ce6 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2924,10 +2924,6 @@
     "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage": "失敗したオブジェクトを再試行中…",
     "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage": "保存された検索が正しくリンクされていることを確認してください…",
     "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage": "矛盾を保存中…",
-    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteBody": "{title}を上書きしてよろしいですか？",
-    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteCancelButtonText": "キャンセル",
-    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteOverwriteButtonText": "上書き",
-    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteTitle": "{type}を上書きしますか？",
     "savedObjectsManagement.objectsTable.flyout.errorCalloutTitle": "申し訳ございません、エラーが発生しました",
     "savedObjectsManagement.objectsTable.flyout.import.cancelButtonLabel": "キャンセル",
     "savedObjectsManagement.objectsTable.flyout.import.confirmButtonLabel": "インポート",
@@ -2950,7 +2946,6 @@
     "savedObjectsManagement.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage": "保存されたオブジェクトのファイル形式が無効なため、インポートできません。",
     "savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody": "最新のレポートでNDJSONファイルを作成すれば完了です。",
     "savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle": "JSONファイルのサポートが終了します",
-    "savedObjectsManagement.objectsTable.flyout.overwriteSavedObjectsLabel": "すべての保存されたオブジェクトを自動的に上書きしますか？",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountDescription": "影響されるオブジェクトの数です",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountName": "カウント",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "インデックスパターンのIDです",
@@ -17868,16 +17863,8 @@
     "xpack.spaces.management.confirmDeleteModal.deletingSpaceWarningMessage": "スペースを削除すると、スペースと {allContents} が永久に削除されます。この操作は元に戻すことができません。",
     "xpack.spaces.management.confirmDeleteModal.redirectAfterDeletingCurrentSpaceWarningMessage": "現在のスペース {name} を削除しようとしています。続行すると、別のスペースを選択する画面に移動します。",
     "xpack.spaces.management.confirmDeleteModal.spaceNamesDoNoMatchErrorMessage": "スペース名が一致していません。",
-    "xpack.spaces.management.copyToSpace.actionDescription": "この保存されたオブジェクトを1つまたは複数のスペースにコピーします。",
-    "xpack.spaces.management.copyToSpace.actionTitle": "スペースにコピー",
-    "xpack.spaces.management.copyToSpace.automaticallyOverwrite": "すべての保存されたオブジェクトを自動的に上書き",
-    "xpack.spaces.management.copyToSpace.copyDetail.overwriteButton": "上書き",
-    "xpack.spaces.management.copyToSpace.copyDetail.skipOverwriteButton": "スキップ",
     "xpack.spaces.management.copyToSpace.copyErrorTitle": "保存されたオブジェクトのコピー中にエラーが発生",
-    "xpack.spaces.management.copyToSpace.copyResultsLabel": "コピー結果",
     "xpack.spaces.management.copyToSpace.copyStatus.conflictsMessage": "このスペースには同じID({id})の保存されたオブジェクトが既に存在します。",
-    "xpack.spaces.management.copyToSpace.copyStatus.conflictsOverwriteMessage": "「上書き」をクリックしてこのバージョンをコピーされたバージョンに置き換えます。",
-    "xpack.spaces.management.copyToSpace.copyStatus.pendingOverwriteMessage": "保存されたオブジェクトは上書きされます。「スキップ」をクリックしてこの操作をキャンセルします。",
     "xpack.spaces.management.copyToSpace.copyStatus.successMessage": "保存されたオブジェクトがコピーされました。",
     "xpack.spaces.management.copyToSpace.copyStatus.unresolvableErrorMessage": "この保存されたオブジェクトのコピー中にエラーが発生しました。",
     "xpack.spaces.management.copyToSpace.copyStatusSummary.conflictsMessage": "{space}スペースに1つまたは複数の矛盾が検出されました。解決するにはこのセクションを拡張してください。",
@@ -17885,26 +17872,17 @@
     "xpack.spaces.management.copyToSpace.copyStatusSummary.successMessage": "{space}スペースにコピーされました。",
     "xpack.spaces.management.copyToSpace.copyToSpacesButton": "{spaceCount} {spaceCount, plural, one {スペース} other {スペース}}にコピー",
     "xpack.spaces.management.copyToSpace.disabledCopyToSpacesButton": "コピー",
-    "xpack.spaces.management.copyToSpace.dontIncludeRelatedLabel": "関連性のある保存されたオブジェクトを含みません",
-    "xpack.spaces.management.copyToSpace.dontOverwriteLabel": "保存されたオブジェクトを上書きしません",
     "xpack.spaces.management.copyToSpace.finishCopyToSpacesButton": "終了",
     "xpack.spaces.management.copyToSpace.finishedButtonLabel": "コピーが完了しました。",
-    "xpack.spaces.management.copyToSpace.finishPendingOverwritesCopyToSpacesButton": "{overwriteCount}件のオブジェクトを上書き",
-    "xpack.spaces.management.copyToSpace.includeRelatedFormLabel": "関連性のある保存されたオブジェクトを含みます",
-    "xpack.spaces.management.copyToSpace.includeRelatedLabel": "関連性のある保存されたオブジェクトを含みます",
     "xpack.spaces.management.copyToSpace.inProgressButtonLabel": "コピーが進行中です。お待ちください。",
     "xpack.spaces.management.copyToSpace.noSpacesBody": "コピーできるスペースがありません。",
     "xpack.spaces.management.copyToSpace.noSpacesTitle": "スペースがありません",
     "xpack.spaces.management.copyToSpace.overwriteLabel": "保存されたオブジェクトを自動的に上書きしています",
     "xpack.spaces.management.copyToSpace.resolveCopyErrorTitle": "保存されたオブジェクトの矛盾の解決中にエラーが発生",
-    "xpack.spaces.management.copyToSpace.resolveCopySuccessTitle": "上書き成功",
-    "xpack.spaces.management.copyToSpace.selectSpacesLabel": "コピー先のスペースを選択してください",
     "xpack.spaces.management.copyToSpace.spacesLoadErrorTitle": "利用可能なスペースを読み込み中にエラーが発生",
-    "xpack.spaces.management.copyToSpaceFlyoutFooter.conflictCount": "スキップ",
     "xpack.spaces.management.copyToSpaceFlyoutFooter.errorCount": "エラー",
     "xpack.spaces.management.copyToSpaceFlyoutFooter.pendingCount": "保留中",
     "xpack.spaces.management.copyToSpaceFlyoutFooter.successCount": "コピー完了",
-    "xpack.spaces.management.copyToSpaceFlyoutHeader": "保存されたオブジェクトのスペースへのコピー",
     "xpack.spaces.management.createSpaceBreadcrumb": "作成",
     "xpack.spaces.management.customizeSpaceAvatar.colorFormRowLabel": "色",
     "xpack.spaces.management.customizeSpaceAvatar.imageUrl": "カスタム画像",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 59d0e63ef2d4a..e682a12859c47 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2925,10 +2925,6 @@
     "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.retryingFailedObjectsLoadingMessage": "正在重试失败的对象……",
     "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.savedSearchAreLinkedProperlyLoadingMessage": "确保已保存搜索已正确链接……",
     "savedObjectsManagement.objectsTable.flyout.confirmLegacyImport.savingConflictsLoadingMessage": "正在保存冲突……",
-    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteBody": "确定要覆盖“{title}”？",
-    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteCancelButtonText": "取消",
-    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteOverwriteButtonText": "覆盖",
-    "savedObjectsManagement.objectsTable.flyout.confirmOverwriteTitle": "覆盖“{type}”？",
     "savedObjectsManagement.objectsTable.flyout.errorCalloutTitle": "抱歉，有错误",
     "savedObjectsManagement.objectsTable.flyout.import.cancelButtonLabel": "取消",
     "savedObjectsManagement.objectsTable.flyout.import.confirmButtonLabel": "导入",
@@ -2951,7 +2947,6 @@
     "savedObjectsManagement.objectsTable.flyout.invalidFormatOfImportedFileErrorMessage": "已保存对象文件格式无效，无法导入。",
     "savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody": "只需使用更新的导出功能生成 NDJSON 文件，便万事俱备。",
     "savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle": "将不再支持 JSON 文件",
-    "savedObjectsManagement.objectsTable.flyout.overwriteSavedObjectsLabel": "自动覆盖所有已保存对象？",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountDescription": "受影响对象数目",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnCountName": "计数",
     "savedObjectsManagement.objectsTable.flyout.renderConflicts.columnIdDescription": "索引模式的 ID",
@@ -17875,16 +17870,8 @@
     "xpack.spaces.management.confirmDeleteModal.deletingSpaceWarningMessage": "删除空间会永久删除空间及其 {allContents}。此操作无法撤消。",
     "xpack.spaces.management.confirmDeleteModal.redirectAfterDeletingCurrentSpaceWarningMessage": "您即将删除当前空间 {name}。如果继续，系统会将您重定向到选择其他空间的位置。",
     "xpack.spaces.management.confirmDeleteModal.spaceNamesDoNoMatchErrorMessage": "空间名称不匹配。",
-    "xpack.spaces.management.copyToSpace.actionDescription": "将此已保存对象复制到一个或多个工作区",
-    "xpack.spaces.management.copyToSpace.actionTitle": "复制到工作区",
-    "xpack.spaces.management.copyToSpace.automaticallyOverwrite": "自动覆盖所有已保存对象",
-    "xpack.spaces.management.copyToSpace.copyDetail.overwriteButton": "覆盖",
-    "xpack.spaces.management.copyToSpace.copyDetail.skipOverwriteButton": "跳过",
     "xpack.spaces.management.copyToSpace.copyErrorTitle": "复制已保存对象时出错",
-    "xpack.spaces.management.copyToSpace.copyResultsLabel": "复制结果",
     "xpack.spaces.management.copyToSpace.copyStatus.conflictsMessage": "具有匹配 ID ({id}) 的已保存对象在此工作区中已存在。",
-    "xpack.spaces.management.copyToSpace.copyStatus.conflictsOverwriteMessage": "单击“覆盖”可将此版本替换为复制的版本。",
-    "xpack.spaces.management.copyToSpace.copyStatus.pendingOverwriteMessage": "已保存对象将被覆盖。单击“跳过”可取消此操作。",
     "xpack.spaces.management.copyToSpace.copyStatus.successMessage": "已保存对象成功复制。",
     "xpack.spaces.management.copyToSpace.copyStatus.unresolvableErrorMessage": "复制此已保存对象时出错。",
     "xpack.spaces.management.copyToSpace.copyStatusSummary.conflictsMessage": "在 {space} 工作区中检测到一个或多个冲突。展开此部分以进行解决。",
@@ -17892,26 +17879,17 @@
     "xpack.spaces.management.copyToSpace.copyStatusSummary.successMessage": "已成功复制到 {space} 工作区。",
     "xpack.spaces.management.copyToSpace.copyToSpacesButton": "复制到 {spaceCount} {spaceCount, plural, one {个工作区} other {个工作区}}",
     "xpack.spaces.management.copyToSpace.disabledCopyToSpacesButton": "复制",
-    "xpack.spaces.management.copyToSpace.dontIncludeRelatedLabel": "不包括相关已保存对象",
-    "xpack.spaces.management.copyToSpace.dontOverwriteLabel": "未覆盖已保存对象",
     "xpack.spaces.management.copyToSpace.finishCopyToSpacesButton": "完成",
     "xpack.spaces.management.copyToSpace.finishedButtonLabel": "复制已完成。",
-    "xpack.spaces.management.copyToSpace.finishPendingOverwritesCopyToSpacesButton": "覆盖 {overwriteCount} 个对象",
-    "xpack.spaces.management.copyToSpace.includeRelatedFormLabel": "包括相关已保存对象",
-    "xpack.spaces.management.copyToSpace.includeRelatedLabel": "包括相关已保存对象",
     "xpack.spaces.management.copyToSpace.inProgressButtonLabel": "复制正在进行中。请稍候。",
     "xpack.spaces.management.copyToSpace.noSpacesBody": "没有可向其中进行复制的合格工作区。",
     "xpack.spaces.management.copyToSpace.noSpacesTitle": "没有可用的工作区",
     "xpack.spaces.management.copyToSpace.overwriteLabel": "正在自动覆盖已保存对象",
     "xpack.spaces.management.copyToSpace.resolveCopyErrorTitle": "解决已保存对象冲突时出错",
-    "xpack.spaces.management.copyToSpace.resolveCopySuccessTitle": "覆盖成功",
-    "xpack.spaces.management.copyToSpace.selectSpacesLabel": "选择要向其中进行复制的工作区",
     "xpack.spaces.management.copyToSpace.spacesLoadErrorTitle": "加载可用工作区时出错",
-    "xpack.spaces.management.copyToSpaceFlyoutFooter.conflictCount": "已跳过",
     "xpack.spaces.management.copyToSpaceFlyoutFooter.errorCount": "错误",
     "xpack.spaces.management.copyToSpaceFlyoutFooter.pendingCount": "待处理",
     "xpack.spaces.management.copyToSpaceFlyoutFooter.successCount": "已复制",
-    "xpack.spaces.management.copyToSpaceFlyoutHeader": "将已保存对象复制到工作区",
     "xpack.spaces.management.createSpaceBreadcrumb": "创建",
     "xpack.spaces.management.customizeSpaceAvatar.colorFormRowLabel": "颜色",
     "xpack.spaces.management.customizeSpaceAvatar.imageUrl": "定制图像",
diff --git a/x-pack/test/functional/apps/spaces/copy_saved_objects.ts b/x-pack/test/functional/apps/spaces/copy_saved_objects.ts
index 05d497c235dad..2ee6b903cc3a9 100644
--- a/x-pack/test/functional/apps/spaces/copy_saved_objects.ts
+++ b/x-pack/test/functional/apps/spaces/copy_saved_objects.ts
@@ -65,10 +65,10 @@ export default function spaceSelectorFunctonalTests({
       const summaryCounts = await PageObjects.copySavedObjectsToSpace.getSummaryCounts();
 
       expect(summaryCounts).to.eql({
-        copied: 3,
+        success: 3,
+        pending: 0,
         skipped: 0,
         errors: 0,
-        overwrite: undefined,
       });
 
       await PageObjects.copySavedObjectsToSpace.finishCopy();
@@ -93,23 +93,23 @@ export default function spaceSelectorFunctonalTests({
       const summaryCounts = await PageObjects.copySavedObjectsToSpace.getSummaryCounts();
 
       expect(summaryCounts).to.eql({
-        copied: 2,
+        success: 0,
+        pending: 2,
         skipped: 1,
         errors: 0,
-        overwrite: undefined,
       });
 
       // Mark conflict for overwrite
       await testSubjects.click(`cts-space-result-${destinationSpaceId}`);
-      await testSubjects.click(`cts-overwrite-conflict-logstash-*`);
+      await testSubjects.click(`cts-overwrite-conflict-index-pattern:logstash-*`);
 
       // Verify summary changed
-      const updatedSummaryCounts = await PageObjects.copySavedObjectsToSpace.getSummaryCounts(true);
+      const updatedSummaryCounts = await PageObjects.copySavedObjectsToSpace.getSummaryCounts();
 
       expect(updatedSummaryCounts).to.eql({
-        copied: 2,
+        success: 0,
+        pending: 3,
         skipped: 0,
-        overwrite: 1,
         errors: 0,
       });
 
diff --git a/x-pack/test/functional/page_objects/copy_saved_objects_to_space_page.ts b/x-pack/test/functional/page_objects/copy_saved_objects_to_space_page.ts
index 629a86520389d..6b8680271635b 100644
--- a/x-pack/test/functional/page_objects/copy_saved_objects_to_space_page.ts
+++ b/x-pack/test/functional/page_objects/copy_saved_objects_to_space_page.ts
@@ -35,7 +35,11 @@ export function CopySavedObjectsToSpacePageProvider({
       destinationSpaceId: string;
     }) {
       if (!overwrite) {
-        await testSubjects.click('cts-form-overwrite');
+        const radio = await testSubjects.find('cts-copyModeControl-overwriteRadioGroup');
+        // a radio button consists of a div tag that contains an input, a div, and a label
+        // we can't click the input directly, need to go up one level and click the parent div
+        const div = await radio.findByXpath("//div[input[@id='overwriteDisabled']]");
+        await div.click();
       }
       await testSubjects.click(`cts-space-selector-row-${destinationSpaceId}`);
     },
@@ -49,31 +53,25 @@ export function CopySavedObjectsToSpacePageProvider({
       await testSubjects.waitForDeleted('copy-to-space-flyout');
     },
 
-    async getSummaryCounts(includeOverwrite: boolean = false) {
-      const copied = extractCountFromSummary(
+    async getSummaryCounts() {
+      const success = extractCountFromSummary(
         await testSubjects.getVisibleText('cts-summary-success-count')
       );
+      const pending = extractCountFromSummary(
+        await testSubjects.getVisibleText('cts-summary-pending-count')
+      );
       const skipped = extractCountFromSummary(
-        await testSubjects.getVisibleText('cts-summary-conflict-count')
+        await testSubjects.getVisibleText('cts-summary-skipped-count')
       );
       const errors = extractCountFromSummary(
         await testSubjects.getVisibleText('cts-summary-error-count')
       );
 
-      let overwrite;
-      if (includeOverwrite) {
-        overwrite = extractCountFromSummary(
-          await testSubjects.getVisibleText('cts-summary-overwrite-count')
-        );
-      } else {
-        await testSubjects.missingOrFail('cts-summary-overwrite-count', { timeout: 250 });
-      }
-
       return {
-        copied,
+        success,
+        pending,
         skipped,
         errors,
-        overwrite,
       };
     },
   };
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json b/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
index d2c14189e2529..4c0447c29c8f9 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
@@ -397,3 +397,91 @@
     "type": "doc"
   }
 }
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_1",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object in all spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default", "space_1", "space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_2a",
+    "index": ".kibana",
+    "source": {
+      "originId": "conflict_2",
+      "sharedtype": {
+        "title": "A shared saved-object in all spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default", "space_1", "space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_2b",
+    "index": ".kibana",
+    "source": {
+      "originId": "conflict_2",
+      "sharedtype": {
+        "title": "A shared saved-object in all spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default", "space_1", "space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_3",
+    "index": ".kibana",
+    "source": {
+      "sharedtype": {
+        "title": "A shared saved-object in all spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default", "space_1", "space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_4a",
+    "index": ".kibana",
+    "source": {
+      "originId": "conflict_4",
+      "sharedtype": {
+        "title": "A shared saved-object in all spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default", "space_1", "space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json b/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
index 7b5b1d86f6bcc..73f0e536b9295 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
@@ -182,6 +182,9 @@
         "namespaces": {
           "type": "keyword"
         },
+        "originId": {
+          "type": "keyword"
+        },
         "search": {
           "properties": {
             "columns": {
diff --git a/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts b/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts
index 0c15ab4bd2f80..45880635586a7 100644
--- a/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts
+++ b/x-pack/test/saved_object_api_integration/common/fixtures/saved_object_test_plugin/server/plugin.ts
@@ -48,6 +48,7 @@ export class Plugin {
       name: 'sharedtype',
       hidden: false,
       namespaceType: 'multiple',
+      management,
       mappings,
     });
     core.savedObjects.registerType({
diff --git a/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts b/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
index 5d08421038d3f..595986c08efc1 100644
--- a/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
+++ b/x-pack/test/saved_object_api_integration/common/lib/saved_object_test_utils.ts
@@ -168,7 +168,9 @@ export const expectResponses = {
       expect(actualNamespace).to.eql(spaceId);
     }
     if (isMultiNamespace(type)) {
-      if (id === CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1.id) {
+      if (['conflict_1', 'conflict_2a', 'conflict_2b', 'conflict_3', 'conflict_4a'].includes(id)) {
+        expect(actualNamespaces).to.eql([DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID]);
+      } else if (id === CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1.id) {
         expect(actualNamespaces).to.eql([DEFAULT_SPACE_ID, SPACE_1_ID]);
       } else if (id === CASES.MULTI_NAMESPACE_ONLY_SPACE_1.id) {
         expect(actualNamespaces).to.eql([SPACE_1_ID]);
diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
index bc356927cc0af..e3163ef77d427 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_create.ts
@@ -6,6 +6,7 @@
 
 import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
+import { SavedObjectsErrorHelpers } from '../../../../../src/core/server';
 import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES } from '../lib/spaces';
 import {
@@ -23,6 +24,7 @@ export interface BulkCreateTestDefinition extends TestDefinition {
 export type BulkCreateTestSuite = TestSuite<BulkCreateTestDefinition>;
 export interface BulkCreateTestCase extends TestCase {
   failure?: 400 | 409; // only used for permitted response case
+  fail409Param?: string;
 }
 
 const NEW_ATTRIBUTE_KEY = 'title'; // all type mappings include this attribute, for simplicity's sake
@@ -56,6 +58,15 @@ export function bulkCreateTestSuiteFactory(es: any, esArchiver: any, supertest:
       for (let i = 0; i < savedObjects.length; i++) {
         const object = savedObjects[i];
         const testCase = testCaseArray[i];
+        if (testCase.failure === 409 && testCase.fail409Param === 'unresolvableConflict') {
+          const { type, id } = testCase;
+          const error = SavedObjectsErrorHelpers.createConflictError(type, id);
+          const payload = { ...error.output.payload, metadata: { isNotOverwritable: true } };
+          expect(object.type).to.eql(type);
+          expect(object.id).to.eql(id);
+          expect(object.error).to.eql(payload);
+          continue;
+        }
         await expectResponses.permitted(object, testCase);
         if (!testCase.failure) {
           expect(object.attributes[NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
diff --git a/x-pack/test/saved_object_api_integration/common/suites/export.ts b/x-pack/test/saved_object_api_integration/common/suites/export.ts
index ff22cdaeafd06..4a8eff1fb380c 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/export.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/export.ts
@@ -8,7 +8,7 @@ import { SuperTest } from 'supertest';
 import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES } from '../lib/spaces';
 import { expectResponses, getUrlPrefix } from '../lib/saved_object_test_utils';
-import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
+import { ExpectResponseBody, TestDefinition, TestSuite } from '../lib/types';
 
 const {
   DEFAULT: { spaceId: DEFAULT_SPACE_ID },
@@ -20,15 +20,28 @@ export interface ExportTestDefinition extends TestDefinition {
   request: ReturnType<typeof createRequest>;
 }
 export type ExportTestSuite = TestSuite<ExportTestDefinition>;
+interface SuccessResult {
+  type: string;
+  id: string;
+  originId?: string;
+}
 export interface ExportTestCase {
   title: string;
   type: string;
   id?: string;
-  successResult?: TestCase | TestCase[];
+  successResult?: SuccessResult | SuccessResult[];
   failure?: 400 | 403;
 }
 
-export const getTestCases = (spaceId?: string) => ({
+// additional sharedtype objects that exist but do not have common test cases defined
+const CID = 'conflict_';
+const CONFLICT_1_OBJ = Object.freeze({ type: 'sharedtype', id: `${CID}1` });
+const CONFLICT_2A_OBJ = Object.freeze({ type: 'sharedtype', id: `${CID}2a`, originId: `${CID}2` });
+const CONFLICT_2B_OBJ = Object.freeze({ type: 'sharedtype', id: `${CID}2b`, originId: `${CID}2` });
+const CONFLICT_3_OBJ = Object.freeze({ type: 'sharedtype', id: `${CID}3` });
+const CONFLICT_4A_OBJ = Object.freeze({ type: 'sharedtype', id: `${CID}4a`, originId: `${CID}4` });
+
+export const getTestCases = (spaceId?: string): { [key: string]: ExportTestCase } => ({
   singleNamespaceObject: {
     title: 'single-namespace object',
     ...(spaceId === SPACE_1_ID
@@ -36,7 +49,7 @@ export const getTestCases = (spaceId?: string) => ({
       : spaceId === SPACE_2_ID
       ? CASES.SINGLE_NAMESPACE_SPACE_2
       : CASES.SINGLE_NAMESPACE_DEFAULT_SPACE),
-  } as ExportTestCase,
+  },
   singleNamespaceType: {
     // this test explicitly ensures that single-namespace objects from other spaces are not returned
     title: 'single-namespace type',
@@ -47,7 +60,7 @@ export const getTestCases = (spaceId?: string) => ({
         : spaceId === SPACE_2_ID
         ? CASES.SINGLE_NAMESPACE_SPACE_2
         : CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
-  } as ExportTestCase,
+  },
   multiNamespaceObject: {
     title: 'multi-namespace object',
     ...(spaceId === SPACE_1_ID
@@ -55,30 +68,30 @@ export const getTestCases = (spaceId?: string) => ({
       : spaceId === SPACE_2_ID
       ? CASES.MULTI_NAMESPACE_ONLY_SPACE_2
       : CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1),
-    failure: 400, // multi-namespace types cannot be exported yet
-  } as ExportTestCase,
+  },
   multiNamespaceType: {
     title: 'multi-namespace type',
     type: 'sharedtype',
-    // successResult:
-    //   spaceId === SPACE_1_ID
-    //     ? [CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, CASES.MULTI_NAMESPACE_ONLY_SPACE_1]
-    //     : spaceId === SPACE_2_ID
-    //     ? CASES.MULTI_NAMESPACE_ONLY_SPACE_2
-    //     : CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
-    failure: 400, // multi-namespace types cannot be exported yet
-  } as ExportTestCase,
+    successResult: (spaceId === SPACE_1_ID
+      ? [CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, CASES.MULTI_NAMESPACE_ONLY_SPACE_1]
+      : spaceId === SPACE_2_ID
+      ? [CASES.MULTI_NAMESPACE_ONLY_SPACE_2]
+      : [CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1]
+    )
+      .concat([CONFLICT_1_OBJ, CONFLICT_2A_OBJ, CONFLICT_2B_OBJ, CONFLICT_3_OBJ, CONFLICT_4A_OBJ])
+      .flat(),
+  },
   namespaceAgnosticObject: {
     title: 'namespace-agnostic object',
     ...CASES.NAMESPACE_AGNOSTIC,
-  } as ExportTestCase,
+  },
   namespaceAgnosticType: {
     title: 'namespace-agnostic type',
     type: 'globaltype',
     successResult: CASES.NAMESPACE_AGNOSTIC,
-  } as ExportTestCase,
-  hiddenObject: { title: 'hidden object', ...CASES.HIDDEN, failure: 400 } as ExportTestCase,
-  hiddenType: { title: 'hidden type', type: 'hiddentype', failure: 400 } as ExportTestCase,
+  },
+  hiddenObject: { title: 'hidden object', ...CASES.HIDDEN, failure: 400 },
+  hiddenType: { title: 'hidden type', type: 'hiddentype', failure: 400 },
 });
 export const createRequest = ({ type, id }: ExportTestCase) =>
   id ? { objects: [{ type, id }] } : { type };
@@ -98,7 +111,7 @@ export function exportTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
   const expectResponseBody = (testCase: ExportTestCase): ExpectResponseBody => async (
     response: Record<string, any>
   ) => {
-    const { type, id, successResult = { type, id }, failure } = testCase;
+    const { type, id, successResult = { type, id } as SuccessResult, failure } = testCase;
     if (failure === 403) {
       // In export only, the API uses "bulk_get" or "find" depending on the parameters it receives.
       // The best that could be done here is to have an if statement to ensure at least one of the
@@ -125,11 +138,14 @@ export function exportTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
       const ndjson = response.text.split('\n');
       const savedObjectsArray = Array.isArray(successResult) ? successResult : [successResult];
       expect(ndjson.length).to.eql(savedObjectsArray.length + 1);
-      for (let i = 0; i < savedObjectsArray.length; i++) {
+      for (let i = 0; i < ndjson.length - 1; i++) {
         const object = JSON.parse(ndjson[i]);
-        const { type: expectedType, id: expectedId } = savedObjectsArray[i];
-        expect(object.type).to.eql(expectedType);
-        expect(object.id).to.eql(expectedId);
+        const expected = savedObjectsArray.find((x) => x.id === object.id)!;
+        expect(expected).not.to.be(undefined);
+        expect(object.type).to.eql(expected.type);
+        if (object.originId) {
+          expect(object.originId).to.eql(expected.originId);
+        }
         expect(object.updated_at).to.match(/^[\d-]{10}T[\d:\.]{12}Z$/);
         // don't test attributes, version, or references
       }
diff --git a/x-pack/test/saved_object_api_integration/common/suites/find.ts b/x-pack/test/saved_object_api_integration/common/suites/find.ts
index 882451c28bfe4..bab4a4d88534a 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/find.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/find.ts
@@ -43,6 +43,36 @@ export interface FindTestCase {
   };
 }
 
+// additional sharedtype objects that exist but do not have common test cases defined
+const CONFLICT_1_OBJ = Object.freeze({
+  type: 'sharedtype',
+  id: 'conflict_1',
+  namespaces: ['default', 'space_1', 'space_2'],
+});
+const CONFLICT_2A_OBJ = Object.freeze({
+  type: 'sharedtype',
+  id: 'conflict_2a',
+  originId: 'conflict_2',
+  namespaces: ['default', 'space_1', 'space_2'],
+});
+const CONFLICT_2B_OBJ = Object.freeze({
+  type: 'sharedtype',
+  id: 'conflict_2b',
+  originId: 'conflict_2',
+  namespaces: ['default', 'space_1', 'space_2'],
+});
+const CONFLICT_3_OBJ = Object.freeze({
+  type: 'sharedtype',
+  id: 'conflict_3',
+  namespaces: ['default', 'space_1', 'space_2'],
+});
+const CONFLICT_4A_OBJ = Object.freeze({
+  type: 'sharedtype',
+  id: 'conflict_4a',
+  originId: 'conflict_4',
+  namespaces: ['default', 'space_1', 'space_2'],
+});
+
 const TEST_CASES = [
   { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, namespaces: ['default'] },
   { ...CASES.SINGLE_NAMESPACE_SPACE_1, namespaces: ['space_1'] },
@@ -110,7 +140,13 @@ export const getTestCases = (
       query: `type=sharedtype&fields=title${namespacesQueryParam}`,
       successResult: {
         // expected depends on which spaces the user is authorized against...
-        savedObjects: getExpectedSavedObjects((t) => t.type === 'sharedtype'),
+        savedObjects: getExpectedSavedObjects((t) => t.type === 'sharedtype').concat(
+          CONFLICT_1_OBJ,
+          CONFLICT_2A_OBJ,
+          CONFLICT_2B_OBJ,
+          CONFLICT_3_OBJ,
+          CONFLICT_4A_OBJ
+        ),
       },
     } as FindTestCase,
     namespaceAgnosticType: {
diff --git a/x-pack/test/saved_object_api_integration/common/suites/import.ts b/x-pack/test/saved_object_api_integration/common/suites/import.ts
index ed57c6eb16b9a..5036d7b200881 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/import.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/import.ts
@@ -8,33 +8,66 @@ import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES } from '../lib/spaces';
-import {
-  createRequest,
-  expectResponses,
-  getUrlPrefix,
-  getTestTitle,
-} from '../lib/saved_object_test_utils';
+import { expectResponses, getUrlPrefix, getTestTitle } from '../lib/saved_object_test_utils';
 import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
 
 export interface ImportTestDefinition extends TestDefinition {
-  request: Array<{ type: string; id: string }>;
+  request: Array<{ type: string; id: string; originId?: string }>;
+  overwrite: boolean;
+  createNewCopies: boolean;
 }
 export type ImportTestSuite = TestSuite<ImportTestDefinition>;
 export interface ImportTestCase extends TestCase {
+  originId?: string;
+  expectedNewId?: string;
+  successParam?: string;
   failure?: 400 | 409; // only used for permitted response case
+  fail409Param?: string;
 }
 
 const NEW_ATTRIBUTE_KEY = 'title'; // all type mappings include this attribute, for simplicity's sake
 const NEW_ATTRIBUTE_VAL = `New attribute value ${Date.now()}`;
 
-const NEW_SINGLE_NAMESPACE_OBJ = Object.freeze({ type: 'dashboard', id: 'new-dashboard-id' });
-const NEW_MULTI_NAMESPACE_OBJ = Object.freeze({ type: 'sharedtype', id: 'new-sharedtype-id' });
-const NEW_NAMESPACE_AGNOSTIC_OBJ = Object.freeze({ type: 'globaltype', id: 'new-globaltype-id' });
+// these five saved objects already exist in the sample data:
+//  * id: conflict_1
+//  * id: conflict_2a, originId: conflict_2
+//  * id: conflict_2b, originId: conflict_2
+//  * id: conflict_3
+//  * id: conflict_4a, originId: conflict_4
+// using the seven conflict test case objects below, we can exercise various permutations of exact/inexact/ambiguous conflict scenarios
+const CID = 'conflict_';
 export const TEST_CASES = Object.freeze({
   ...CASES,
-  NEW_SINGLE_NAMESPACE_OBJ,
-  NEW_MULTI_NAMESPACE_OBJ,
-  NEW_NAMESPACE_AGNOSTIC_OBJ,
+  CONFLICT_1_OBJ: Object.freeze({ type: 'sharedtype', id: `${CID}1` }),
+  CONFLICT_1A_OBJ: Object.freeze({ type: 'sharedtype', id: `${CID}1a`, originId: `${CID}1` }),
+  CONFLICT_1B_OBJ: Object.freeze({ type: 'sharedtype', id: `${CID}1b`, originId: `${CID}1` }),
+  CONFLICT_2C_OBJ: Object.freeze({ type: 'sharedtype', id: `${CID}2c`, originId: `${CID}2` }),
+  CONFLICT_2D_OBJ: Object.freeze({ type: 'sharedtype', id: `${CID}2d`, originId: `${CID}2` }),
+  CONFLICT_3A_OBJ: Object.freeze({
+    type: 'sharedtype',
+    id: `${CID}3a`,
+    originId: `${CID}3`,
+    expectedNewId: `${CID}3`,
+  }),
+  CONFLICT_4_OBJ: Object.freeze({ type: 'sharedtype', id: `${CID}4`, expectedNewId: `${CID}4a` }),
+  NEW_SINGLE_NAMESPACE_OBJ: Object.freeze({ type: 'dashboard', id: 'new-dashboard-id' }),
+  NEW_MULTI_NAMESPACE_OBJ: Object.freeze({ type: 'sharedtype', id: 'new-sharedtype-id' }),
+  NEW_NAMESPACE_AGNOSTIC_OBJ: Object.freeze({ type: 'globaltype', id: 'new-globaltype-id' }),
+});
+
+/**
+ * Test cases have additional properties that we don't want to send in HTTP Requests
+ */
+const createRequest = ({ type, id, originId }: ImportTestCase) => ({
+  type,
+  id,
+  ...(originId && { originId }),
+});
+
+const getConflictDest = (id: string) => ({
+  id,
+  title: 'A shared saved-object in all spaces',
+  updatedAt: '2017-09-21T18:59:16.270Z',
 });
 
 export function importTestSuiteFactory(es: any, esArchiver: any, supertest: SuperTest<any>) {
@@ -42,6 +75,9 @@ export function importTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
   const expectResponseBody = (
     testCases: ImportTestCase | ImportTestCase[],
     statusCode: 200 | 403,
+    singleRequest: boolean,
+    overwrite: boolean,
+    createNewCopies: boolean,
     spaceId = SPACES.DEFAULT.spaceId
   ): ExpectResponseBody => async (response: Record<string, any>) => {
     const testCaseArray = Array.isArray(testCases) ? testCases : [testCases];
@@ -50,7 +86,7 @@ export function importTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
       await expectForbidden(types)(response);
     } else {
       // permitted
-      const { success, successCount, errors } = response.body;
+      const { success, successCount, successResults, errors } = response.body;
       const expectedSuccesses = testCaseArray.filter((x) => !x.failure);
       const expectedFailures = testCaseArray.filter((x) => x.failure);
       expect(success).to.eql(expectedFailures.length === 0);
@@ -61,12 +97,53 @@ export function importTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
         expect(response.body).not.to.have.property('errors');
       }
       for (let i = 0; i < expectedSuccesses.length; i++) {
-        const { type, id } = expectedSuccesses[i];
-        const { _source } = await expectResponses.successCreated(es, spaceId, type, id);
-        expect(_source[type][NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
+        const { type, id, successParam, expectedNewId } = expectedSuccesses[i];
+        // we don't know the order of the returned successResults; search for each one
+        const object = (successResults as Array<Record<string, unknown>>).find(
+          (x) => x.type === type && x.id === id
+        );
+        expect(object).not.to.be(undefined);
+        const destinationId = object!.destinationId as string;
+        if (successParam === 'destinationId') {
+          // Kibana created the object with a different ID than what was specified in the import
+          // This can happen due to an unresolvable conflict (so the new ID will be random), or due to an inexact match (so the new ID will
+          // be equal to the ID or originID of the existing object that it inexactly matched)
+          if (expectedNewId) {
+            expect(destinationId).to.be(expectedNewId);
+          } else {
+            // the new ID was randomly generated
+            expect(destinationId).to.match(/^[0-9a-f-]{36}$/);
+          }
+        } else if (successParam === 'createNewCopies' || successParam === 'createNewCopy') {
+          // the new ID was randomly generated
+          expect(destinationId).to.match(/^[0-9a-f-]{36}$/);
+        } else {
+          expect(destinationId).to.be(undefined);
+        }
+
+        // This assertion is only needed for the case where `createNewCopies` mode is disabled and ambiguous source conflicts are detected.
+        // When `createNewCopies` mode is permanently enabled, this field will be removed, and this assertion will be redundant and can be
+        // removed too.
+        const createNewCopy = object!.createNewCopy as boolean | undefined;
+        if (successParam === 'createNewCopy') {
+          expect(createNewCopy).to.be(true);
+        } else {
+          expect(createNewCopy).to.be(undefined);
+        }
+
+        if (!singleRequest || overwrite || createNewCopies) {
+          // even if the object result was a "success" result, it may not have been created if other resolvable errors were returned
+          const { _source } = await expectResponses.successCreated(
+            es,
+            spaceId,
+            type,
+            destinationId ?? id
+          );
+          expect(_source[type][NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
+        }
       }
       for (let i = 0; i < expectedFailures.length; i++) {
-        const { type, id, failure } = expectedFailures[i];
+        const { type, id, failure, fail409Param, expectedNewId } = expectedFailures[i];
         // we don't know the order of the returned errors; search for each one
         const object = (errors as Array<Record<string, unknown>>).find(
           (x) => x.type === type && x.id === id
@@ -76,7 +153,24 @@ export function importTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
           expect(object!.error).to.eql({ type: 'unsupported_type' });
         } else {
           // 409
-          expect(object!.error).to.eql({ type: 'conflict' });
+          let error: Record<string, unknown> = {
+            type: 'conflict',
+            ...(expectedNewId && { destinationId: expectedNewId }),
+          };
+          if (fail409Param === 'ambiguous_conflict_1a1b') {
+            // "ambiguous source" conflict
+            error = {
+              type: 'ambiguous_conflict',
+              destinations: [getConflictDest(`${CID}1`)],
+            };
+          } else if (fail409Param === 'ambiguous_conflict_2c') {
+            // "ambiguous destination" conflict
+            error = {
+              type: 'ambiguous_conflict',
+              destinations: [getConflictDest(`${CID}2a`), getConflictDest(`${CID}2b`)],
+            };
+          }
+          expect(object!.error).to.eql(error);
         }
       }
     }
@@ -84,7 +178,9 @@ export function importTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
   const createTestDefinitions = (
     testCases: ImportTestCase | ImportTestCase[],
     forbidden: boolean,
-    options?: {
+    options: {
+      overwrite?: boolean;
+      createNewCopies?: boolean;
       spaceId?: string;
       singleRequest?: boolean;
       responseBodyOverride?: ExpectResponseBody;
@@ -92,7 +188,14 @@ export function importTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
   ): ImportTestDefinition[] => {
     const cases = Array.isArray(testCases) ? testCases : [testCases];
     const responseStatusCode = forbidden ? 403 : 200;
-    if (!options?.singleRequest) {
+    const {
+      overwrite = false,
+      createNewCopies = false,
+      spaceId,
+      singleRequest,
+      responseBodyOverride,
+    } = options;
+    if (!singleRequest) {
       // if we are testing cases that should result in a forbidden response, we can do each case individually
       // this ensures that multiple test cases of a single type will each result in a forbidden error
       return cases.map((x) => ({
@@ -100,8 +203,10 @@ export function importTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
         request: [createRequest(x)],
         responseStatusCode,
         responseBody:
-          options?.responseBodyOverride ||
-          expectResponseBody(x, responseStatusCode, options?.spaceId),
+          responseBodyOverride ||
+          expectResponseBody(x, responseStatusCode, false, overwrite, createNewCopies, spaceId),
+        overwrite,
+        createNewCopies,
       }));
     }
     // batch into a single request to save time during test execution
@@ -111,8 +216,10 @@ export function importTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
         request: cases.map((x) => createRequest(x)),
         responseStatusCode,
         responseBody:
-          options?.responseBodyOverride ||
-          expectResponseBody(cases, responseStatusCode, options?.spaceId),
+          responseBodyOverride ||
+          expectResponseBody(cases, responseStatusCode, true, overwrite, createNewCopies, spaceId),
+        overwrite,
+        createNewCopies,
       },
     ];
   };
@@ -134,8 +241,13 @@ export function importTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
           const requestBody = test.request
             .map((obj) => JSON.stringify({ ...obj, ...attrs }))
             .join('\n');
+          const query = test.overwrite
+            ? '?overwrite=true'
+            : test.createNewCopies
+            ? '?createNewCopies=true'
+            : '';
           await supertest
-            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_import`)
+            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_import${query}`)
             .auth(user?.username, user?.password)
             .attach('file', Buffer.from(requestBody, 'utf8'), 'export.ndjson')
             .expect(test.responseStatusCode)
diff --git a/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
index 822214cd6dc6a..6d294aed9b4de 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/resolve_import_errors.ts
@@ -8,34 +8,85 @@ import expect from '@kbn/expect';
 import { SuperTest } from 'supertest';
 import { SAVED_OBJECT_TEST_CASES as CASES } from '../lib/saved_object_test_cases';
 import { SPACES } from '../lib/spaces';
-import {
-  createRequest,
-  expectResponses,
-  getUrlPrefix,
-  getTestTitle,
-} from '../lib/saved_object_test_utils';
+import { expectResponses, getUrlPrefix, getTestTitle } from '../lib/saved_object_test_utils';
 import { ExpectResponseBody, TestCase, TestDefinition, TestSuite } from '../lib/types';
 
 export interface ResolveImportErrorsTestDefinition extends TestDefinition {
-  request: Array<{ type: string; id: string }>;
+  request: {
+    objects: Array<{ type: string; id: string; originId?: string }>;
+    retries: Array<{ type: string; id: string; overwrite: boolean; destinationId?: string }>;
+  };
   overwrite: boolean;
+  createNewCopies: boolean;
 }
 export type ResolveImportErrorsTestSuite = TestSuite<ResolveImportErrorsTestDefinition>;
 export interface ResolveImportErrorsTestCase extends TestCase {
+  originId?: string;
+  expectedNewId?: string;
+  successParam?: string;
   failure?: 400 | 409; // only used for permitted response case
 }
 
 const NEW_ATTRIBUTE_KEY = 'title'; // all type mappings include this attribute, for simplicity's sake
 const NEW_ATTRIBUTE_VAL = `New attribute value ${Date.now()}`;
 
-const NEW_SINGLE_NAMESPACE_OBJ = Object.freeze({ type: 'dashboard', id: 'new-dashboard-id' });
-const NEW_MULTI_NAMESPACE_OBJ = Object.freeze({ type: 'sharedtype', id: 'new-sharedtype-id' });
-const NEW_NAMESPACE_AGNOSTIC_OBJ = Object.freeze({ type: 'globaltype', id: 'new-globaltype-id' });
+// these five saved objects already exist in the sample data:
+//  * id: conflict_1
+//  * id: conflict_2a, originId: conflict_2
+//  * id: conflict_2b, originId: conflict_2
+//  * id: conflict_3
+//  * id: conflict_4a, originId: conflict_4
+// using the five conflict test case objects below, we can exercise various permutations of exact/inexact/ambiguous conflict scenarios
 export const TEST_CASES = Object.freeze({
   ...CASES,
-  NEW_SINGLE_NAMESPACE_OBJ,
-  NEW_MULTI_NAMESPACE_OBJ,
-  NEW_NAMESPACE_AGNOSTIC_OBJ,
+  CONFLICT_1A_OBJ: Object.freeze({
+    type: 'sharedtype',
+    id: `conflict_1a`,
+    originId: `conflict_1`,
+    expectedNewId: 'some-random-id',
+  }),
+  CONFLICT_1B_OBJ: Object.freeze({
+    type: 'sharedtype',
+    id: `conflict_1b`,
+    originId: `conflict_1`,
+    expectedNewId: 'another-random-id',
+  }),
+  CONFLICT_2C_OBJ: Object.freeze({
+    type: 'sharedtype',
+    id: `conflict_2c`,
+    originId: `conflict_2`,
+    expectedNewId: `conflict_2a`,
+  }),
+  CONFLICT_3A_OBJ: Object.freeze({
+    type: 'sharedtype',
+    id: `conflict_3a`,
+    originId: `conflict_3`,
+    expectedNewId: `conflict_3`,
+  }),
+  CONFLICT_4_OBJ: Object.freeze({
+    type: 'sharedtype',
+    id: `conflict_4`,
+    expectedNewId: `conflict_4a`,
+  }),
+});
+
+/**
+ * Test cases have additional properties that we don't want to send in HTTP Requests
+ */
+const createRequest = (
+  { type, id, originId, expectedNewId, successParam }: ResolveImportErrorsTestCase,
+  overwrite: boolean
+): ResolveImportErrorsTestDefinition['request'] => ({
+  objects: [{ type, id, ...(originId && { originId }) }],
+  retries: [
+    {
+      type,
+      id,
+      overwrite,
+      ...(expectedNewId && { destinationId: expectedNewId }),
+      ...(successParam === 'createNewCopy' && { createNewCopy: true }),
+    },
+  ],
 });
 
 export function resolveImportErrorsTestSuiteFactory(
@@ -47,6 +98,9 @@ export function resolveImportErrorsTestSuiteFactory(
   const expectResponseBody = (
     testCases: ResolveImportErrorsTestCase | ResolveImportErrorsTestCase[],
     statusCode: 200 | 403,
+    singleRequest: boolean,
+    overwrite: boolean,
+    createNewCopies: boolean,
     spaceId = SPACES.DEFAULT.spaceId
   ): ExpectResponseBody => async (response: Record<string, any>) => {
     const testCaseArray = Array.isArray(testCases) ? testCases : [testCases];
@@ -55,7 +109,7 @@ export function resolveImportErrorsTestSuiteFactory(
       await expectForbidden(types)(response);
     } else {
       // permitted
-      const { success, successCount, errors } = response.body;
+      const { success, successCount, successResults, errors } = response.body;
       const expectedSuccesses = testCaseArray.filter((x) => !x.failure);
       const expectedFailures = testCaseArray.filter((x) => x.failure);
       expect(success).to.eql(expectedFailures.length === 0);
@@ -66,12 +120,51 @@ export function resolveImportErrorsTestSuiteFactory(
         expect(response.body).not.to.have.property('errors');
       }
       for (let i = 0; i < expectedSuccesses.length; i++) {
-        const { type, id } = expectedSuccesses[i];
-        const { _source } = await expectResponses.successCreated(es, spaceId, type, id);
-        expect(_source[type][NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
+        const { type, id, successParam, expectedNewId } = expectedSuccesses[i];
+        // we don't know the order of the returned successResults; search for each one
+        const object = (successResults as Array<Record<string, unknown>>).find(
+          (x) => x.type === type && x.id === id
+        );
+        expect(object).not.to.be(undefined);
+        const destinationId = object!.destinationId as string;
+        if (successParam === 'destinationId') {
+          // Kibana created the object with a different ID than what was specified in the import
+          // This can happen due to an unresolvable conflict (so the new ID will be random), or due to an inexact match (so the new ID will
+          // be equal to the ID or originID of the existing object that it inexactly matched)
+          if (expectedNewId) {
+            expect(destinationId).to.be(expectedNewId);
+          } else {
+            // the new ID was randomly generated
+            expect(destinationId).to.match(/^[0-9a-f-]{36}$/);
+          }
+        } else if (successParam === 'createNewCopies' || successParam === 'createNewCopy') {
+          expect(destinationId).to.be(expectedNewId!);
+        } else {
+          expect(destinationId).to.be(undefined);
+        }
+
+        // This assertion is only needed for the case where `createNewCopies` mode is disabled and ambiguous source conflicts are detected.
+        // When `createNewCopies` mode is permanently enabled, this field will be removed, and this assertion will be redundant and can be
+        // removed too.
+        const createNewCopy = object!.createNewCopy as boolean | undefined;
+        if (successParam === 'createNewCopy') {
+          expect(createNewCopy).to.be(true);
+        } else {
+          expect(createNewCopy).to.be(undefined);
+        }
+
+        if (!singleRequest || overwrite || createNewCopies) {
+          const { _source } = await expectResponses.successCreated(
+            es,
+            spaceId,
+            type,
+            destinationId ?? id
+          );
+          expect(_source[type][NEW_ATTRIBUTE_KEY]).to.eql(NEW_ATTRIBUTE_VAL);
+        }
       }
       for (let i = 0; i < expectedFailures.length; i++) {
-        const { type, id, failure } = expectedFailures[i];
+        const { type, id, failure, expectedNewId } = expectedFailures[i];
         // we don't know the order of the returned errors; search for each one
         const object = (errors as Array<Record<string, unknown>>).find(
           (x) => x.type === type && x.id === id
@@ -81,7 +174,10 @@ export function resolveImportErrorsTestSuiteFactory(
           expect(object!.error).to.eql({ type: 'unsupported_type' });
         } else {
           // 409
-          expect(object!.error).to.eql({ type: 'conflict' });
+          expect(object!.error).to.eql({
+            type: 'conflict',
+            ...(expectedNewId && { destinationId: expectedNewId }),
+          });
         }
       }
     }
@@ -89,8 +185,9 @@ export function resolveImportErrorsTestSuiteFactory(
   const createTestDefinitions = (
     testCases: ResolveImportErrorsTestCase | ResolveImportErrorsTestCase[],
     forbidden: boolean,
-    overwrite: boolean,
-    options?: {
+    options: {
+      overwrite?: boolean;
+      createNewCopies?: boolean;
       spaceId?: string;
       singleRequest?: boolean;
       responseBodyOverride?: ExpectResponseBody;
@@ -98,29 +195,43 @@ export function resolveImportErrorsTestSuiteFactory(
   ): ResolveImportErrorsTestDefinition[] => {
     const cases = Array.isArray(testCases) ? testCases : [testCases];
     const responseStatusCode = forbidden ? 403 : 200;
-    if (!options?.singleRequest) {
+    const {
+      overwrite = false,
+      createNewCopies = false,
+      spaceId,
+      singleRequest,
+      responseBodyOverride,
+    } = options;
+    if (!singleRequest) {
       // if we are testing cases that should result in a forbidden response, we can do each case individually
       // this ensures that multiple test cases of a single type will each result in a forbidden error
       return cases.map((x) => ({
         title: getTestTitle(x, responseStatusCode),
-        request: [createRequest(x)],
+        request: createRequest(x, overwrite),
         responseStatusCode,
         responseBody:
-          options?.responseBodyOverride ||
-          expectResponseBody(x, responseStatusCode, options?.spaceId),
+          responseBodyOverride ||
+          expectResponseBody(x, responseStatusCode, false, overwrite, createNewCopies, spaceId),
         overwrite,
+        createNewCopies,
       }));
     }
     // batch into a single request to save time during test execution
     return [
       {
         title: getTestTitle(cases, responseStatusCode),
-        request: cases.map((x) => createRequest(x)),
+        request: cases
+          .map((x) => createRequest(x, overwrite))
+          .reduce((acc, cur) => ({
+            objects: [...acc.objects, ...cur.objects],
+            retries: [...acc.retries, ...cur.retries],
+          })),
         responseStatusCode,
         responseBody:
-          options?.responseBodyOverride ||
-          expectResponseBody(cases, responseStatusCode, options?.spaceId),
+          responseBodyOverride ||
+          expectResponseBody(cases, responseStatusCode, true, overwrite, createNewCopies, spaceId),
         overwrite,
+        createNewCopies,
       },
     ];
   };
@@ -139,17 +250,14 @@ export function resolveImportErrorsTestSuiteFactory(
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
-          const retryAttrs = test.overwrite ? { overwrite: true } : {};
-          const retries = JSON.stringify(
-            test.request.map(({ type, id }) => ({ type, id, ...retryAttrs }))
-          );
-          const requestBody = test.request
+          const requestBody = test.request.objects
             .map((obj) => JSON.stringify({ ...obj, ...attrs }))
             .join('\n');
+          const query = test.createNewCopies ? '?createNewCopies=true' : '';
           await supertest
-            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_resolve_import_errors`)
+            .post(`${getUrlPrefix(spaceId)}/api/saved_objects/_resolve_import_errors${query}`)
             .auth(user?.username, user?.password)
-            .field('retries', retries)
+            .field('retries', JSON.stringify(test.request.retries))
             .attach('file', Buffer.from(requestBody, 'utf8'), 'export.ndjson')
             .expect(test.responseStatusCode)
             .then(test.responseBody);
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts
index d83f3449460ce..0cc5969e2b7ab 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/bulk_create.ts
@@ -20,6 +20,8 @@ const {
   SPACE_2: { spaceId: SPACE_2_ID },
 } = SPACES;
 const { fail400, fail409 } = testCaseFailures;
+const unresolvableConflict = (condition?: boolean) =>
+  condition !== false ? { fail409Param: 'unresolvableConflict' } : {};
 
 const createTestCases = (overwrite: boolean, spaceId: string) => {
   // for each permitted (non-403) outcome, if failure !== undefined then we expect
@@ -34,9 +36,18 @@ const createTestCases = (overwrite: boolean, spaceId: string) => {
     {
       ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
       ...fail409(!overwrite || (spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID)),
+      ...unresolvableConflict(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1,
+      ...fail409(!overwrite || spaceId !== SPACE_1_ID),
+      ...unresolvableConflict(spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2,
+      ...fail409(!overwrite || spaceId !== SPACE_2_ID),
+      ...unresolvableConflict(spaceId !== SPACE_2_ID),
     },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail409(!overwrite || spaceId !== SPACE_1_ID) },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail409(!overwrite || spaceId !== SPACE_2_ID) },
     { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
     CASES.NEW_SINGLE_NAMESPACE_OBJ,
     CASES.NEW_MULTI_NAMESPACE_OBJ,
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts
index f85cd3a36c092..c581a1757565e 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/export.ts
@@ -18,15 +18,12 @@ const createTestCases = (spaceId: string) => {
   const exportableTypes = [
     cases.singleNamespaceObject,
     cases.singleNamespaceType,
-    cases.namespaceAgnosticObject,
-    cases.namespaceAgnosticType,
-  ];
-  const nonExportableTypes = [
     cases.multiNamespaceObject,
     cases.multiNamespaceType,
-    cases.hiddenObject,
-    cases.hiddenType,
+    cases.namespaceAgnosticObject,
+    cases.namespaceAgnosticType,
   ];
+  const nonExportableTypes = [cases.hiddenObject, cases.hiddenType];
   const allTypes = exportableTypes.concat(nonExportableTypes);
   return { exportableTypes, nonExportableTypes, allTypes };
 };
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts
index 6b4dfe1d05f72..0b531a3dccc1a 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/import.ts
@@ -20,27 +20,78 @@ const {
   SPACE_2: { spaceId: SPACE_2_ID },
 } = SPACES;
 const { fail400, fail409 } = testCaseFailures;
+const destinationId = (condition?: boolean) =>
+  condition !== false ? { successParam: 'destinationId' } : {};
+const newCopy = () => ({ successParam: 'createNewCopy' });
+const ambiguousConflict = (suffix: string) => ({
+  failure: 409 as 409,
+  fail409Param: `ambiguous_conflict_${suffix}`,
+});
 
-const createTestCases = (spaceId: string) => {
+const createNewCopiesTestCases = () => {
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  const cases = Object.entries(CASES).filter(([key]) => key !== 'HIDDEN');
+  const importable = cases.map(([, val]) => ({ ...val, successParam: 'createNewCopies' }));
+  const nonImportable = [{ ...CASES.HIDDEN, ...fail400() }];
+  const all = [...importable, ...nonImportable];
+  return { importable, nonImportable, all };
+};
+
+const createTestCases = (overwrite: boolean, spaceId: string) => {
   // for each permitted (non-403) outcome, if failure !== undefined then we expect
   // to receive an error; otherwise, we expect to receive a success result
-  const importableTypes = [
-    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409(spaceId === DEFAULT_SPACE_ID) },
-    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(spaceId === SPACE_1_ID) },
-    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(spaceId === SPACE_2_ID) },
-    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409() },
+  const group1Importable = [
+    // when overwrite=true, all of the objects in this group are created successfully, so we can check the created object attributes
+    {
+      ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+      ...fail409(!overwrite && spaceId === DEFAULT_SPACE_ID),
+    },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(!overwrite && spaceId === SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(!overwrite && spaceId === SPACE_2_ID) },
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
     CASES.NEW_SINGLE_NAMESPACE_OBJ,
     CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
   ];
-  const nonImportableTypes = [
-    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
-    { ...CASES.HIDDEN, ...fail400() },
-    { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
+  const group1NonImportable = [{ ...CASES.HIDDEN, ...fail400() }];
+  const group1All = group1Importable.concat(group1NonImportable);
+  const group2 = [
+    // when overwrite=true, all of the objects in this group are created successfully, so we can check the created object attributes
+    CASES.NEW_MULTI_NAMESPACE_OBJ,
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail409(!overwrite && (spaceId === DEFAULT_SPACE_ID || spaceId === SPACE_1_ID)),
+      ...destinationId(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1,
+      ...fail409(!overwrite && spaceId === SPACE_1_ID),
+      ...destinationId(spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2,
+      ...fail409(!overwrite && spaceId === SPACE_2_ID),
+      ...destinationId(spaceId !== SPACE_2_ID),
+    },
+    { ...CASES.CONFLICT_1A_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_1B_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_3A_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict
+    { ...CASES.CONFLICT_4_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict
+  ];
+  const group3 = [
+    // when overwrite=true, all of the objects in this group are errors, so we cannot check the created object attributes
+    // grouping errors together simplifies the test suite code
+    { ...CASES.CONFLICT_2C_OBJ, ...ambiguousConflict('2c') }, // "ambiguous destination" conflict
+  ];
+  const group4 = [
+    // when overwrite=true, all of the objects in this group are created successfully, so we can check the created object attributes
+    { ...CASES.CONFLICT_1_OBJ, ...fail409(!overwrite) }, // "exact match" conflict
+    CASES.CONFLICT_1A_OBJ, // no conflict because CONFLICT_1_OBJ is an exact match
+    CASES.CONFLICT_1B_OBJ, // no conflict because CONFLICT_1_OBJ is an exact match
+    { ...CASES.CONFLICT_2C_OBJ, ...newCopy() }, // "ambiguous source and destination" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_2D_OBJ, ...newCopy() }, // "ambiguous source and destination" conflict which results in a new destination ID and empty origin ID
   ];
-  const allTypes = importableTypes.concat(nonImportableTypes);
-  return { importableTypes, nonImportableTypes, allTypes };
+  return { group1Importable, group1NonImportable, group1All, group2, group3, group4 };
 };
 
 export default function ({ getService }: FtrProviderContext) {
@@ -53,27 +104,77 @@ export default function ({ getService }: FtrProviderContext) {
     esArchiver,
     supertest
   );
-  const createTests = (spaceId: string) => {
-    const { importableTypes, nonImportableTypes, allTypes } = createTestCases(spaceId);
-    // use singleRequest to reduce execution time and/or test combined cases
+  const createTests = (overwrite: boolean, createNewCopies: boolean, spaceId: string) => {
+    const singleRequest = true;
+
+    if (createNewCopies) {
+      const { importable, nonImportable, all } = createNewCopiesTestCases();
+      return {
+        unauthorized: [
+          createTestDefinitions(importable, true, { createNewCopies, spaceId }),
+          createTestDefinitions(nonImportable, false, { createNewCopies, spaceId, singleRequest }),
+          createTestDefinitions(all, true, {
+            createNewCopies,
+            spaceId,
+            singleRequest,
+            responseBodyOverride: expectForbidden([
+              'dashboard',
+              'globaltype',
+              'isolatedtype',
+              'sharedtype',
+            ]),
+          }),
+        ].flat(),
+        authorized: createTestDefinitions(all, false, { createNewCopies, spaceId, singleRequest }),
+      };
+    }
+
+    const {
+      group1Importable,
+      group1NonImportable,
+      group1All,
+      group2,
+      group3,
+      group4,
+    } = createTestCases(overwrite, spaceId);
     return {
       unauthorized: [
-        createTestDefinitions(importableTypes, true, { spaceId }),
-        createTestDefinitions(nonImportableTypes, false, { spaceId, singleRequest: true }),
-        createTestDefinitions(allTypes, true, {
+        createTestDefinitions(group1Importable, true, { overwrite, spaceId }),
+        createTestDefinitions(group1NonImportable, false, { overwrite, spaceId, singleRequest }),
+        createTestDefinitions(group1All, true, {
+          overwrite,
           spaceId,
-          singleRequest: true,
+          singleRequest,
           responseBodyOverride: expectForbidden(['dashboard', 'globaltype', 'isolatedtype']),
         }),
+        createTestDefinitions(group2, true, { overwrite, spaceId, singleRequest }),
+        createTestDefinitions(group3, true, { overwrite, spaceId, singleRequest }),
+        createTestDefinitions(group4, true, { overwrite, spaceId, singleRequest }),
+      ].flat(),
+      authorized: [
+        createTestDefinitions(group1All, false, { overwrite, spaceId, singleRequest }),
+        createTestDefinitions(group2, false, { overwrite, spaceId, singleRequest }),
+        createTestDefinitions(group3, false, { overwrite, spaceId, singleRequest }),
+        createTestDefinitions(group4, false, { overwrite, spaceId, singleRequest }),
       ].flat(),
-      authorized: createTestDefinitions(allTypes, false, { spaceId, singleRequest: true }),
     };
   };
 
   describe('_import', () => {
-    getTestScenarios().securityAndSpaces.forEach(({ spaceId, users }) => {
-      const suffix = ` within the ${spaceId} space`;
-      const { unauthorized, authorized } = createTests(spaceId);
+    getTestScenarios([
+      [false, false],
+      [false, true],
+      [true, false],
+    ]).securityAndSpaces.forEach(({ spaceId, users, modifier }) => {
+      const [overwrite, createNewCopies] = modifier!;
+      const suffix = ` within the ${spaceId} space${
+        overwrite
+          ? ' with overwrite enabled'
+          : createNewCopies
+          ? ' with createNewCopies enabled'
+          : ''
+      }`;
+      const { unauthorized, authorized } = createTests(overwrite, createNewCopies, spaceId);
       const _addTests = (user: TestUser, tests: ImportTestDefinition[]) => {
         addTests(`${user.description}${suffix}`, { user, spaceId, tests });
       };
diff --git a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts
index 8c16e298c7df9..792fe63e5932d 100644
--- a/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/security_and_spaces/apis/resolve_import_errors.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { v4 as uuidv4 } from 'uuid';
 import { SPACES } from '../../common/lib/spaces';
 import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { TestUser } from '../../common/lib/types';
@@ -20,30 +21,65 @@ const {
   SPACE_2: { spaceId: SPACE_2_ID },
 } = SPACES;
 const { fail400, fail409 } = testCaseFailures;
+const destinationId = (condition?: boolean) =>
+  condition !== false ? { successParam: 'destinationId' } : {};
+const newCopy = () => ({ successParam: 'createNewCopy' });
+
+const createNewCopiesTestCases = () => {
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  const cases = Object.entries(CASES).filter(([key]) => key !== 'HIDDEN');
+  const importable = cases.map(([, val]) => ({
+    ...val,
+    successParam: 'createNewCopies',
+    expectedNewId: uuidv4(),
+  }));
+  const nonImportable = [{ ...CASES.HIDDEN, ...fail400() }];
+  const all = [...importable, ...nonImportable];
+  return { importable, nonImportable, all };
+};
 
 const createTestCases = (overwrite: boolean, spaceId: string) => {
   // for each permitted (non-403) outcome, if failure !== undefined then we expect
   // to receive an error; otherwise, we expect to receive a success result
-  const importableTypes = [
-    {
-      ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
-      ...fail409(!overwrite && spaceId === DEFAULT_SPACE_ID),
-    },
-    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(!overwrite && spaceId === SPACE_1_ID) },
-    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(!overwrite && spaceId === SPACE_2_ID) },
+  const singleNamespaceObject =
+    spaceId === DEFAULT_SPACE_ID
+      ? CASES.SINGLE_NAMESPACE_DEFAULT_SPACE
+      : spaceId === SPACE_1_ID
+      ? CASES.SINGLE_NAMESPACE_SPACE_1
+      : CASES.SINGLE_NAMESPACE_SPACE_2;
+  const group1Importable = [
+    { ...singleNamespaceObject, ...fail409(!overwrite) },
     { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
-    CASES.NEW_SINGLE_NAMESPACE_OBJ,
-    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
   ];
-  const nonImportableTypes = [
-    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
-    { ...CASES.HIDDEN, ...fail400() },
-    { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
+  const group1NonImportable = [{ ...CASES.HIDDEN, ...fail400() }];
+  const group1All = [...group1Importable, ...group1NonImportable];
+  const group2 = [
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail409(!overwrite && (spaceId === DEFAULT_SPACE_ID || spaceId === SPACE_1_ID)),
+      ...destinationId(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1,
+      ...fail409(!overwrite && spaceId === SPACE_1_ID),
+      ...destinationId(spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2,
+      ...fail409(!overwrite && spaceId === SPACE_2_ID),
+      ...destinationId(spaceId !== SPACE_2_ID),
+    },
+    { ...CASES.CONFLICT_1A_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_1B_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    // all of the cases below represent imports that had an inexact match conflict or an ambiguous conflict
+    // if we call _resolve_import_errors and don't specify overwrite, each of these will result in a conflict because an object with that
+    // `expectedDestinationId` already exists
+    { ...CASES.CONFLICT_2C_OBJ, ...fail409(!overwrite), ...destinationId() }, // "ambiguous destination" conflict; if overwrite=true, will overwrite 'conflict_2a'
+    { ...CASES.CONFLICT_3A_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict; if overwrite=true, will overwrite 'conflict_3'
+    { ...CASES.CONFLICT_4_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict; if overwrite=true, will overwrite 'conflict_4a'
   ];
-  const allTypes = importableTypes.concat(nonImportableTypes);
-  return { importableTypes, nonImportableTypes, allTypes };
+  return { group1Importable, group1NonImportable, group1All, group2 };
 };
 
 export default function ({ getService }: FtrProviderContext) {
@@ -56,47 +92,82 @@ export default function ({ getService }: FtrProviderContext) {
     esArchiver,
     supertest
   );
-  const createTests = (overwrite: boolean, spaceId: string) => {
-    const { importableTypes, nonImportableTypes, allTypes } = createTestCases(overwrite, spaceId);
-    const singleRequest = true;
+  const createTests = (overwrite: boolean, createNewCopies: boolean, spaceId: string) => {
     // use singleRequest to reduce execution time and/or test combined cases
+    const singleRequest = true;
+
+    if (createNewCopies) {
+      const { importable, nonImportable, all } = createNewCopiesTestCases();
+      return {
+        unauthorized: [
+          createTestDefinitions(importable, true, { createNewCopies, spaceId }),
+          createTestDefinitions(nonImportable, false, { createNewCopies, spaceId, singleRequest }),
+          createTestDefinitions(all, true, {
+            createNewCopies,
+            spaceId,
+            singleRequest,
+            responseBodyOverride: expectForbidden(['globaltype', 'isolatedtype', 'sharedtype']),
+          }),
+        ].flat(),
+        authorized: createTestDefinitions(all, false, { createNewCopies, spaceId, singleRequest }),
+      };
+    }
+
+    const { group1Importable, group1NonImportable, group1All, group2 } = createTestCases(
+      overwrite,
+      spaceId
+    );
     return {
       unauthorized: [
-        createTestDefinitions(importableTypes, true, overwrite, { spaceId }),
-        createTestDefinitions(nonImportableTypes, false, overwrite, { spaceId, singleRequest }),
-        createTestDefinitions(allTypes, true, overwrite, {
+        createTestDefinitions(group1Importable, true, { overwrite, spaceId }),
+        createTestDefinitions(group1NonImportable, false, { overwrite, spaceId, singleRequest }),
+        createTestDefinitions(group1All, true, {
+          overwrite,
           spaceId,
           singleRequest,
-          responseBodyOverride: expectForbidden(['dashboard', 'globaltype', 'isolatedtype']),
+          responseBodyOverride: expectForbidden(['globaltype', 'isolatedtype']),
         }),
+        createTestDefinitions(group2, true, { overwrite, spaceId, singleRequest }),
+      ].flat(),
+      authorized: [
+        createTestDefinitions(group1All, false, { overwrite, spaceId, singleRequest }),
+        createTestDefinitions(group2, false, { overwrite, spaceId, singleRequest }),
       ].flat(),
-      authorized: createTestDefinitions(allTypes, false, overwrite, { spaceId, singleRequest }),
     };
   };
 
   describe('_resolve_import_errors', () => {
-    getTestScenarios([false, true]).securityAndSpaces.forEach(
-      ({ spaceId, users, modifier: overwrite }) => {
-        const suffix = ` within the ${spaceId} space${overwrite ? ' with overwrite enabled' : ''}`;
-        const { unauthorized, authorized } = createTests(overwrite!, spaceId);
-        const _addTests = (user: TestUser, tests: ResolveImportErrorsTestDefinition[]) => {
-          addTests(`${user.description}${suffix}`, { user, spaceId, tests });
-        };
+    getTestScenarios([
+      [false, false],
+      [false, true],
+      [true, false],
+    ]).securityAndSpaces.forEach(({ spaceId, users, modifier }) => {
+      const [overwrite, createNewCopies] = modifier!;
+      const suffix = ` within the ${spaceId} space${
+        overwrite
+          ? ' with overwrite enabled'
+          : createNewCopies
+          ? ' with createNewCopies enabled'
+          : ''
+      }`;
+      const { unauthorized, authorized } = createTests(overwrite, createNewCopies, spaceId);
+      const _addTests = (user: TestUser, tests: ResolveImportErrorsTestDefinition[]) => {
+        addTests(`${user.description}${suffix}`, { user, spaceId, tests });
+      };
 
-        [
-          users.noAccess,
-          users.legacyAll,
-          users.dualRead,
-          users.readGlobally,
-          users.readAtSpace,
-          users.allAtOtherSpace,
-        ].forEach((user) => {
-          _addTests(user, unauthorized);
-        });
-        [users.dualAll, users.allGlobally, users.allAtSpace, users.superuser].forEach((user) => {
-          _addTests(user, authorized);
-        });
-      }
-    );
+      [
+        users.noAccess,
+        users.legacyAll,
+        users.dualRead,
+        users.readGlobally,
+        users.readAtSpace,
+        users.allAtOtherSpace,
+      ].forEach((user) => {
+        _addTests(user, unauthorized);
+      });
+      [users.dualAll, users.allGlobally, users.allAtSpace, users.superuser].forEach((user) => {
+        _addTests(user, authorized);
+      });
+    });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts
index 464a5a1e76016..725120687c231 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/bulk_create.ts
@@ -14,6 +14,7 @@ import {
 } from '../../common/suites/bulk_create';
 
 const { fail400, fail409 } = testCaseFailures;
+const unresolvableConflict = () => ({ fail409Param: 'unresolvableConflict' });
 
 const createTestCases = (overwrite: boolean) => {
   // for each permitted (non-403) outcome, if failure !== undefined then we expect
@@ -23,8 +24,8 @@ const createTestCases = (overwrite: boolean) => {
     CASES.SINGLE_NAMESPACE_SPACE_1,
     CASES.SINGLE_NAMESPACE_SPACE_2,
     { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail409(!overwrite) },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail409() },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail409() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail409(), ...unresolvableConflict() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail409(), ...unresolvableConflict() },
     { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
     CASES.NEW_SINGLE_NAMESPACE_OBJ,
     CASES.NEW_MULTI_NAMESPACE_OBJ,
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/export.ts b/x-pack/test/saved_object_api_integration/security_only/apis/export.ts
index 61ff6eeb4bd80..99babf683ccfa 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/export.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/export.ts
@@ -18,15 +18,12 @@ const createTestCases = () => {
   const exportableTypes = [
     cases.singleNamespaceObject,
     cases.singleNamespaceType,
-    cases.namespaceAgnosticObject,
-    cases.namespaceAgnosticType,
-  ];
-  const nonExportableTypes = [
     cases.multiNamespaceObject,
     cases.multiNamespaceType,
-    cases.hiddenObject,
-    cases.hiddenType,
+    cases.namespaceAgnosticObject,
+    cases.namespaceAgnosticType,
   ];
+  const nonExportableTypes = [cases.hiddenObject, cases.hiddenType];
   const allTypes = exportableTypes.concat(nonExportableTypes);
   return { exportableTypes, nonExportableTypes, allTypes };
 };
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/import.ts b/x-pack/test/saved_object_api_integration/security_only/apis/import.ts
index beec276b3bd73..34be3b7408432 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/import.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/import.ts
@@ -14,27 +14,63 @@ import {
 } from '../../common/suites/import';
 
 const { fail400, fail409 } = testCaseFailures;
+const destinationId = (condition?: boolean) =>
+  condition !== false ? { successParam: 'destinationId' } : {};
+const newCopy = () => ({ successParam: 'createNewCopy' });
+const ambiguousConflict = (suffix: string) => ({
+  failure: 409 as 409,
+  fail409Param: `ambiguous_conflict_${suffix}`,
+});
 
-const createTestCases = () => {
+const createNewCopiesTestCases = () => {
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  const cases = Object.entries(CASES).filter(([key]) => key !== 'HIDDEN');
+  const importable = cases.map(([, val]) => ({ ...val, successParam: 'createNewCopies' }));
+  const nonImportable = [{ ...CASES.HIDDEN, ...fail400() }];
+  const all = [...importable, ...nonImportable];
+  return { importable, nonImportable, all };
+};
+
+const createTestCases = (overwrite: boolean) => {
   // for each permitted (non-403) outcome, if failure !== undefined then we expect
   // to receive an error; otherwise, we expect to receive a success result
-  const importableTypes = [
-    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409() },
+  const group1Importable = [
+    // when overwrite=true, all of the objects in this group are created successfully, so we can check the created object attributes
+    { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409(!overwrite) },
     CASES.SINGLE_NAMESPACE_SPACE_1,
     CASES.SINGLE_NAMESPACE_SPACE_2,
-    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409() },
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
     CASES.NEW_SINGLE_NAMESPACE_OBJ,
     CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
   ];
-  const nonImportableTypes = [
-    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
-    { ...CASES.HIDDEN, ...fail400() },
-    { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
+  const group1NonImportable = [{ ...CASES.HIDDEN, ...fail400() }];
+  const group1All = group1Importable.concat(group1NonImportable);
+  const group2 = [
+    // when overwrite=true, all of the objects in this group are created successfully, so we can check the created object attributes
+    CASES.NEW_MULTI_NAMESPACE_OBJ,
+    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail409(!overwrite) },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...destinationId() },
+    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...destinationId() },
+    { ...CASES.CONFLICT_1A_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_1B_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_3A_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict
+    { ...CASES.CONFLICT_4_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict
+  ];
+  const group3 = [
+    // when overwrite=true, all of the objects in this group are errors, so we cannot check the created object attributes
+    // grouping errors together simplifies the test suite code
+    { ...CASES.CONFLICT_2C_OBJ, ...ambiguousConflict('2c') }, // "ambiguous destination" conflict
+  ];
+  const group4 = [
+    // when overwrite=true, all of the objects in this group are created successfully, so we can check the created object attributes
+    { ...CASES.CONFLICT_1_OBJ, ...fail409(!overwrite) }, // "exact match" conflict
+    CASES.CONFLICT_1A_OBJ, // no conflict because CONFLICT_1_OBJ is an exact match
+    CASES.CONFLICT_1B_OBJ, // no conflict because CONFLICT_1_OBJ is an exact match
+    { ...CASES.CONFLICT_2C_OBJ, ...newCopy() }, // "ambiguous source and destination" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_2D_OBJ, ...newCopy() }, // "ambiguous source and destination" conflict which results in a new destination ID and empty origin ID
   ];
-  const allTypes = importableTypes.concat(nonImportableTypes);
-  return { importableTypes, nonImportableTypes, allTypes };
+  return { group1Importable, group1NonImportable, group1All, group2, group3, group4 };
 };
 
 export default function ({ getService }: FtrProviderContext) {
@@ -47,27 +83,76 @@ export default function ({ getService }: FtrProviderContext) {
     esArchiver,
     supertest
   );
-  const createTests = () => {
-    const { importableTypes, nonImportableTypes, allTypes } = createTestCases();
+  const createTests = (overwrite: boolean, createNewCopies: boolean) => {
     // use singleRequest to reduce execution time and/or test combined cases
+    const singleRequest = true;
+
+    if (createNewCopies) {
+      const { importable, nonImportable, all } = createNewCopiesTestCases();
+      return {
+        unauthorized: [
+          createTestDefinitions(importable, true, { createNewCopies }),
+          createTestDefinitions(nonImportable, false, { createNewCopies, singleRequest }),
+          createTestDefinitions(all, true, {
+            createNewCopies,
+            singleRequest,
+            responseBodyOverride: expectForbidden([
+              'dashboard',
+              'globaltype',
+              'isolatedtype',
+              'sharedtype',
+            ]),
+          }),
+        ].flat(),
+        authorized: createTestDefinitions(all, false, { createNewCopies, singleRequest }),
+      };
+    }
+
+    const {
+      group1Importable,
+      group1NonImportable,
+      group1All,
+      group2,
+      group3,
+      group4,
+    } = createTestCases(overwrite);
     return {
       unauthorized: [
-        createTestDefinitions(importableTypes, true),
-        createTestDefinitions(nonImportableTypes, false, { singleRequest: true }),
-        createTestDefinitions(allTypes, true, {
-          singleRequest: true,
+        createTestDefinitions(group1Importable, true, { overwrite }),
+        createTestDefinitions(group1NonImportable, false, { overwrite, singleRequest }),
+        createTestDefinitions(group1All, true, {
+          overwrite,
+          singleRequest,
           responseBodyOverride: expectForbidden(['dashboard', 'globaltype', 'isolatedtype']),
         }),
+        createTestDefinitions(group2, true, { overwrite, singleRequest }),
+        createTestDefinitions(group3, true, { overwrite, singleRequest }),
+        createTestDefinitions(group4, true, { overwrite, singleRequest }),
+      ].flat(),
+      authorized: [
+        createTestDefinitions(group1All, false, { overwrite, singleRequest }),
+        createTestDefinitions(group2, false, { overwrite, singleRequest }),
+        createTestDefinitions(group3, false, { overwrite, singleRequest }),
+        createTestDefinitions(group4, false, { overwrite, singleRequest }),
       ].flat(),
-      authorized: createTestDefinitions(allTypes, false, { singleRequest: true }),
     };
   };
 
   describe('_import', () => {
-    getTestScenarios().security.forEach(({ users }) => {
-      const { unauthorized, authorized } = createTests();
+    getTestScenarios([
+      [false, false],
+      [false, true],
+      [true, false],
+    ]).security.forEach(({ users, modifier }) => {
+      const [overwrite, createNewCopies] = modifier!;
+      const suffix = overwrite
+        ? ' with overwrite enabled'
+        : createNewCopies
+        ? ' with createNewCopies enabled'
+        : '';
+      const { unauthorized, authorized } = createTests(overwrite, createNewCopies);
       const _addTests = (user: TestUser, tests: ImportTestDefinition[]) => {
-        addTests(user.description, { user, tests });
+        addTests(`${user.description}${suffix}`, { user, tests });
       };
 
       [
diff --git a/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts
index a0abe4b0483f8..91134dd14bd8a 100644
--- a/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/security_only/apis/resolve_import_errors.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { v4 as uuidv4 } from 'uuid';
 import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { TestUser } from '../../common/lib/types';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
@@ -14,27 +15,45 @@ import {
 } from '../../common/suites/resolve_import_errors';
 
 const { fail400, fail409 } = testCaseFailures;
+const destinationId = (condition?: boolean) =>
+  condition !== false ? { successParam: 'destinationId' } : {};
+const newCopy = () => ({ successParam: 'createNewCopy' });
+
+const createNewCopiesTestCases = () => {
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  const cases = Object.entries(CASES).filter(([key]) => key !== 'HIDDEN');
+  const importable = cases.map(([, val]) => ({
+    ...val,
+    successParam: 'createNewCopies',
+    expectedNewId: uuidv4(),
+  }));
+  const nonImportable = [{ ...CASES.HIDDEN, ...fail400() }];
+  const all = [...importable, ...nonImportable];
+  return { importable, nonImportable, all };
+};
 
 const createTestCases = (overwrite: boolean) => {
   // for each permitted (non-403) outcome, if failure !== undefined then we expect
   // to receive an error; otherwise, we expect to receive a success result
-  const importableTypes = [
+  const group1Importable = [
     { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409(!overwrite) },
-    CASES.SINGLE_NAMESPACE_SPACE_1,
-    CASES.SINGLE_NAMESPACE_SPACE_2,
     { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
-    CASES.NEW_SINGLE_NAMESPACE_OBJ,
-    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
   ];
-  const nonImportableTypes = [
-    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
-    { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
-    { ...CASES.HIDDEN, ...fail400() },
-    { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
+  const group1NonImportable = [{ ...CASES.HIDDEN, ...fail400() }];
+  const group1All = [...group1Importable, ...group1NonImportable];
+  const group2 = [
+    { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail409(!overwrite) },
+    { ...CASES.CONFLICT_1A_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_1B_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    // all of the cases below represent imports that had an inexact match conflict or an ambiguous conflict
+    // if we call _resolve_import_errors and don't specify overwrite, each of these will result in a conflict because an object with that
+    // `expectedDestinationId` already exists
+    { ...CASES.CONFLICT_2C_OBJ, ...fail409(!overwrite), ...destinationId() }, // "ambiguous destination" conflict; if overwrite=true, will overwrite 'conflict_2a'
+    { ...CASES.CONFLICT_3A_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict; if overwrite=true, will overwrite 'conflict_3'
+    { ...CASES.CONFLICT_4_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict; if overwrite=true, will overwrite 'conflict_4a'
   ];
-  const allTypes = importableTypes.concat(nonImportableTypes);
-  return { importableTypes, nonImportableTypes, allTypes };
+  return { group1Importable, group1NonImportable, group1All, group2 };
 };
 
 export default function ({ getService }: FtrProviderContext) {
@@ -47,26 +66,58 @@ export default function ({ getService }: FtrProviderContext) {
     esArchiver,
     supertest
   );
-  const createTests = (overwrite: boolean) => {
-    const { importableTypes, nonImportableTypes, allTypes } = createTestCases(overwrite);
+  const createTests = (overwrite: boolean, createNewCopies: boolean) => {
     // use singleRequest to reduce execution time and/or test combined cases
+    const singleRequest = true;
+
+    if (createNewCopies) {
+      const { importable, nonImportable, all } = createNewCopiesTestCases();
+      return {
+        unauthorized: [
+          createTestDefinitions(importable, true, { createNewCopies }),
+          createTestDefinitions(nonImportable, false, { createNewCopies, singleRequest }),
+          createTestDefinitions(all, true, {
+            createNewCopies,
+            singleRequest,
+            responseBodyOverride: expectForbidden(['globaltype', 'isolatedtype', 'sharedtype']),
+          }),
+        ].flat(),
+        authorized: createTestDefinitions(all, false, { createNewCopies, singleRequest }),
+      };
+    }
+
+    const { group1Importable, group1NonImportable, group1All, group2 } = createTestCases(overwrite);
     return {
       unauthorized: [
-        createTestDefinitions(importableTypes, true, overwrite),
-        createTestDefinitions(nonImportableTypes, false, overwrite, { singleRequest: true }),
-        createTestDefinitions(allTypes, true, overwrite, {
-          singleRequest: true,
-          responseBodyOverride: expectForbidden(['dashboard', 'globaltype', 'isolatedtype']),
+        createTestDefinitions(group1Importable, true, { overwrite }),
+        createTestDefinitions(group1NonImportable, false, { overwrite, singleRequest }),
+        createTestDefinitions(group1All, true, {
+          overwrite,
+          singleRequest,
+          responseBodyOverride: expectForbidden(['globaltype', 'isolatedtype']),
         }),
+        createTestDefinitions(group2, true, { overwrite, singleRequest }),
+      ].flat(),
+      authorized: [
+        createTestDefinitions(group1All, false, { overwrite, singleRequest }),
+        createTestDefinitions(group2, false, { overwrite, singleRequest }),
       ].flat(),
-      authorized: createTestDefinitions(allTypes, false, overwrite, { singleRequest: true }),
     };
   };
 
   describe('_resolve_import_errors', () => {
-    getTestScenarios([false, true]).security.forEach(({ users, modifier: overwrite }) => {
-      const suffix = overwrite ? ' with overwrite enabled' : '';
-      const { unauthorized, authorized } = createTests(overwrite!);
+    getTestScenarios([
+      [false, false],
+      [false, true],
+      [true, false],
+    ]).security.forEach(({ users, modifier }) => {
+      const [overwrite, createNewCopies] = modifier!;
+      const suffix = overwrite
+        ? ' with overwrite enabled'
+        : createNewCopies
+        ? ' with createNewCopies enabled'
+        : '';
+      const { unauthorized, authorized } = createTests(overwrite, createNewCopies);
       const _addTests = (user: TestUser, tests: ResolveImportErrorsTestDefinition[]) => {
         addTests(`${user.description}${suffix}`, { user, tests });
       };
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts
index f9edc56b8ffea..74fade39bf7a5 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/bulk_create.ts
@@ -16,6 +16,8 @@ const {
   SPACE_2: { spaceId: SPACE_2_ID },
 } = SPACES;
 const { fail400, fail409 } = testCaseFailures;
+const unresolvableConflict = (condition?: boolean) =>
+  condition !== false ? { fail409Param: 'unresolvableConflict' } : {};
 
 const createTestCases = (overwrite: boolean, spaceId: string) => [
   // for each outcome, if failure !== undefined then we expect to receive
@@ -29,9 +31,18 @@ const createTestCases = (overwrite: boolean, spaceId: string) => [
   {
     ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
     ...fail409(!overwrite || (spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID)),
+    ...unresolvableConflict(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+  },
+  {
+    ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1,
+    ...fail409(!overwrite || spaceId !== SPACE_1_ID),
+    ...unresolvableConflict(spaceId !== SPACE_1_ID),
+  },
+  {
+    ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2,
+    ...fail409(!overwrite || spaceId !== SPACE_2_ID),
+    ...unresolvableConflict(spaceId !== SPACE_2_ID),
   },
-  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail409(!overwrite || spaceId !== SPACE_1_ID) },
-  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail409(!overwrite || spaceId !== SPACE_2_ID) },
   { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
   { ...CASES.HIDDEN, ...fail400() },
   CASES.NEW_SINGLE_NAMESPACE_OBJ,
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts
index 45a76a2f39e37..a36249528540b 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/import.ts
@@ -15,22 +15,75 @@ const {
   SPACE_2: { spaceId: SPACE_2_ID },
 } = SPACES;
 const { fail400, fail409 } = testCaseFailures;
+const destinationId = (condition?: boolean) =>
+  condition !== false ? { successParam: 'destinationId' } : {};
+const newCopy = () => ({ successParam: 'createNewCopy' });
+const ambiguousConflict = (suffix: string) => ({
+  failure: 409 as 409,
+  fail409Param: `ambiguous_conflict_${suffix}`,
+});
 
-const createTestCases = (spaceId: string) => [
+const createNewCopiesTestCases = () => {
   // for each outcome, if failure !== undefined then we expect to receive
   // an error; otherwise, we expect to receive a success result
-  { ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE, ...fail409(spaceId === DEFAULT_SPACE_ID) },
-  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(spaceId === SPACE_1_ID) },
-  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(spaceId === SPACE_2_ID) },
-  { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
-  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
-  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
-  { ...CASES.NAMESPACE_AGNOSTIC, ...fail409() },
-  { ...CASES.HIDDEN, ...fail400() },
-  CASES.NEW_SINGLE_NAMESPACE_OBJ,
-  { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
-  CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
-];
+  const cases = Object.entries(CASES).filter(([key]) => key !== 'HIDDEN');
+  return [
+    ...cases.map(([, val]) => ({ ...val, successParam: 'createNewCopies' })),
+    { ...CASES.HIDDEN, ...fail400() },
+  ];
+};
+
+const createTestCases = (overwrite: boolean, spaceId: string) => {
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  const group1 = [
+    // when overwrite=true, all of the objects in this group are created successfully, so we can check the created object attributes
+    {
+      ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
+      ...fail409(!overwrite && spaceId === DEFAULT_SPACE_ID),
+    },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(!overwrite && spaceId === SPACE_1_ID) },
+    { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(!overwrite && spaceId === SPACE_2_ID) },
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail409(!overwrite && (spaceId === DEFAULT_SPACE_ID || spaceId === SPACE_1_ID)),
+      ...destinationId(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1,
+      ...fail409(!overwrite && spaceId === SPACE_1_ID),
+      ...destinationId(spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2,
+      ...fail409(!overwrite && spaceId === SPACE_2_ID),
+      ...destinationId(spaceId !== SPACE_2_ID),
+    },
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+    { ...CASES.HIDDEN, ...fail400() },
+    { ...CASES.CONFLICT_1A_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_1B_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_3A_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict
+    { ...CASES.CONFLICT_4_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict
+    CASES.NEW_SINGLE_NAMESPACE_OBJ,
+    CASES.NEW_MULTI_NAMESPACE_OBJ,
+    CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
+  ];
+  const group2 = [
+    // when overwrite=true, all of the objects in this group are errors, so we cannot check the created object attributes
+    // grouping errors together simplifies the test suite code
+    { ...CASES.CONFLICT_2C_OBJ, ...ambiguousConflict('2c') }, // "ambiguous destination" conflict
+  ];
+  const group3 = [
+    // when overwrite=true, all of the objects in this group are created successfully, so we can check the created object attributes
+    { ...CASES.CONFLICT_1_OBJ, ...fail409(!overwrite) }, // "exact match" conflict
+    CASES.CONFLICT_1A_OBJ, // no conflict because CONFLICT_1_OBJ is an exact match
+    CASES.CONFLICT_1B_OBJ, // no conflict because CONFLICT_1_OBJ is an exact match
+    { ...CASES.CONFLICT_2C_OBJ, ...newCopy() }, // "ambiguous source and destination" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_2D_OBJ, ...newCopy() }, // "ambiguous source and destination" conflict which results in a new destination ID and empty origin ID
+  ];
+  return { group1, group2, group3 };
+};
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
@@ -38,15 +91,35 @@ export default function ({ getService }: FtrProviderContext) {
   const es = getService('legacyEs');
 
   const { addTests, createTestDefinitions } = importTestSuiteFactory(es, esArchiver, supertest);
-  const createTests = (spaceId: string) => {
-    const testCases = createTestCases(spaceId);
-    return createTestDefinitions(testCases, false, { spaceId, singleRequest: true });
+  const createTests = (overwrite: boolean, createNewCopies: boolean, spaceId: string) => {
+    const singleRequest = true;
+    if (createNewCopies) {
+      const cases = createNewCopiesTestCases();
+      return createTestDefinitions(cases, false, { createNewCopies, spaceId, singleRequest });
+    }
+
+    const { group1, group2, group3 } = createTestCases(overwrite, spaceId);
+    return [
+      createTestDefinitions(group1, false, { overwrite, spaceId, singleRequest }),
+      createTestDefinitions(group2, false, { overwrite, spaceId, singleRequest }),
+      createTestDefinitions(group3, false, { overwrite, spaceId, singleRequest }),
+    ].flat();
   };
 
   describe('_import', () => {
-    getTestScenarios().spaces.forEach(({ spaceId }) => {
-      const tests = createTests(spaceId);
-      addTests(`within the ${spaceId} space`, { spaceId, tests });
+    getTestScenarios([
+      [false, false],
+      [false, true],
+      [true, false],
+    ]).spaces.forEach(({ spaceId, modifier }) => {
+      const [overwrite, createNewCopies] = modifier!;
+      const suffix = overwrite
+        ? ' with overwrite enabled'
+        : createNewCopies
+        ? ' with createNewCopies enabled'
+        : '';
+      const tests = createTests(overwrite, createNewCopies, spaceId);
+      addTests(`within the ${spaceId} space${suffix}`, { spaceId, tests });
     });
   });
 }
diff --git a/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts b/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts
index a6ef902e2e9eb..1431a61b1cbe0 100644
--- a/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts
+++ b/x-pack/test/saved_object_api_integration/spaces_only/apis/resolve_import_errors.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { v4 as uuidv4 } from 'uuid';
 import { SPACES } from '../../common/lib/spaces';
 import { testCaseFailures, getTestScenarios } from '../../common/lib/saved_object_test_utils';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
@@ -18,25 +19,62 @@ const {
   SPACE_2: { spaceId: SPACE_2_ID },
 } = SPACES;
 const { fail400, fail409 } = testCaseFailures;
+const destinationId = (condition?: boolean) =>
+  condition !== false ? { successParam: 'destinationId' } : {};
+const newCopy = () => ({ successParam: 'createNewCopy' });
 
-const createTestCases = (overwrite: boolean, spaceId: string) => [
+const createNewCopiesTestCases = () => {
   // for each outcome, if failure !== undefined then we expect to receive
   // an error; otherwise, we expect to receive a success result
-  {
-    ...CASES.SINGLE_NAMESPACE_DEFAULT_SPACE,
-    ...fail409(!overwrite && spaceId === DEFAULT_SPACE_ID),
-  },
-  { ...CASES.SINGLE_NAMESPACE_SPACE_1, ...fail409(!overwrite && spaceId === SPACE_1_ID) },
-  { ...CASES.SINGLE_NAMESPACE_SPACE_2, ...fail409(!overwrite && spaceId === SPACE_2_ID) },
-  { ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1, ...fail400() },
-  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1, ...fail400() },
-  { ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2, ...fail400() },
-  { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
-  { ...CASES.HIDDEN, ...fail400() },
-  CASES.NEW_SINGLE_NAMESPACE_OBJ,
-  { ...CASES.NEW_MULTI_NAMESPACE_OBJ, ...fail400() },
-  CASES.NEW_NAMESPACE_AGNOSTIC_OBJ,
-];
+  const cases = Object.entries(CASES).filter(([key]) => key !== 'HIDDEN');
+  return [
+    ...cases.map(([, val]) => ({
+      ...val,
+      successParam: 'createNewCopies',
+      expectedNewId: uuidv4(),
+    })),
+    { ...CASES.HIDDEN, ...fail400() },
+  ];
+};
+
+const createTestCases = (overwrite: boolean, spaceId: string) => {
+  // for each outcome, if failure !== undefined then we expect to receive
+  // an error; otherwise, we expect to receive a success result
+  const singleNamespaceObject =
+    spaceId === DEFAULT_SPACE_ID
+      ? CASES.SINGLE_NAMESPACE_DEFAULT_SPACE
+      : spaceId === SPACE_1_ID
+      ? CASES.SINGLE_NAMESPACE_SPACE_1
+      : CASES.SINGLE_NAMESPACE_SPACE_2;
+  return [
+    { ...singleNamespaceObject, ...fail409(!overwrite) },
+    {
+      ...CASES.MULTI_NAMESPACE_DEFAULT_AND_SPACE_1,
+      ...fail409(!overwrite && (spaceId === DEFAULT_SPACE_ID || spaceId === SPACE_1_ID)),
+      ...destinationId(spaceId !== DEFAULT_SPACE_ID && spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.MULTI_NAMESPACE_ONLY_SPACE_1,
+      ...fail409(!overwrite && spaceId === SPACE_1_ID),
+      ...destinationId(spaceId !== SPACE_1_ID),
+    },
+    {
+      ...CASES.MULTI_NAMESPACE_ONLY_SPACE_2,
+      ...fail409(!overwrite && spaceId === SPACE_2_ID),
+      ...destinationId(spaceId !== SPACE_2_ID),
+    },
+    { ...CASES.NAMESPACE_AGNOSTIC, ...fail409(!overwrite) },
+    { ...CASES.HIDDEN, ...fail400() },
+    { ...CASES.CONFLICT_1A_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    { ...CASES.CONFLICT_1B_OBJ, ...newCopy() }, // "ambiguous source" conflict which results in a new destination ID and empty origin ID
+    // all of the cases below represent imports that had an inexact match conflict or an ambiguous conflict
+    // if we call _resolve_import_errors and don't specify overwrite, each of these will result in a conflict because an object with that
+    // `expectedDestinationId` already exists
+    { ...CASES.CONFLICT_2C_OBJ, ...fail409(!overwrite), ...destinationId() }, // "ambiguous destination" conflict; if overwrite=true, will overwrite 'conflict_2a'
+    { ...CASES.CONFLICT_3A_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict; if overwrite=true, will overwrite 'conflict_3'
+    { ...CASES.CONFLICT_4_OBJ, ...fail409(!overwrite), ...destinationId() }, // "inexact match" conflict; if overwrite=true, will overwrite 'conflict_4a'
+  ];
+};
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
@@ -48,15 +86,32 @@ export default function ({ getService }: FtrProviderContext) {
     esArchiver,
     supertest
   );
-  const createTests = (overwrite: boolean, spaceId: string) => {
+  const createTests = (overwrite: boolean, createNewCopies: boolean, spaceId: string) => {
+    const singleRequest = true;
+    if (createNewCopies) {
+      const cases = createNewCopiesTestCases();
+      // The resolveImportErrors API doesn't actually have a flag for "createNewCopies" mode; rather, we create test cases as if we are resolving
+      // errors from a call to the import API that had createNewCopies mode enabled.
+      return createTestDefinitions(cases, false, { createNewCopies, spaceId, singleRequest });
+    }
+
     const testCases = createTestCases(overwrite, spaceId);
-    return createTestDefinitions(testCases, false, overwrite, { spaceId, singleRequest: true });
+    return createTestDefinitions(testCases, false, { overwrite, spaceId, singleRequest });
   };
 
   describe('_resolve_import_errors', () => {
-    getTestScenarios([false, true]).spaces.forEach(({ spaceId, modifier: overwrite }) => {
-      const suffix = overwrite ? ' with overwrite enabled' : '';
-      const tests = createTests(overwrite!, spaceId);
+    getTestScenarios([
+      [false, false],
+      [false, true],
+      [true, false],
+    ]).spaces.forEach(({ spaceId, modifier }) => {
+      const [overwrite, createNewCopies] = modifier!;
+      const suffix = overwrite
+        ? ' with overwrite enabled'
+        : createNewCopies
+        ? ' with createNewCopies enabled'
+        : '';
+      const tests = createTests(overwrite, createNewCopies, spaceId);
       addTests(`within the ${spaceId} space${suffix}`, { spaceId, tests });
     });
   });
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
index 9a8a0a1fdda14..7e528c23c20a0 100644
--- a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
+++ b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/data.json
@@ -380,11 +380,11 @@
 {
   "type": "doc",
   "value": {
-    "id": "sharedtype:default_space_only",
+    "id": "sharedtype:default_only",
     "index": ".kibana",
     "source": {
       "sharedtype": {
-        "title": "A shared saved-object in the default space"
+        "title": "A shared saved-object in one space"
       },
       "type": "sharedtype",
       "namespaces": ["default"],
@@ -401,7 +401,7 @@
     "index": ".kibana",
     "source": {
       "sharedtype": {
-        "title": "A shared saved-object in the space_1 space"
+        "title": "A shared saved-object in one space"
       },
       "type": "sharedtype",
       "namespaces": ["space_1"],
@@ -418,7 +418,7 @@
     "index": ".kibana",
     "source": {
       "sharedtype": {
-        "title": "A shared saved-object in the space_2 space"
+        "title": "A shared saved-object in one space"
       },
       "type": "sharedtype",
       "namespaces": ["space_2"],
@@ -496,3 +496,128 @@
   }
 }
 
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_1_default",
+    "index": ".kibana",
+    "source": {
+      "originId": "conflict_1",
+      "sharedtype": {
+        "title": "A shared saved-object in one space"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_1_space_1",
+    "index": ".kibana",
+    "source": {
+      "originId": "conflict_1",
+      "sharedtype": {
+        "title": "A shared saved-object in one space"
+      },
+      "type": "sharedtype",
+      "namespaces": ["space_1"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_1_space_2",
+    "index": ".kibana",
+    "source": {
+      "originId": "conflict_1",
+      "sharedtype": {
+        "title": "A shared saved-object in one space"
+      },
+      "type": "sharedtype",
+      "namespaces": ["space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_2_default",
+    "index": ".kibana",
+    "source": {
+      "originId": "conflict_2",
+      "sharedtype": {
+        "title": "A shared saved-object in one space"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_2_space_1",
+    "index": ".kibana",
+    "source": {
+      "originId": "conflict_2",
+      "sharedtype": {
+        "title": "A shared saved-object in one space"
+      },
+      "type": "sharedtype",
+      "namespaces": ["space_1"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_2_space_2",
+    "index": ".kibana",
+    "source": {
+      "originId": "conflict_2",
+      "sharedtype": {
+        "title": "A shared saved-object in one space"
+      },
+      "type": "sharedtype",
+      "namespaces": ["space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "sharedtype:conflict_2_all",
+    "index": ".kibana",
+    "source": {
+      "originId": "conflict_2",
+      "sharedtype": {
+        "title": "A shared saved-object in all spaces"
+      },
+      "type": "sharedtype",
+      "namespaces": ["default", "space_1", "space_2"],
+      "updated_at": "2017-09-21T18:59:16.270Z"
+    },
+    "type": "doc"
+  }
+}
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
index 508de68c32f70..a2f8088ce0436 100644
--- a/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
+++ b/x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces/mappings.json
@@ -162,6 +162,9 @@
         "namespaces": {
           "type": "keyword"
         },
+        "originId": {
+          "type": "keyword"
+        },
         "search": {
           "properties": {
             "columns": {
diff --git a/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts b/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts
index ee03fa6b648af..0e63e1bc19954 100644
--- a/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts
+++ b/x-pack/test/spaces_api_integration/common/fixtures/spaces_test_plugin/server/plugin.ts
@@ -15,6 +15,13 @@ export class Plugin {
       name: 'sharedtype',
       hidden: false,
       namespaceType: 'multiple',
+      management: {
+        icon: 'beaker',
+        importableAndExportable: true,
+        getTitle(obj) {
+          return obj.attributes.title;
+        },
+      },
       mappings: {
         properties: {
           title: { type: 'text' },
diff --git a/x-pack/test/spaces_api_integration/common/lib/saved_object_test_cases.ts b/x-pack/test/spaces_api_integration/common/lib/saved_object_test_cases.ts
index 67f5d737ba010..3b0f5f8570aa3 100644
--- a/x-pack/test/spaces_api_integration/common/lib/saved_object_test_cases.ts
+++ b/x-pack/test/spaces_api_integration/common/lib/saved_object_test_cases.ts
@@ -5,8 +5,8 @@
  */
 
 export const MULTI_NAMESPACE_SAVED_OBJECT_TEST_CASES = Object.freeze({
-  DEFAULT_SPACE_ONLY: Object.freeze({
-    id: 'default_space_only',
+  DEFAULT_ONLY: Object.freeze({
+    id: 'default_only',
     existingNamespaces: ['default'],
   }),
   SPACE_1_ONLY: Object.freeze({
diff --git a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
index 2dd4484ffcde8..26c736034501f 100644
--- a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
@@ -19,6 +19,11 @@ interface CopyToSpaceTest {
   response: (resp: TestResponse) => Promise<void>;
 }
 
+interface CopyToSpaceMultiNamespaceTest extends CopyToSpaceTest {
+  testTitle: string;
+  objects: Array<Record<string, any>>;
+}
+
 interface CopyToSpaceTests {
   noConflictsWithoutReferences: CopyToSpaceTest;
   noConflictsWithReferences: CopyToSpaceTest;
@@ -30,6 +35,7 @@ interface CopyToSpaceTests {
     withConflictsResponse: (resp: TestResponse) => Promise<void>;
     noConflictsResponse: (resp: TestResponse) => Promise<void>;
   };
+  multiNamespaceTestCases: (overwrite: boolean) => CopyToSpaceMultiNamespaceTest[];
 }
 
 interface CopyToSpaceTestDefinition {
@@ -53,28 +59,14 @@ interface SpaceBucket {
 }
 
 const INITIAL_COUNTS: Record<string, Record<string, number>> = {
-  [DEFAULT_SPACE_ID]: {
-    dashboard: 2,
-    visualization: 3,
-    'index-pattern': 1,
-  },
-  space_1: {
-    dashboard: 2,
-    visualization: 3,
-    'index-pattern': 1,
-  },
-  space_2: {
-    dashboard: 1,
-  },
+  [DEFAULT_SPACE_ID]: { dashboard: 2, visualization: 3, 'index-pattern': 1 },
+  space_1: { dashboard: 2, visualization: 3, 'index-pattern': 1 },
+  space_2: { dashboard: 1 },
 };
 
 const getDestinationWithoutConflicts = () => 'space_2';
-const getDestinationWithConflicts = (originSpaceId?: string) => {
-  if (!originSpaceId || originSpaceId === DEFAULT_SPACE_ID) {
-    return 'space_1';
-  }
-  return DEFAULT_SPACE_ID;
-};
+const getDestinationWithConflicts = (originSpaceId?: string) =>
+  !originSpaceId || originSpaceId === DEFAULT_SPACE_ID ? 'space_1' : DEFAULT_SPACE_ID;
 
 export function copyToSpaceTestSuiteFactory(
   es: any,
@@ -86,27 +78,11 @@ export function copyToSpaceTestSuiteFactory(
       index: '.kibana',
       body: {
         size: 0,
-        query: {
-          terms: {
-            type: ['visualization', 'dashboard', 'index-pattern'],
-          },
-        },
+        query: { terms: { type: ['visualization', 'dashboard', 'index-pattern'] } },
         aggs: {
           count: {
-            terms: {
-              field: 'namespace',
-              missing: DEFAULT_SPACE_ID,
-              size: 10,
-            },
-            aggs: {
-              countByType: {
-                terms: {
-                  field: 'type',
-                  missing: 'UNKNOWN',
-                  size: 10,
-                },
-              },
-            },
+            terms: { field: 'namespace', missing: DEFAULT_SPACE_ID, size: 10 },
+            aggs: { countByType: { terms: { field: 'type', missing: 'UNKNOWN', size: 10 } } },
           },
         },
       },
@@ -135,13 +111,7 @@ export function copyToSpaceTestSuiteFactory(
     const { countByType } = spaceBucket;
     const expectedBuckets = Object.entries(expectedCounts).reduce((acc, entry) => {
       const [type, count] = entry;
-      return [
-        ...acc,
-        {
-          key: type,
-          doc_count: count,
-        },
-      ];
+      return [...acc, { key: type, doc_count: count }];
     }, [] as CountByTypeBucket[]);
 
     expectedBuckets.sort(bucketSorter);
@@ -154,14 +124,6 @@ export function copyToSpaceTestSuiteFactory(
     });
   };
 
-  const expectRbacForbiddenResponse = async (resp: TestResponse) => {
-    expect(resp.body).to.eql({
-      statusCode: 403,
-      error: 'Forbidden',
-      message: 'Unable to bulk_get dashboard',
-    });
-  };
-
   const expectNotFoundResponse = async (resp: TestResponse) => {
     expect(resp.body).to.eql({
       statusCode: 404,
@@ -172,39 +134,81 @@ export function copyToSpaceTestSuiteFactory(
 
   const createExpectNoConflictsWithoutReferencesForSpace = (
     spaceId: string,
+    destination: string,
     expectedDashboardCount: number
   ) => async (resp: TestResponse) => {
     const result = resp.body as CopyResponse;
     expect(result).to.eql({
-      [spaceId]: {
+      [destination]: {
         success: true,
         successCount: 1,
+        successResults: [
+          {
+            id: 'cts_dashboard',
+            type: 'dashboard',
+            meta: {
+              title: `This is the ${spaceId} test space CTS dashboard`,
+              icon: 'dashboardApp',
+            },
+          },
+        ],
       },
     } as CopyResponse);
 
     // Query ES to ensure that we copied everything we expected
-    await assertSpaceCounts(spaceId, {
+    await assertSpaceCounts(destination, {
       dashboard: expectedDashboardCount,
     });
   };
 
-  const expectNoConflictsWithoutReferencesResult = createExpectNoConflictsWithoutReferencesForSpace(
-    getDestinationWithoutConflicts(),
-    2
-  );
+  const expectNoConflictsWithoutReferencesResult = (spaceId: string = DEFAULT_SPACE_ID) =>
+    createExpectNoConflictsWithoutReferencesForSpace(spaceId, getDestinationWithoutConflicts(), 2);
 
-  const expectNoConflictsForNonExistentSpaceResult = createExpectNoConflictsWithoutReferencesForSpace(
-    'non_existent_space',
-    1
-  );
+  const expectNoConflictsForNonExistentSpaceResult = (spaceId: string = DEFAULT_SPACE_ID) =>
+    createExpectNoConflictsWithoutReferencesForSpace(spaceId, 'non_existent_space', 1);
 
-  const expectNoConflictsWithReferencesResult = async (resp: TestResponse) => {
+  const expectNoConflictsWithReferencesResult = (spaceId: string = DEFAULT_SPACE_ID) => async (
+    resp: TestResponse
+  ) => {
     const destination = getDestinationWithoutConflicts();
     const result = resp.body as CopyResponse;
     expect(result).to.eql({
       [destination]: {
         success: true,
         successCount: 5,
+        successResults: [
+          {
+            id: 'cts_ip_1',
+            type: 'index-pattern',
+            meta: {
+              icon: 'indexPatternApp',
+              title: `Copy to Space index pattern 1 from ${spaceId} space`,
+            },
+          },
+          {
+            id: `cts_vis_1_${spaceId}`,
+            type: 'visualization',
+            meta: { icon: 'visualizeApp', title: `CTS vis 1 from ${spaceId} space` },
+          },
+          {
+            id: `cts_vis_2_${spaceId}`,
+            type: 'visualization',
+            meta: { icon: 'visualizeApp', title: `CTS vis 2 from ${spaceId} space` },
+          },
+          {
+            id: 'cts_vis_3',
+            type: 'visualization',
+            meta: { icon: 'visualizeApp', title: `CTS vis 3 from ${spaceId} space` },
+          },
+          {
+            id: 'cts_dashboard',
+            type: 'dashboard',
+            meta: {
+              icon: 'dashboardApp',
+              title: `This is the ${spaceId} test space CTS dashboard`,
+            },
+          },
+        ],
       },
     } as CopyResponse);
 
@@ -288,6 +292,42 @@ export function copyToSpaceTestSuiteFactory(
       [destination]: {
         success: true,
         successCount: 5,
+        successResults: [
+          {
+            id: 'cts_ip_1',
+            type: 'index-pattern',
+            meta: {
+              icon: 'indexPatternApp',
+              title: `Copy to Space index pattern 1 from ${spaceId} space`,
+            },
+            overwrite: true,
+          },
+          {
+            id: `cts_vis_1_${spaceId}`,
+            type: 'visualization',
+            meta: { icon: 'visualizeApp', title: `CTS vis 1 from ${spaceId} space` },
+          },
+          {
+            id: `cts_vis_2_${spaceId}`,
+            type: 'visualization',
+            meta: { icon: 'visualizeApp', title: `CTS vis 2 from ${spaceId} space` },
+          },
+          {
+            id: 'cts_vis_3',
+            type: 'visualization',
+            meta: { icon: 'visualizeApp', title: `CTS vis 3 from ${spaceId} space` },
+            overwrite: true,
+          },
+          {
+            id: 'cts_dashboard',
+            type: 'dashboard',
+            meta: {
+              icon: 'dashboardApp',
+              title: `This is the ${spaceId} test space CTS dashboard`,
+            },
+            overwrite: true,
+          },
+        ],
       },
     } as CopyResponse);
 
@@ -309,30 +349,48 @@ export function copyToSpaceTestSuiteFactory(
     const result = resp.body as CopyResponse;
     result[destination].errors!.sort(errorSorter);
 
+    const expectedSuccessResults = [
+      {
+        id: `cts_vis_1_${spaceId}`,
+        type: 'visualization',
+        meta: { icon: 'visualizeApp', title: `CTS vis 1 from ${spaceId} space` },
+      },
+      {
+        id: `cts_vis_2_${spaceId}`,
+        type: 'visualization',
+        meta: { icon: 'visualizeApp', title: `CTS vis 2 from ${spaceId} space` },
+      },
+    ];
     const expectedErrors = [
       {
-        error: {
-          type: 'conflict',
-        },
+        error: { type: 'conflict' },
         id: 'cts_dashboard',
         title: `This is the ${spaceId} test space CTS dashboard`,
         type: 'dashboard',
+        meta: {
+          title: `This is the ${spaceId} test space CTS dashboard`,
+          icon: 'dashboardApp',
+        },
       },
       {
-        error: {
-          type: 'conflict',
-        },
+        error: { type: 'conflict' },
         id: 'cts_ip_1',
         title: `Copy to Space index pattern 1 from ${spaceId} space`,
         type: 'index-pattern',
+        meta: {
+          title: `Copy to Space index pattern 1 from ${spaceId} space`,
+          icon: 'indexPatternApp',
+        },
       },
       {
-        error: {
-          type: 'conflict',
-        },
+        error: { type: 'conflict' },
         id: 'cts_vis_3',
         title: `CTS vis 3 from ${spaceId} space`,
         type: 'visualization',
+        meta: {
+          title: `CTS vis 3 from ${spaceId} space`,
+          icon: 'visualizeApp',
+        },
       },
     ];
     expectedErrors.sort(errorSorter);
@@ -341,16 +399,176 @@ export function copyToSpaceTestSuiteFactory(
       [destination]: {
         success: false,
         successCount: 2,
+        successResults: expectedSuccessResults,
         errors: expectedErrors,
       },
     } as CopyResponse);
 
-    // Query ES to ensure that we copied everything we expected
-    await assertSpaceCounts(destination, {
-      dashboard: 2,
-      visualization: 5,
-      'index-pattern': 1,
-    });
+    // Query ES to ensure that no objects were created
+    await assertSpaceCounts(destination, INITIAL_COUNTS[destination]);
+  };
+
+  /**
+   * Creates test cases for multi-namespace saved object types.
+   * Note: these are written with the assumption that test data will only be reloaded between each group of test cases, *not* before every
+   * single test case. This saves time during test execution.
+   */
+  const createMultiNamespaceTestCases = (
+    spaceId: string,
+    outcome: 'authorized' | 'unauthorizedRead' | 'unauthorizedWrite' | 'noAccess' = 'authorized'
+  ) => (overwrite: boolean): CopyToSpaceMultiNamespaceTest[] => {
+    // the status code of the HTTP response differs depending on the error type
+    // a 403 error actually comes back as an HTTP 200 response
+    const statusCode = outcome === 'noAccess' ? 404 : 200;
+    const type = 'sharedtype';
+    const v4 = new RegExp(/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i);
+    const noConflictId = `${spaceId}_only`;
+    const exactMatchId = 'all_spaces';
+    const inexactMatchId = `conflict_1_${spaceId}`;
+    const ambiguousConflictId = `conflict_2_${spaceId}`;
+
+    const getResult = (response: TestResponse) => (response.body as CopyResponse).space_2;
+    const expectForbiddenResponse = (response: TestResponse) => {
+      expect(response.body).to.eql({
+        space_2: {
+          success: false,
+          successCount: 0,
+          errors: [
+            { statusCode: 403, error: 'Forbidden', message: `Unable to bulk_create sharedtype` },
+          ],
+        },
+      });
+    };
+
+    return [
+      {
+        testTitle: 'copying with no conflict',
+        objects: [{ type, id: noConflictId }],
+        statusCode,
+        response: async (response: TestResponse) => {
+          if (outcome === 'authorized') {
+            const { success, successCount, successResults, errors } = getResult(response);
+            expect(success).to.eql(true);
+            expect(successCount).to.eql(1);
+            const destinationId = successResults![0].destinationId;
+            expect(destinationId).to.match(v4);
+            const meta = { title: 'A shared saved-object in one space', icon: 'beaker' };
+            expect(successResults).to.eql([{ type, id: noConflictId, meta, destinationId }]);
+            expect(errors).to.be(undefined);
+          } else if (outcome === 'noAccess') {
+            expectNotFoundResponse(response);
+          } else {
+            // unauthorized read/write
+            expectForbiddenResponse(response);
+          }
+        },
+      },
+      {
+        testTitle: 'copying with an exact match conflict',
+        objects: [{ type, id: exactMatchId }],
+        statusCode,
+        response: async (response: TestResponse) => {
+          if (outcome === 'authorized') {
+            const { success, successCount, successResults, errors } = getResult(response);
+            const title = 'A shared saved-object in the default, space_1, and space_2 spaces';
+            const meta = { title, icon: 'beaker' };
+            if (overwrite) {
+              expect(success).to.eql(true);
+              expect(successCount).to.eql(1);
+              expect(successResults).to.eql([{ type, id: exactMatchId, meta, overwrite: true }]);
+              expect(errors).to.be(undefined);
+            } else {
+              expect(success).to.eql(false);
+              expect(successCount).to.eql(0);
+              expect(successResults).to.be(undefined);
+              expect(errors).to.eql([
+                { error: { type: 'conflict' }, type, id: exactMatchId, title, meta },
+              ]);
+            }
+          } else if (outcome === 'noAccess') {
+            expectNotFoundResponse(response);
+          } else {
+            // unauthorized read/write
+            expectForbiddenResponse(response);
+          }
+        },
+      },
+      {
+        testTitle: 'copying with an inexact match conflict',
+        objects: [{ type, id: inexactMatchId }],
+        statusCode,
+        response: async (response: TestResponse) => {
+          if (outcome === 'authorized') {
+            const { success, successCount, successResults, errors } = getResult(response);
+            const title = 'A shared saved-object in one space';
+            const meta = { title, icon: 'beaker' };
+            const destinationId = 'conflict_1_space_2';
+            if (overwrite) {
+              expect(success).to.eql(true);
+              expect(successCount).to.eql(1);
+              expect(successResults).to.eql([
+                { type, id: inexactMatchId, meta, overwrite: true, destinationId },
+              ]);
+              expect(errors).to.be(undefined);
+            } else {
+              expect(success).to.eql(false);
+              expect(successCount).to.eql(0);
+              expect(successResults).to.be(undefined);
+              expect(errors).to.eql([
+                {
+                  error: { type: 'conflict', destinationId },
+                  type,
+                  id: inexactMatchId,
+                  title,
+                  meta,
+                },
+              ]);
+            }
+          } else if (outcome === 'noAccess') {
+            expectNotFoundResponse(response);
+          } else {
+            // unauthorized read/write
+            expectForbiddenResponse(response);
+          }
+        },
+      },
+      {
+        testTitle: 'copying with an ambiguous conflict',
+        objects: [{ type, id: ambiguousConflictId }],
+        statusCode,
+        response: async (response: TestResponse) => {
+          if (outcome === 'authorized') {
+            const { success, successCount, successResults, errors } = getResult(response);
+            const updatedAt = '2017-09-21T18:59:16.270Z';
+            const destinations = [
+              // response should be sorted by updatedAt in descending order
+              { id: 'conflict_2_space_2', title: 'A shared saved-object in one space', updatedAt },
+              { id: 'conflict_2_all', title: 'A shared saved-object in all spaces', updatedAt },
+            ];
+            expect(success).to.eql(false);
+            expect(successCount).to.eql(0);
+            expect(successResults).to.be(undefined);
+            expect(errors).to.eql([
+              {
+                error: { type: 'ambiguous_conflict', destinations },
+                type,
+                id: ambiguousConflictId,
+                title: 'A shared saved-object in one space',
+                meta: {
+                  title: 'A shared saved-object in one space',
+                  icon: 'beaker',
+                },
+              },
+            ]);
+          } else if (outcome === 'noAccess') {
+            expectNotFoundResponse(response);
+          } else {
+            // unauthorized read/write
+            expectForbiddenResponse(response);
+          }
+        },
+      },
+    ];
   };
 
   const makeCopyToSpaceTest = (describeFn: DescribeFn) => (
@@ -363,162 +581,153 @@ export function copyToSpaceTestSuiteFactory(
         expect(['default', 'space_1']).to.contain(spaceId);
       });
 
-      beforeEach(() => esArchiver.load('saved_objects/spaces'));
-      afterEach(() => esArchiver.unload('saved_objects/spaces'));
-
-      it(`should return ${tests.noConflictsWithoutReferences.statusCode} when copying to space without conflicts or references`, async () => {
-        const destination = getDestinationWithoutConflicts();
-
-        await assertSpaceCounts(destination, INITIAL_COUNTS[destination]);
-
-        return supertest
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            spaces: [destination],
-            includeReferences: false,
-            overwrite: false,
-          })
-          .expect(tests.noConflictsWithoutReferences.statusCode)
-          .then(tests.noConflictsWithoutReferences.response);
-      });
-
-      it(`should return ${tests.noConflictsWithReferences.statusCode} when copying to space without conflicts with references`, async () => {
-        const destination = getDestinationWithoutConflicts();
-
-        await assertSpaceCounts(destination, INITIAL_COUNTS[destination]);
-
-        return supertest
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            spaces: [destination],
-            includeReferences: true,
-            overwrite: false,
-          })
-          .expect(tests.noConflictsWithReferences.statusCode)
-          .then(tests.noConflictsWithReferences.response);
-      });
-
-      it(`should return ${tests.withConflictsOverwriting.statusCode} when copying to space with conflicts when overwriting`, async () => {
-        const destination = getDestinationWithConflicts(spaceId);
-
-        await assertSpaceCounts(destination, INITIAL_COUNTS[destination]);
-
-        return supertest
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            spaces: [destination],
-            includeReferences: true,
-            overwrite: true,
-          })
-          .expect(tests.withConflictsOverwriting.statusCode)
-          .then(tests.withConflictsOverwriting.response);
-      });
-
-      it(`should return ${tests.withConflictsWithoutOverwriting.statusCode} when copying to space with conflicts without overwriting`, async () => {
-        const destination = getDestinationWithConflicts(spaceId);
-
-        await assertSpaceCounts(destination, INITIAL_COUNTS[destination]);
-
-        return supertest
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            spaces: [destination],
-            includeReferences: true,
-            overwrite: false,
-          })
-          .expect(tests.withConflictsWithoutOverwriting.statusCode)
-          .then(tests.withConflictsWithoutOverwriting.response);
-      });
-
-      it(`should return ${tests.multipleSpaces.statusCode} when copying to multiple spaces`, async () => {
-        const conflictDestination = getDestinationWithConflicts(spaceId);
-        const noConflictDestination = getDestinationWithoutConflicts();
-
-        return supertest
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            spaces: [conflictDestination, noConflictDestination],
-            includeReferences: true,
-            overwrite: true,
-          })
-          .expect(tests.multipleSpaces.statusCode)
-          .then((response: TestResponse) => {
-            if (tests.multipleSpaces.statusCode === 200) {
-              expect(Object.keys(response.body).length).to.eql(2);
+      describe('single-namespace types', () => {
+        beforeEach(() => esArchiver.load('saved_objects/spaces'));
+        afterEach(() => esArchiver.unload('saved_objects/spaces'));
+
+        const dashboardObject = { type: 'dashboard', id: 'cts_dashboard' };
+
+        it(`should return ${tests.noConflictsWithoutReferences.statusCode} when copying to space without conflicts or references`, async () => {
+          const destination = getDestinationWithoutConflicts();
+
+          await assertSpaceCounts(destination, INITIAL_COUNTS[destination]);
+
+          return supertest
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              spaces: [destination],
+              includeReferences: false,
+              overwrite: false,
+            })
+            .expect(tests.noConflictsWithoutReferences.statusCode)
+            .then(tests.noConflictsWithoutReferences.response);
+        });
+
+        it(`should return ${tests.noConflictsWithReferences.statusCode} when copying to space without conflicts with references`, async () => {
+          const destination = getDestinationWithoutConflicts();
+
+          await assertSpaceCounts(destination, INITIAL_COUNTS[destination]);
+
+          return supertest
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              spaces: [destination],
+              includeReferences: true,
+              overwrite: false,
+            })
+            .expect(tests.noConflictsWithReferences.statusCode)
+            .then(tests.noConflictsWithReferences.response);
+        });
+
+        it(`should return ${tests.withConflictsOverwriting.statusCode} when copying to space with conflicts when overwriting`, async () => {
+          const destination = getDestinationWithConflicts(spaceId);
+
+          await assertSpaceCounts(destination, INITIAL_COUNTS[destination]);
+
+          return supertest
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              spaces: [destination],
+              includeReferences: true,
+              overwrite: true,
+            })
+            .expect(tests.withConflictsOverwriting.statusCode)
+            .then(tests.withConflictsOverwriting.response);
+        });
+
+        it(`should return ${tests.withConflictsWithoutOverwriting.statusCode} when copying to space with conflicts without overwriting`, async () => {
+          const destination = getDestinationWithConflicts(spaceId);
+
+          await assertSpaceCounts(destination, INITIAL_COUNTS[destination]);
+
+          return supertest
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              spaces: [destination],
+              includeReferences: true,
+              overwrite: false,
+            })
+            .expect(tests.withConflictsWithoutOverwriting.statusCode)
+            .then(tests.withConflictsWithoutOverwriting.response);
+        });
+
+        it(`should return ${tests.multipleSpaces.statusCode} when copying to multiple spaces`, async () => {
+          const conflictDestination = getDestinationWithConflicts(spaceId);
+          const noConflictDestination = getDestinationWithoutConflicts();
+
+          return supertest
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              spaces: [conflictDestination, noConflictDestination],
+              includeReferences: true,
+              overwrite: true,
+            })
+            .expect(tests.multipleSpaces.statusCode)
+            .then((response: TestResponse) => {
+              if (tests.multipleSpaces.statusCode === 200) {
+                expect(Object.keys(response.body).length).to.eql(2);
+                return Promise.all([
+                  tests.multipleSpaces.noConflictsResponse({
+                    body: { [noConflictDestination]: response.body[noConflictDestination] },
+                  }),
+                  tests.multipleSpaces.withConflictsResponse({
+                    body: { [conflictDestination]: response.body[conflictDestination] },
+                  }),
+                ]);
+              }
+
+              // non-200 status codes will not have a response body broken out by space id, like above.
               return Promise.all([
-                tests.multipleSpaces.noConflictsResponse({
-                  body: {
-                    [noConflictDestination]: response.body[noConflictDestination],
-                  },
-                }),
-                tests.multipleSpaces.withConflictsResponse({
-                  body: {
-                    [conflictDestination]: response.body[conflictDestination],
-                  },
-                }),
+                tests.multipleSpaces.noConflictsResponse(response),
+                tests.multipleSpaces.withConflictsResponse(response),
               ]);
-            }
-
-            // non-200 status codes will not have a response body broken out by space id, like above.
-            return Promise.all([
-              tests.multipleSpaces.noConflictsResponse(response),
-              tests.multipleSpaces.withConflictsResponse(response),
-            ]);
-          });
+            });
+        });
+
+        it(`should return ${tests.nonExistentSpace.statusCode} when copying to non-existent space`, async () => {
+          return supertest
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              spaces: ['non_existent_space'],
+              includeReferences: false,
+              overwrite: true,
+            })
+            .expect(tests.nonExistentSpace.statusCode)
+            .then(tests.nonExistentSpace.response);
+        });
       });
 
-      it(`should return ${tests.nonExistentSpace.statusCode} when copying to non-existent space`, async () => {
-        return supertest
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            spaces: ['non_existent_space'],
-            includeReferences: false,
-            overwrite: true,
-          })
-          .expect(tests.nonExistentSpace.statusCode)
-          .then(tests.nonExistentSpace.response);
+      [false, true].forEach((overwrite) => {
+        const spaces = ['space_2'];
+        const includeReferences = false;
+        describe(`multi-namespace types with overwrite=${overwrite}`, () => {
+          before(() => esArchiver.load('saved_objects/spaces'));
+          after(() => esArchiver.unload('saved_objects/spaces'));
+
+          const testCases = tests.multiNamespaceTestCases(overwrite);
+          testCases.forEach(({ testTitle, objects, statusCode, response }) => {
+            it(`should return ${statusCode} when ${testTitle}`, async () => {
+              return supertest
+                .post(`${getUrlPrefix(spaceId)}/api/spaces/_copy_saved_objects`)
+                .auth(user.username, user.password)
+                .send({ objects, spaces, includeReferences, overwrite })
+                .expect(statusCode)
+                .then(response);
+            });
+          });
+        });
       });
     });
   };
@@ -534,10 +743,10 @@ export function copyToSpaceTestSuiteFactory(
     expectNoConflictsForNonExistentSpaceResult,
     createExpectWithConflictsOverwritingResult,
     createExpectWithConflictsWithoutOverwritingResult,
-    expectRbacForbiddenResponse,
     expectNotFoundResponse,
     createExpectUnauthorizedAtSpaceWithReferencesResult,
     createExpectUnauthorizedAtSpaceWithoutReferencesResult,
+    createMultiNamespaceTestCases,
     originSpaces: ['default', 'space_1'],
   };
 }
diff --git a/x-pack/test/spaces_api_integration/common/suites/delete.ts b/x-pack/test/spaces_api_integration/common/suites/delete.ts
index 15a90092f5517..69b5697d8a9a8 100644
--- a/x-pack/test/spaces_api_integration/common/suites/delete.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/delete.ts
@@ -130,7 +130,7 @@ export function deleteTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
 
     expect(buckets).to.eql(expectedBuckets);
 
-    // There were seven multi-namespace objects.
+    // There were eleven multi-namespace objects.
     // Since Space 2 was deleted, any multi-namespace objects that existed in that space
     // are updated to remove it, and of those, any that don't exist in any space are deleted.
     const multiNamespaceResponse = await es.search({
@@ -138,16 +138,13 @@ export function deleteTestSuiteFactory(es: any, esArchiver: any, supertest: Supe
       body: { query: { terms: { type: ['sharedtype'] } } },
     });
     const docs: [Record<string, any>] = multiNamespaceResponse.hits.hits;
-    expect(docs).length(6); // just six results, since spaces_2_only got deleted
-    Object.values(CASES).forEach(({ id, existingNamespaces }) => {
-      const remainingNamespaces = existingNamespaces.filter((x) => x !== 'space_2');
-      const doc = docs.find((x) => x._id === `sharedtype:${id}`);
-      if (remainingNamespaces.length > 0) {
-        expect(doc?._source?.namespaces).to.eql(remainingNamespaces);
-      } else {
-        expect(doc).to.be(undefined);
-      }
+    expect(docs).length(10); // just ten results, since spaces_2_only got deleted
+    docs.forEach((doc) => () => {
+      const containsSpace2 = doc?._source?.namespaces.includes('space_2');
+      expect(containsSpace2).to.eql(false);
     });
+    const space2OnlyObjExists = docs.some((x) => x._id === CASES.SPACE_2_ONLY);
+    expect(space2OnlyObjExists).to.eql(false);
   };
 
   const expectNotFound = (resp: { [key: string]: any }) => {
diff --git a/x-pack/test/spaces_api_integration/common/suites/get_all.ts b/x-pack/test/spaces_api_integration/common/suites/get_all.ts
index b6fb449e7b087..d41d73bba90bc 100644
--- a/x-pack/test/spaces_api_integration/common/suites/get_all.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/get_all.ts
@@ -16,6 +16,7 @@ interface GetAllTest {
 interface GetAllTests {
   exists: GetAllTest;
   copySavedObjectsPurpose: GetAllTest;
+  shareSavedObjectsPurpose: GetAllTest;
 }
 
 interface GetAllTestDefinition {
@@ -88,6 +89,17 @@ export function getAllTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
             .then(tests.copySavedObjectsPurpose.response);
         });
       });
+
+      describe('copySavedObjects purpose', () => {
+        it(`should return ${tests.shareSavedObjectsPurpose.statusCode}`, async () => {
+          return supertest
+            .get(`${getUrlPrefix(spaceId)}/api/spaces/space`)
+            .query({ purpose: 'shareSavedObjectsIntoSpace' })
+            .auth(user.username, user.password)
+            .expect(tests.copySavedObjectsPurpose.statusCode)
+            .then(tests.copySavedObjectsPurpose.response);
+        });
+      });
     });
   };
 
diff --git a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
index 6d80688b7a703..cb9219b1ba2ed 100644
--- a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
@@ -20,12 +20,19 @@ interface ResolveCopyToSpaceTest {
   response: (resp: TestResponse) => Promise<void>;
 }
 
+interface ResolveCopyToSpaceMultiNamespaceTest extends ResolveCopyToSpaceTest {
+  testTitle: string;
+  objects: Array<Record<string, any>>;
+  retries: Record<string, any>;
+}
+
 interface ResolveCopyToSpaceTests {
   withReferencesNotOverwriting: ResolveCopyToSpaceTest;
   withReferencesOverwriting: ResolveCopyToSpaceTest;
   withoutReferencesOverwriting: ResolveCopyToSpaceTest;
   withoutReferencesNotOverwriting: ResolveCopyToSpaceTest;
   nonExistentSpace: ResolveCopyToSpaceTest;
+  multiNamespaceTestCases: () => ResolveCopyToSpaceMultiNamespaceTest[];
 }
 
 interface ResolveCopyToSpaceTestDefinition {
@@ -76,6 +83,17 @@ export function resolveCopyToSpaceConflictsSuite(
       [destination]: {
         success: true,
         successCount: 1,
+        successResults: [
+          {
+            id: 'cts_vis_3',
+            type: 'visualization',
+            meta: {
+              title: `CTS vis 3 from ${sourceSpaceId} space`,
+              icon: 'visualizeApp',
+            },
+            overwrite: true,
+          },
+        ],
       },
     });
     const [dashboard, visualization] = await getObjectsAtSpace(destination);
@@ -94,6 +112,17 @@ export function resolveCopyToSpaceConflictsSuite(
       [destinationSpaceId]: {
         success: true,
         successCount: 1,
+        successResults: [
+          {
+            id: 'cts_dashboard',
+            type: 'dashboard',
+            meta: {
+              title: `This is the ${sourceSpaceId} test space CTS dashboard`,
+              icon: 'dashboardApp',
+            },
+            overwrite: true,
+          },
+        ],
       },
     });
     const [dashboard, visualization] = await getObjectsAtSpace(destinationSpaceId);
@@ -119,11 +148,13 @@ export function resolveCopyToSpaceConflictsSuite(
         successCount: 0,
         errors: [
           {
-            error: {
-              type: 'conflict',
-            },
+            error: { type: 'conflict' },
             id: 'cts_vis_3',
             title: `CTS vis 3 from ${sourceSpaceId} space`,
+            meta: {
+              title: `CTS vis 3 from ${sourceSpaceId} space`,
+              icon: 'visualizeApp',
+            },
             type: 'visualization',
           },
         ],
@@ -149,12 +180,14 @@ export function resolveCopyToSpaceConflictsSuite(
         successCount: 0,
         errors: [
           {
-            error: {
-              type: 'conflict',
-            },
+            error: { type: 'conflict' },
             id: 'cts_dashboard',
-            title: `This is the ${sourceSpaceId} test space CTS dashboard`,
             type: 'dashboard',
+            title: `This is the ${sourceSpaceId} test space CTS dashboard`,
+            meta: {
+              title: `This is the ${sourceSpaceId} test space CTS dashboard`,
+              icon: 'dashboardApp',
+            },
           },
         ],
       },
@@ -264,6 +297,113 @@ export function resolveCopyToSpaceConflictsSuite(
     }
   };
 
+  /**
+   * Creates test cases for multi-namespace saved object types.
+   * Note: these are written with the assumption that test data will only be reloaded between each group of test cases, *not* before every
+   * single test case. This saves time during test execution.
+   */
+  const createMultiNamespaceTestCases = (
+    spaceId: string,
+    outcome: 'authorized' | 'unauthorizedRead' | 'unauthorizedWrite' | 'noAccess' = 'authorized'
+  ) => (): ResolveCopyToSpaceMultiNamespaceTest[] => {
+    // the status code of the HTTP response differs depending on the error type
+    // a 403 error actually comes back as an HTTP 200 response
+    const statusCode = outcome === 'noAccess' ? 404 : 200;
+    const type = 'sharedtype';
+    const exactMatchId = 'all_spaces';
+    const inexactMatchId = `conflict_1_${spaceId}`;
+    const ambiguousConflictId = `conflict_2_${spaceId}`;
+
+    const createRetries = (overwriteRetry: Record<string, any>) => ({ space_2: [overwriteRetry] });
+    const getResult = (response: TestResponse) => (response.body as CopyResponse).space_2;
+    const expectForbiddenResponse = (response: TestResponse) => {
+      expect(response.body).to.eql({
+        space_2: {
+          success: false,
+          successCount: 0,
+          errors: [
+            { statusCode: 403, error: 'Forbidden', message: `Unable to bulk_create sharedtype` },
+          ],
+        },
+      });
+    };
+    const expectSuccessResponse = (response: TestResponse, id: string, destinationId?: string) => {
+      const { success, successCount, successResults, errors } = getResult(response);
+      expect(success).to.eql(true);
+      expect(successCount).to.eql(1);
+      expect(errors).to.be(undefined);
+      const title =
+        id === exactMatchId
+          ? 'A shared saved-object in the default, space_1, and space_2 spaces'
+          : 'A shared saved-object in one space';
+      const meta = { title, icon: 'beaker' };
+      expect(successResults).to.eql([
+        { type, id, meta, overwrite: true, ...(destinationId && { destinationId }) },
+      ]);
+    };
+
+    return [
+      {
+        testTitle: 'copying with an exact match conflict',
+        objects: [{ type, id: exactMatchId }],
+        retries: createRetries({ type, id: exactMatchId, overwrite: true }),
+        statusCode,
+        response: async (response: TestResponse) => {
+          if (outcome === 'authorized') {
+            expectSuccessResponse(response, exactMatchId);
+          } else if (outcome === 'noAccess') {
+            expectNotFoundResponse(response);
+          } else {
+            // unauthorized read/write
+            expectForbiddenResponse(response);
+          }
+        },
+      },
+      {
+        testTitle: 'copying with an inexact match conflict',
+        objects: [{ type, id: inexactMatchId }],
+        retries: createRetries({
+          type,
+          id: inexactMatchId,
+          overwrite: true,
+          destinationId: 'conflict_1_space_2',
+        }),
+        statusCode,
+        response: async (response: TestResponse) => {
+          if (outcome === 'authorized') {
+            expectSuccessResponse(response, inexactMatchId, 'conflict_1_space_2');
+          } else if (outcome === 'noAccess') {
+            expectNotFoundResponse(response);
+          } else {
+            // unauthorized read/write
+            expectForbiddenResponse(response);
+          }
+        },
+      },
+      {
+        testTitle: 'copying with an ambiguous conflict',
+        objects: [{ type, id: ambiguousConflictId }],
+        retries: createRetries({
+          type,
+          id: ambiguousConflictId,
+          overwrite: true,
+          destinationId: 'conflict_2_space_2',
+        }),
+        statusCode,
+        response: async (response: TestResponse) => {
+          if (outcome === 'authorized') {
+            expectSuccessResponse(response, ambiguousConflictId, 'conflict_2_space_2');
+          } else if (outcome === 'noAccess') {
+            expectNotFoundResponse(response);
+          } else {
+            // unauthorized read/write
+            expectForbiddenResponse(response);
+          }
+        },
+      },
+    ];
+  };
+
   const makeResolveCopyToSpaceConflictsTest = (describeFn: DescribeFn) => (
     description: string,
     { user = {}, spaceId = DEFAULT_SPACE_ID, tests }: ResolveCopyToSpaceTestDefinition
@@ -274,147 +414,105 @@ export function resolveCopyToSpaceConflictsSuite(
         expect(['default', 'space_1']).to.contain(spaceId);
       });
 
-      beforeEach(() => esArchiver.load('saved_objects/spaces'));
-      afterEach(() => esArchiver.unload('saved_objects/spaces'));
-
-      it(`should return ${tests.withReferencesNotOverwriting.statusCode} when not overwriting, with references`, async () => {
-        const destination = getDestinationSpace(spaceId);
-
-        return supertestWithoutAuth
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            includeReferences: true,
-            retries: {
-              [destination]: [
-                {
-                  type: 'visualization',
-                  id: 'cts_vis_3',
-                  overwrite: false,
-                },
-              ],
-            },
-          })
-          .expect(tests.withReferencesNotOverwriting.statusCode)
-          .then(tests.withReferencesNotOverwriting.response);
-      });
-
-      it(`should return ${tests.withReferencesOverwriting.statusCode} when overwriting, with references`, async () => {
-        const destination = getDestinationSpace(spaceId);
-
-        return supertestWithoutAuth
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            includeReferences: true,
-            retries: {
-              [destination]: [
-                {
-                  type: 'visualization',
-                  id: 'cts_vis_3',
-                  overwrite: true,
-                },
-              ],
-            },
-          })
-          .expect(tests.withReferencesOverwriting.statusCode)
-          .then(tests.withReferencesOverwriting.response);
-      });
-
-      it(`should return ${tests.withoutReferencesOverwriting.statusCode} when overwriting, without references`, async () => {
-        const destination = getDestinationSpace(spaceId);
-
-        return supertestWithoutAuth
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            includeReferences: false,
-            retries: {
-              [destination]: [
-                {
-                  type: 'dashboard',
-                  id: 'cts_dashboard',
-                  overwrite: true,
-                },
-              ],
-            },
-          })
-          .expect(tests.withoutReferencesOverwriting.statusCode)
-          .then(tests.withoutReferencesOverwriting.response);
+      describe('single-namespace types', () => {
+        beforeEach(() => esArchiver.load('saved_objects/spaces'));
+        afterEach(() => esArchiver.unload('saved_objects/spaces'));
+
+        const dashboardObject = { type: 'dashboard', id: 'cts_dashboard' };
+        const visualizationObject = { type: 'visualization', id: 'cts_vis_3' };
+
+        it(`should return ${tests.withReferencesNotOverwriting.statusCode} when not overwriting, with references`, async () => {
+          const destination = getDestinationSpace(spaceId);
+
+          return supertestWithoutAuth
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              includeReferences: true,
+              retries: { [destination]: [{ ...visualizationObject, overwrite: false }] },
+            })
+            .expect(tests.withReferencesNotOverwriting.statusCode)
+            .then(tests.withReferencesNotOverwriting.response);
+        });
+
+        it(`should return ${tests.withReferencesOverwriting.statusCode} when overwriting, with references`, async () => {
+          const destination = getDestinationSpace(spaceId);
+
+          return supertestWithoutAuth
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              includeReferences: true,
+              retries: { [destination]: [{ ...visualizationObject, overwrite: true }] },
+            })
+            .expect(tests.withReferencesOverwriting.statusCode)
+            .then(tests.withReferencesOverwriting.response);
+        });
+
+        it(`should return ${tests.withoutReferencesOverwriting.statusCode} when overwriting, without references`, async () => {
+          const destination = getDestinationSpace(spaceId);
+
+          return supertestWithoutAuth
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              includeReferences: false,
+              retries: { [destination]: [{ ...dashboardObject, overwrite: true }] },
+            })
+            .expect(tests.withoutReferencesOverwriting.statusCode)
+            .then(tests.withoutReferencesOverwriting.response);
+        });
+
+        it(`should return ${tests.withoutReferencesNotOverwriting.statusCode} when not overwriting, without references`, async () => {
+          const destination = getDestinationSpace(spaceId);
+
+          return supertestWithoutAuth
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              includeReferences: false,
+              retries: { [destination]: [{ ...dashboardObject, overwrite: false }] },
+            })
+            .expect(tests.withoutReferencesNotOverwriting.statusCode)
+            .then(tests.withoutReferencesNotOverwriting.response);
+        });
+
+        it(`should return ${tests.nonExistentSpace.statusCode} when resolving within a non-existent space`, async () => {
+          const destination = NON_EXISTENT_SPACE_ID;
+
+          return supertestWithoutAuth
+            .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
+            .auth(user.username, user.password)
+            .send({
+              objects: [dashboardObject],
+              includeReferences: false,
+              retries: { [destination]: [{ ...dashboardObject, overwrite: true }] },
+            })
+            .expect(tests.nonExistentSpace.statusCode)
+            .then(tests.nonExistentSpace.response);
+        });
       });
 
-      it(`should return ${tests.withoutReferencesNotOverwriting.statusCode} when not overwriting, without references`, async () => {
-        const destination = getDestinationSpace(spaceId);
-
-        return supertestWithoutAuth
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            includeReferences: false,
-            retries: {
-              [destination]: [
-                {
-                  type: 'dashboard',
-                  id: 'cts_dashboard',
-                  overwrite: false,
-                },
-              ],
-            },
-          })
-          .expect(tests.withoutReferencesNotOverwriting.statusCode)
-          .then(tests.withoutReferencesNotOverwriting.response);
-      });
-
-      it(`should return ${tests.nonExistentSpace.statusCode} when resolving within a non-existent space`, async () => {
-        const destination = NON_EXISTENT_SPACE_ID;
-
-        return supertestWithoutAuth
-          .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
-          .auth(user.username, user.password)
-          .send({
-            objects: [
-              {
-                type: 'dashboard',
-                id: 'cts_dashboard',
-              },
-            ],
-            includeReferences: false,
-            retries: {
-              [destination]: [
-                {
-                  type: 'dashboard',
-                  id: 'cts_dashboard',
-                  overwrite: true,
-                },
-              ],
-            },
-          })
-          .expect(tests.nonExistentSpace.statusCode)
-          .then(tests.nonExistentSpace.response);
+      const includeReferences = false;
+      describe(`multi-namespace types with "overwrite" retry`, () => {
+        before(() => esArchiver.load('saved_objects/spaces'));
+        after(() => esArchiver.unload('saved_objects/spaces'));
+
+        const testCases = tests.multiNamespaceTestCases();
+        testCases.forEach(({ testTitle, objects, retries, statusCode, response }) => {
+          it(`should return ${statusCode} when ${testTitle}`, async () => {
+            return supertestWithoutAuth
+              .post(`${getUrlPrefix(spaceId)}/api/spaces/_resolve_copy_saved_objects_errors`)
+              .auth(user.username, user.password)
+              .send({ objects, includeReferences, retries })
+              .expect(statusCode)
+              .then(response);
+          });
+        });
       });
     });
   };
@@ -433,6 +531,7 @@ export function resolveCopyToSpaceConflictsSuite(
     createExpectUnauthorizedAtSpaceWithReferencesResult,
     createExpectReadonlyAtSpaceWithReferencesResult,
     createExpectUnauthorizedAtSpaceWithoutReferencesResult,
+    createMultiNamespaceTestCases,
     originSpaces: ['default', 'space_1'],
     NON_EXISTENT_SPACE_ID,
   };
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space.ts
index 08450f48567c8..0f1c27098af92 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space.ts
@@ -25,6 +25,7 @@ export default function copyToSpaceSpacesAndSecuritySuite({ getService }: TestIn
     createExpectUnauthorizedAtSpaceWithReferencesResult,
     createExpectUnauthorizedAtSpaceWithoutReferencesResult,
     expectNotFoundResponse,
+    createMultiNamespaceTestCases,
   } = copyToSpaceTestSuiteFactory(es, esArchiver, supertestWithoutAuth);
 
   describe('copy to spaces', () => {
@@ -55,325 +56,148 @@ export default function copyToSpaceSpacesAndSecuritySuite({ getService }: TestIn
           dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
         },
       },
-    ].forEach((scenario) => {
-      copyToSpaceTest(`user with no access from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.noAccess,
+    ].forEach(({ spaceId, ...scenario }) => {
+      const definitionNoAccess = (user: { username: string; password: string }) => ({
+        spaceId,
+        user,
         tests: {
-          noConflictsWithoutReferences: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
-          },
-          noConflictsWithReferences: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
-          },
-          withConflictsOverwriting: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
-          },
-          withConflictsWithoutOverwriting: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
-          },
+          noConflictsWithoutReferences: { statusCode: 404, response: expectNotFoundResponse },
+          noConflictsWithReferences: { statusCode: 404, response: expectNotFoundResponse },
+          withConflictsOverwriting: { statusCode: 404, response: expectNotFoundResponse },
+          withConflictsWithoutOverwriting: { statusCode: 404, response: expectNotFoundResponse },
           multipleSpaces: {
             statusCode: 404,
             withConflictsResponse: expectNotFoundResponse,
             noConflictsResponse: expectNotFoundResponse,
           },
-          nonExistentSpace: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
-          },
+          nonExistentSpace: { statusCode: 404, response: expectNotFoundResponse },
+          multiNamespaceTestCases: createMultiNamespaceTestCases(spaceId, 'noAccess'),
         },
       });
-
-      copyToSpaceTest(`superuser from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.superuser,
-        tests: {
-          noConflictsWithoutReferences: {
-            statusCode: 200,
-            response: expectNoConflictsWithoutReferencesResult,
-          },
-          noConflictsWithReferences: {
-            statusCode: 200,
-            response: expectNoConflictsWithReferencesResult,
-          },
-          withConflictsOverwriting: {
-            statusCode: 200,
-            response: createExpectWithConflictsOverwritingResult(scenario.spaceId),
-          },
-          withConflictsWithoutOverwriting: {
-            statusCode: 200,
-            response: createExpectWithConflictsWithoutOverwritingResult(scenario.spaceId),
-          },
-          multipleSpaces: {
-            statusCode: 200,
-            withConflictsResponse: createExpectWithConflictsOverwritingResult(scenario.spaceId),
-            noConflictsResponse: expectNoConflictsWithReferencesResult,
-          },
-          nonExistentSpace: {
-            statusCode: 200,
-            response: expectNoConflictsForNonExistentSpaceResult,
-          },
+      // In *this* test suite, a user who is unauthorized to write (but authorized to read) in the destination space will get the same exact
+      // results as a user who is unauthorized to read in the destination space. However, that may not *always* be the case depending on the
+      // input that is submitted, due to the `validateReferences` check that can trigger a `bulkGet` for the destination space. See also the
+      // integration tests in `./resolve_copy_to_space_conflicts`, which behave differently.
+      const commonUnauthorizedTests = {
+        noConflictsWithoutReferences: {
+          statusCode: 200,
+          response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
+            spaceId,
+            'without-conflicts'
+          ),
         },
-      });
-
-      copyToSpaceTest(`rbac user with all globally from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.allGlobally,
-        tests: {
-          noConflictsWithoutReferences: {
-            statusCode: 200,
-            response: expectNoConflictsWithoutReferencesResult,
-          },
-          noConflictsWithReferences: {
-            statusCode: 200,
-            response: expectNoConflictsWithReferencesResult,
-          },
-          withConflictsOverwriting: {
-            statusCode: 200,
-            response: createExpectWithConflictsOverwritingResult(scenario.spaceId),
-          },
-          withConflictsWithoutOverwriting: {
-            statusCode: 200,
-            response: createExpectWithConflictsWithoutOverwritingResult(scenario.spaceId),
-          },
-          multipleSpaces: {
-            statusCode: 200,
-            withConflictsResponse: createExpectWithConflictsOverwritingResult(scenario.spaceId),
-            noConflictsResponse: expectNoConflictsWithReferencesResult,
-          },
-          nonExistentSpace: {
-            statusCode: 200,
-            response: expectNoConflictsForNonExistentSpaceResult,
-          },
+        noConflictsWithReferences: {
+          statusCode: 200,
+          response: createExpectUnauthorizedAtSpaceWithReferencesResult(
+            spaceId,
+            'without-conflicts'
+          ),
         },
-      });
-
-      copyToSpaceTest(`dual-privileges user from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.dualAll,
-        tests: {
-          noConflictsWithoutReferences: {
-            statusCode: 200,
-            response: expectNoConflictsWithoutReferencesResult,
-          },
-          noConflictsWithReferences: {
-            statusCode: 200,
-            response: expectNoConflictsWithReferencesResult,
-          },
-          withConflictsOverwriting: {
-            statusCode: 200,
-            response: createExpectWithConflictsOverwritingResult(scenario.spaceId),
-          },
-          withConflictsWithoutOverwriting: {
-            statusCode: 200,
-            response: createExpectWithConflictsWithoutOverwritingResult(scenario.spaceId),
-          },
-          multipleSpaces: {
-            statusCode: 200,
-            withConflictsResponse: createExpectWithConflictsOverwritingResult(scenario.spaceId),
-            noConflictsResponse: expectNoConflictsWithReferencesResult,
-          },
-          nonExistentSpace: {
-            statusCode: 200,
-            response: expectNoConflictsForNonExistentSpaceResult,
-          },
+        withConflictsOverwriting: {
+          statusCode: 200,
+          response: createExpectUnauthorizedAtSpaceWithReferencesResult(spaceId, 'with-conflicts'),
         },
-      });
-
-      copyToSpaceTest(`legacy user from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.legacyAll,
-        tests: {
-          noConflictsWithoutReferences: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
-          },
-          noConflictsWithReferences: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
-          },
-          withConflictsOverwriting: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
-          },
-          withConflictsWithoutOverwriting: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
-          },
-          multipleSpaces: {
-            statusCode: 404,
-            withConflictsResponse: expectNotFoundResponse,
-            noConflictsResponse: expectNotFoundResponse,
-          },
-          nonExistentSpace: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
-          },
+        withConflictsWithoutOverwriting: {
+          statusCode: 200,
+          response: createExpectUnauthorizedAtSpaceWithReferencesResult(spaceId, 'with-conflicts'),
         },
-      });
-
-      copyToSpaceTest(`rbac user with read globally from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.readGlobally,
+        multipleSpaces: {
+          statusCode: 200,
+          withConflictsResponse: createExpectUnauthorizedAtSpaceWithReferencesResult(
+            spaceId,
+            'with-conflicts'
+          ),
+          noConflictsResponse: createExpectUnauthorizedAtSpaceWithReferencesResult(
+            spaceId,
+            'without-conflicts'
+          ),
+        },
+        nonExistentSpace: {
+          statusCode: 200,
+          response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(spaceId, 'non-existent'),
+        },
+      };
+      const definitionUnauthorizedRead = (user: { username: string; password: string }) => ({
+        spaceId,
+        user,
         tests: {
-          noConflictsWithoutReferences: {
-            statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
-              scenario.spaceId,
-              'without-conflicts'
-            ),
-          },
-          noConflictsWithReferences: {
-            statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'without-conflicts'
-            ),
-          },
-          withConflictsOverwriting: {
-            statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'with-conflicts'
-            ),
-          },
-          withConflictsWithoutOverwriting: {
-            statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'with-conflicts'
-            ),
-          },
-          multipleSpaces: {
-            statusCode: 200,
-            withConflictsResponse: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'with-conflicts'
-            ),
-            noConflictsResponse: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'without-conflicts'
-            ),
-          },
-          nonExistentSpace: {
-            statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
-              scenario.spaceId,
-              'non-existent'
-            ),
-          },
+          ...commonUnauthorizedTests,
+          multiNamespaceTestCases: createMultiNamespaceTestCases(spaceId, 'unauthorizedRead'),
         },
       });
-
-      copyToSpaceTest(`dual-privileges readonly user from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.dualRead,
+      const definitionUnauthorizedWrite = (user: { username: string; password: string }) => ({
+        spaceId,
+        user,
         tests: {
-          noConflictsWithoutReferences: {
-            statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
-              scenario.spaceId,
-              'without-conflicts'
-            ),
-          },
-          noConflictsWithReferences: {
-            statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'without-conflicts'
-            ),
-          },
-          withConflictsOverwriting: {
-            statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'with-conflicts'
-            ),
-          },
-          withConflictsWithoutOverwriting: {
-            statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'with-conflicts'
-            ),
-          },
-          multipleSpaces: {
-            statusCode: 200,
-            withConflictsResponse: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'with-conflicts'
-            ),
-            noConflictsResponse: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'without-conflicts'
-            ),
-          },
-          nonExistentSpace: {
-            statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
-              scenario.spaceId,
-              'non-existent'
-            ),
-          },
+          ...commonUnauthorizedTests,
+          multiNamespaceTestCases: createMultiNamespaceTestCases(spaceId, 'unauthorizedWrite'),
         },
       });
-
-      copyToSpaceTest(`rbac user with all at space from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.allAtSpace,
+      const definitionAuthorized = (user: { username: string; password: string }) => ({
+        spaceId,
+        user,
         tests: {
           noConflictsWithoutReferences: {
             statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
-              scenario.spaceId,
-              'without-conflicts'
-            ),
+            response: expectNoConflictsWithoutReferencesResult(spaceId),
           },
           noConflictsWithReferences: {
             statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'without-conflicts'
-            ),
+            response: expectNoConflictsWithReferencesResult(spaceId),
           },
           withConflictsOverwriting: {
             statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'with-conflicts'
-            ),
+            response: createExpectWithConflictsOverwritingResult(spaceId),
           },
           withConflictsWithoutOverwriting: {
             statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'with-conflicts'
-            ),
+            response: createExpectWithConflictsWithoutOverwritingResult(spaceId),
           },
           multipleSpaces: {
             statusCode: 200,
-            withConflictsResponse: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'with-conflicts'
-            ),
-            noConflictsResponse: createExpectUnauthorizedAtSpaceWithReferencesResult(
-              scenario.spaceId,
-              'without-conflicts'
-            ),
+            withConflictsResponse: createExpectWithConflictsOverwritingResult(spaceId),
+            noConflictsResponse: expectNoConflictsWithReferencesResult(spaceId),
           },
           nonExistentSpace: {
             statusCode: 200,
-            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
-              scenario.spaceId,
-              'non-existent'
-            ),
+            response: expectNoConflictsForNonExistentSpaceResult(spaceId),
           },
+          multiNamespaceTestCases: createMultiNamespaceTestCases(spaceId, 'authorized'),
         },
       });
+
+      copyToSpaceTest(
+        `user with no access from the ${spaceId} space`,
+        definitionNoAccess(scenario.users.noAccess)
+      );
+      copyToSpaceTest(
+        `superuser from the ${spaceId} space`,
+        definitionAuthorized(scenario.users.superuser)
+      );
+      copyToSpaceTest(
+        `rbac user with all globally from the ${spaceId} space`,
+        definitionAuthorized(scenario.users.allGlobally)
+      );
+      copyToSpaceTest(
+        `dual-privileges user from the ${spaceId} space`,
+        definitionAuthorized(scenario.users.dualAll)
+      );
+      copyToSpaceTest(
+        `legacy user from the ${spaceId} space`,
+        definitionNoAccess(scenario.users.legacyAll)
+      );
+      copyToSpaceTest(
+        `rbac user with read globally from the ${spaceId} space`,
+        definitionUnauthorizedWrite(scenario.users.readGlobally)
+      );
+      copyToSpaceTest(
+        `dual-privileges readonly user from the ${spaceId} space`,
+        definitionUnauthorizedWrite(scenario.users.dualRead)
+      );
+      copyToSpaceTest(
+        `rbac user with all at space from the ${spaceId} space`,
+        definitionUnauthorizedRead(scenario.users.allAtSpace)
+      );
     });
   });
 }
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/get_all.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/get_all.ts
index e64f721825089..bf1d90bfc3556 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/get_all.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/get_all.ts
@@ -88,6 +88,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 403,
             response: expectRbacForbidden,
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 403,
+            response: expectRbacForbidden,
+          },
         },
       });
 
@@ -103,6 +107,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 200,
             response: createExpectResults('default', 'space_1', 'space_2'),
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 200,
+            response: createExpectResults('default', 'space_1', 'space_2'),
+          },
         },
       });
 
@@ -118,6 +126,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 200,
             response: createExpectResults('default', 'space_1', 'space_2'),
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 200,
+            response: createExpectResults('default', 'space_1', 'space_2'),
+          },
         },
       });
 
@@ -133,6 +145,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 200,
             response: createExpectResults('default', 'space_1', 'space_2'),
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 200,
+            response: createExpectResults('default', 'space_1', 'space_2'),
+          },
         },
       });
 
@@ -148,6 +164,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 403,
             response: expectRbacForbidden,
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 403,
+            response: expectRbacForbidden,
+          },
         },
       });
 
@@ -163,6 +183,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 403,
             response: expectRbacForbidden,
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 403,
+            response: expectRbacForbidden,
+          },
         },
       });
 
@@ -178,6 +202,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 403,
             response: expectRbacForbidden,
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 403,
+            response: expectRbacForbidden,
+          },
         },
       });
 
@@ -193,6 +221,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 200,
             response: createExpectResults('space_1'),
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 200,
+            response: createExpectResults('space_1'),
+          },
         },
       });
 
@@ -208,6 +240,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 403,
             response: expectRbacForbidden,
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 403,
+            response: expectRbacForbidden,
+          },
         },
       });
 
@@ -225,6 +261,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
               statusCode: 200,
               response: createExpectResults('default'),
             },
+            shareSavedObjectsPurpose: {
+              statusCode: 200,
+              response: createExpectResults('default'),
+            },
           },
         }
       );
@@ -243,6 +283,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
               statusCode: 403,
               response: expectRbacForbidden,
             },
+            shareSavedObjectsPurpose: {
+              statusCode: 403,
+              response: expectRbacForbidden,
+            },
           },
         }
       );
@@ -261,6 +305,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
               statusCode: 200,
               response: createExpectResults('default'),
             },
+            shareSavedObjectsPurpose: {
+              statusCode: 200,
+              response: createExpectResults('default'),
+            },
           },
         }
       );
@@ -279,6 +327,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
               statusCode: 403,
               response: expectRbacForbidden,
             },
+            shareSavedObjectsPurpose: {
+              statusCode: 403,
+              response: expectRbacForbidden,
+            },
           },
         }
       );
@@ -297,6 +349,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
               statusCode: 200,
               response: createExpectResults('space_1'),
             },
+            shareSavedObjectsPurpose: {
+              statusCode: 200,
+              response: createExpectResults('space_1'),
+            },
           },
         }
       );
@@ -315,6 +371,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
               statusCode: 403,
               response: expectRbacForbidden,
             },
+            shareSavedObjectsPurpose: {
+              statusCode: 403,
+              response: expectRbacForbidden,
+            },
           },
         }
       );
@@ -331,6 +391,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 403,
             response: expectRbacForbidden,
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 403,
+            response: expectRbacForbidden,
+          },
         },
       });
 
@@ -346,6 +410,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 403,
             response: expectRbacForbidden,
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 403,
+            response: expectRbacForbidden,
+          },
         },
       });
 
@@ -361,6 +429,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 403,
             response: expectRbacForbidden,
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 403,
+            response: expectRbacForbidden,
+          },
         },
       });
 
@@ -376,6 +448,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 403,
             response: expectRbacForbidden,
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 403,
+            response: expectRbacForbidden,
+          },
         },
       });
     });
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/resolve_copy_to_space_conflicts.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/resolve_copy_to_space_conflicts.ts
index 472ec1a927126..b81f2965eba22 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/resolve_copy_to_space_conflicts.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/resolve_copy_to_space_conflicts.ts
@@ -25,6 +25,7 @@ export default function resolveCopyToSpaceConflictsTestSuite({ getService }: Tes
     createExpectUnauthorizedAtSpaceWithReferencesResult,
     createExpectReadonlyAtSpaceWithReferencesResult,
     createExpectUnauthorizedAtSpaceWithoutReferencesResult,
+    createMultiNamespaceTestCases,
     NON_EXISTENT_SPACE_ID,
   } = resolveCopyToSpaceConflictsSuite(esArchiver, supertestWithAuth, supertestWithoutAuth);
 
@@ -56,10 +57,10 @@ export default function resolveCopyToSpaceConflictsTestSuite({ getService }: Tes
           dualRead: AUTHENTICATION.KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
         },
       },
-    ].forEach((scenario) => {
-      resolveCopyToSpaceConflictsTest(`user with no access from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.noAccess,
+    ].forEach(({ spaceId, ...scenario }) => {
+      const definitionNoAccess = (user: { username: string; password: string }) => ({
+        spaceId,
+        user,
         tests: {
           withReferencesNotOverwriting: {
             statusCode: 404,
@@ -81,226 +82,131 @@ export default function resolveCopyToSpaceConflictsTestSuite({ getService }: Tes
             statusCode: 404,
             response: expectNotFoundResponse,
           },
+          multiNamespaceTestCases: createMultiNamespaceTestCases(spaceId, 'noAccess'),
         },
       });
-
-      resolveCopyToSpaceConflictsTest(`superuser from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.superuser,
+      const definitionUnauthorizedRead = (user: { username: string; password: string }) => ({
+        spaceId,
+        user,
         tests: {
           withReferencesNotOverwriting: {
             statusCode: 200,
-            response: createExpectNonOverriddenResponseWithReferences(scenario.spaceId),
+            response: createExpectUnauthorizedAtSpaceWithReferencesResult(spaceId),
           },
           withReferencesOverwriting: {
             statusCode: 200,
-            response: createExpectOverriddenResponseWithReferences(scenario.spaceId),
+            response: createExpectUnauthorizedAtSpaceWithReferencesResult(spaceId),
           },
           withoutReferencesOverwriting: {
             statusCode: 200,
-            response: createExpectOverriddenResponseWithoutReferences(scenario.spaceId),
+            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(spaceId),
           },
           withoutReferencesNotOverwriting: {
             statusCode: 200,
-            response: createExpectNonOverriddenResponseWithoutReferences(scenario.spaceId),
+            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(spaceId),
           },
           nonExistentSpace: {
             statusCode: 200,
-            response: createExpectOverriddenResponseWithoutReferences(
-              scenario.spaceId,
+            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
+              spaceId,
               NON_EXISTENT_SPACE_ID
             ),
           },
+          multiNamespaceTestCases: createMultiNamespaceTestCases(spaceId, 'unauthorizedRead'),
         },
       });
-
-      resolveCopyToSpaceConflictsTest(
-        `rbac user with all globally from the ${scenario.spaceId} space`,
-        {
-          spaceId: scenario.spaceId,
-          user: scenario.users.allGlobally,
-          tests: {
-            withReferencesNotOverwriting: {
-              statusCode: 200,
-              response: createExpectNonOverriddenResponseWithReferences(scenario.spaceId),
-            },
-            withReferencesOverwriting: {
-              statusCode: 200,
-              response: createExpectOverriddenResponseWithReferences(scenario.spaceId),
-            },
-            withoutReferencesOverwriting: {
-              statusCode: 200,
-              response: createExpectOverriddenResponseWithoutReferences(scenario.spaceId),
-            },
-            withoutReferencesNotOverwriting: {
-              statusCode: 200,
-              response: createExpectNonOverriddenResponseWithoutReferences(scenario.spaceId),
-            },
-            nonExistentSpace: {
-              statusCode: 200,
-              response: createExpectOverriddenResponseWithoutReferences(
-                scenario.spaceId,
-                NON_EXISTENT_SPACE_ID
-              ),
-            },
-          },
-        }
-      );
-
-      resolveCopyToSpaceConflictsTest(`dual-privileges user from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.dualAll,
+      const definitionUnauthorizedWrite = (user: { username: string; password: string }) => ({
+        spaceId,
+        user,
         tests: {
           withReferencesNotOverwriting: {
             statusCode: 200,
-            response: createExpectNonOverriddenResponseWithReferences(scenario.spaceId),
+            response: createExpectReadonlyAtSpaceWithReferencesResult(spaceId),
           },
           withReferencesOverwriting: {
             statusCode: 200,
-            response: createExpectOverriddenResponseWithReferences(scenario.spaceId),
+            response: createExpectReadonlyAtSpaceWithReferencesResult(spaceId),
           },
           withoutReferencesOverwriting: {
             statusCode: 200,
-            response: createExpectOverriddenResponseWithoutReferences(scenario.spaceId),
+            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(spaceId),
           },
           withoutReferencesNotOverwriting: {
             statusCode: 200,
-            response: createExpectNonOverriddenResponseWithoutReferences(scenario.spaceId),
+            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(spaceId),
           },
           nonExistentSpace: {
             statusCode: 200,
-            response: createExpectOverriddenResponseWithoutReferences(
-              scenario.spaceId,
+            response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
+              spaceId,
               NON_EXISTENT_SPACE_ID
             ),
           },
+          multiNamespaceTestCases: createMultiNamespaceTestCases(spaceId, 'unauthorizedWrite'),
         },
       });
-
-      resolveCopyToSpaceConflictsTest(`legacy user from the ${scenario.spaceId} space`, {
-        spaceId: scenario.spaceId,
-        user: scenario.users.legacyAll,
+      const definitionAuthorized = (user: { username: string; password: string }) => ({
+        spaceId,
+        user,
         tests: {
           withReferencesNotOverwriting: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
+            statusCode: 200,
+            response: createExpectNonOverriddenResponseWithReferences(spaceId),
           },
           withReferencesOverwriting: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
+            statusCode: 200,
+            response: createExpectOverriddenResponseWithReferences(spaceId),
           },
           withoutReferencesOverwriting: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
+            statusCode: 200,
+            response: createExpectOverriddenResponseWithoutReferences(spaceId),
           },
           withoutReferencesNotOverwriting: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
+            statusCode: 200,
+            response: createExpectNonOverriddenResponseWithoutReferences(spaceId),
           },
           nonExistentSpace: {
-            statusCode: 404,
-            response: expectNotFoundResponse,
+            statusCode: 200,
+            response: createExpectOverriddenResponseWithoutReferences(
+              spaceId,
+              NON_EXISTENT_SPACE_ID
+            ),
           },
+          multiNamespaceTestCases: createMultiNamespaceTestCases(spaceId, 'authorized'),
         },
       });
 
       resolveCopyToSpaceConflictsTest(
-        `rbac user with read globally from the ${scenario.spaceId} space`,
-        {
-          spaceId: scenario.spaceId,
-          user: scenario.users.readGlobally,
-          tests: {
-            withReferencesNotOverwriting: {
-              statusCode: 200,
-              response: createExpectReadonlyAtSpaceWithReferencesResult(scenario.spaceId),
-            },
-            withReferencesOverwriting: {
-              statusCode: 200,
-              response: createExpectReadonlyAtSpaceWithReferencesResult(scenario.spaceId),
-            },
-            withoutReferencesOverwriting: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(scenario.spaceId),
-            },
-            withoutReferencesNotOverwriting: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(scenario.spaceId),
-            },
-            nonExistentSpace: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
-                scenario.spaceId,
-                NON_EXISTENT_SPACE_ID
-              ),
-            },
-          },
-        }
+        `user with no access from the ${spaceId} space`,
+        definitionNoAccess(scenario.users.noAccess)
       );
-
       resolveCopyToSpaceConflictsTest(
-        `dual-privileges readonly user from the ${scenario.spaceId} space`,
-        {
-          spaceId: scenario.spaceId,
-          user: scenario.users.dualRead,
-          tests: {
-            withReferencesNotOverwriting: {
-              statusCode: 200,
-              response: createExpectReadonlyAtSpaceWithReferencesResult(scenario.spaceId),
-            },
-            withReferencesOverwriting: {
-              statusCode: 200,
-              response: createExpectReadonlyAtSpaceWithReferencesResult(scenario.spaceId),
-            },
-            withoutReferencesOverwriting: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(scenario.spaceId),
-            },
-            withoutReferencesNotOverwriting: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(scenario.spaceId),
-            },
-            nonExistentSpace: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
-                scenario.spaceId,
-                NON_EXISTENT_SPACE_ID
-              ),
-            },
-          },
-        }
+        `superuser from the ${spaceId} space`,
+        definitionAuthorized(scenario.users.superuser)
       );
-
       resolveCopyToSpaceConflictsTest(
-        `rbac user with all at space from the ${scenario.spaceId} space`,
-        {
-          spaceId: scenario.spaceId,
-          user: scenario.users.allAtSpace,
-          tests: {
-            withReferencesNotOverwriting: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithReferencesResult(scenario.spaceId),
-            },
-            withReferencesOverwriting: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithReferencesResult(scenario.spaceId),
-            },
-            withoutReferencesOverwriting: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(scenario.spaceId),
-            },
-            withoutReferencesNotOverwriting: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(scenario.spaceId),
-            },
-            nonExistentSpace: {
-              statusCode: 200,
-              response: createExpectUnauthorizedAtSpaceWithoutReferencesResult(
-                scenario.spaceId,
-                NON_EXISTENT_SPACE_ID
-              ),
-            },
-          },
-        }
+        `rbac user with all globally from the ${spaceId} space`,
+        definitionAuthorized(scenario.users.allGlobally)
+      );
+      resolveCopyToSpaceConflictsTest(
+        `dual-privileges user from the ${spaceId} space`,
+        definitionAuthorized(scenario.users.dualAll)
+      );
+      resolveCopyToSpaceConflictsTest(
+        `legacy user from the ${spaceId} space`,
+        definitionNoAccess(scenario.users.legacyAll)
+      );
+      resolveCopyToSpaceConflictsTest(
+        `rbac user with read globally from the ${spaceId} space`,
+        definitionUnauthorizedWrite(scenario.users.readGlobally)
+      );
+      resolveCopyToSpaceConflictsTest(
+        `dual-privileges readonly user from the ${spaceId} space`,
+        definitionUnauthorizedWrite(scenario.users.dualRead)
+      );
+      resolveCopyToSpaceConflictsTest(
+        `rbac user with all at space from the ${spaceId} space`,
+        definitionUnauthorizedRead(scenario.users.allAtSpace)
       );
     });
   });
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_add.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_add.ts
index f3e6580e439bb..ddd029c8d7d68 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_add.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_add.ts
@@ -25,7 +25,7 @@ const createTestCases = (spaceId: string) => {
   const namespaces = [spaceId];
   return [
     // Test cases to check adding the target namespace to different saved objects
-    { ...CASES.DEFAULT_SPACE_ONLY, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.DEFAULT_ONLY, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
     { ...CASES.SPACE_1_ONLY, namespaces, ...fail404(spaceId !== SPACE_1_ID) },
     { ...CASES.SPACE_2_ONLY, namespaces, ...fail404(spaceId !== SPACE_2_ID) },
     { ...CASES.DEFAULT_AND_SPACE_1, namespaces, ...fail404(spaceId === SPACE_2_ID) },
@@ -37,7 +37,7 @@ const createTestCases = (spaceId: string) => {
     // These are non-exhaustive, they only check cases for adding two additional namespaces to a saved object
     // More permutations are covered in the corresponding spaces_only test suite
     {
-      ...CASES.DEFAULT_SPACE_ONLY,
+      ...CASES.DEFAULT_ONLY,
       namespaces: [SPACE_1_ID, SPACE_2_ID],
       ...fail404(spaceId !== DEFAULT_SPACE_ID),
     },
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_remove.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_remove.ts
index d83020a9598f1..4b120a71213b7 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_remove.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/share_remove.ts
@@ -29,7 +29,7 @@ const createTestCases = (spaceId: string) => {
   // Test cases to check removing the target namespace from different saved objects
   let namespaces = [spaceId];
   const singleSpace = [
-    { id: CASES.DEFAULT_SPACE_ONLY.id, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { id: CASES.DEFAULT_ONLY.id, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
     { id: CASES.SPACE_1_ONLY.id, namespaces, ...fail404(spaceId !== SPACE_1_ID) },
     { id: CASES.SPACE_2_ONLY.id, namespaces, ...fail404(spaceId !== SPACE_2_ID) },
     { id: CASES.DEFAULT_AND_SPACE_1.id, namespaces, ...fail404(spaceId === SPACE_2_ID) },
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/copy_to_space.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/copy_to_space.ts
index 75b35fecd5d83..cc5bb9cf8c739 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/copy_to_space.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/copy_to_space.ts
@@ -20,6 +20,7 @@ export default function copyToSpacesOnlySuite({ getService }: FtrProviderContext
     expectNoConflictsForNonExistentSpaceResult,
     createExpectWithConflictsOverwritingResult,
     createExpectWithConflictsWithoutOverwritingResult,
+    createMultiNamespaceTestCases,
     originSpaces,
   } = copyToSpaceTestSuiteFactory(es, esArchiver, supertestWithoutAuth);
 
@@ -30,11 +31,11 @@ export default function copyToSpacesOnlySuite({ getService }: FtrProviderContext
         tests: {
           noConflictsWithoutReferences: {
             statusCode: 200,
-            response: expectNoConflictsWithoutReferencesResult,
+            response: expectNoConflictsWithoutReferencesResult(spaceId),
           },
           noConflictsWithReferences: {
             statusCode: 200,
-            response: expectNoConflictsWithReferencesResult,
+            response: expectNoConflictsWithReferencesResult(spaceId),
           },
           withConflictsOverwriting: {
             statusCode: 200,
@@ -47,12 +48,13 @@ export default function copyToSpacesOnlySuite({ getService }: FtrProviderContext
           multipleSpaces: {
             statusCode: 200,
             withConflictsResponse: createExpectWithConflictsOverwritingResult(spaceId),
-            noConflictsResponse: expectNoConflictsWithReferencesResult,
+            noConflictsResponse: expectNoConflictsWithReferencesResult(spaceId),
           },
           nonExistentSpace: {
             statusCode: 200,
-            response: expectNoConflictsForNonExistentSpaceResult,
+            response: expectNoConflictsForNonExistentSpaceResult(spaceId),
           },
+          multiNamespaceTestCases: createMultiNamespaceTestCases(spaceId),
         },
       });
     });
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/get_all.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/get_all.ts
index 1e56a583eca1f..14c98aff262fe 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/get_all.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/get_all.ts
@@ -38,6 +38,10 @@ export default function getAllSpacesTestSuite({ getService }: TestInvoker) {
             statusCode: 200,
             response: createExpectResults('default', 'space_1', 'space_2'),
           },
+          shareSavedObjectsPurpose: {
+            statusCode: 200,
+            response: createExpectResults('default', 'space_1', 'space_2'),
+          },
         },
       });
     });
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/resolve_copy_to_space_conflicts.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/resolve_copy_to_space_conflicts.ts
index ef2735de3d3db..5c84475d32850 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/resolve_copy_to_space_conflicts.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/resolve_copy_to_space_conflicts.ts
@@ -19,6 +19,7 @@ export default function resolveCopyToSpaceConflictsTestSuite({ getService }: Ftr
     createExpectNonOverriddenResponseWithoutReferences,
     createExpectOverriddenResponseWithReferences,
     createExpectOverriddenResponseWithoutReferences,
+    createMultiNamespaceTestCases,
     NON_EXISTENT_SPACE_ID,
     originSpaces,
   } = resolveCopyToSpaceConflictsSuite(esArchiver, supertestWithAuth, supertestWithoutAuth);
@@ -51,6 +52,7 @@ export default function resolveCopyToSpaceConflictsTestSuite({ getService }: Ftr
               NON_EXISTENT_SPACE_ID
             ),
           },
+          multiNamespaceTestCases: createMultiNamespaceTestCases(spaceId),
         },
       });
     });
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/share_add.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/share_add.ts
index 5cdebf9edfcfd..25ba986a12fd8 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/share_add.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/share_add.ts
@@ -27,7 +27,7 @@ const { fail404 } = testCaseFailures;
 const createSingleTestCases = (spaceId: string) => {
   const namespaces = ['some-space-id'];
   return [
-    { ...CASES.DEFAULT_SPACE_ONLY, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.DEFAULT_ONLY, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
     { ...CASES.SPACE_1_ONLY, namespaces, ...fail404(spaceId !== SPACE_1_ID) },
     { ...CASES.SPACE_2_ONLY, namespaces, ...fail404(spaceId !== SPACE_2_ID) },
     { ...CASES.DEFAULT_AND_SPACE_1, namespaces, ...fail404(spaceId === SPACE_2_ID) },
@@ -43,7 +43,7 @@ const createSingleTestCases = (spaceId: string) => {
  */
 const createMultiTestCases = () => {
   const allSpaces = [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID];
-  let id = CASES.DEFAULT_SPACE_ONLY.id;
+  let id = CASES.DEFAULT_ONLY.id;
   const one = [{ id, namespaces: allSpaces }];
   id = CASES.DEFAULT_AND_SPACE_1.id;
   const two = [{ id, namespaces: allSpaces }];
diff --git a/x-pack/test/spaces_api_integration/spaces_only/apis/share_remove.ts b/x-pack/test/spaces_api_integration/spaces_only/apis/share_remove.ts
index 8bcd294b38f3f..2c4506b723533 100644
--- a/x-pack/test/spaces_api_integration/spaces_only/apis/share_remove.ts
+++ b/x-pack/test/spaces_api_integration/spaces_only/apis/share_remove.ts
@@ -27,7 +27,7 @@ const { fail404 } = testCaseFailures;
 const createSingleTestCases = (spaceId: string) => {
   const namespaces = [spaceId];
   return [
-    { ...CASES.DEFAULT_SPACE_ONLY, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
+    { ...CASES.DEFAULT_ONLY, namespaces, ...fail404(spaceId !== DEFAULT_SPACE_ID) },
     { ...CASES.SPACE_1_ONLY, namespaces, ...fail404(spaceId !== SPACE_1_ID) },
     { ...CASES.SPACE_2_ONLY, namespaces, ...fail404(spaceId !== SPACE_2_ID) },
     { ...CASES.DEFAULT_AND_SPACE_1, namespaces, ...fail404(spaceId === SPACE_2_ID) },
@@ -43,7 +43,7 @@ const createSingleTestCases = (spaceId: string) => {
  */
 const createMultiTestCases = () => {
   const nonExistentSpaceId = 'does_not_exist'; // space that doesn't exist
-  let id = CASES.DEFAULT_SPACE_ONLY.id;
+  let id = CASES.DEFAULT_ONLY.id;
   const one = [
     { id, namespaces: [nonExistentSpaceId] },
     { id, namespaces: [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID] },

From deb71ecbb7a0a7f0e6eb5159854a782a9aa89a65 Mon Sep 17 00:00:00 2001
From: Davis Plumlee <56367316+dplumlee@users.noreply.github.com>
Date: Wed, 26 Aug 2020 17:13:38 -0400
Subject: [PATCH 074/148] [Security Solution][Exceptions Modal] Switches modal
 header (#76016)

---
 .../components/exceptions/add_exception_modal/translations.ts   | 2 +-
 .../components/exceptions/edit_exception_modal/translations.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/translations.ts b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/translations.ts
index 3916284416707..2e9bced21fe71 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/translations.ts
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/translations.ts
@@ -13,7 +13,7 @@ export const CANCEL = i18n.translate('xpack.securitySolution.exceptions.addExcep
 export const ADD_EXCEPTION = i18n.translate(
   'xpack.securitySolution.exceptions.addException.addException',
   {
-    defaultMessage: 'Add Exception',
+    defaultMessage: 'Add Rule Exception',
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/translations.ts b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/translations.ts
index 09e0a75d21573..1452003d8f8b8 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/translations.ts
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/translations.ts
@@ -20,7 +20,7 @@ export const EDIT_EXCEPTION_SAVE_BUTTON = i18n.translate(
 export const EDIT_EXCEPTION_TITLE = i18n.translate(
   'xpack.securitySolution.exceptions.editException.editExceptionTitle',
   {
-    defaultMessage: 'Edit Exception',
+    defaultMessage: 'Edit Rule Exception',
   }
 );
 

From fd39f094ccc3bf0aba39789961d31bedebe2cce1 Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@hotmail.com>
Date: Wed, 26 Aug 2020 17:19:30 -0400
Subject: [PATCH 075/148] Duplicate title warning wording (#75908)

Changed wording on duplicate title warning.
---
 .../save_modal/saved_object_save_modal.tsx      | 17 ++++-------------
 .../translations/translations/ja-JP.json        |  2 --
 .../translations/translations/zh-CN.json        |  2 --
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx
index 962f993633e6f..3b9efbee22ba6 100644
--- a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx
+++ b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx
@@ -281,8 +281,8 @@ export class SavedObjectSaveModal extends React.Component<Props, SaveModalState>
             title={
               <FormattedMessage
                 id="savedObjects.saveModal.duplicateTitleLabel"
-                defaultMessage="A {objectType} with the title '{title}' already exists"
-                values={{ objectType: this.props.objectType, title: this.state.title }}
+                defaultMessage="This {objectType} already exists"
+                values={{ objectType: this.props.objectType }}
               />
             }
             color="warning"
@@ -292,18 +292,9 @@ export class SavedObjectSaveModal extends React.Component<Props, SaveModalState>
             <p>
               <FormattedMessage
                 id="savedObjects.saveModal.duplicateTitleDescription"
-                defaultMessage="Clicking {confirmSaveLabel} will save the {objectType} with this duplicate title."
+                defaultMessage="Saving '{title}' creates a duplicate title."
                 values={{
-                  objectType: this.props.objectType,
-                  confirmSaveLabel: (
-                    <strong>
-                      {this.props.confirmButtonLabel
-                        ? this.props.confirmButtonLabel
-                        : i18n.translate('savedObjects.saveModal.saveButtonLabel', {
-                            defaultMessage: 'Save',
-                          })}
-                    </strong>
-                  ),
+                  title: this.props.title,
                 }}
               />
             </p>
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 70e2b34d06ce6..d6e611e65154b 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2880,8 +2880,6 @@
     "savedObjects.saveDuplicateRejectedDescription": "重複ファイルの保存確認が拒否されました",
     "savedObjects.saveModal.cancelButtonLabel": "キャンセル",
     "savedObjects.saveModal.descriptionLabel": "説明",
-    "savedObjects.saveModal.duplicateTitleDescription": "{confirmSaveLabel} をクリックすると {objectType} がこの重複したタイトルで保存されます。",
-    "savedObjects.saveModal.duplicateTitleLabel": "「{title}」というタイトルの {objectType} が既に存在します",
     "savedObjects.saveModal.saveAsNewLabel": "新しい {objectType} として保存",
     "savedObjects.saveModal.saveButtonLabel": "保存",
     "savedObjects.saveModal.saveTitle": "{objectType} を保存",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index e682a12859c47..54c69d849e3a9 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2881,8 +2881,6 @@
     "savedObjects.saveDuplicateRejectedDescription": "已拒绝使用重复标题保存确认",
     "savedObjects.saveModal.cancelButtonLabel": "取消",
     "savedObjects.saveModal.descriptionLabel": "描述",
-    "savedObjects.saveModal.duplicateTitleDescription": "单击“{confirmSaveLabel}”将会使用此重复标题保存 {objectType}。",
-    "savedObjects.saveModal.duplicateTitleLabel": "具有标题“{title}”的 {objectType} 已存在",
     "savedObjects.saveModal.saveAsNewLabel": "另存为新的 {objectType}",
     "savedObjects.saveModal.saveButtonLabel": "保存",
     "savedObjects.saveModal.saveTitle": "保存 {objectType}",

From 35b8d50ccd412ab50e5b22726f4455000c5fa72b Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Wed, 26 Aug 2020 16:21:11 -0500
Subject: [PATCH 076/148] [Enterprise Search] Adds app logic file to Workplace
 Search (#76009)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add new Workplace Search initial data properties

* Add app logic

* Refactor index to match App Search

Adds the easier-to-read ComponentConfigured and ComponentUnconfigured FCs with a ternary in the root compoenent

* Remove ‘Logic’ from interface names

* Extract initial data from WS into interface

This allows for breaking apart the app-specific data and also having an interface to extend in the app_logic file

* Destructuring FTW
---
 .../common/__mocks__/initial_app_data.ts      |  2 +
 .../enterprise_search/common/types/index.ts   |  7 +-
 .../common/types/workplace_search.ts          |  7 ++
 .../workplace_search/app_logic.test.ts        | 35 +++++++++
 .../workplace_search/app_logic.ts             | 32 ++++++++
 .../workplace_search/index.test.tsx           | 77 ++++++++++++++-----
 .../applications/workplace_search/index.tsx   | 38 +++++----
 .../lib/enterprise_search_config_api.test.ts  |  4 +
 .../lib/enterprise_search_config_api.ts       |  2 +
 9 files changed, 165 insertions(+), 39 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts

diff --git a/x-pack/plugins/enterprise_search/common/__mocks__/initial_app_data.ts b/x-pack/plugins/enterprise_search/common/__mocks__/initial_app_data.ts
index 79e1efc425b4e..2d31be65dd30e 100644
--- a/x-pack/plugins/enterprise_search/common/__mocks__/initial_app_data.ts
+++ b/x-pack/plugins/enterprise_search/common/__mocks__/initial_app_data.ts
@@ -29,6 +29,8 @@ export const DEFAULT_INITIAL_APP_DATA = {
     },
   },
   workplaceSearch: {
+    canCreateInvitations: true,
+    isFederatedAuth: false,
     organization: {
       name: 'ACME Donuts',
       defaultOrgName: 'My Organization',
diff --git a/x-pack/plugins/enterprise_search/common/types/index.ts b/x-pack/plugins/enterprise_search/common/types/index.ts
index 52e468b741a07..008afb234a376 100644
--- a/x-pack/plugins/enterprise_search/common/types/index.ts
+++ b/x-pack/plugins/enterprise_search/common/types/index.ts
@@ -5,17 +5,14 @@
  */
 
 import { IAccount as IAppSearchAccount } from './app_search';
-import { IAccount as IWorkplaceSearchAccount, IOrganization } from './workplace_search';
+import { IWorkplaceSearchInitialData } from './workplace_search';
 
 export interface IInitialAppData {
   readOnlyMode?: boolean;
   ilmEnabled?: boolean;
   configuredLimits?: IConfiguredLimits;
   appSearch?: IAppSearchAccount;
-  workplaceSearch?: {
-    organization: IOrganization;
-    fpAccount: IWorkplaceSearchAccount;
-  };
+  workplaceSearch?: IWorkplaceSearchInitialData;
 }
 
 export interface IConfiguredLimits {
diff --git a/x-pack/plugins/enterprise_search/common/types/workplace_search.ts b/x-pack/plugins/enterprise_search/common/types/workplace_search.ts
index fd8fa6daf81ac..bc4e39b0788d9 100644
--- a/x-pack/plugins/enterprise_search/common/types/workplace_search.ts
+++ b/x-pack/plugins/enterprise_search/common/types/workplace_search.ts
@@ -17,3 +17,10 @@ export interface IOrganization {
   name: string;
   defaultOrgName: string;
 }
+
+export interface IWorkplaceSearchInitialData {
+  canCreateInvitations: boolean;
+  isFederatedAuth: boolean;
+  organization: IOrganization;
+  fpAccount: IAccount;
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts
new file mode 100644
index 0000000000000..bc31b7df5d971
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { resetContext } from 'kea';
+
+import { DEFAULT_INITIAL_APP_DATA } from '../../../common/__mocks__';
+import { AppLogic } from './app_logic';
+
+describe('AppLogic', () => {
+  beforeEach(() => {
+    resetContext({});
+    AppLogic.mount();
+  });
+
+  const DEFAULT_VALUES = {
+    hasInitialized: false,
+  };
+
+  it('has expected default values', () => {
+    expect(AppLogic.values).toEqual(DEFAULT_VALUES);
+  });
+
+  describe('initializeAppData()', () => {
+    it('sets values based on passed props', () => {
+      AppLogic.actions.initializeAppData(DEFAULT_INITIAL_APP_DATA);
+
+      expect(AppLogic.values).toEqual({
+        hasInitialized: true,
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts
new file mode 100644
index 0000000000000..b7116f02663c1
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { kea } from 'kea';
+
+import { IInitialAppData } from '../../../common/types';
+import { IWorkplaceSearchInitialData } from '../../../common/types/workplace_search';
+import { IKeaLogic } from '../shared/types';
+
+export interface IAppValues extends IWorkplaceSearchInitialData {
+  hasInitialized: boolean;
+}
+export interface IAppActions {
+  initializeAppData(props: IInitialAppData): void;
+}
+
+export const AppLogic = kea({
+  actions: (): IAppActions => ({
+    initializeAppData: ({ workplaceSearch }) => workplaceSearch,
+  }),
+  reducers: () => ({
+    hasInitialized: [
+      false,
+      {
+        initializeAppData: () => true,
+      },
+    ],
+  }),
+}) as IKeaLogic<IAppValues, IAppActions>;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
index a0d9352ee9f82..39280ad6f4be4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.test.tsx
@@ -10,39 +10,76 @@ import '../__mocks__/kea.mock';
 import React, { useContext } from 'react';
 import { Redirect } from 'react-router-dom';
 import { shallow } from 'enzyme';
-import { useValues } from 'kea';
+import { useValues, useActions } from 'kea';
 
-import { Overview } from './views/overview';
+import { SetupGuide } from './views/setup_guide';
 import { ErrorState } from './views/error_state';
+import { Overview } from './views/overview';
 
-import { WorkplaceSearch } from './';
+import { WorkplaceSearch, WorkplaceSearchUnconfigured, WorkplaceSearchConfigured } from './';
 
-describe('Workplace Search', () => {
-  it('redirects to Setup Guide when enterpriseSearchUrl is not set', () => {
-    (useContext as jest.Mock).mockImplementationOnce(() => ({
-      config: { host: '' },
-    }));
+describe('WorkplaceSearch', () => {
+  it('renders WorkplaceSearchUnconfigured when config.host is not set', () => {
+    (useContext as jest.Mock).mockImplementationOnce(() => ({ config: { host: '' } }));
     const wrapper = shallow(<WorkplaceSearch />);
 
-    expect(wrapper.find(Redirect)).toHaveLength(1);
-    expect(wrapper.find(Overview)).toHaveLength(0);
+    expect(wrapper.find(WorkplaceSearchUnconfigured)).toHaveLength(1);
   });
 
-  it('renders the Overview when enterpriseSearchUrl is set', () => {
-    (useContext as jest.Mock).mockImplementationOnce(() => ({
-      config: { host: 'https://foo.bar' },
-    }));
+  it('renders WorkplaceSearchConfigured when config.host set', () => {
+    (useContext as jest.Mock).mockImplementationOnce(() => ({ config: { host: 'some.url' } }));
     const wrapper = shallow(<WorkplaceSearch />);
 
+    expect(wrapper.find(WorkplaceSearchConfigured)).toHaveLength(1);
+  });
+});
+
+describe('WorkplaceSearchUnconfigured', () => {
+  it('renders the Setup Guide and redirects to the Setup Guide', () => {
+    const wrapper = shallow(<WorkplaceSearchUnconfigured />);
+
+    expect(wrapper.find(SetupGuide)).toHaveLength(1);
+    expect(wrapper.find(Redirect)).toHaveLength(1);
+  });
+});
+
+describe('WorkplaceSearchConfigured', () => {
+  beforeEach(() => {
+    // Mock resets
+    (useValues as jest.Mock).mockImplementation(() => ({}));
+    (useActions as jest.Mock).mockImplementation(() => ({ initializeAppData: () => {} }));
+  });
+
+  it('renders with layout', () => {
+    const wrapper = shallow(<WorkplaceSearchConfigured />);
+
     expect(wrapper.find(Overview)).toHaveLength(1);
-    expect(wrapper.find(Redirect)).toHaveLength(0);
   });
 
-  it('renders ErrorState when the app cannot connect to Enterprise Search', () => {
-    (useValues as jest.Mock).mockImplementationOnce(() => ({ errorConnecting: true }));
-    const wrapper = shallow(<WorkplaceSearch />);
+  it('initializes app data with passed props', () => {
+    const initializeAppData = jest.fn();
+    (useActions as jest.Mock).mockImplementation(() => ({ initializeAppData }));
+
+    shallow(<WorkplaceSearchConfigured readOnlyMode={true} />);
+
+    expect(initializeAppData).toHaveBeenCalledWith({ readOnlyMode: true });
+  });
+
+  it('does not re-initialize app data', () => {
+    const initializeAppData = jest.fn();
+    (useActions as jest.Mock).mockImplementation(() => ({ initializeAppData }));
+    (useValues as jest.Mock).mockImplementation(() => ({ hasInitialized: true }));
+
+    shallow(<WorkplaceSearchConfigured />);
+
+    expect(initializeAppData).not.toHaveBeenCalled();
+  });
+
+  it('renders ErrorState', () => {
+    (useValues as jest.Mock).mockImplementation(() => ({ errorConnecting: true }));
+
+    const wrapper = shallow(<WorkplaceSearchConfigured />);
 
-    expect(wrapper.find(ErrorState).exists()).toBe(true);
-    expect(wrapper.find(Overview)).toHaveLength(0);
+    expect(wrapper.find(ErrorState)).toHaveLength(2);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
index 8582a003c6fa8..c0a51d5670a14 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
@@ -4,13 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } from 'react';
 import { Route, Redirect, Switch } from 'react-router-dom';
-import { useValues } from 'kea';
+import { useActions, useValues } from 'kea';
 
 import { IInitialAppData } from '../../../common/types';
 import { KibanaContext, IKibanaContext } from '../index';
 import { HttpLogic, IHttpLogicValues } from '../shared/http';
+import { AppLogic, IAppActions, IAppValues } from './app_logic';
 import { Layout } from '../shared/layout';
 import { WorkplaceSearchNav } from './components/layout/nav';
 
@@ -20,21 +21,19 @@ import { SetupGuide } from './views/setup_guide';
 import { ErrorState } from './views/error_state';
 import { Overview } from './views/overview';
 
-export const WorkplaceSearch: React.FC<IInitialAppData> = () => {
+export const WorkplaceSearch: React.FC<IInitialAppData> = (props) => {
   const { config } = useContext(KibanaContext) as IKibanaContext;
+  return !config.host ? <WorkplaceSearchUnconfigured /> : <WorkplaceSearchConfigured {...props} />;
+};
+
+export const WorkplaceSearchConfigured: React.FC<IInitialAppData> = (props) => {
+  const { hasInitialized } = useValues(AppLogic) as IAppValues;
+  const { initializeAppData } = useActions(AppLogic) as IAppActions;
   const { errorConnecting } = useValues(HttpLogic) as IHttpLogicValues;
 
-  if (!config.host)
-    return (
-      <Switch>
-        <Route exact path={SETUP_GUIDE_PATH}>
-          <SetupGuide />
-        </Route>
-        <Route>
-          <Redirect to={SETUP_GUIDE_PATH} />
-        </Route>
-      </Switch>
-    );
+  useEffect(() => {
+    if (!hasInitialized) initializeAppData(props);
+  }, [hasInitialized]);
 
   return (
     <Switch>
@@ -61,3 +60,14 @@ export const WorkplaceSearch: React.FC<IInitialAppData> = () => {
     </Switch>
   );
 };
+
+export const WorkplaceSearchUnconfigured: React.FC = () => (
+  <Switch>
+    <Route exact path={SETUP_GUIDE_PATH}>
+      <SetupGuide />
+    </Route>
+    <Route>
+      <Redirect to={SETUP_GUIDE_PATH} />
+    </Route>
+  </Switch>
+);
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
index c26ada77f504f..323f79e63bc6f 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.test.ts
@@ -47,6 +47,8 @@ describe('callEnterpriseSearchConfigAPI', () => {
         onboarding_complete: true,
       },
       workplace_search: {
+        can_create_invitations: true,
+        is_federated_auth: false,
         organization: {
           name: 'ACME Donuts',
           default_org_name: 'My Organization',
@@ -136,6 +138,8 @@ describe('callEnterpriseSearchConfigAPI', () => {
         },
       },
       workplaceSearch: {
+        canCreateInvitations: false,
+        isFederatedAuth: false,
         organization: {
           name: undefined,
           defaultOrgName: undefined,
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
index 1dbec76806ba8..c9cbec15169d9 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_config_api.ts
@@ -90,6 +90,8 @@ export const callEnterpriseSearchConfigAPI = async ({
         },
       },
       workplaceSearch: {
+        canCreateInvitations: !!data?.settings?.workplace_search?.can_create_invitations,
+        isFederatedAuth: !!data?.settings?.workplace_search?.is_federated_auth,
         organization: {
           name: data?.settings?.workplace_search?.organization?.name,
           defaultOrgName: data?.settings?.workplace_search?.organization?.default_org_name,

From d2d7b0decfef5016a7996a284dd13565ac6b43cf Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Wed, 26 Aug 2020 23:33:15 +0200
Subject: [PATCH 077/148] Legacy ES plugin pre-removal cleanup (#75779)

* delete integration tests

* remove legacy version healthcheck / waitUntilReady

* remove handleESError

* remove createCluster

* no longer depends on kibana plugin

* fix kbn_server

* remove deprecated comment and dead code

* revert code removal, apparently was used (?)

* Revert "revert code removal, apparently was used (?)"

This reverts commit 69481850
---
 .../integration_tests/index.test.ts           | 16 ----
 .../integration_tests/lib/servers.ts          | 16 ----
 .../core_plugins/elasticsearch/index.d.ts     |  2 -
 .../core_plugins/elasticsearch/index.js       | 33 +------
 .../integration_tests/elasticsearch.test.ts   | 89 -------------------
 .../elasticsearch/lib/version_health_check.js | 39 --------
 .../lib/version_health_check.test.js          | 71 ---------------
 .../server/lib/__tests__/handle_es_error.js   | 58 ------------
 .../server/lib/handle_es_error.js             | 50 -----------
 src/test_utils/kbn_server.ts                  |  5 +-
 10 files changed, 3 insertions(+), 376 deletions(-)
 delete mode 100644 src/legacy/core_plugins/elasticsearch/integration_tests/elasticsearch.test.ts
 delete mode 100644 src/legacy/core_plugins/elasticsearch/lib/version_health_check.js
 delete mode 100644 src/legacy/core_plugins/elasticsearch/lib/version_health_check.test.js
 delete mode 100644 src/legacy/core_plugins/elasticsearch/server/lib/__tests__/handle_es_error.js
 delete mode 100644 src/legacy/core_plugins/elasticsearch/server/lib/handle_es_error.js

diff --git a/src/core/server/ui_settings/integration_tests/index.test.ts b/src/core/server/ui_settings/integration_tests/index.test.ts
index e704532ee4cdf..7353f5d3eb760 100644
--- a/src/core/server/ui_settings/integration_tests/index.test.ts
+++ b/src/core/server/ui_settings/integration_tests/index.test.ts
@@ -24,22 +24,6 @@ import { docMissingSuite } from './doc_missing';
 import { docMissingAndIndexReadOnlySuite } from './doc_missing_and_index_read_only';
 
 describe('uiSettings/routes', function () {
-  /**
-   *  The "doc missing" and "index missing" tests verify how the uiSettings
-   *  API behaves in between healthChecks, so they interact with the healthCheck
-   *  in somewhat weird ways (can't wait until we get to https://github.com/elastic/kibana/issues/14163)
-   *
-   *  To make this work we have a `waitUntilNextHealthCheck()` function in ./lib/servers.js
-   *  that deletes the kibana index and then calls `plugins.elasticsearch.waitUntilReady()`.
-   *
-   *  waitUntilReady() waits for the kibana index to exist and then for the
-   *  elasticsearch plugin to go green. Since we have verified that the kibana index
-   *  does not exist we know that the plugin will also turn yellow while waiting for
-   *  it and then green once the health check is complete, ensuring that we run our
-   *  tests right after the health check. All of this is to say that the tests are
-   *  stupidly fragile and timing sensitive. #14163 should fix that, but until then
-   *  this is the most stable way I've been able to get this to work.
-   */
   jest.setTimeout(10000);
 
   beforeAll(startServers);
diff --git a/src/core/server/ui_settings/integration_tests/lib/servers.ts b/src/core/server/ui_settings/integration_tests/lib/servers.ts
index ea462291059a5..b4cfc3c1efe8b 100644
--- a/src/core/server/ui_settings/integration_tests/lib/servers.ts
+++ b/src/core/server/ui_settings/integration_tests/lib/servers.ts
@@ -39,7 +39,6 @@ interface AllServices {
   savedObjectsClient: SavedObjectsClientContract;
   callCluster: LegacyAPICaller;
   uiSettings: IUiSettingsClient;
-  deleteKibanaIndex: typeof deleteKibanaIndex;
 }
 
 let services: AllServices;
@@ -62,20 +61,6 @@ export async function startServers() {
   kbnServer = kbn.kbnServer;
 }
 
-async function deleteKibanaIndex(callCluster: LegacyAPICaller) {
-  const kibanaIndices = await callCluster('cat.indices', { index: '.kibana*', format: 'json' });
-  const indexNames = kibanaIndices.map((x: any) => x.index);
-  if (!indexNames.length) {
-    return;
-  }
-  await callCluster('indices.putSettings', {
-    index: indexNames,
-    body: { index: { blocks: { read_only: false } } },
-  });
-  await callCluster('indices.delete', { index: indexNames });
-  return indexNames;
-}
-
 export function getServices() {
   if (services) {
     return services;
@@ -97,7 +82,6 @@ export function getServices() {
     callCluster,
     savedObjectsClient,
     uiSettings,
-    deleteKibanaIndex,
   };
 
   return services;
diff --git a/src/legacy/core_plugins/elasticsearch/index.d.ts b/src/legacy/core_plugins/elasticsearch/index.d.ts
index 683f58b1a80ce..83e7bb19e57ba 100644
--- a/src/legacy/core_plugins/elasticsearch/index.d.ts
+++ b/src/legacy/core_plugins/elasticsearch/index.d.ts
@@ -523,6 +523,4 @@ export interface CallCluster {
 export interface ElasticsearchPlugin {
   status: { on: (status: string, cb: () => void) => void };
   getCluster(name: string): Cluster;
-  createCluster(name: string, config: ClusterConfig): Cluster;
-  waitUntilReady(): Promise<void>;
 }
diff --git a/src/legacy/core_plugins/elasticsearch/index.js b/src/legacy/core_plugins/elasticsearch/index.js
index eb502e97fb77c..599886788604b 100644
--- a/src/legacy/core_plugins/elasticsearch/index.js
+++ b/src/legacy/core_plugins/elasticsearch/index.js
@@ -19,14 +19,12 @@
 import { first } from 'rxjs/operators';
 import { Cluster } from './server/lib/cluster';
 import { createProxy } from './server/lib/create_proxy';
-import { handleESError } from './server/lib/handle_es_error';
-import { versionHealthCheck } from './lib/version_health_check';
 
 export default function (kibana) {
   let defaultVars;
 
   return new kibana.Plugin({
-    require: ['kibana'],
+    require: [],
 
     uiExports: { injectDefaultVars: () => defaultVars },
 
@@ -61,25 +59,6 @@ export default function (kibana) {
         return clusters.get(name);
       });
 
-      server.expose('createCluster', (name, clientConfig = {}) => {
-        // NOTE: Not having `admin` and `data` clients provided by the core in `clusters`
-        // map implicitly allows to create custom `data` and `admin` clients. This is
-        // allowed intentionally to support custom `admin` cluster client created by the
-        // x-pack/monitoring bulk uploader. We should forbid that as soon as monitoring
-        // bulk uploader is refactored, see https://github.com/elastic/kibana/issues/31934.
-        if (clusters.has(name)) {
-          throw new Error(`cluster '${name}' already exists`);
-        }
-
-        const cluster = new Cluster(
-          server.newPlatform.setup.core.elasticsearch.legacy.createClient(name, clientConfig)
-        );
-
-        clusters.set(name, cluster);
-
-        return cluster;
-      });
-
       server.events.on('stop', () => {
         for (const cluster of clusters.values()) {
           cluster.close();
@@ -88,17 +67,7 @@ export default function (kibana) {
         clusters.clear();
       });
 
-      server.expose('handleESError', handleESError);
-
       createProxy(server);
-
-      const waitUntilHealthy = versionHealthCheck(
-        this,
-        server.logWithMetadata,
-        server.newPlatform.__internals.elasticsearch.esNodesCompatibility$
-      );
-
-      server.expose('waitUntilReady', () => waitUntilHealthy);
     },
   });
 }
diff --git a/src/legacy/core_plugins/elasticsearch/integration_tests/elasticsearch.test.ts b/src/legacy/core_plugins/elasticsearch/integration_tests/elasticsearch.test.ts
deleted file mode 100644
index 0331153cdf615..0000000000000
--- a/src/legacy/core_plugins/elasticsearch/integration_tests/elasticsearch.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import {
-  createTestServers,
-  TestElasticsearchUtils,
-  TestKibanaUtils,
-  TestUtils,
-  createRootWithCorePlugins,
-  getKbnServer,
-} from '../../../../test_utils/kbn_server';
-
-import { BehaviorSubject } from 'rxjs';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { NodesVersionCompatibility } from 'src/core/server/elasticsearch/version_check/ensure_es_version';
-
-describe('Elasticsearch plugin', () => {
-  let servers: TestUtils;
-  let esServer: TestElasticsearchUtils;
-  let root: TestKibanaUtils['root'];
-  let elasticsearch: TestKibanaUtils['kbnServer']['server']['plugins']['elasticsearch'];
-
-  const esNodesCompatibility$ = new BehaviorSubject<NodesVersionCompatibility>({
-    isCompatible: true,
-    incompatibleNodes: [],
-    warningNodes: [],
-    kibanaVersion: '8.0.0',
-  });
-
-  beforeAll(async function () {
-    const settings = {
-      elasticsearch: {},
-      adjustTimeout: (t: any) => {
-        jest.setTimeout(t);
-      },
-    };
-    servers = createTestServers(settings);
-    esServer = await servers.startES();
-
-    const elasticsearchSettings = {
-      hosts: esServer.hosts,
-      username: esServer.username,
-      password: esServer.password,
-    };
-    root = createRootWithCorePlugins({ elasticsearch: elasticsearchSettings });
-
-    const setup = await root.setup();
-    setup.elasticsearch.esNodesCompatibility$ = esNodesCompatibility$;
-    await root.start();
-
-    elasticsearch = getKbnServer(root).server.plugins.elasticsearch;
-  });
-
-  afterAll(async () => {
-    await esServer.stop();
-    await root.shutdown();
-  }, 30000);
-
-  it("should set it's status to green when all nodes are compatible", (done) => {
-    jest.setTimeout(30000);
-    elasticsearch.status.on('green', () => done());
-  });
-
-  it("should set it's status to red when some nodes aren't compatible", (done) => {
-    esNodesCompatibility$.next({
-      isCompatible: false,
-      incompatibleNodes: [],
-      warningNodes: [],
-      kibanaVersion: '8.0.0',
-    });
-    elasticsearch.status.on('red', () => done());
-  });
-});
diff --git a/src/legacy/core_plugins/elasticsearch/lib/version_health_check.js b/src/legacy/core_plugins/elasticsearch/lib/version_health_check.js
deleted file mode 100644
index b1a106d2aae5d..0000000000000
--- a/src/legacy/core_plugins/elasticsearch/lib/version_health_check.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export const versionHealthCheck = (esPlugin, logWithMetadata, esNodesCompatibility$) => {
-  esPlugin.status.yellow('Waiting for Elasticsearch');
-
-  return new Promise((resolve) => {
-    esNodesCompatibility$.subscribe(({ isCompatible, message, kibanaVersion, warningNodes }) => {
-      if (!isCompatible) {
-        esPlugin.status.red(message);
-      } else {
-        if (message) {
-          logWithMetadata(['warning'], message, {
-            kibanaVersion,
-            nodes: warningNodes,
-          });
-        }
-        esPlugin.status.green('Ready');
-        resolve();
-      }
-    });
-  });
-};
diff --git a/src/legacy/core_plugins/elasticsearch/lib/version_health_check.test.js b/src/legacy/core_plugins/elasticsearch/lib/version_health_check.test.js
deleted file mode 100644
index 4c03c0c0105ee..0000000000000
--- a/src/legacy/core_plugins/elasticsearch/lib/version_health_check.test.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { versionHealthCheck } from './version_health_check';
-import { Subject } from 'rxjs';
-
-describe('plugins/elasticsearch', () => {
-  describe('lib/health_version_check', function () {
-    let plugin;
-    let logWithMetadata;
-
-    beforeEach(() => {
-      plugin = {
-        status: {
-          red: jest.fn(),
-          green: jest.fn(),
-          yellow: jest.fn(),
-        },
-      };
-
-      logWithMetadata = jest.fn();
-      jest.clearAllMocks();
-    });
-
-    it('returned promise resolves when all nodes are compatible ', function () {
-      const esNodesCompatibility$ = new Subject();
-      const versionHealthyPromise = versionHealthCheck(
-        plugin,
-        logWithMetadata,
-        esNodesCompatibility$
-      );
-      esNodesCompatibility$.next({ isCompatible: true, message: undefined });
-      return expect(versionHealthyPromise).resolves.toBe(undefined);
-    });
-
-    it('should set elasticsearch plugin status to green when all nodes are compatible', function () {
-      const esNodesCompatibility$ = new Subject();
-      versionHealthCheck(plugin, logWithMetadata, esNodesCompatibility$);
-      expect(plugin.status.yellow).toHaveBeenCalledWith('Waiting for Elasticsearch');
-      expect(plugin.status.green).not.toHaveBeenCalled();
-      esNodesCompatibility$.next({ isCompatible: true, message: undefined });
-      expect(plugin.status.green).toHaveBeenCalledWith('Ready');
-      expect(plugin.status.red).not.toHaveBeenCalled();
-    });
-
-    it('should set elasticsearch plugin status to red when some nodes are incompatible', function () {
-      const esNodesCompatibility$ = new Subject();
-      versionHealthCheck(plugin, logWithMetadata, esNodesCompatibility$);
-      expect(plugin.status.yellow).toHaveBeenCalledWith('Waiting for Elasticsearch');
-      expect(plugin.status.red).not.toHaveBeenCalled();
-      esNodesCompatibility$.next({ isCompatible: false, message: 'your nodes are incompatible' });
-      expect(plugin.status.red).toHaveBeenCalledWith('your nodes are incompatible');
-      expect(plugin.status.green).not.toHaveBeenCalled();
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/handle_es_error.js b/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/handle_es_error.js
deleted file mode 100644
index ccab1a3b830b6..0000000000000
--- a/src/legacy/core_plugins/elasticsearch/server/lib/__tests__/handle_es_error.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-import { handleESError } from '../handle_es_error';
-import { errors as esErrors } from 'elasticsearch';
-
-describe('handleESError', function () {
-  it('should transform elasticsearch errors into boom errors with the same status code', function () {
-    const conflict = handleESError(new esErrors.Conflict());
-    expect(conflict.isBoom).to.be(true);
-    expect(conflict.output.statusCode).to.be(409);
-
-    const forbidden = handleESError(new esErrors[403]());
-    expect(forbidden.isBoom).to.be(true);
-    expect(forbidden.output.statusCode).to.be(403);
-
-    const notFound = handleESError(new esErrors.NotFound());
-    expect(notFound.isBoom).to.be(true);
-    expect(notFound.output.statusCode).to.be(404);
-
-    const badRequest = handleESError(new esErrors.BadRequest());
-    expect(badRequest.isBoom).to.be(true);
-    expect(badRequest.output.statusCode).to.be(400);
-  });
-
-  it('should return an unknown error without transforming it', function () {
-    const unknown = new Error('mystery error');
-    expect(handleESError(unknown)).to.be(unknown);
-  });
-
-  it('should return a boom 503 server timeout error for ES connection errors', function () {
-    expect(handleESError(new esErrors.ConnectionFault()).output.statusCode).to.be(503);
-    expect(handleESError(new esErrors.ServiceUnavailable()).output.statusCode).to.be(503);
-    expect(handleESError(new esErrors.NoConnections()).output.statusCode).to.be(503);
-    expect(handleESError(new esErrors.RequestTimeout()).output.statusCode).to.be(503);
-  });
-
-  it('should throw an error if called with a non-error argument', function () {
-    expect(handleESError).withArgs('notAnError').to.throwException();
-  });
-});
diff --git a/src/legacy/core_plugins/elasticsearch/server/lib/handle_es_error.js b/src/legacy/core_plugins/elasticsearch/server/lib/handle_es_error.js
deleted file mode 100644
index d76b2a2aa9364..0000000000000
--- a/src/legacy/core_plugins/elasticsearch/server/lib/handle_es_error.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Boom from 'boom';
-import _ from 'lodash';
-import { errors as esErrors } from 'elasticsearch';
-
-export function handleESError(error) {
-  if (!(error instanceof Error)) {
-    throw new Error('Expected an instance of Error');
-  }
-
-  if (
-    error instanceof esErrors.ConnectionFault ||
-    error instanceof esErrors.ServiceUnavailable ||
-    error instanceof esErrors.NoConnections ||
-    error instanceof esErrors.RequestTimeout
-  ) {
-    return Boom.serverUnavailable(error);
-  } else if (
-    error instanceof esErrors.Conflict ||
-    _.includes(error.message, 'index_template_already_exists')
-  ) {
-    return Boom.conflict(error);
-  } else if (error instanceof esErrors[403]) {
-    return Boom.forbidden(error);
-  } else if (error instanceof esErrors.NotFound) {
-    return Boom.notFound(error);
-  } else if (error instanceof esErrors.BadRequest) {
-    return Boom.badRequest(error);
-  } else {
-    return error;
-  }
-}
diff --git a/src/test_utils/kbn_server.ts b/src/test_utils/kbn_server.ts
index e337a469f17e6..e44ce0de403d9 100644
--- a/src/test_utils/kbn_server.ts
+++ b/src/test_utils/kbn_server.ts
@@ -32,10 +32,10 @@ import { defaultsDeep, get } from 'lodash';
 import { resolve } from 'path';
 import { BehaviorSubject } from 'rxjs';
 import supertest from 'supertest';
+import { LegacyAPICaller } from '../core/server';
 import { CliArgs, Env } from '../core/server/config';
 import { Root } from '../core/server/root';
 import KbnServer from '../legacy/server/kbn_server';
-import { CallCluster } from '../legacy/core_plugins/elasticsearch';
 
 export type HttpMethod = 'delete' | 'get' | 'head' | 'post' | 'put';
 
@@ -156,7 +156,7 @@ export interface TestElasticsearchServer {
   stop: () => Promise<void>;
   cleanup: () => Promise<void>;
   getClient: () => Client;
-  getCallCluster: () => CallCluster;
+  getCallCluster: () => LegacyAPICaller;
   getUrl: () => string;
 }
 
@@ -292,7 +292,6 @@ export function createTestServers({
       await root.start();
 
       const kbnServer = getKbnServer(root);
-      await kbnServer.server.plugins.elasticsearch.waitUntilReady();
 
       return {
         root,

From 595dfdb023d472c9f0bbecdb4201947b76435f09 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Wed, 26 Aug 2020 14:37:55 -0700
Subject: [PATCH 078/148] Disables Chromedriver version detection (#75984)

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
---
 src/dev/ci_setup/setup.sh     |  6 ++++++
 src/dev/ci_setup/setup_env.sh | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/dev/ci_setup/setup.sh b/src/dev/ci_setup/setup.sh
index aabc1e75b9025..3351170c29e01 100755
--- a/src/dev/ci_setup/setup.sh
+++ b/src/dev/ci_setup/setup.sh
@@ -16,6 +16,12 @@ echo " -- TEST_ES_SNAPSHOT_VERSION='$TEST_ES_SNAPSHOT_VERSION'"
 echo " -- installing node.js dependencies"
 yarn kbn bootstrap --prefer-offline
 
+###
+### ensure Chromedriver install hook is triggered
+### when modules are up-to-date
+###
+node node_modules/chromedriver/install.js
+
 ###
 ### Download es snapshots
 ###
diff --git a/src/dev/ci_setup/setup_env.sh b/src/dev/ci_setup/setup_env.sh
index 72ec73ad810e6..5757d72f99582 100644
--- a/src/dev/ci_setup/setup_env.sh
+++ b/src/dev/ci_setup/setup_env.sh
@@ -134,13 +134,13 @@ export CYPRESS_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudf
 export CHECKS_REPORTER_ACTIVE=false
 
 # This is mainly for release-manager builds, which run in an environment that doesn't have Chrome installed
-if [[ "$(which google-chrome-stable)" || "$(which google-chrome)" ]]; then
-  echo "Chrome detected, setting DETECT_CHROMEDRIVER_VERSION=true"
-  export DETECT_CHROMEDRIVER_VERSION=true
-  export CHROMEDRIVER_FORCE_DOWNLOAD=true
-else
-  echo "Chrome not detected, installing default chromedriver binary for the package version"
-fi
+# if [[ "$(which google-chrome-stable)" || "$(which google-chrome)" ]]; then
+#   echo "Chrome detected, setting DETECT_CHROMEDRIVER_VERSION=true"
+#   export DETECT_CHROMEDRIVER_VERSION=true
+#   export CHROMEDRIVER_FORCE_DOWNLOAD=true
+# else
+#   echo "Chrome not detected, installing default chromedriver binary for the package version"
+# fi
 
 ### only run on pr jobs for elastic/kibana, checks-reporter doesn't work for other repos
 if [[ "$ghprbPullId" && "$ghprbGhRepository" == 'elastic/kibana' ]] ; then

From 979d1dbca801839d0f896599665c564639b3a973 Mon Sep 17 00:00:00 2001
From: "Devin W. Hurley" <devin.hurley@elastic.co>
Date: Wed, 26 Aug 2020 18:18:39 -0400
Subject: [PATCH 079/148] [Security Solution] [Detections] Updates rules routes
 to validate "from" param on rules (#76000)

* updates validation on 'from' param to prevent malformed datemath strings from being accepted

* fix imports

* copy paste is not my friend

* missed type check somehow

* forgot to mock common utils

* updates bodies for request validation tests
---
 .../schemas/common/schemas.ts                 | 17 ++++++++-
 .../schemas/types/default_from_string.ts      | 10 +++--
 .../common/detection_engine/utils.ts          | 15 ++++++++
 .../rules_notification_alert_type.ts          |  2 +-
 .../rules/create_rules_bulk_route.test.ts     | 27 ++++++++++++++
 .../routes/rules/create_rules_route.test.ts   | 25 +++++++++++++
 .../rules/patch_rules_bulk_route.test.ts      | 27 ++++++++++++++
 .../routes/rules/patch_rules_route.test.ts    | 33 +++++++++++++++--
 .../rules/update_rules_bulk_route.test.ts     | 28 ++++++++++++++
 .../routes/rules/update_rules_route.test.ts   | 34 +++++++++++++++--
 .../signals/signal_rule_alert_type.test.ts    |  3 +-
 .../signals/signal_rule_alert_type.ts         |  2 +-
 .../detection_engine/signals/utils.test.ts    |  2 +-
 .../lib/detection_engine/signals/utils.ts     | 14 +------
 .../basic/tests/import_rules.ts               | 37 +++++++++++++++++++
 15 files changed, 246 insertions(+), 30 deletions(-)

diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts
index 2a0d1ef8b9dfd..64f2f223a3073 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts
@@ -7,11 +7,14 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import * as t from 'io-ts';
+import { Either } from 'fp-ts/lib/Either';
+
 import { RiskScore } from '../types/risk_score';
 import { UUID } from '../types/uuid';
 import { IsoDateString } from '../types/iso_date_string';
 import { PositiveIntegerGreaterThanZero } from '../types/positive_integer_greater_than_zero';
 import { PositiveInteger } from '../types/positive_integer';
+import { parseScheduleDates } from '../../utils';
 
 export const author = t.array(t.string);
 export type Author = t.TypeOf<typeof author>;
@@ -76,8 +79,18 @@ export const action = t.exact(
 export const actions = t.array(action);
 export type Actions = t.TypeOf<typeof actions>;
 
-// TODO: Create a regular expression type or custom date math part type here
-export const from = t.string;
+const stringValidator = (input: unknown): input is string => typeof input === 'string';
+export const from = new t.Type<string, string, unknown>(
+  'From',
+  t.string.is,
+  (input, context): Either<t.Errors, string> => {
+    if (stringValidator(input) && parseScheduleDates(input) == null) {
+      return t.failure(input, context, 'Failed to parse "from" on rule param');
+    }
+    return t.string.validate(input, context);
+  },
+  t.identity
+);
 export type From = t.TypeOf<typeof from>;
 
 export const fromOrUndefined = t.union([from, t.undefined]);
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/types/default_from_string.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/types/default_from_string.ts
index a85ea58b26478..5b1c837db9f74 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/types/default_from_string.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/types/default_from_string.ts
@@ -6,7 +6,7 @@
 
 import * as t from 'io-ts';
 import { Either } from 'fp-ts/lib/Either';
-
+import { from } from '../common/schemas';
 /**
  * Types the DefaultFromString as:
  *   - If null or undefined, then a default of the string "now-6m" will be used
@@ -14,7 +14,11 @@ import { Either } from 'fp-ts/lib/Either';
 export const DefaultFromString = new t.Type<string, string | undefined, unknown>(
   'DefaultFromString',
   t.string.is,
-  (input, context): Either<t.Errors, string> =>
-    input == null ? t.success('now-6m') : t.string.validate(input, context),
+  (input, context): Either<t.Errors, string> => {
+    if (input == null) {
+      return t.success('now-6m');
+    }
+    return from.validate(input, context);
+  },
   t.identity
 );
diff --git a/x-pack/plugins/security_solution/common/detection_engine/utils.ts b/x-pack/plugins/security_solution/common/detection_engine/utils.ts
index 153130fc16d60..a70258c2684b6 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/utils.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/utils.ts
@@ -4,6 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import moment from 'moment';
+import dateMath from '@elastic/datemath';
+
 import { EntriesArray } from '../shared_imports';
 import { RuleType } from './types';
 
@@ -18,3 +21,15 @@ export const hasNestedEntry = (entries: EntriesArray): boolean => {
 };
 
 export const isThresholdRule = (ruleType: RuleType) => ruleType === 'threshold';
+
+export const parseScheduleDates = (time: string): moment.Moment | null => {
+  const isValidDateString = !isNaN(Date.parse(time));
+  const isValidInput = isValidDateString || time.trim().startsWith('now');
+  const formattedDate = isValidDateString
+    ? moment(time)
+    : isValidInput
+    ? dateMath.parse(time)
+    : null;
+
+  return formattedDate ?? null;
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
index 2eb34529d044c..0a899562d61c2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/rules_notification_alert_type.ts
@@ -14,7 +14,7 @@ import { RuleAlertAttributes } from '../signals/types';
 import { siemRuleActionGroups } from '../signals/siem_rule_action_groups';
 import { scheduleNotificationActions } from './schedule_notification_actions';
 import { getNotificationResultsLink } from './utils';
-import { parseScheduleDates } from '../signals/utils';
+import { parseScheduleDates } from '../../../../common/detection_engine/utils';
 
 export const rulesNotificationAlertType = ({
   logger,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
index 4636618cc5ac0..06fcba36642ca 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_bulk_route.test.ts
@@ -161,6 +161,17 @@ describe('create_rules_bulk', () => {
       expect(result.ok).toHaveBeenCalled();
     });
 
+    test('allows rule type of query and custom from and interval', async () => {
+      const request = requestMock.create({
+        method: 'post',
+        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+        body: [{ from: 'now-7m', interval: '5m', ...getCreateRulesSchemaMock() }],
+      });
+      const result = server.validate(request);
+
+      expect(result.ok).toHaveBeenCalled();
+    });
+
     test('disallows unknown rule type', async () => {
       const request = requestMock.create({
         method: 'post',
@@ -173,5 +184,21 @@ describe('create_rules_bulk', () => {
         'Invalid value "unexpected_type" supplied to "type"'
       );
     });
+
+    test('disallows invalid "from" param on rule', async () => {
+      const request = requestMock.create({
+        method: 'post',
+        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_create`,
+        body: [
+          {
+            from: 'now-3755555555555555.67s',
+            interval: '5m',
+            ...getCreateRulesSchemaMock(),
+          },
+        ],
+      });
+      const result = server.validate(request);
+      expect(result.badRequest).toHaveBeenCalledWith('Failed to parse "from" on rule param');
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
index 59c64fbf8fce1..26febb0999ac7 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/create_rules_route.test.ts
@@ -164,5 +164,30 @@ describe('create_rules', () => {
         'Invalid value "unexpected_type" supplied to "type"'
       );
     });
+
+    test('allows rule type of query and custom from and interval', async () => {
+      const request = requestMock.create({
+        method: 'post',
+        path: DETECTION_ENGINE_RULES_URL,
+        body: { from: 'now-7m', interval: '5m', ...getCreateRulesSchemaMock() },
+      });
+      const result = server.validate(request);
+
+      expect(result.ok).toHaveBeenCalled();
+    });
+
+    test('disallows invalid "from" param on rule', async () => {
+      const request = requestMock.create({
+        method: 'post',
+        path: DETECTION_ENGINE_RULES_URL,
+        body: {
+          from: 'now-3755555555555555.67s',
+          interval: '5m',
+          ...getCreateRulesSchemaMock(),
+        },
+      });
+      const result = server.validate(request);
+      expect(result.badRequest).toHaveBeenCalledWith('Failed to parse "from" on rule param');
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
index db32f7f4485b1..c162caa1278e6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_bulk_route.test.ts
@@ -183,5 +183,32 @@ describe('patch_rules_bulk', () => {
         'Invalid value "unknown_type" supplied to "type"'
       );
     });
+
+    test('allows rule type of query and custom from and interval', async () => {
+      const request = requestMock.create({
+        method: 'patch',
+        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        body: [{ from: 'now-7m', interval: '5m', ...getCreateRulesSchemaMock() }],
+      });
+      const result = server.validate(request);
+
+      expect(result.ok).toHaveBeenCalled();
+    });
+
+    test('disallows invalid "from" param on rule', async () => {
+      const request = requestMock.create({
+        method: 'patch',
+        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        body: [
+          {
+            from: 'now-3755555555555555.67s',
+            interval: '5m',
+            ...getCreateRulesSchemaMock(),
+          },
+        ],
+      });
+      const result = server.validate(request);
+      expect(result.badRequest).toHaveBeenCalledWith('Failed to parse "from" on rule param');
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
index d3350bcb0d762..a406de593652b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/patch_rules_route.test.ts
@@ -18,7 +18,7 @@ import {
 } from '../__mocks__/request_responses';
 import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { patchRulesRoute } from './patch_rules_route';
-import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/create_rules_schema.mock';
+import { getPatchRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/patch_rules_schema.mock';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
 
@@ -156,7 +156,7 @@ describe('patch_rules', () => {
       const request = requestMock.create({
         method: 'patch',
         path: DETECTION_ENGINE_RULES_URL,
-        body: { ...getCreateRulesSchemaMock(), rule_id: undefined },
+        body: { ...getPatchRulesSchemaMock(), rule_id: undefined },
       });
       const response = await server.inject(request, context);
       expect(response.body).toEqual({
@@ -169,7 +169,7 @@ describe('patch_rules', () => {
       const request = requestMock.create({
         method: 'patch',
         path: DETECTION_ENGINE_RULES_URL,
-        body: { ...getCreateRulesSchemaMock(), type: 'query' },
+        body: { ...getPatchRulesSchemaMock(), type: 'query' },
       });
       const result = server.validate(request);
 
@@ -180,7 +180,7 @@ describe('patch_rules', () => {
       const request = requestMock.create({
         method: 'patch',
         path: DETECTION_ENGINE_RULES_URL,
-        body: { ...getCreateRulesSchemaMock(), type: 'unknown_type' },
+        body: { ...getPatchRulesSchemaMock(), type: 'unknown_type' },
       });
       const result = server.validate(request);
 
@@ -188,5 +188,30 @@ describe('patch_rules', () => {
         'Invalid value "unknown_type" supplied to "type"'
       );
     });
+
+    test('allows rule type of query and custom from and interval', async () => {
+      const request = requestMock.create({
+        method: 'patch',
+        path: DETECTION_ENGINE_RULES_URL,
+        body: { from: 'now-7m', interval: '5m', ...getPatchRulesSchemaMock() },
+      });
+      const result = server.validate(request);
+
+      expect(result.ok).toHaveBeenCalled();
+    });
+
+    test('disallows invalid "from" param on rule', async () => {
+      const request = requestMock.create({
+        method: 'patch',
+        path: DETECTION_ENGINE_RULES_URL,
+        body: {
+          from: 'now-3755555555555555.67s',
+          interval: '5m',
+          ...getPatchRulesSchemaMock(),
+        },
+      });
+      const result = server.validate(request);
+      expect(result.badRequest).toHaveBeenCalledWith('Failed to parse "from" on rule param');
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
index 9c5df89a52bed..ec5a2be255a2c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_bulk_route.test.ts
@@ -154,5 +154,33 @@ describe('update_rules_bulk', () => {
         'Invalid value "unknown_type" supplied to "type"'
       );
     });
+
+    test('allows rule type of query and custom from and interval', async () => {
+      const request = requestMock.create({
+        method: 'put',
+        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        body: [{ from: 'now-7m', interval: '5m', ...getCreateRulesSchemaMock(), type: 'query' }],
+      });
+      const result = server.validate(request);
+
+      expect(result.ok).toHaveBeenCalled();
+    });
+
+    test('disallows invalid "from" param on rule', async () => {
+      const request = requestMock.create({
+        method: 'put',
+        path: `${DETECTION_ENGINE_RULES_URL}/_bulk_update`,
+        body: [
+          {
+            from: 'now-3755555555555555.67s',
+            interval: '5m',
+            ...getCreateRulesSchemaMock(),
+            type: 'query',
+          },
+        ],
+      });
+      const result = server.validate(request);
+      expect(result.badRequest).toHaveBeenCalledWith('Failed to parse "from" on rule param');
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
index 46fe773e1a88d..fd077c18b7983 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/update_rules_route.test.ts
@@ -19,7 +19,7 @@ import { requestContextMock, serverMock, requestMock } from '../__mocks__';
 import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
 import { updateRulesNotifications } from '../../rules/update_rules_notifications';
 import { updateRulesRoute } from './update_rules_route';
-import { getCreateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/create_rules_schema.mock';
+import { getUpdateRulesSchemaMock } from '../../../../../common/detection_engine/schemas/request/update_rules_schema.mock';
 
 jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
 jest.mock('../../rules/update_rules_notifications');
@@ -130,7 +130,7 @@ describe('update_rules', () => {
         method: 'put',
         path: DETECTION_ENGINE_RULES_URL,
         body: {
-          ...getCreateRulesSchemaMock(),
+          ...getUpdateRulesSchemaMock(),
           rule_id: undefined,
         },
       });
@@ -145,7 +145,7 @@ describe('update_rules', () => {
       const request = requestMock.create({
         method: 'put',
         path: DETECTION_ENGINE_RULES_URL,
-        body: { ...getCreateRulesSchemaMock(), type: 'query' },
+        body: { ...getUpdateRulesSchemaMock(), type: 'query' },
       });
       const result = await server.validate(request);
 
@@ -156,7 +156,7 @@ describe('update_rules', () => {
       const request = requestMock.create({
         method: 'put',
         path: DETECTION_ENGINE_RULES_URL,
-        body: { ...getCreateRulesSchemaMock(), type: 'unknown type' },
+        body: { ...getUpdateRulesSchemaMock(), type: 'unknown type' },
       });
       const result = await server.validate(request);
 
@@ -164,5 +164,31 @@ describe('update_rules', () => {
         'Invalid value "unknown type" supplied to "type"'
       );
     });
+
+    test('allows rule type of query and custom from and interval', async () => {
+      const request = requestMock.create({
+        method: 'put',
+        path: DETECTION_ENGINE_RULES_URL,
+        body: { from: 'now-7m', interval: '5m', ...getUpdateRulesSchemaMock(), type: 'query' },
+      });
+      const result = server.validate(request);
+
+      expect(result.ok).toHaveBeenCalled();
+    });
+
+    test('disallows invalid "from" param on rule', async () => {
+      const request = requestMock.create({
+        method: 'put',
+        path: DETECTION_ENGINE_RULES_URL,
+        body: {
+          from: 'now-3755555555555555.67s',
+          interval: '5m',
+          ...getUpdateRulesSchemaMock(),
+          type: 'query',
+        },
+      });
+      const result = server.validate(request);
+      expect(result.badRequest).toHaveBeenCalledWith('Failed to parse "from" on rule param');
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
index b29d15f5e5c72..a7213c30eb3fb 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
@@ -16,8 +16,8 @@ import {
   getListsClient,
   getExceptions,
   sortExceptionItems,
-  parseScheduleDates,
 } from './utils';
+import { parseScheduleDates } from '../../../../common/detection_engine/utils';
 import { RuleExecutorOptions } from './types';
 import { searchAfterAndBulkCreate } from './search_after_bulk_create';
 import { scheduleNotificationActions } from '../notifications/schedule_notification_actions';
@@ -37,6 +37,7 @@ jest.mock('./utils');
 jest.mock('../notifications/schedule_notification_actions');
 jest.mock('./find_ml_signals');
 jest.mock('./bulk_create_ml_signals');
+jest.mock('./../../../../common/detection_engine/utils');
 
 const getPayload = (ruleAlert: RuleAlertType, services: AlertServicesMock) => ({
   alertId: ruleAlert.id,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
index b5cbf80b084f7..c5124edcaf187 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.ts
@@ -14,6 +14,7 @@ import {
   SERVER_APP_ID,
 } from '../../../../common/constants';
 import { isJobStarted, isMlRule } from '../../../../common/machine_learning/helpers';
+import { parseScheduleDates } from '../../../../common/detection_engine/utils';
 import { SetupPlugins } from '../../../plugin';
 import { getInputIndex } from './get_input_output_index';
 import {
@@ -24,7 +25,6 @@ import { getFilter } from './get_filter';
 import { SignalRuleAlertTypeDefinition, RuleAlertAttributes } from './types';
 import {
   getGapBetweenRuns,
-  parseScheduleDates,
   getListsClient,
   getExceptions,
   getGapMaxCatchupRatio,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
index 3c41f29625a51..a2e2fec3309c3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
@@ -13,11 +13,11 @@ import { buildRuleMessageFactory } from './rule_messages';
 import { ExceptionListClient } from '../../../../../lists/server';
 import { getListArrayMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
 import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { parseScheduleDates } from '../../../../common/detection_engine/utils';
 
 import {
   generateId,
   parseInterval,
-  parseScheduleDates,
   getDriftTolerance,
   getGapBetweenRuns,
   getGapMaxCatchupRatio,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
index 9519720d0bbec..92cc9be69839f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.ts
@@ -14,7 +14,7 @@ import { ExceptionListItemSchema } from '../../../../../lists/common/schemas';
 import { ListArrayOrUndefined } from '../../../../common/detection_engine/schemas/types/lists';
 import { BulkResponse, BulkResponseErrorAggregation, isValidUnit } from './types';
 import { BuildRuleMessage } from './rule_messages';
-import { hasLargeValueList } from '../../../../common/detection_engine/utils';
+import { hasLargeValueList, parseScheduleDates } from '../../../../common/detection_engine/utils';
 import { MAX_EXCEPTION_LIST_SIZE } from '../../../../../lists/common/constants';
 
 interface SortExceptionsReturn {
@@ -220,18 +220,6 @@ export const parseInterval = (intervalString: string): moment.Duration | null =>
   }
 };
 
-export const parseScheduleDates = (time: string): moment.Moment | null => {
-  const isValidDateString = !isNaN(Date.parse(time));
-  const isValidInput = isValidDateString || time.trim().startsWith('now');
-  const formattedDate = isValidDateString
-    ? moment(time)
-    : isValidInput
-    ? dateMath.parse(time)
-    : null;
-
-  return formattedDate ?? null;
-};
-
 export const getDriftTolerance = ({
   from,
   to,
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts
index e0b60ae1fbeeb..108ca365bc14f 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/import_rules.ts
@@ -141,6 +141,43 @@ export default ({ getService }: FtrProviderContext): void => {
         expect(bodyToCompare).to.eql(getSimpleRuleOutput('rule-1'));
       });
 
+      it('should fail validation when importing a rule with malformed "from" params on the rules', async () => {
+        const stringifiedRule = JSON.stringify({
+          from: 'now-3755555555555555.67s',
+          interval: '5m',
+          ...getSimpleRule('rule-1'),
+        });
+        const fileNdJson = Buffer.from(stringifiedRule + '\n');
+        const { body } = await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_import`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', fileNdJson, 'rules.ndjson')
+          .expect(200);
+
+        expect(body.errors[0].error.message).to.eql('Failed to parse "from" on rule param');
+      });
+
+      it('should fail validation when importing two rules and one has a malformed "from" params', async () => {
+        const stringifiedRule = JSON.stringify({
+          from: 'now-3755555555555555.67s',
+          interval: '5m',
+          ...getSimpleRule('rule-1'),
+        });
+        const stringifiedRule2 = JSON.stringify({
+          ...getSimpleRule('rule-2'),
+        });
+        const fileNdJson = Buffer.from([stringifiedRule, stringifiedRule2].join('\n'));
+        const { body } = await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/_import`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', fileNdJson, 'rules.ndjson')
+          .expect(200);
+
+        // should result in one success and a failure message
+        expect(body.success_count).to.eql(1);
+        expect(body.errors[0].error.message).to.eql('Failed to parse "from" on rule param');
+      });
+
       it('should be able to import two rules', async () => {
         const { body } = await supertest
           .post(`${DETECTION_ENGINE_RULES_URL}/_import`)

From 8364d8d67acb3d905a08e020eb1f906d82cd1a0c Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Wed, 26 Aug 2020 18:27:40 -0400
Subject: [PATCH 080/148] [Lens] Decouple visualizations from specific
 operations (#75703)

* [Lens] Decouple visualizations from specific operations

* Remove unused mock
---
 .../expression.test.tsx                       | 52 +++++++++++++++++++
 .../datatable_visualization/expression.tsx    |  5 +-
 .../pie_visualization/suggestions.test.ts     | 36 ++++++++++++-
 .../public/pie_visualization/suggestions.ts   |  2 +-
 x-pack/plugins/lens/public/types.ts           |  5 ++
 .../xy_visualization/xy_suggestions.test.ts   | 39 ++++++++++++++
 .../public/xy_visualization/xy_suggestions.ts | 10 ++--
 7 files changed, 139 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx
index ac43593213687..b9bdea5522f32 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/expression.test.tsx
@@ -144,6 +144,58 @@ describe('datatable_expression', () => {
       });
     });
 
+    test('it invokes executeTriggerActions with correct context on click on timefield from range', () => {
+      const data: LensMultiTable = {
+        type: 'lens_multitable',
+        tables: {
+          l1: {
+            type: 'kibana_datatable',
+            columns: [
+              { id: 'a', name: 'a', meta: { type: 'date_range', aggConfigParams: { field: 'a' } } },
+              { id: 'b', name: 'b', meta: { type: 'count' } },
+            ],
+            rows: [{ a: 1588024800000, b: 3 }],
+          },
+        },
+      };
+
+      const args: DatatableProps['args'] = {
+        title: '',
+        columns: { columnIds: ['a', 'b'], type: 'lens_datatable_columns' },
+      };
+
+      const wrapper = mountWithIntl(
+        <DatatableComponent
+          data={{
+            ...data,
+            dateRange: {
+              fromDate: new Date('2020-04-20T05:00:00.000Z'),
+              toDate: new Date('2020-05-03T05:00:00.000Z'),
+            },
+          }}
+          args={args}
+          formatFactory={(x) => x as IFieldFormat}
+          onClickValue={onClickValue}
+          getType={jest.fn(() => ({ type: 'buckets' } as IAggType))}
+        />
+      );
+
+      wrapper.find('[data-test-subj="lensDatatableFilterFor"]').at(1).simulate('click');
+
+      expect(onClickValue).toHaveBeenCalledWith({
+        data: [
+          {
+            column: 0,
+            row: 0,
+            table: data.tables.l1,
+            value: 1588024800000,
+          },
+        ],
+        negate: false,
+        timeFieldName: 'a',
+      });
+    });
+
     test('it shows emptyPlaceholder for undefined bucketed data', () => {
       const { args, data } = sampleArgs();
       const emptyData: LensMultiTable = {
diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
index 02186ecf09b4b..87ac2d1710b19 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
@@ -164,9 +164,8 @@ export function DatatableComponent(props: DatatableRenderProps) {
   const handleFilterClick = useMemo(
     () => (field: string, value: unknown, colIndex: number, negate: boolean = false) => {
       const col = firstTable.columns[colIndex];
-      const isDateHistogram = col.meta?.type === 'date_histogram';
-      const timeFieldName =
-        negate && isDateHistogram ? undefined : col?.meta?.aggConfigParams?.field;
+      const isDate = col.meta?.type === 'date_histogram' || col.meta?.type === 'date_range';
+      const timeFieldName = negate && isDate ? undefined : col?.meta?.aggConfigParams?.field;
       const rowIndex = firstTable.rows.findIndex((row) => row[field] === value);
 
       const data: LensFilterEvent['data'] = {
diff --git a/x-pack/plugins/lens/public/pie_visualization/suggestions.test.ts b/x-pack/plugins/lens/public/pie_visualization/suggestions.test.ts
index 20b267caa9074..b8b43c3ed248b 100644
--- a/x-pack/plugins/lens/public/pie_visualization/suggestions.test.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/suggestions.test.ts
@@ -90,7 +90,41 @@ describe('suggestions', () => {
             columns: [
               {
                 columnId: 'b',
-                operation: { label: 'Days', dataType: 'date' as DataType, isBucketed: true },
+                operation: {
+                  label: 'Days',
+                  dataType: 'date' as DataType,
+                  isBucketed: true,
+                  scale: 'interval',
+                },
+              },
+              {
+                columnId: 'c',
+                operation: { label: 'Count', dataType: 'number' as DataType, isBucketed: false },
+              },
+            ],
+            changeType: 'initial',
+          },
+          state: undefined,
+          keptLayerIds: ['first'],
+        })
+      ).toHaveLength(0);
+    });
+
+    it('should reject any histogram operations', () => {
+      expect(
+        suggestions({
+          table: {
+            layerId: 'first',
+            isMultiRow: true,
+            columns: [
+              {
+                columnId: 'b',
+                operation: {
+                  label: 'Durations',
+                  dataType: 'number' as DataType,
+                  isBucketed: true,
+                  scale: 'interval',
+                },
               },
               {
                 columnId: 'c',
diff --git a/x-pack/plugins/lens/public/pie_visualization/suggestions.ts b/x-pack/plugins/lens/public/pie_visualization/suggestions.ts
index 5d85ac3bbd56a..067b0bb4906df 100644
--- a/x-pack/plugins/lens/public/pie_visualization/suggestions.ts
+++ b/x-pack/plugins/lens/public/pie_visualization/suggestions.ts
@@ -15,7 +15,7 @@ function shouldReject({ table, keptLayerIds }: SuggestionRequest<PieVisualizatio
     keptLayerIds.length > 1 ||
     (keptLayerIds.length && table.layerId !== keptLayerIds[0]) ||
     table.changeType === 'reorder' ||
-    table.columns.some((col) => col.operation.dataType === 'date')
+    table.columns.some((col) => col.operation.scale === 'interval') // Histograms are not good for pie
   );
 }
 
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index 20f2ce6c56774..729daed7223fe 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -259,6 +259,11 @@ export interface OperationMetadata {
   // A bucketed operation is grouped by duplicate values, otherwise each row is
   // treated as unique
   isBucketed: boolean;
+  /**
+   * ordinal: Each name is a unique value, but the names are in sorted order, like "Top values"
+   * interval: Histogram data, like date or number histograms
+   * ratio: Most number data is rendered as a ratio that includes 0
+   */
   scale?: 'ordinal' | 'interval' | 'ratio';
   // Extra meta-information like cardinality, color
   // TODO currently it's not possible to differentiate between a field from a raw
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts
index 632f6fc8861a4..79e4ed6958193 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.test.ts
@@ -54,6 +54,18 @@ describe('xy_suggestions', () => {
     };
   }
 
+  function histogramCol(columnId: string): TableSuggestionColumn {
+    return {
+      columnId,
+      operation: {
+        dataType: 'number',
+        isBucketed: true,
+        label: `${columnId} histogram`,
+        scale: 'interval',
+      },
+    };
+  }
+
   // Helper that plucks out the important part of a suggestion for
   // most test assertions
   function suggestionSubset(suggestion: VisualizationSuggestion<State>) {
@@ -274,6 +286,33 @@ describe('xy_suggestions', () => {
     `);
   });
 
+  test('suggests all basic x y chart with histogram on x', () => {
+    (generateId as jest.Mock).mockReturnValueOnce('aaa');
+    const [suggestion, ...rest] = getSuggestions({
+      table: {
+        isMultiRow: true,
+        columns: [numCol('bytes'), histogramCol('duration')],
+        layerId: 'first',
+        changeType: 'unchanged',
+      },
+      keptLayerIds: [],
+    });
+
+    expect(rest).toHaveLength(visualizationTypes.length - 1);
+    expect(suggestionSubset(suggestion)).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "seriesType": "bar_stacked",
+          "splitAccessor": undefined,
+          "x": "duration",
+          "y": Array [
+            "bytes",
+          ],
+        },
+      ]
+    `);
+  });
+
   test('does not suggest multiple splits', () => {
     const suggestions = getSuggestions({
       table: {
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
index 387d56c03e31a..75dd5a7a579b8 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
@@ -112,13 +112,13 @@ function getBucketMappings(table: TableSuggestion, currentState?: State) {
   const currentXColumnIndex = prioritizedBuckets.findIndex(
     ({ columnId }) => columnId === currentLayer.xAccessor
   );
-  const currentXDataType =
-    currentXColumnIndex > -1 && prioritizedBuckets[currentXColumnIndex].operation.dataType;
+  const currentXScaleType =
+    currentXColumnIndex > -1 && prioritizedBuckets[currentXColumnIndex].operation.scale;
 
   if (
-    currentXDataType &&
-    // make sure time gets mapped to x dimension even when changing current bucket/dimension mapping
-    (currentXDataType === 'date' || prioritizedBuckets[0].operation.dataType !== 'date')
+    currentXScaleType &&
+    // make sure histograms get mapped to x dimension even when changing current bucket/dimension mapping
+    (currentXScaleType === 'interval' || prioritizedBuckets[0].operation.scale !== 'interval')
   ) {
     const [x] = prioritizedBuckets.splice(currentXColumnIndex, 1);
     prioritizedBuckets.unshift(x);

From 043382d686d8c7cd1d5bc5918d813e0654334b77 Mon Sep 17 00:00:00 2001
From: Yara Tercero <yctercero@users.noreply.github.com>
Date: Wed, 26 Aug 2020 18:46:15 -0400
Subject: [PATCH 081/148] [Security Solution][Exceptions] - Improve UX for
 missing exception list associated with rule (#76012)

## Summary

**Current behavior:**
  - **Scenario 1:** User is in the exceptions viewer flow, they select to edit an exception item, but the list the item is associated with has since been deleted (let's say by another user) - a user is able to open modal to edit exception item and on save, an error toaster shows but no information is given to the user to indicate the issue.
  - **Scenario 2:** User exports rules from space 'X' and imports into space 'Y'. The exception lists associated with their newly imported rules do not exist in space 'Y' - a user goes to add an exception item and gets a modal with an error, unable to add any exceptions.
  - **Workaround:** current workaround exists only via API - user would need to remove the exception list from their rule via API

**New behavior:**
  - **Scenario 1:** User is still able to oped edit modal, but on save they see an error explaining that the associated exception list does not exist and prompts them to remove the exception list --> now they're able to add exceptions to their rule
  - **Scenario 2:** User navigates to exceptions after importing their rule, tries to add  exception, modal pops up with error informing them that they need to remove association to missing exception list, button prompts them to do so --> now can continue adding exceptions to rule
---
 .../exceptions/add_exception_modal/index.tsx  |  90 +++++++---
 .../edit_exception_modal/index.test.tsx       |   5 +
 .../exceptions/edit_exception_modal/index.tsx |  91 +++++++---
 .../exceptions/error_callout.test.tsx         | 160 +++++++++++++++++
 .../components/exceptions/error_callout.tsx   | 169 ++++++++++++++++++
 .../components/exceptions/translations.ts     |  49 +++++
 .../exceptions/use_add_exception.test.tsx     |  44 +++++
 .../exceptions/use_add_exception.tsx          |   8 +-
 ...tch_or_create_rule_exception_list.test.tsx |   2 +-
 ...se_fetch_or_create_rule_exception_list.tsx |   8 +-
 .../components/exceptions/viewer/index.tsx    |   2 +
 .../use_dissasociate_exception_list.test.tsx  |  52 ++++++
 .../rules/use_dissasociate_exception_list.tsx |  80 +++++++++
 13 files changed, 706 insertions(+), 54 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
 create mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx

diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
index 03051ead357c9..21f82c6ab4c98 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/add_exception_modal/index.tsx
@@ -18,7 +18,6 @@ import {
   EuiCheckbox,
   EuiSpacer,
   EuiFormRow,
-  EuiCallOut,
   EuiText,
 } from '@elastic/eui';
 import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
@@ -28,6 +27,7 @@ import {
   ExceptionListType,
 } from '../../../../../public/lists_plugin_deps';
 import * as i18n from './translations';
+import * as sharedI18n from '../translations';
 import { TimelineNonEcsData, Ecs } from '../../../../graphql/types';
 import { useAppToasts } from '../../../hooks/use_app_toasts';
 import { useKibana } from '../../../lib/kibana';
@@ -35,6 +35,7 @@ import { ExceptionBuilderComponent } from '../builder';
 import { Loader } from '../../loader';
 import { useAddOrUpdateException } from '../use_add_exception';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
+import { useRuleAsync } from '../../../../detections/containers/detection_engine/rules/use_rule_async';
 import { useFetchOrCreateRuleExceptionList } from '../use_fetch_or_create_rule_exception_list';
 import { AddExceptionComments } from '../add_exception_comments';
 import {
@@ -46,6 +47,7 @@ import {
   entryHasNonEcsType,
   getMappedNonEcsValue,
 } from '../helpers';
+import { ErrorInfo, ErrorCallout } from '../error_callout';
 import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules';
 
 export interface AddExceptionModalBaseProps {
@@ -107,13 +109,14 @@ export const AddExceptionModal = memo(function AddExceptionModal({
 }: AddExceptionModalProps) {
   const { http } = useKibana().services;
   const [comment, setComment] = useState('');
+  const { rule: maybeRule } = useRuleAsync(ruleId);
   const [shouldCloseAlert, setShouldCloseAlert] = useState(false);
   const [shouldBulkCloseAlert, setShouldBulkCloseAlert] = useState(false);
   const [shouldDisableBulkClose, setShouldDisableBulkClose] = useState(false);
   const [exceptionItemsToAdd, setExceptionItemsToAdd] = useState<
     Array<ExceptionListItemSchema | CreateExceptionListItemSchema>
   >([]);
-  const [fetchOrCreateListError, setFetchOrCreateListError] = useState(false);
+  const [fetchOrCreateListError, setFetchOrCreateListError] = useState<ErrorInfo | null>(null);
   const { addError, addSuccess } = useAppToasts();
   const { loading: isSignalIndexLoading, signalIndexName } = useSignalIndex();
   const [
@@ -164,17 +167,41 @@ export const AddExceptionModal = memo(function AddExceptionModal({
     },
     [onRuleChange]
   );
-  const onFetchOrCreateExceptionListError = useCallback(
-    (error: Error) => {
-      setFetchOrCreateListError(true);
+
+  const handleDissasociationSuccess = useCallback(
+    (id: string): void => {
+      handleRuleChange(true);
+      addSuccess(sharedI18n.DISSASOCIATE_LIST_SUCCESS(id));
+      onCancel();
+    },
+    [handleRuleChange, addSuccess, onCancel]
+  );
+
+  const handleDissasociationError = useCallback(
+    (error: Error): void => {
+      addError(error, { title: sharedI18n.DISSASOCIATE_EXCEPTION_LIST_ERROR });
+      onCancel();
+    },
+    [addError, onCancel]
+  );
+
+  const handleFetchOrCreateExceptionListError = useCallback(
+    (error: Error, statusCode: number | null, message: string | null) => {
+      setFetchOrCreateListError({
+        reason: error.message,
+        code: statusCode,
+        details: message,
+        listListId: null,
+      });
     },
     [setFetchOrCreateListError]
   );
+
   const [isLoadingExceptionList, ruleExceptionList] = useFetchOrCreateRuleExceptionList({
     http,
     ruleId,
     exceptionListType,
-    onError: onFetchOrCreateExceptionListError,
+    onError: handleFetchOrCreateExceptionListError,
     onSuccess: handleRuleChange,
   });
 
@@ -279,7 +306,9 @@ export const AddExceptionModal = memo(function AddExceptionModal({
   ]);
 
   const isSubmitButtonDisabled = useMemo(
-    () => fetchOrCreateListError || exceptionItemsToAdd.every((item) => item.entries.length === 0),
+    () =>
+      fetchOrCreateListError != null ||
+      exceptionItemsToAdd.every((item) => item.entries.length === 0),
     [fetchOrCreateListError, exceptionItemsToAdd]
   );
 
@@ -295,19 +324,27 @@ export const AddExceptionModal = memo(function AddExceptionModal({
           </ModalHeaderSubtitle>
         </ModalHeader>
 
-        {fetchOrCreateListError === true && (
-          <EuiCallOut title={i18n.ADD_EXCEPTION_FETCH_ERROR_TITLE} color="danger" iconType="alert">
-            <p>{i18n.ADD_EXCEPTION_FETCH_ERROR}</p>
-          </EuiCallOut>
+        {fetchOrCreateListError != null && (
+          <EuiModalFooter>
+            <ErrorCallout
+              http={http}
+              errorInfo={fetchOrCreateListError}
+              rule={maybeRule}
+              onCancel={onCancel}
+              onSuccess={handleDissasociationSuccess}
+              onError={handleDissasociationError}
+              data-test-subj="addExceptionModalErrorCallout"
+            />
+          </EuiModalFooter>
         )}
-        {fetchOrCreateListError === false &&
+        {fetchOrCreateListError == null &&
           (isLoadingExceptionList ||
             isIndexPatternLoading ||
             isSignalIndexLoading ||
             isSignalIndexPatternLoading) && (
             <Loader data-test-subj="loadingAddExceptionModal" size="xl" />
           )}
-        {fetchOrCreateListError === false &&
+        {fetchOrCreateListError == null &&
           !isSignalIndexLoading &&
           !isSignalIndexPatternLoading &&
           !isLoadingExceptionList &&
@@ -377,20 +414,21 @@ export const AddExceptionModal = memo(function AddExceptionModal({
               </ModalBodySection>
             </>
           )}
+        {fetchOrCreateListError == null && (
+          <EuiModalFooter>
+            <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
 
-        <EuiModalFooter>
-          <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
-
-          <EuiButton
-            data-test-subj="add-exception-confirm-button"
-            onClick={onAddExceptionConfirm}
-            isLoading={addExceptionIsLoading}
-            isDisabled={isSubmitButtonDisabled}
-            fill
-          >
-            {i18n.ADD_EXCEPTION}
-          </EuiButton>
-        </EuiModalFooter>
+            <EuiButton
+              data-test-subj="add-exception-confirm-button"
+              onClick={onAddExceptionConfirm}
+              isLoading={addExceptionIsLoading}
+              isDisabled={isSubmitButtonDisabled}
+              fill
+            >
+              {i18n.ADD_EXCEPTION}
+            </EuiButton>
+          </EuiModalFooter>
+        )}
       </Modal>
     </EuiOverlayMask>
   );
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
index 6ff218ca06059..c724e6a2c711f 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.test.tsx
@@ -77,6 +77,7 @@ describe('When the edit exception modal is opened', () => {
         <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
           <EditExceptionModal
             ruleIndices={[]}
+            ruleId="123"
             ruleName={ruleName}
             exceptionListType={'endpoint'}
             onCancel={jest.fn()}
@@ -105,6 +106,7 @@ describe('When the edit exception modal is opened', () => {
           <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
             <EditExceptionModal
               ruleIndices={['filebeat-*']}
+              ruleId="123"
               ruleName={ruleName}
               exceptionListType={'endpoint'}
               onCancel={jest.fn()}
@@ -147,6 +149,7 @@ describe('When the edit exception modal is opened', () => {
           <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
             <EditExceptionModal
               ruleIndices={['filebeat-*']}
+              ruleId="123"
               ruleName={ruleName}
               exceptionListType={'endpoint'}
               onCancel={jest.fn()}
@@ -190,6 +193,7 @@ describe('When the edit exception modal is opened', () => {
         <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
           <EditExceptionModal
             ruleIndices={['filebeat-*']}
+            ruleId="123"
             ruleName={ruleName}
             exceptionListType={'detection'}
             onCancel={jest.fn()}
@@ -229,6 +233,7 @@ describe('When the edit exception modal is opened', () => {
         <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
           <EditExceptionModal
             ruleIndices={['filebeat-*']}
+            ruleId="123"
             ruleName={ruleName}
             exceptionListType={'detection'}
             onCancel={jest.fn()}
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
index a2c8531def2ba..41fc6ba57d715 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/edit_exception_modal/index.tsx
@@ -23,12 +23,14 @@ import {
 } from '@elastic/eui';
 import { useFetchIndexPatterns } from '../../../../detections/containers/detection_engine/rules';
 import { useSignalIndex } from '../../../../detections/containers/detection_engine/alerts/use_signal_index';
+import { useRuleAsync } from '../../../../detections/containers/detection_engine/rules/use_rule_async';
 import {
   ExceptionListItemSchema,
   CreateExceptionListItemSchema,
   ExceptionListType,
 } from '../../../../../public/lists_plugin_deps';
 import * as i18n from './translations';
+import * as sharedI18n from '../translations';
 import { useKibana } from '../../../lib/kibana';
 import { useAppToasts } from '../../../hooks/use_app_toasts';
 import { ExceptionBuilderComponent } from '../builder';
@@ -43,14 +45,17 @@ import {
   lowercaseHashValues,
 } from '../helpers';
 import { Loader } from '../../loader';
+import { ErrorInfo, ErrorCallout } from '../error_callout';
 
 interface EditExceptionModalProps {
   ruleName: string;
+  ruleId: string;
   ruleIndices: string[];
   exceptionItem: ExceptionListItemSchema;
   exceptionListType: ExceptionListType;
   onCancel: () => void;
   onConfirm: () => void;
+  onRuleChange?: () => void;
 }
 
 const Modal = styled(EuiModal)`
@@ -83,14 +88,18 @@ const ModalBodySection = styled.section`
 
 export const EditExceptionModal = memo(function EditExceptionModal({
   ruleName,
+  ruleId,
   ruleIndices,
   exceptionItem,
   exceptionListType,
   onCancel,
   onConfirm,
+  onRuleChange,
 }: EditExceptionModalProps) {
   const { http } = useKibana().services;
   const [comment, setComment] = useState('');
+  const { rule: maybeRule } = useRuleAsync(ruleId);
+  const [updateError, setUpdateError] = useState<ErrorInfo | null>(null);
   const [hasVersionConflict, setHasVersionConflict] = useState(false);
   const [shouldBulkCloseAlert, setShouldBulkCloseAlert] = useState(false);
   const [shouldDisableBulkClose, setShouldDisableBulkClose] = useState(false);
@@ -108,18 +117,44 @@ export const EditExceptionModal = memo(function EditExceptionModal({
     'rules'
   );
 
-  const onError = useCallback(
-    (error) => {
+  const handleExceptionUpdateError = useCallback(
+    (error: Error, statusCode: number | null, message: string | null) => {
       if (error.message.includes('Conflict')) {
         setHasVersionConflict(true);
       } else {
-        addError(error, { title: i18n.EDIT_EXCEPTION_ERROR });
-        onCancel();
+        setUpdateError({
+          reason: error.message,
+          code: statusCode,
+          details: message,
+          listListId: exceptionItem.list_id,
+        });
       }
     },
+    [setUpdateError, setHasVersionConflict, exceptionItem.list_id]
+  );
+
+  const handleDissasociationSuccess = useCallback(
+    (id: string): void => {
+      addSuccess(sharedI18n.DISSASOCIATE_LIST_SUCCESS(id));
+
+      if (onRuleChange) {
+        onRuleChange();
+      }
+
+      onCancel();
+    },
+    [addSuccess, onCancel, onRuleChange]
+  );
+
+  const handleDissasociationError = useCallback(
+    (error: Error): void => {
+      addError(error, { title: sharedI18n.DISSASOCIATE_EXCEPTION_LIST_ERROR });
+      onCancel();
+    },
     [addError, onCancel]
   );
-  const onSuccess = useCallback(() => {
+
+  const handleExceptionUpdateSuccess = useCallback((): void => {
     addSuccess(i18n.EDIT_EXCEPTION_SUCCESS);
     onConfirm();
   }, [addSuccess, onConfirm]);
@@ -127,8 +162,8 @@ export const EditExceptionModal = memo(function EditExceptionModal({
   const [{ isLoading: addExceptionIsLoading }, addOrUpdateExceptionItems] = useAddOrUpdateException(
     {
       http,
-      onSuccess,
-      onError,
+      onSuccess: handleExceptionUpdateSuccess,
+      onError: handleExceptionUpdateError,
     }
   );
 
@@ -222,11 +257,9 @@ export const EditExceptionModal = memo(function EditExceptionModal({
             {ruleName}
           </ModalHeaderSubtitle>
         </ModalHeader>
-
         {(addExceptionIsLoading || isIndexPatternLoading || isSignalIndexLoading) && (
           <Loader data-test-subj="loadingEditExceptionModal" size="xl" />
         )}
-
         {!isSignalIndexLoading && !addExceptionIsLoading && !isIndexPatternLoading && (
           <>
             <ModalBodySection className="builder-section">
@@ -280,7 +313,18 @@ export const EditExceptionModal = memo(function EditExceptionModal({
             </ModalBodySection>
           </>
         )}
-
+        {updateError != null && (
+          <ModalBodySection>
+            <ErrorCallout
+              http={http}
+              errorInfo={updateError}
+              rule={maybeRule}
+              onCancel={onCancel}
+              onSuccess={handleDissasociationSuccess}
+              onError={handleDissasociationError}
+            />
+          </ModalBodySection>
+        )}
         {hasVersionConflict && (
           <ModalBodySection>
             <EuiCallOut title={i18n.VERSION_CONFLICT_ERROR_TITLE} color="danger" iconType="alert">
@@ -288,20 +332,21 @@ export const EditExceptionModal = memo(function EditExceptionModal({
             </EuiCallOut>
           </ModalBodySection>
         )}
+        {updateError == null && (
+          <EuiModalFooter>
+            <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
 
-        <EuiModalFooter>
-          <EuiButtonEmpty onClick={onCancel}>{i18n.CANCEL}</EuiButtonEmpty>
-
-          <EuiButton
-            data-test-subj="edit-exception-confirm-button"
-            onClick={onEditExceptionConfirm}
-            isLoading={addExceptionIsLoading}
-            isDisabled={isSubmitButtonDisabled}
-            fill
-          >
-            {i18n.EDIT_EXCEPTION_SAVE_BUTTON}
-          </EuiButton>
-        </EuiModalFooter>
+            <EuiButton
+              data-test-subj="edit-exception-confirm-button"
+              onClick={onEditExceptionConfirm}
+              isLoading={addExceptionIsLoading}
+              isDisabled={isSubmitButtonDisabled}
+              fill
+            >
+              {i18n.EDIT_EXCEPTION_SAVE_BUTTON}
+            </EuiButton>
+          </EuiModalFooter>
+        )}
       </Modal>
     </EuiOverlayMask>
   );
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
new file mode 100644
index 0000000000000..9c86c502a7648
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.test.tsx
@@ -0,0 +1,160 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { ThemeProvider } from 'styled-components';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+
+import { coreMock } from '../../../../../../../src/core/public/mocks';
+import { getListMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
+import { useDissasociateExceptionList } from '../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list';
+import { ErrorCallout } from './error_callout';
+import { savedRuleMock } from '../../../detections/containers/detection_engine/rules/mock';
+
+jest.mock('../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list');
+
+const mockKibanaHttpService = coreMock.createStart().http;
+
+describe('ErrorCallout', () => {
+  const mockDissasociate = jest.fn();
+
+  beforeEach(() => {
+    (useDissasociateExceptionList as jest.Mock).mockReturnValue([false, mockDissasociate]);
+  });
+
+  it('it renders error details', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+        <ErrorCallout
+          http={mockKibanaHttpService}
+          errorInfo={{
+            reason: 'error reason',
+            code: 500,
+            details: null,
+            listListId: null,
+          }}
+          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
+          onCancel={jest.fn()}
+          onSuccess={jest.fn()}
+          onError={jest.fn()}
+        />
+      </ThemeProvider>
+    );
+
+    expect(
+      wrapper.find('[data-test-subj="errorCalloutContainer"] .euiCallOutHeader__title').text()
+    ).toEqual('Error: error reason (500)');
+    expect(wrapper.find('[data-test-subj="errorCalloutMessage"]').at(0).text()).toEqual(
+      'Error fetching exception list'
+    );
+  });
+
+  it('it invokes "onCancel" when cancel button clicked', () => {
+    const mockOnCancel = jest.fn();
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+        <ErrorCallout
+          http={mockKibanaHttpService}
+          errorInfo={{
+            reason: 'error reason',
+            code: 500,
+            details: null,
+            listListId: null,
+          }}
+          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
+          onCancel={mockOnCancel}
+          onSuccess={jest.fn()}
+          onError={jest.fn()}
+        />
+      </ThemeProvider>
+    );
+
+    wrapper.find('[data-test-subj="errorCalloutCancelButton"]').at(0).simulate('click');
+
+    expect(mockOnCancel).toHaveBeenCalled();
+  });
+
+  it('it does not render status code if not available', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+        <ErrorCallout
+          http={mockKibanaHttpService}
+          errorInfo={{
+            reason: 'not found',
+            code: null,
+            details: 'list of id "some_uuid" not found',
+            listListId: null,
+          }}
+          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
+          onCancel={jest.fn()}
+          onSuccess={jest.fn()}
+          onError={jest.fn()}
+        />
+      </ThemeProvider>
+    );
+
+    expect(
+      wrapper.find('[data-test-subj="errorCalloutContainer"] .euiCallOutHeader__title').text()
+    ).toEqual('Error: not found');
+    expect(wrapper.find('[data-test-subj="errorCalloutMessage"]').at(0).text()).toEqual(
+      'Error fetching exception list'
+    );
+    expect(wrapper.find('[data-test-subj="errorCalloutDissasociateButton"]').exists()).toBeFalsy();
+  });
+
+  it('it renders specific missing exceptions list error', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+        <ErrorCallout
+          http={mockKibanaHttpService}
+          errorInfo={{
+            reason: 'not found',
+            code: 404,
+            details: 'list of id "some_uuid" not found',
+            listListId: null,
+          }}
+          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
+          onCancel={jest.fn()}
+          onSuccess={jest.fn()}
+          onError={jest.fn()}
+        />
+      </ThemeProvider>
+    );
+
+    expect(
+      wrapper.find('[data-test-subj="errorCalloutContainer"] .euiCallOutHeader__title').text()
+    ).toEqual('Error: not found (404)');
+    expect(wrapper.find('[data-test-subj="errorCalloutMessage"]').at(0).text()).toEqual(
+      'The associated exception list (some_uuid) no longer exists. Please remove the missing exception list to add additional exceptions to the detection rule.'
+    );
+    expect(wrapper.find('[data-test-subj="errorCalloutDissasociateButton"]').exists()).toBeTruthy();
+  });
+
+  it('it dissasociates list from rule when remove exception list clicked ', () => {
+    const wrapper = mountWithIntl(
+      <ThemeProvider theme={() => ({ eui: euiLightVars, darkMode: false })}>
+        <ErrorCallout
+          http={mockKibanaHttpService}
+          errorInfo={{
+            reason: 'not found',
+            code: 404,
+            details: 'list of id "some_uuid" not found',
+            listListId: null,
+          }}
+          rule={{ ...savedRuleMock, exceptions_list: [getListMock()] }}
+          onCancel={jest.fn()}
+          onSuccess={jest.fn()}
+          onError={jest.fn()}
+        />
+      </ThemeProvider>
+    );
+
+    wrapper.find('[data-test-subj="errorCalloutDissasociateButton"]').at(0).simulate('click');
+
+    expect(mockDissasociate).toHaveBeenCalledWith([]);
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
new file mode 100644
index 0000000000000..a2419ef16df3a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/error_callout.tsx
@@ -0,0 +1,169 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useMemo, useEffect, useState, useCallback } from 'react';
+import {
+  EuiButtonEmpty,
+  EuiAccordion,
+  EuiCodeBlock,
+  EuiButton,
+  EuiCallOut,
+  EuiText,
+  EuiSpacer,
+} from '@elastic/eui';
+
+import { HttpSetup } from '../../../../../../../src/core/public';
+import { List } from '../../../../common/detection_engine/schemas/types/lists';
+import { Rule } from '../../../detections/containers/detection_engine/rules/types';
+import * as i18n from './translations';
+import { useDissasociateExceptionList } from '../../../detections/containers/detection_engine/rules/use_dissasociate_exception_list';
+
+export interface ErrorInfo {
+  reason: string | null;
+  code: number | null;
+  details: string | null;
+  listListId: string | null;
+}
+
+export interface ErrorCalloutProps {
+  http: HttpSetup;
+  rule: Rule | null;
+  errorInfo: ErrorInfo;
+  onCancel: () => void;
+  onSuccess: (listId: string) => void;
+  onError: (arg: Error) => void;
+}
+
+const ErrorCalloutComponent = ({
+  http,
+  rule,
+  errorInfo,
+  onCancel,
+  onError,
+  onSuccess,
+}: ErrorCalloutProps): JSX.Element => {
+  const [listToDelete, setListToDelete] = useState<List | null>(null);
+  const [errorTitle, setErrorTitle] = useState<string>('');
+  const [errorMessage, setErrorMessage] = useState<string>(i18n.ADD_EXCEPTION_FETCH_ERROR);
+
+  const handleOnSuccess = useCallback((): void => {
+    onSuccess(listToDelete != null ? listToDelete.id : '');
+  }, [onSuccess, listToDelete]);
+
+  const [isDissasociatingList, handleDissasociateExceptionList] = useDissasociateExceptionList({
+    http,
+    ruleRuleId: rule != null ? rule.rule_id : '',
+    onSuccess: handleOnSuccess,
+    onError,
+  });
+
+  const canDisplay404Actions = useMemo(
+    (): boolean =>
+      errorInfo.code === 404 &&
+      rule != null &&
+      listToDelete != null &&
+      handleDissasociateExceptionList != null,
+    [errorInfo.code, listToDelete, handleDissasociateExceptionList, rule]
+  );
+
+  useEffect((): void => {
+    // Yes, it's redundant, unfortunately typescript wasn't picking up
+    // that `listToDelete` is checked in canDisplay404Actions
+    if (canDisplay404Actions && listToDelete != null) {
+      setErrorMessage(i18n.ADD_EXCEPTION_FETCH_404_ERROR(listToDelete.id));
+    }
+
+    setErrorTitle(`${errorInfo.reason}${errorInfo.code != null ? ` (${errorInfo.code})` : ''}`);
+  }, [errorInfo.reason, errorInfo.code, listToDelete, canDisplay404Actions]);
+
+  const handleDissasociateList = useCallback((): void => {
+    // Yes, it's redundant, unfortunately typescript wasn't picking up
+    // that `handleDissasociateExceptionList` and `list` are checked in
+    // canDisplay404Actions
+    if (
+      canDisplay404Actions &&
+      rule != null &&
+      listToDelete != null &&
+      handleDissasociateExceptionList != null
+    ) {
+      const exceptionLists = (rule.exceptions_list ?? []).filter(
+        ({ id }) => id !== listToDelete.id
+      );
+
+      handleDissasociateExceptionList(exceptionLists);
+    }
+  }, [handleDissasociateExceptionList, listToDelete, canDisplay404Actions, rule]);
+
+  useEffect((): void => {
+    if (errorInfo.code === 404 && rule != null && rule.exceptions_list != null) {
+      const [listFound] = rule.exceptions_list.filter(
+        ({ id, list_id: listId }) =>
+          (errorInfo.details != null && errorInfo.details.includes(id)) ||
+          errorInfo.listListId === listId
+      );
+      setListToDelete(listFound);
+    }
+  }, [rule, errorInfo.details, errorInfo.code, errorInfo.listListId]);
+
+  return (
+    <EuiCallOut
+      data-test-subj="errorCalloutContainer"
+      title={`${i18n.ERROR}: ${errorTitle}`}
+      color="danger"
+      iconType="alert"
+    >
+      <EuiText size="s">
+        <p data-test-subj="errorCalloutMessage">{errorMessage}</p>
+      </EuiText>
+      <EuiSpacer />
+      {listToDelete != null && (
+        <EuiAccordion
+          id="accordion1"
+          buttonContent={
+            <EuiText size="s">
+              <p>{i18n.MODAL_ERROR_ACCORDION_TEXT}</p>
+            </EuiText>
+          }
+        >
+          <EuiCodeBlock
+            language="json"
+            fontSize="s"
+            paddingSize="m"
+            overflowHeight={300}
+            isCopyable
+          >
+            {JSON.stringify(listToDelete)}
+          </EuiCodeBlock>
+        </EuiAccordion>
+      )}
+      <EuiSpacer />
+      <EuiButtonEmpty
+        data-test-subj="errorCalloutCancelButton"
+        color="danger"
+        isDisabled={isDissasociatingList}
+        onClick={onCancel}
+      >
+        {i18n.CANCEL}
+      </EuiButtonEmpty>
+      {canDisplay404Actions && (
+        <EuiButton
+          data-test-subj="errorCalloutDissasociateButton"
+          isLoading={isDissasociatingList}
+          onClick={handleDissasociateList}
+          color="danger"
+        >
+          {i18n.CLEAR_EXCEPTIONS_LABEL}
+        </EuiButton>
+      )}
+    </EuiCallOut>
+  );
+};
+
+ErrorCalloutComponent.displayName = 'ErrorCalloutComponent';
+
+export const ErrorCallout = React.memo(ErrorCalloutComponent);
+
+ErrorCallout.displayName = 'ErrorCallout';
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts b/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts
index 13e9d0df549f8..484a3d593026e 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/translations.ts
@@ -190,3 +190,52 @@ export const TOTAL_ITEMS_FETCH_ERROR = i18n.translate(
     defaultMessage: 'Error getting exception item totals',
   }
 );
+
+export const CLEAR_EXCEPTIONS_LABEL = i18n.translate(
+  'xpack.securitySolution.exceptions.clearExceptionsLabel',
+  {
+    defaultMessage: 'Remove Exception List',
+  }
+);
+
+export const ADD_EXCEPTION_FETCH_404_ERROR = (listId: string) =>
+  i18n.translate('xpack.securitySolution.exceptions.fetch404Error', {
+    values: { listId },
+    defaultMessage:
+      'The associated exception list ({listId}) no longer exists. Please remove the missing exception list to add additional exceptions to the detection rule.',
+  });
+
+export const ADD_EXCEPTION_FETCH_ERROR = i18n.translate(
+  'xpack.securitySolution.exceptions.fetchError',
+  {
+    defaultMessage: 'Error fetching exception list',
+  }
+);
+
+export const ERROR = i18n.translate('xpack.securitySolution.exceptions.errorLabel', {
+  defaultMessage: 'Error',
+});
+
+export const CANCEL = i18n.translate('xpack.securitySolution.exceptions.cancelLabel', {
+  defaultMessage: 'Cancel',
+});
+
+export const MODAL_ERROR_ACCORDION_TEXT = i18n.translate(
+  'xpack.securitySolution.exceptions.modalErrorAccordionText',
+  {
+    defaultMessage: 'Show rule reference information:',
+  }
+);
+
+export const DISSASOCIATE_LIST_SUCCESS = (id: string) =>
+  i18n.translate('xpack.securitySolution.exceptions.dissasociateListSuccessText', {
+    values: { id },
+    defaultMessage: 'Exception list ({id}) has successfully been removed',
+  });
+
+export const DISSASOCIATE_EXCEPTION_LIST_ERROR = i18n.translate(
+  'xpack.securitySolution.exceptions.dissasociateExceptionListError',
+  {
+    defaultMessage: 'Failed to remove exception list',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
index 6611ee2385d10..46923e07d225a 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.test.tsx
@@ -148,6 +148,50 @@ describe('useAddOrUpdateException', () => {
     });
   });
 
+  it('invokes "onError" if call to add exception item fails', async () => {
+    const mockError = new Error('error adding item');
+
+    addExceptionListItem = jest
+      .spyOn(listsApi, 'addExceptionListItem')
+      .mockRejectedValue(mockError);
+
+    await act(async () => {
+      const { rerender, result, waitForNextUpdate } = render();
+      const addOrUpdateItems = await waitForAddOrUpdateFunc({
+        rerender,
+        result,
+        waitForNextUpdate,
+      });
+      if (addOrUpdateItems) {
+        addOrUpdateItems(...addOrUpdateItemsArgs);
+      }
+      await waitForNextUpdate();
+      expect(onError).toHaveBeenCalledWith(mockError, null, null);
+    });
+  });
+
+  it('invokes "onError" if call to update exception item fails', async () => {
+    const mockError = new Error('error updating item');
+
+    updateExceptionListItem = jest
+      .spyOn(listsApi, 'updateExceptionListItem')
+      .mockRejectedValue(mockError);
+
+    await act(async () => {
+      const { rerender, result, waitForNextUpdate } = render();
+      const addOrUpdateItems = await waitForAddOrUpdateFunc({
+        rerender,
+        result,
+        waitForNextUpdate,
+      });
+      if (addOrUpdateItems) {
+        addOrUpdateItems(...addOrUpdateItemsArgs);
+      }
+      await waitForNextUpdate();
+      expect(onError).toHaveBeenCalledWith(mockError, null, null);
+    });
+  });
+
   describe('when alertIdToClose is not passed in', () => {
     it('should not update the alert status', async () => {
       await act(async () => {
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
index 9d45a411b5130..be289b0e85e66 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_add_exception.tsx
@@ -42,7 +42,7 @@ export type ReturnUseAddOrUpdateException = [
 
 export interface UseAddOrUpdateExceptionProps {
   http: HttpStart;
-  onError: (arg: Error) => void;
+  onError: (arg: Error, code: number | null, message: string | null) => void;
   onSuccess: () => void;
 }
 
@@ -157,7 +157,11 @@ export const useAddOrUpdateException = ({
       } catch (error) {
         if (isSubscribed) {
           setIsLoading(false);
-          onError(error);
+          if (error.body != null) {
+            onError(error, error.body.status_code, error.body.message);
+          } else {
+            onError(error, null, null);
+          }
         }
       }
     };
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
index 39d88bd8e4724..f20a58b9ffa36 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.test.tsx
@@ -379,7 +379,7 @@ describe('useFetchOrCreateRuleExceptionList', () => {
         await waitForNextUpdate();
         await waitForNextUpdate();
         expect(onError).toHaveBeenCalledTimes(1);
-        expect(onError).toHaveBeenCalledWith(error);
+        expect(onError).toHaveBeenCalledWith(error, null, null);
       });
     });
 
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
index 0d367e03a799f..944631d4e9fb5 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/use_fetch_or_create_rule_exception_list.tsx
@@ -30,7 +30,7 @@ export interface UseFetchOrCreateRuleExceptionListProps {
   http: HttpStart;
   ruleId: Rule['id'];
   exceptionListType: ExceptionListSchema['type'];
-  onError: (arg: Error) => void;
+  onError: (arg: Error, code: number | null, message: string | null) => void;
   onSuccess?: (ruleWasChanged: boolean) => void;
 }
 
@@ -179,7 +179,11 @@ export const useFetchOrCreateRuleExceptionList = ({
         if (isSubscribed) {
           setIsLoading(false);
           setExceptionList(null);
-          onError(error);
+          if (error.body != null) {
+            onError(error, error.body.status_code, error.body.message);
+          } else {
+            onError(error, null, null);
+          }
         }
       }
     }
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
index 7482068454a97..c97895cdfe236 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/index.tsx
@@ -322,11 +322,13 @@ const ExceptionsViewerComponent = ({
         exceptionListTypeToEdit != null && (
           <EditExceptionModal
             ruleName={ruleName}
+            ruleId={ruleId}
             ruleIndices={ruleIndices}
             exceptionListType={exceptionListTypeToEdit}
             exceptionItem={exceptionToEdit}
             onCancel={handleOnCancelExceptionModal}
             onConfirm={handleOnConfirmExceptionModal}
+            onRuleChange={onRuleChange}
           />
         )}
 
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
new file mode 100644
index 0000000000000..6721d89f2799b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.test.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { act, renderHook } from '@testing-library/react-hooks';
+
+import { coreMock } from '../../../../../../../../src/core/public/mocks';
+
+import * as api from './api';
+import { ruleMock } from './mock';
+import {
+  ReturnUseDissasociateExceptionList,
+  UseDissasociateExceptionListProps,
+  useDissasociateExceptionList,
+} from './use_dissasociate_exception_list';
+
+const mockKibanaHttpService = coreMock.createStart().http;
+
+describe('useDissasociateExceptionList', () => {
+  const onError = jest.fn();
+  const onSuccess = jest.fn();
+
+  beforeEach(() => {
+    jest.spyOn(api, 'patchRule').mockResolvedValue(ruleMock);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('initializes hook', async () => {
+    await act(async () => {
+      const { result, waitForNextUpdate } = renderHook<
+        UseDissasociateExceptionListProps,
+        ReturnUseDissasociateExceptionList
+      >(() =>
+        useDissasociateExceptionList({
+          http: mockKibanaHttpService,
+          ruleRuleId: 'rule_id',
+          onError,
+          onSuccess,
+        })
+      );
+
+      await waitForNextUpdate();
+
+      expect(result.current).toEqual([false, null]);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
new file mode 100644
index 0000000000000..dffba3e6e0436
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_dissasociate_exception_list.tsx
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useEffect, useState, useRef } from 'react';
+
+import { HttpStart } from '../../../../../../../../src/core/public';
+import { List } from '../../../../../common/detection_engine/schemas/types/lists';
+import { patchRule } from './api';
+
+type Func = (lists: List[]) => void;
+export type ReturnUseDissasociateExceptionList = [boolean, Func | null];
+
+export interface UseDissasociateExceptionListProps {
+  http: HttpStart;
+  ruleRuleId: string;
+  onError: (arg: Error) => void;
+  onSuccess: () => void;
+}
+
+/**
+ * Hook for removing an exception list reference from a rule
+ *
+ * @param http Kibana http service
+ * @param ruleRuleId a rule_id (NOT id)
+ * @param onError error callback
+ * @param onSuccess success callback
+ *
+ */
+export const useDissasociateExceptionList = ({
+  http,
+  ruleRuleId,
+  onError,
+  onSuccess,
+}: UseDissasociateExceptionListProps): ReturnUseDissasociateExceptionList => {
+  const [isLoading, setLoading] = useState(false);
+  const dissasociateList = useRef<Func | null>(null);
+
+  useEffect(() => {
+    let isSubscribed = true;
+    const abortCtrl = new AbortController();
+
+    const dissasociateListFromRule = (id: string) => async (
+      exceptionLists: List[]
+    ): Promise<void> => {
+      try {
+        if (isSubscribed) {
+          setLoading(true);
+
+          await patchRule({
+            ruleProperties: {
+              rule_id: id,
+              exceptions_list: exceptionLists,
+            },
+            signal: abortCtrl.signal,
+          });
+
+          onSuccess();
+          setLoading(false);
+        }
+      } catch (err) {
+        if (isSubscribed) {
+          setLoading(false);
+          onError(err);
+        }
+      }
+    };
+
+    dissasociateList.current = dissasociateListFromRule(ruleRuleId);
+
+    return (): void => {
+      isSubscribed = false;
+      abortCtrl.abort();
+    };
+  }, [http, ruleRuleId, onError, onSuccess]);
+
+  return [isLoading, dissasociateList.current];
+};

From 4289f9d8b110fb03bc9b16eabdef8d37b073d409 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 26 Aug 2020 14:23:27 -0700
Subject: [PATCH 082/148] skip all tests that rely on es authentication type

---
 .../test/login_selector_api_integration/apis/login_selector.ts | 3 ++-
 .../apis/authorization_code_flow/oidc_auth.ts                  | 3 ++-
 .../test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts  | 3 ++-
 x-pack/test/pki_api_integration/apis/security/pki_auth.ts      | 3 ++-
 x-pack/test/saml_api_integration/apis/security/saml_login.ts   | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/x-pack/test/login_selector_api_integration/apis/login_selector.ts b/x-pack/test/login_selector_api_integration/apis/login_selector.ts
index 439e553b17a86..63084d3bfc9e9 100644
--- a/x-pack/test/login_selector_api_integration/apis/login_selector.ts
+++ b/x-pack/test/login_selector_api_integration/apis/login_selector.ts
@@ -62,7 +62,8 @@ export default function ({ getService }: FtrProviderContext) {
     expect(apiResponse.body.authentication_provider).to.be(providerName);
   }
 
-  describe('Login Selector', () => {
+  // FAILING: https://github.com/elastic/kibana/issues/75707
+  describe.skip('Login Selector', () => {
     it('should redirect user to a login selector', async () => {
       const response = await supertest
         .get('/abc/xyz/handshake?one=two three')
diff --git a/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.ts b/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.ts
index 18dfdcffef363..1b37d60436ddc 100644
--- a/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.ts
+++ b/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.ts
@@ -15,7 +15,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const config = getService('config');
 
-  describe('OpenID Connect authentication', () => {
+  // FAILING: https://github.com/elastic/kibana/issues/75707
+  describe.skip('OpenID Connect authentication', () => {
     it('should reject API requests if client is not authenticated', async () => {
       await supertest.get('/internal/security/me').set('kbn-xsrf', 'xxx').expect(401);
     });
diff --git a/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts b/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
index bea2f996141d5..43d9d680e102a 100644
--- a/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
+++ b/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
@@ -15,7 +15,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const config = getService('config');
 
-  describe('OpenID Connect Implicit Flow authentication', () => {
+  // FAILING: https://github.com/elastic/kibana/issues/75707
+  describe.skip('OpenID Connect Implicit Flow authentication', () => {
     describe('finishing handshake', () => {
       let stateAndNonce: ReturnType<typeof getStateAndNonce>;
       let handshakeCookie: Cookie;
diff --git a/x-pack/test/pki_api_integration/apis/security/pki_auth.ts b/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
index 664fdb9fba67a..a2090a8c2cc48 100644
--- a/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
+++ b/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
@@ -41,7 +41,8 @@ export default function ({ getService }: FtrProviderContext) {
     expect(cookie.maxAge).to.be(0);
   }
 
-  describe('PKI authentication', () => {
+  // FAILING: https://github.com/elastic/kibana/issues/75707
+  describe.skip('PKI authentication', () => {
     before(async () => {
       await getService('esSupertest')
         .post('/_security/role_mapping/first_client_pki')
diff --git a/x-pack/test/saml_api_integration/apis/security/saml_login.ts b/x-pack/test/saml_api_integration/apis/security/saml_login.ts
index d78f4da63ab5b..13b541f75e5bd 100644
--- a/x-pack/test/saml_api_integration/apis/security/saml_login.ts
+++ b/x-pack/test/saml_api_integration/apis/security/saml_login.ts
@@ -61,7 +61,8 @@ export default function ({ getService }: FtrProviderContext) {
     expect(apiResponse.body.username).to.be(username);
   }
 
-  describe('SAML authentication', () => {
+  // FAILING: https://github.com/elastic/kibana/issues/75707
+  describe.skip('SAML authentication', () => {
     it('should reject API requests if client is not authenticated', async () => {
       await supertest.get('/internal/security/me').set('kbn-xsrf', 'xxx').expect(401);
     });

From c08bf7f3ca6374a7eb4adb7b5ee760d75ceddf0b Mon Sep 17 00:00:00 2001
From: Rashmi Kulkarni <rashmi.kulkarni@elastic.co>
Date: Wed, 26 Aug 2020 17:21:16 -0700
Subject: [PATCH 083/148] using test_user with minimum privileges for canvas
 functional ui tests (#75917)

* incorporating test_user wth specific roles for the canvas functional ui tests

* additional checks - removed comments

* changes to incorporate code comments

* lint check

* incorporate code reviews

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../functional/apps/canvas/custom_elements.ts     |  6 +-----
 x-pack/test/functional/apps/canvas/expression.ts  |  6 +-----
 x-pack/test/functional/apps/canvas/index.js       | 15 ++++++++++++++-
 x-pack/test/functional/apps/canvas/smoke_test.js  |  7 +------
 x-pack/test/functional/config.js                  | 11 +++++++++++
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/x-pack/test/functional/apps/canvas/custom_elements.ts b/x-pack/test/functional/apps/canvas/custom_elements.ts
index 33db56751285e..1a05560aaf931 100644
--- a/x-pack/test/functional/apps/canvas/custom_elements.ts
+++ b/x-pack/test/functional/apps/canvas/custom_elements.ts
@@ -12,24 +12,20 @@ export default function canvasCustomElementTest({
   getService,
   getPageObjects,
 }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
   const retry = getService('retry');
   const PageObjects = getPageObjects(['canvas', 'common']);
   const find = getService('find');
+  const esArchiver = getService('esArchiver');
 
   describe('custom elements', function () {
     this.tags('skipFirefox');
 
     before(async () => {
-      // init data
-      await esArchiver.loadIfNeeded('logstash_functional');
       await esArchiver.load('canvas/default');
-
       // open canvas home
       await PageObjects.common.navigateToApp('canvas');
-
       // load test workpad
       await PageObjects.common.navigateToApp('canvas', {
         hash: '/workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31/page/1',
diff --git a/x-pack/test/functional/apps/canvas/expression.ts b/x-pack/test/functional/apps/canvas/expression.ts
index c184dca8366be..548321243d4fb 100644
--- a/x-pack/test/functional/apps/canvas/expression.ts
+++ b/x-pack/test/functional/apps/canvas/expression.ts
@@ -9,22 +9,18 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function canvasExpressionTest({ getService, getPageObjects }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
-  // const browser = getService('browser');
   const retry = getService('retry');
   const PageObjects = getPageObjects(['canvas', 'common']);
   const find = getService('find');
+  const esArchiver = getService('esArchiver');
 
   describe('expression editor', function () {
     // there is an issue with FF not properly clicking on workpad elements
     this.tags('skipFirefox');
 
     before(async () => {
-      // init data
-      await esArchiver.loadIfNeeded('logstash_functional');
       await esArchiver.load('canvas/default');
-
       // load test workpad
       await PageObjects.common.navigateToApp('canvas', {
         hash: '/workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31/page/1',
diff --git a/x-pack/test/functional/apps/canvas/index.js b/x-pack/test/functional/apps/canvas/index.js
index d6ded9b20b1ad..7ee48beaabb2a 100644
--- a/x-pack/test/functional/apps/canvas/index.js
+++ b/x-pack/test/functional/apps/canvas/index.js
@@ -4,8 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export default function canvasApp({ loadTestFile }) {
+export default function canvasApp({ loadTestFile, getService }) {
+  const security = getService('security');
+  const esArchiver = getService('esArchiver');
+
   describe('Canvas app', function canvasAppTestSuite() {
+    before(async () => {
+      // init data
+      await security.testUser.setRoles(['test_logstash_reader', 'global_canvas_all']);
+      await esArchiver.loadIfNeeded('logstash_functional');
+    });
+
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
+
     this.tags('ciGroup2'); // CI requires tags ヽ(゜Q。)ノ？
     loadTestFile(require.resolve('./smoke_test'));
     loadTestFile(require.resolve('./expression'));
diff --git a/x-pack/test/functional/apps/canvas/smoke_test.js b/x-pack/test/functional/apps/canvas/smoke_test.js
index 056713a5dacfa..596d34e7c1df5 100644
--- a/x-pack/test/functional/apps/canvas/smoke_test.js
+++ b/x-pack/test/functional/apps/canvas/smoke_test.js
@@ -8,11 +8,11 @@ import expect from '@kbn/expect';
 import { parse } from 'url';
 
 export default function canvasSmokeTest({ getService, getPageObjects }) {
-  const esArchiver = getService('esArchiver');
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
   const retry = getService('retry');
   const PageObjects = getPageObjects(['common']);
+  const esArchiver = getService('esArchiver');
 
   describe('smoke test', function () {
     this.tags('includeFirefox');
@@ -20,12 +20,7 @@ export default function canvasSmokeTest({ getService, getPageObjects }) {
     const testWorkpadId = 'workpad-1705f884-6224-47de-ba49-ca224fe6ec31';
 
     before(async () => {
-      // init data
-      await esArchiver.loadIfNeeded('logstash_functional');
       await esArchiver.load('canvas/default');
-
-      // load canvas
-      // see also navigateToUrl(app, hash)
       await PageObjects.common.navigateToApp('canvas');
     });
 
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index 003d842cc3d6f..cdc6292ba808a 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -221,6 +221,17 @@ export default async function ({ readConfigFile }) {
           kibana: [],
         },
 
+        global_canvas_all: {
+          kibana: [
+            {
+              feature: {
+                canvas: ['all'],
+              },
+              spaces: ['*'],
+            },
+          ],
+        },
+
         global_discover_read: {
           kibana: [
             {

From 42942327e52fc9cb1671f7c938158991d62c2659 Mon Sep 17 00:00:00 2001
From: Brent Kimmel <bkimmel@users.noreply.github.com>
Date: Wed, 26 Aug 2020 21:06:38 -0400
Subject: [PATCH 084/148] =?UTF-8?q?[Security=20Solution][Resolver]=20Word-?=
 =?UTF-8?q?break=20long=20titles=20in=20related=20event=E2=80=A6=20(#75926?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Security Solution][Resolver] Word-break long titles in related event description lists

* word-break long titles at non-word boundaries

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../resolver/store/data/reducer.test.ts       |  19 ++
 .../public/resolver/store/data/selectors.ts   |  98 ++++++++++
 .../public/resolver/store/selectors.ts        |   9 +
 .../public/resolver/types.ts                  |  16 ++
 .../view/panels/event_counts_for_process.tsx  |   3 +-
 .../view/panels/panel_content_error.tsx       |   3 +-
 .../view/panels/panel_content_utilities.tsx   |   8 -
 .../resolver/view/panels/process_details.tsx  |   3 +-
 .../view/panels/process_event_list.tsx        |   9 +-
 .../view/panels/process_list_with_counts.tsx  |   3 +-
 .../view/panels/related_event_detail.tsx      | 174 ++++++++----------
 .../view/use_resolver_query_params.ts         |   2 +-
 12 files changed, 225 insertions(+), 122 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
index edda2ef984a9e..e087db9f74685 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/reducer.test.ts
@@ -11,6 +11,7 @@ import * as selectors from './selectors';
 import { DataState } from '../../types';
 import { DataAction } from './action';
 import { ResolverChildNode, ResolverTree } from '../../../../common/endpoint/types';
+import * as eventModel from '../../../../common/endpoint/models/event';
 
 /**
  * Test the data reducer and selector.
@@ -175,6 +176,24 @@ describe('Resolver Data Middleware', () => {
           eventStatsForFirstChildNode.byCategory[categoryToOverCount] - 1
         );
       });
+      it('should return the correct related event detail metadata for a given related event', () => {
+        const relatedEventsByCategory = selectors.relatedEventsByCategory(store.getState());
+        const someRelatedEventForTheFirstChild = relatedEventsByCategory(firstChildNodeInTree.id)(
+          categoryToOverCount
+        )[0];
+        const relatedEventID = eventModel.eventId(someRelatedEventForTheFirstChild)!;
+        const relatedDisplayInfo = selectors.relatedEventDisplayInfoByEntityAndSelfID(
+          store.getState()
+        )(firstChildNodeInTree.id, relatedEventID);
+        const [, countOfSameType, , sectionData] = relatedDisplayInfo;
+        const hostEntries = sectionData.filter((section) => {
+          return section.sectionTitle === 'host';
+        })[0].entries;
+        expect(hostEntries).toContainEqual({ title: 'os.platform', description: 'Windows' });
+        expect(countOfSameType).toBe(
+          eventStatsForFirstChildNode.byCategory[categoryToOverCount] - 1
+        );
+      });
       it('should indicate the limit has been exceeded because the number of related events received for the category is less than what the stats count said it would be', () => {
         const selectedRelatedInfo = selectors.relatedEventInfoByEntityId(store.getState());
         const shouldShowLimit = selectedRelatedInfo(firstChildNodeInTree.id)
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts
index 569a24bb8537e..965547f1e309a 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.ts
@@ -14,6 +14,7 @@ import {
   IndexedProcessNode,
   AABB,
   VisibleEntites,
+  SectionData,
 } from '../../types';
 import {
   isGraphableProcess,
@@ -29,11 +30,14 @@ import {
   ResolverNodeStats,
   ResolverRelatedEvents,
   SafeResolverEvent,
+  EndpointEvent,
+  LegacyEndpointEvent,
 } from '../../../../common/endpoint/types';
 import * as resolverTreeModel from '../../models/resolver_tree';
 import * as isometricTaxiLayoutModel from '../../models/indexed_process_tree/isometric_taxi_layout';
 import * as eventModel from '../../../../common/endpoint/models/event';
 import * as vector2 from '../../models/vector2';
+import { formatDate } from '../../view/panels/panel_content_utilities';
 
 /**
  * If there is currently a request.
@@ -173,6 +177,100 @@ export function relatedEventsByEntityId(data: DataState): Map<string, ResolverRe
   return data.relatedEvents;
 }
 
+/**
+ * A helper function to turn objects into EuiDescriptionList entries.
+ * This reflects the strategy of more or less "dumping" metadata for related processes
+ * in description lists with little/no 'prettification'. This has the obvious drawback of
+ * data perhaps appearing inscrutable/daunting, but the benefit of presenting these fields
+ * to the user "as they occur" in ECS, which may help them with e.g. EQL queries.
+ *
+ * Given an object like: {a:{b: 1}, c: 'd'} it will yield title/description entries like so:
+ * {title: "a.b", description: "1"}, {title: "c", description: "d"}
+ *
+ * @param {object} obj The object to turn into `<dt><dd>` entries
+ */
+const objectToDescriptionListEntries = function* (
+  obj: object,
+  prefix = ''
+): Generator<{ title: string; description: string }> {
+  const nextPrefix = prefix.length ? `${prefix}.` : '';
+  for (const [metaKey, metaValue] of Object.entries(obj)) {
+    if (typeof metaValue === 'number' || typeof metaValue === 'string') {
+      yield { title: nextPrefix + metaKey, description: `${metaValue}` };
+    } else if (metaValue instanceof Array) {
+      yield {
+        title: nextPrefix + metaKey,
+        description: metaValue
+          .filter((arrayEntry) => {
+            return typeof arrayEntry === 'number' || typeof arrayEntry === 'string';
+          })
+          .join(','),
+      };
+    } else if (typeof metaValue === 'object') {
+      yield* objectToDescriptionListEntries(metaValue, nextPrefix + metaKey);
+    }
+  }
+};
+
+/**
+ * Returns a function that returns the information needed to display related event details based on
+ * the related event's entityID and its own ID.
+ */
+export const relatedEventDisplayInfoByEntityAndSelfID: (
+  state: DataState
+) => (
+  entityId: string,
+  relatedEventId: string | number
+) => [
+  EndpointEvent | LegacyEndpointEvent | undefined,
+  number,
+  string | undefined,
+  SectionData,
+  string
+] = createSelector(relatedEventsByEntityId, function relatedEventDetails(
+  /* eslint-disable no-shadow */
+  relatedEventsByEntityId
+  /* eslint-enable no-shadow */
+) {
+  return defaultMemoize((entityId: string, relatedEventId: string | number) => {
+    const relatedEventsForThisProcess = relatedEventsByEntityId.get(entityId);
+    if (!relatedEventsForThisProcess) {
+      return [undefined, 0, undefined, [], ''];
+    }
+    const specificEvent = relatedEventsForThisProcess.events.find(
+      (evt) => eventModel.eventId(evt) === relatedEventId
+    );
+    // For breadcrumbs:
+    const specificCategory = specificEvent && eventModel.primaryEventCategory(specificEvent);
+    const countOfCategory = relatedEventsForThisProcess.events.reduce((sumtotal, evt) => {
+      return eventModel.primaryEventCategory(evt) === specificCategory ? sumtotal + 1 : sumtotal;
+    }, 0);
+
+    // Assuming these details (agent, ecs, process) aren't as helpful, can revisit
+    const { agent, ecs, process, ...relevantData } = specificEvent as ResolverEvent & {
+      // Type this with various unknown keys so that ts will let us delete those keys
+      ecs: unknown;
+      process: unknown;
+    };
+
+    let displayDate = '';
+    const sectionData: SectionData = Object.entries(relevantData)
+      .map(([sectionTitle, val]) => {
+        if (sectionTitle === '@timestamp') {
+          displayDate = formatDate(val);
+          return { sectionTitle: '', entries: [] };
+        }
+        if (typeof val !== 'object') {
+          return { sectionTitle, entries: [{ title: sectionTitle, description: `${val}` }] };
+        }
+        return { sectionTitle, entries: [...objectToDescriptionListEntries(val)] };
+      })
+      .filter((v) => v.sectionTitle !== '' && v.entries.length);
+
+    return [specificEvent, countOfCategory, specificCategory, sectionData, displayDate];
+  });
+});
+
 /**
  * Returns a function that returns a function (when supplied with an entity id for a node)
  * that returns related events for a node that match an event.category (when supplied with the category)
diff --git a/x-pack/plugins/security_solution/public/resolver/store/selectors.ts b/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
index 70a461909a99b..f50aeed3f4d48 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
@@ -122,6 +122,15 @@ export const relatedEventsByEntityId = composeSelectors(
   dataSelectors.relatedEventsByEntityId
 );
 
+/**
+ * Returns a function that returns the information needed to display related event details based on
+ * the related event's entityID and its own ID.
+ */
+export const relatedEventDisplayInfoByEntityAndSelfId = composeSelectors(
+  dataStateSelector,
+  dataSelectors.relatedEventDisplayInfoByEntityAndSelfID
+);
+
 /**
  * Returns a function that returns a function (when supplied with an entity id for a node)
  * that returns related events for a node that match an event.category (when supplied with the category)
diff --git a/x-pack/plugins/security_solution/public/resolver/types.ts b/x-pack/plugins/security_solution/public/resolver/types.ts
index 33f7a1d97db13..9ebe3fa14e842 100644
--- a/x-pack/plugins/security_solution/public/resolver/types.ts
+++ b/x-pack/plugins/security_solution/public/resolver/types.ts
@@ -160,6 +160,22 @@ export interface IndexedProcessNode extends BBox {
   position: Vector2;
 }
 
+/**
+ * A type describing the shape of section titles and entries for description lists
+ */
+export type SectionData = Array<{
+  sectionTitle: string;
+  entries: Array<{ title: string; description: string }>;
+}>;
+
+/**
+ * The two query parameters we read/write on to control which view the table presents:
+ */
+export interface CrumbInfo {
+  crumbId: string;
+  crumbEvent: string;
+}
+
 /**
  * A type containing all things to actually be rendered to the DOM.
  */
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx
index 129aff776808a..c528ba547e6ae 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx
@@ -8,10 +8,11 @@ import React, { memo, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiBasicTableColumn, EuiButtonEmpty, EuiSpacer, EuiInMemoryTable } from '@elastic/eui';
 import { FormattedMessage } from 'react-intl';
-import { CrumbInfo, StyledBreadcrumbs } from './panel_content_utilities';
+import { StyledBreadcrumbs } from './panel_content_utilities';
 
 import * as event from '../../../../common/endpoint/models/event';
 import { ResolverEvent, ResolverNodeStats } from '../../../../common/endpoint/types';
+import { CrumbInfo } from '../../types';
 
 /**
  * This view gives counts for all the related events of a process grouped by related event type.
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx
index c9a536fd5932d..b93ef6146f1cf 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx
@@ -7,7 +7,8 @@
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiText, EuiButtonEmpty } from '@elastic/eui';
 import React, { memo, useMemo } from 'react';
-import { CrumbInfo, StyledBreadcrumbs } from './panel_content_utilities';
+import { StyledBreadcrumbs } from './panel_content_utilities';
+import { CrumbInfo } from '../../types';
 
 /**
  * Display an error in the panel when something goes wrong and give the user a way to "retreat" back to a default state.
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_utilities.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_utilities.tsx
index 55b5be21fb4a4..5c7a4a476efba 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_utilities.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_utilities.tsx
@@ -23,14 +23,6 @@ const BetaHeader = styled(`header`)`
   margin-bottom: 1em;
 `;
 
-/**
- * The two query parameters we read/write on to control which view the table presents:
- */
-export interface CrumbInfo {
-  crumbId: string;
-  crumbEvent: string;
-}
-
 const ThemedBreadcrumbs = styled(EuiBreadcrumbs)<{ background: string; text: string }>`
   &.euiBreadcrumbs {
     background-color: ${(props) => props.background};
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
index adfcc4cc44d1f..15711909c4c9b 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
@@ -19,7 +19,7 @@ import { FormattedMessage } from 'react-intl';
 import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 import * as selectors from '../../store/selectors';
 import * as event from '../../../../common/endpoint/models/event';
-import { CrumbInfo, formatDate, StyledBreadcrumbs } from './panel_content_utilities';
+import { formatDate, StyledBreadcrumbs } from './panel_content_utilities';
 import {
   processPath,
   processPid,
@@ -31,6 +31,7 @@ import {
 import { CubeForProcess } from './cube_for_process';
 import { ResolverEvent } from '../../../../common/endpoint/types';
 import { useResolverTheme } from '../assets';
+import { CrumbInfo } from '../../types';
 
 const StyledDescriptionList = styled(EuiDescriptionList)`
   &.euiDescriptionList.euiDescriptionList--column dt.euiDescriptionList__title.desc-title {
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx
index 101711475c938..a710d3ad846b3 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx
@@ -10,18 +10,13 @@ import { EuiTitle, EuiSpacer, EuiText, EuiButtonEmpty, EuiHorizontalRule } from
 import { useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
 import styled from 'styled-components';
-import {
-  CrumbInfo,
-  formatDate,
-  StyledBreadcrumbs,
-  BoldCode,
-  StyledTime,
-} from './panel_content_utilities';
+import { formatDate, StyledBreadcrumbs, BoldCode, StyledTime } from './panel_content_utilities';
 import * as event from '../../../../common/endpoint/models/event';
 import { ResolverEvent, ResolverNodeStats } from '../../../../common/endpoint/types';
 import * as selectors from '../../store/selectors';
 import { useResolverDispatch } from '../use_resolver_dispatch';
 import { RelatedEventLimitWarning } from '../limit_warnings';
+import { CrumbInfo } from '../../types';
 
 /**
  * This view presents a list of related events of a given type for a given process.
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx
index 1be4b4b055243..e42140feb928b 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx
@@ -16,12 +16,13 @@ import { useSelector } from 'react-redux';
 import styled from 'styled-components';
 import * as event from '../../../../common/endpoint/models/event';
 import * as selectors from '../../store/selectors';
-import { CrumbInfo, formatter, StyledBreadcrumbs } from './panel_content_utilities';
+import { formatter, StyledBreadcrumbs } from './panel_content_utilities';
 import { useResolverDispatch } from '../use_resolver_dispatch';
 import { SideEffectContext } from '../side_effect_context';
 import { CubeForProcess } from './cube_for_process';
 import { SafeResolverEvent } from '../../../../common/endpoint/types';
 import { LimitWarning } from '../limit_warnings';
+import { CrumbInfo } from '../../types';
 
 const StyledLimitWarning = styled(LimitWarning)`
   flex-flow: row wrap;
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
index 3579b1b2f69b8..da4cd3c9dacad 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
@@ -10,58 +10,19 @@ import { EuiSpacer, EuiText, EuiDescriptionList, EuiTextColor, EuiTitle } from '
 import styled from 'styled-components';
 import { useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
-import {
-  CrumbInfo,
-  formatDate,
-  StyledBreadcrumbs,
-  BoldCode,
-  StyledTime,
-} from './panel_content_utilities';
+import { StyledBreadcrumbs, BoldCode, StyledTime } from './panel_content_utilities';
 import * as event from '../../../../common/endpoint/models/event';
 import { ResolverEvent } from '../../../../common/endpoint/types';
 import * as selectors from '../../store/selectors';
 import { useResolverDispatch } from '../use_resolver_dispatch';
 import { PanelContentError } from './panel_content_error';
-
-/**
- * A helper function to turn objects into EuiDescriptionList entries.
- * This reflects the strategy of more or less "dumping" metadata for related processes
- * in description lists with little/no 'prettification'. This has the obvious drawback of
- * data perhaps appearing inscrutable/daunting, but the benefit of presenting these fields
- * to the user "as they occur" in ECS, which may help them with e.g. EQL queries.
- *
- * Given an object like: {a:{b: 1}, c: 'd'} it will yield title/description entries like so:
- * {title: "a.b", description: "1"}, {title: "c", description: "d"}
- *
- * @param {object} obj The object to turn into `<dt><dd>` entries
- */
-const objectToDescriptionListEntries = function* (
-  obj: object,
-  prefix = ''
-): Generator<{ title: string; description: string }> {
-  const nextPrefix = prefix.length ? `${prefix}.` : '';
-  for (const [metaKey, metaValue] of Object.entries(obj)) {
-    if (typeof metaValue === 'number' || typeof metaValue === 'string') {
-      yield { title: nextPrefix + metaKey, description: `${metaValue}` };
-    } else if (metaValue instanceof Array) {
-      yield {
-        title: nextPrefix + metaKey,
-        description: metaValue
-          .filter((arrayEntry) => {
-            return typeof arrayEntry === 'number' || typeof arrayEntry === 'string';
-          })
-          .join(','),
-      };
-    } else if (typeof metaValue === 'object') {
-      yield* objectToDescriptionListEntries(metaValue, nextPrefix + metaKey);
-    }
-  }
-};
+import { CrumbInfo } from '../../types';
 
 // Adding some styles to prevent horizontal scrollbars, per request from UX review
 const StyledDescriptionList = memo(styled(EuiDescriptionList)`
   &.euiDescriptionList.euiDescriptionList--column dt.euiDescriptionList__title.desc-title {
     max-width: 8em;
+    overflow-wrap: break-word;
   }
   &.euiDescriptionList.euiDescriptionList--column dd.euiDescriptionList__description {
     max-width: calc(100% - 8.5em);
@@ -69,6 +30,12 @@ const StyledDescriptionList = memo(styled(EuiDescriptionList)`
   }
 `);
 
+// Also prevents horizontal scrollbars on long descriptive names
+const StyledDescriptiveName = memo(styled(EuiText)`
+  padding-right: 1em;
+  overflow-wrap: break-word;
+`);
+
 // Styling subtitles, per UX review:
 const StyledFlexTitle = memo(styled('h3')`
   display: flex;
@@ -90,6 +57,49 @@ const TitleHr = memo(() => {
 });
 TitleHr.displayName = 'TitleHR';
 
+const GeneratedText = React.memo(function ({ children }) {
+  return <>{processedValue()}</>;
+
+  function processedValue() {
+    return React.Children.map(children, (child) => {
+      if (typeof child === 'string') {
+        const valueSplitByWordBoundaries = child.split(/\b/);
+
+        if (valueSplitByWordBoundaries.length < 2) {
+          return valueSplitByWordBoundaries[0];
+        }
+
+        return [
+          valueSplitByWordBoundaries[0],
+          ...valueSplitByWordBoundaries
+            .splice(1)
+            .reduce(function (generatedTextMemo: Array<string | JSX.Element>, value, index) {
+              return [...generatedTextMemo, value, <wbr />];
+            }, []),
+        ];
+      } else {
+        return child;
+      }
+    });
+  }
+});
+GeneratedText.displayName = 'GeneratedText';
+
+/**
+ * Take description list entries and prepare them for display by
+ * seeding with `<wbr />` tags.
+ *
+ * @param entries {title: string, description: string}[]
+ */
+function entriesForDisplay(entries: Array<{ title: string; description: string }>) {
+  return entries.map((entry) => {
+    return {
+      description: <GeneratedText>{entry.description}</GeneratedText>,
+      title: <GeneratedText>{entry.title}</GeneratedText>,
+    };
+  });
+}
+
 /**
  * This view presents a detailed view of all the available data for a related event, split and titled by the "section"
  * it appears in the underlying ResolverEvent
@@ -138,60 +148,17 @@ export const RelatedEventDetail = memo(function RelatedEventDetail({
     }
   }, [relatedsReady, dispatch, processEntityId]);
 
-  const relatedEventsForThisProcess = useSelector(selectors.relatedEventsByEntityId).get(
-    processEntityId!
+  const [
+    relatedEventToShowDetailsFor,
+    countBySameCategory,
+    relatedEventCategory = naString,
+    sections,
+    formattedDate,
+  ] = useSelector(selectors.relatedEventDisplayInfoByEntityAndSelfId)(
+    processEntityId,
+    relatedEventId
   );
 
-  const [relatedEventToShowDetailsFor, countBySameCategory, relatedEventCategory] = useMemo(() => {
-    if (!relatedEventsForThisProcess) {
-      return [undefined, 0];
-    }
-    const specificEvent = relatedEventsForThisProcess.events.find(
-      (evt) => event.eventId(evt) === relatedEventId
-    );
-    // For breadcrumbs:
-    const specificCategory = specificEvent && event.primaryEventCategory(specificEvent);
-    const countOfCategory = relatedEventsForThisProcess.events.reduce((sumtotal, evt) => {
-      return event.primaryEventCategory(evt) === specificCategory ? sumtotal + 1 : sumtotal;
-    }, 0);
-    return [specificEvent, countOfCategory, specificCategory || naString];
-  }, [relatedEventsForThisProcess, naString, relatedEventId]);
-
-  const [sections, formattedDate] = useMemo(() => {
-    if (!relatedEventToShowDetailsFor) {
-      // This could happen if user relaods from URL param and requests an eventId that no longer exists
-      return [[], naString];
-    }
-    // Assuming these details (agent, ecs, process) aren't as helpful, can revisit
-    const {
-      agent,
-      ecs,
-      process,
-      ...relevantData
-    } = relatedEventToShowDetailsFor as ResolverEvent & {
-      // Type this with various unknown keys so that ts will let us delete those keys
-      ecs: unknown;
-      process: unknown;
-    };
-    let displayDate = '';
-    const sectionData: Array<{
-      sectionTitle: string;
-      entries: Array<{ title: string; description: string }>;
-    }> = Object.entries(relevantData)
-      .map(([sectionTitle, val]) => {
-        if (sectionTitle === '@timestamp') {
-          displayDate = formatDate(val);
-          return { sectionTitle: '', entries: [] };
-        }
-        if (typeof val !== 'object') {
-          return { sectionTitle, entries: [{ title: sectionTitle, description: `${val}` }] };
-        }
-        return { sectionTitle, entries: [...objectToDescriptionListEntries(val)] };
-      })
-      .filter((v) => v.sectionTitle !== '' && v.entries.length);
-    return [sectionData, displayDate];
-  }, [relatedEventToShowDetailsFor, naString]);
-
   const waitCrumbs = useMemo(() => {
     return [
       {
@@ -338,15 +305,18 @@ export const RelatedEventDetail = memo(function RelatedEventDetail({
         </StyledTime>
       </EuiText>
       <EuiSpacer size="m" />
-      <EuiText>
-        <FormattedMessage
-          id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.eventDescriptiveNameInTitle"
-          values={{ subject, descriptor }}
-          defaultMessage="{descriptor} {subject}"
-        />
-      </EuiText>
+      <StyledDescriptiveName>
+        <GeneratedText>
+          <FormattedMessage
+            id="xpack.securitySolution.endpoint.resolver.panel.relatedEventDetail.eventDescriptiveNameInTitle"
+            values={{ subject, descriptor }}
+            defaultMessage="{descriptor} {subject}"
+          />
+        </GeneratedText>
+      </StyledDescriptiveName>
       <EuiSpacer size="l" />
       {sections.map(({ sectionTitle, entries }, index) => {
+        const displayEntries = entriesForDisplay(entries);
         return (
           <Fragment key={index}>
             {index === 0 ? null : <EuiSpacer size="m" />}
@@ -364,7 +334,7 @@ export const RelatedEventDetail = memo(function RelatedEventDetail({
               align="left"
               titleProps={{ className: 'desc-title' }}
               compressed
-              listItems={entries}
+              listItems={displayEntries}
             />
             {index === sections.length - 1 ? null : <EuiSpacer size="m" />}
           </Fragment>
diff --git a/x-pack/plugins/security_solution/public/resolver/view/use_resolver_query_params.ts b/x-pack/plugins/security_solution/public/resolver/view/use_resolver_query_params.ts
index aa0851916a7b4..b6c229181e9f7 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/use_resolver_query_params.ts
+++ b/x-pack/plugins/security_solution/public/resolver/view/use_resolver_query_params.ts
@@ -7,7 +7,7 @@
 import { useCallback, useMemo } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
 import { useQueryStringKeys } from './use_query_string_keys';
-import { CrumbInfo } from './panels/panel_content_utilities';
+import { CrumbInfo } from '../types';
 
 export function useResolverQueryParams() {
   /**

From a358c5768ea4f378270140d4e480fece98e8e103 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Thu, 27 Aug 2020 07:02:28 +0200
Subject: [PATCH 085/148] [Uptime] One click simple monitor down alert (#73835)

* WIP

* added anomaly alert

* update types

* update types

* update

* types

* types

* update ML part

* update ML part

* update ML part

* unnecessary change

* icon for disable

* update test

* update api

* update labels

* resolve conflicts

* fix types

* fix editing alert

* fix types

* added actions column

* added code to add alert

* update anomaly message

* added anomaly alert test

* update

* update type

* fix ml legacy scoped client

* update

* WIP

* fix conflict

* added aria label

* Added deleteion loading

* fix type

* update

* update tests

* update

* update type

* fix types

* WIP

* added enabled alerts section

* add data

* update

* update tests

* fix test

* update i18n

* update i18n

* update i18n

* fix

* update message

* update

* update

* update

* revert

* update types

* added component

* update test

* incorporate PR feedback

* fix focus

* update drawer

* handle edge case

* improve btn text

* improve btn text

* use switch instead of icons

* update snapshot

* use compressed form

* fix type

* update snapshot

* update snapshot

* update test

* update test

* PR feedback

* fix test and type

* remove delete action

* remove unnecessary function

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../triggers_actions_ui/public/index.ts       |   1 +
 .../uptime/common/constants/rest_api.ts       |   3 +
 .../common/constants/settings_defaults.ts     |   1 +
 .../runtime_types/alerts/status_check.ts      |   2 +
 .../common/runtime_types/dynamic_settings.ts  |   1 +
 .../common/runtime_types/monitor/details.ts   |   3 +-
 .../__tests__/link_for_eui.test.tsx           |   4 +-
 .../components/monitor/ml/manage_ml_job.tsx   |   4 +-
 .../monitor/ml/use_anomaly_alert.ts           |   8 +-
 .../__mocks__/{mock.ts => poly_layer_mock.ts} |   0
 .../embeddables/__tests__/map_config.test.ts  |   2 +-
 .../__snapshots__/monitor_list.test.tsx.snap  | 111 ++++++++++-
 .../__snapshots__/enable_alert.test.tsx.snap  |  89 +++++++++
 .../columns/__tests__/enable_alert.test.tsx   |  90 +++++++++
 .../columns/define_connectors.tsx             |  55 ++++++
 .../monitor_list/columns/enable_alert.tsx     | 130 +++++++++++++
 .../monitor_list/columns/translations.ts      |  15 ++
 .../overview/monitor_list/monitor_list.tsx    |  24 ++-
 .../monitor_list_drawer.test.tsx.snap         |   2 +
 .../most_recent_error.test.tsx.snap           |   2 +-
 .../__tests__/monitor_list_drawer.test.tsx    |  24 ++-
 .../monitor_list_drawer/enabled_alerts.tsx    |  57 ++++++
 .../list_drawer_container.tsx                 |  58 +++---
 .../monitor_list_drawer.tsx                   |  13 +-
 .../overview/monitor_list/translations.ts     |   4 +
 .../certificate_form.test.tsx.snap            |   1 +
 .../__snapshots__/indices_form.test.tsx.snap  |   1 +
 .../__tests__/certificate_form.test.tsx       |   3 +
 .../settings/__tests__/indices_form.test.tsx  |   1 +
 .../settings/add_connector_flyout.tsx         |  70 +++++++
 .../settings/alert_defaults_form.tsx          | 182 ++++++++++++++++++
 .../components/settings/translations.ts       |   9 +
 .../use_url_params.test.tsx.snap              |   4 +-
 .../uptime/public/hooks/use_init_app.ts       |  18 ++
 .../uptime/public/lib/__mocks__/index.ts      |   7 -
 .../public/lib/__mocks__/uptime_store.mock.ts | 120 ++++++++++++
 ...tory.mock.ts => ut_router_history.mock.ts} |   0
 .../__tests__/monitor_status.test.ts          |  10 +-
 .../public/lib/alert_types/alert_messages.tsx |  28 +++
 .../public/lib/helper/helper_with_redux.tsx   |   5 +-
 .../public/lib/helper/helper_with_router.tsx  |  37 +++-
 .../get_supported_url_params.test.ts.snap     |   5 +
 .../get_supported_url_params.test.ts          |   2 +
 .../url_params/get_supported_url_params.ts    |   3 +
 x-pack/plugins/uptime/public/lib/index.ts     |   2 +-
 .../__snapshots__/page_header.test.tsx.snap   |  46 ++---
 .../plugins/uptime/public/pages/monitor.tsx   |  23 ++-
 .../plugins/uptime/public/pages/overview.tsx  |  12 ++
 .../uptime/public/pages/page_header.tsx       |  10 +-
 .../plugins/uptime/public/pages/settings.tsx  |  17 +-
 .../uptime/public/state/actions/monitor.ts    |  12 +-
 .../uptime/public/state/actions/types.ts      |   8 +
 .../uptime/public/state/alerts/alerts.ts      | 165 ++++++++++++++++
 .../plugins/uptime/public/state/api/alerts.ts |  77 +++++++-
 .../public/state/certificates/certificates.ts |   8 +-
 .../uptime/public/state/effects/alerts.ts     |   4 +-
 .../uptime/public/state/effects/index.ts      |   2 +-
 .../uptime/public/state/effects/ml_anomaly.ts |   5 +-
 .../uptime/public/state/effects/monitor.ts    |   8 +-
 .../uptime/public/state/reducers/alerts.ts    |  29 ---
 .../uptime/public/state/reducers/index.ts     |   2 +-
 .../public/state/reducers/index_status.ts     |   8 +-
 .../public/state/reducers/ml_anomaly.ts       |  24 +--
 .../uptime/public/state/reducers/monitor.ts   |   9 +-
 .../uptime/public/state/reducers/types.ts     |   2 +-
 .../uptime/public/state/reducers/utils.ts     |  22 ++-
 .../state/selectors/__tests__/index.test.ts   |   6 +-
 .../uptime/public/state/selectors/index.ts    |   4 +-
 x-pack/plugins/uptime/server/kibana.index.ts  |   8 +-
 .../lib/adapters/framework/adapter_types.ts   |  10 +-
 .../telemetry/kibana_telemetry_adapter.ts     |   6 +-
 .../lib/alerts/__tests__/status_check.test.ts |   8 +
 .../uptime/server/lib/alerts/status_check.ts  |  74 ++++---
 .../lib/requests/__tests__/get_certs.test.ts  |   1 +
 .../__tests__/get_latest_monitor.test.ts      |   2 +-
 .../server/lib/requests/get_latest_monitor.ts |  10 +-
 .../lib/requests/get_monitor_details.ts       |  75 +++++++-
 .../server/lib/requests/get_monitor_status.ts |   2 +-
 .../uptime/server/lib/saved_objects.ts        |   3 +
 .../__tests__/dynamic_settings.test.ts        |   5 +
 .../server/rest_api/dynamic_settings.ts       |   1 +
 .../rest_api/monitors/monitors_details.ts     |   6 +-
 .../rest_api/monitors/monitors_durations.ts   |   1 +
 .../apis/uptime/rest/dynamic_settings.ts      |   1 +
 x-pack/test/functional/apps/uptime/index.ts   |  42 ++--
 .../test/functional/apps/uptime/settings.ts   |   1 +
 .../functional/page_objects/uptime_page.ts    |   1 +
 .../test/functional/services/uptime/common.ts |   6 +-
 .../functional/services/uptime/navigation.ts  |   1 +
 .../functional/services/uptime/overview.ts    |   4 +
 .../functional/services/uptime/settings.ts    |   1 +
 .../apps/uptime/index.ts                      |   1 +
 .../apps/uptime/simple_down_alert.ts          | 109 +++++++++++
 93 files changed, 1828 insertions(+), 265 deletions(-)
 rename x-pack/plugins/uptime/public/components/monitor/status_details/location_map/embeddables/__tests__/__mocks__/{mock.ts => poly_layer_mock.ts} (100%)
 create mode 100644 x-pack/plugins/uptime/public/components/overview/monitor_list/columns/__tests__/__snapshots__/enable_alert.test.tsx.snap
 create mode 100644 x-pack/plugins/uptime/public/components/overview/monitor_list/columns/__tests__/enable_alert.test.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/overview/monitor_list/columns/define_connectors.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/overview/monitor_list/columns/translations.ts
 create mode 100644 x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
 create mode 100644 x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
 create mode 100644 x-pack/plugins/uptime/public/hooks/use_init_app.ts
 delete mode 100644 x-pack/plugins/uptime/public/lib/__mocks__/index.ts
 create mode 100644 x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts
 rename x-pack/plugins/uptime/public/lib/__mocks__/{react_router_history.mock.ts => ut_router_history.mock.ts} (100%)
 create mode 100644 x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx
 create mode 100644 x-pack/plugins/uptime/public/state/alerts/alerts.ts
 delete mode 100644 x-pack/plugins/uptime/public/state/reducers/alerts.ts
 create mode 100644 x-pack/test/functional_with_es_ssl/apps/uptime/simple_down_alert.ts

diff --git a/x-pack/plugins/triggers_actions_ui/public/index.ts b/x-pack/plugins/triggers_actions_ui/public/index.ts
index 7808e2a7f608d..f73fac2259067 100644
--- a/x-pack/plugins/triggers_actions_ui/public/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/index.ts
@@ -21,6 +21,7 @@ export {
   AlertTypeParamsExpressionProps,
   ValidationResult,
   ActionVariable,
+  ActionConnector,
 } from './types';
 export {
   ConnectorAddFlyout,
diff --git a/x-pack/plugins/uptime/common/constants/rest_api.ts b/x-pack/plugins/uptime/common/constants/rest_api.ts
index f3f06f776260d..be1f498c2e75d 100644
--- a/x-pack/plugins/uptime/common/constants/rest_api.ts
+++ b/x-pack/plugins/uptime/common/constants/rest_api.ts
@@ -24,6 +24,9 @@ export enum API_URLS {
   ML_DELETE_JOB = `/api/ml/jobs/delete_jobs`,
   ML_CAPABILITIES = '/api/ml/ml_capabilities',
   ML_ANOMALIES_RESULT = `/api/ml/results/anomalies_table_data`,
+
+  ALERT_ACTIONS = '/api/actions',
+  CREATE_ALERT = '/api/alerts/alert',
   ALERT = '/api/alerts/alert/',
   ALERTS_FIND = '/api/alerts/_find',
 }
diff --git a/x-pack/plugins/uptime/common/constants/settings_defaults.ts b/x-pack/plugins/uptime/common/constants/settings_defaults.ts
index b9e99a54b3b11..6eb2a1913b871 100644
--- a/x-pack/plugins/uptime/common/constants/settings_defaults.ts
+++ b/x-pack/plugins/uptime/common/constants/settings_defaults.ts
@@ -10,4 +10,5 @@ export const DYNAMIC_SETTINGS_DEFAULTS: DynamicSettings = {
   heartbeatIndices: 'heartbeat-8*',
   certAgeThreshold: 730,
   certExpirationThreshold: 30,
+  defaultConnectors: [],
 };
diff --git a/x-pack/plugins/uptime/common/runtime_types/alerts/status_check.ts b/x-pack/plugins/uptime/common/runtime_types/alerts/status_check.ts
index 5a355dc576c0a..971a9f51bfae1 100644
--- a/x-pack/plugins/uptime/common/runtime_types/alerts/status_check.ts
+++ b/x-pack/plugins/uptime/common/runtime_types/alerts/status_check.ts
@@ -25,6 +25,7 @@ export const AtomicStatusCheckParamsType = t.intersection([
     search: t.string,
     filters: StatusCheckFiltersType,
     shouldCheckStatus: t.boolean,
+    isAutoGenerated: t.boolean,
   }),
 ]);
 
@@ -34,6 +35,7 @@ export const StatusCheckParamsType = t.intersection([
   t.partial({
     filters: t.string,
     shouldCheckStatus: t.boolean,
+    isAutoGenerated: t.boolean,
   }),
   t.type({
     locations: t.array(t.string),
diff --git a/x-pack/plugins/uptime/common/runtime_types/dynamic_settings.ts b/x-pack/plugins/uptime/common/runtime_types/dynamic_settings.ts
index a0ec92f7d869b..3621827b294a6 100644
--- a/x-pack/plugins/uptime/common/runtime_types/dynamic_settings.ts
+++ b/x-pack/plugins/uptime/common/runtime_types/dynamic_settings.ts
@@ -10,6 +10,7 @@ export const DynamicSettingsType = t.type({
   heartbeatIndices: t.string,
   certAgeThreshold: t.number,
   certExpirationThreshold: t.number,
+  defaultConnectors: t.array(t.string),
 });
 
 export const DynamicSettingsSaveType = t.intersection([
diff --git a/x-pack/plugins/uptime/common/runtime_types/monitor/details.ts b/x-pack/plugins/uptime/common/runtime_types/monitor/details.ts
index bf81c91bae633..c622d4f19bade 100644
--- a/x-pack/plugins/uptime/common/runtime_types/monitor/details.ts
+++ b/x-pack/plugins/uptime/common/runtime_types/monitor/details.ts
@@ -18,7 +18,6 @@ export type MonitorError = t.TypeOf<typeof MonitorErrorType>;
 
 export const MonitorDetailsType = t.intersection([
   t.type({ monitorId: t.string }),
-  t.partial({ error: MonitorErrorType }),
-  t.partial({ timestamp: t.string }),
+  t.partial({ error: MonitorErrorType, timestamp: t.string, alerts: t.unknown }),
 ]);
 export type MonitorDetails = t.TypeOf<typeof MonitorDetailsType>;
diff --git a/x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_for_eui.test.tsx b/x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_for_eui.test.tsx
index 4a681f6fa60bf..845b597a8ad18 100644
--- a/x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_for_eui.test.tsx
+++ b/x-pack/plugins/uptime/public/components/common/react_router_helpers/__tests__/link_for_eui.test.tsx
@@ -8,10 +8,10 @@ import React from 'react';
 import { shallow, mount } from 'enzyme';
 import { EuiLink, EuiButton } from '@elastic/eui';
 
-import '../../../../lib/__mocks__/react_router_history.mock';
+import '../../../../lib/__mocks__/ut_router_history.mock';
 
 import { ReactRouterEuiLink, ReactRouterEuiButton } from '../link_for_eui';
-import { mockHistory } from '../../../../lib/__mocks__';
+import { mockHistory } from '../../../../lib/__mocks__/ut_router_history.mock';
 
 describe('EUI & React Router Component Helpers', () => {
   beforeEach(() => {
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx b/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
index f4382b37b3d30..7971c4eb58350 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/manage_ml_job.tsx
@@ -22,7 +22,7 @@ import { useMonitorId } from '../../../hooks';
 import { setAlertFlyoutType, setAlertFlyoutVisible } from '../../../state/actions';
 import { useAnomalyAlert } from './use_anomaly_alert';
 import { ConfirmAlertDeletion } from './confirm_alert_delete';
-import { deleteAlertAction } from '../../../state/actions/alerts';
+import { deleteAnomalyAlertAction } from '../../../state/alerts/alerts';
 
 interface Props {
   hasMLJob: boolean;
@@ -52,7 +52,7 @@ export const ManageMLJobComponent = ({ hasMLJob, onEnableJob, onJobDelete }: Pro
   const [isConfirmAlertDeleteOpen, setIsConfirmAlertDeleteOpen] = useState(false);
 
   const deleteAnomalyAlert = () =>
-    dispatch(deleteAlertAction.get({ alertId: anomalyAlert?.id as string }));
+    dispatch(deleteAnomalyAlertAction.get({ alertId: anomalyAlert?.id as string }));
 
   const showLoading = isMLJobCreating || isMLJobLoading;
 
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/use_anomaly_alert.ts b/x-pack/plugins/uptime/public/components/monitor/ml/use_anomaly_alert.ts
index d204cdf10012a..949bbadfc9d26 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/use_anomaly_alert.ts
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/use_anomaly_alert.ts
@@ -6,10 +6,10 @@
 
 import { useContext, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { getExistingAlertAction } from '../../../state/actions/alerts';
-import { alertSelector, selectAlertFlyoutVisibility } from '../../../state/selectors';
+import { selectAlertFlyoutVisibility } from '../../../state/selectors';
 import { UptimeRefreshContext } from '../../../contexts';
 import { useMonitorId } from '../../../hooks';
+import { anomalyAlertSelector, getAnomalyAlertAction } from '../../../state/alerts/alerts';
 
 export const useAnomalyAlert = () => {
   const { lastRefresh } = useContext(UptimeRefreshContext);
@@ -18,12 +18,12 @@ export const useAnomalyAlert = () => {
 
   const monitorId = useMonitorId();
 
-  const { data: anomalyAlert } = useSelector(alertSelector);
+  const { data: anomalyAlert } = useSelector(anomalyAlertSelector);
 
   const alertFlyoutVisible = useSelector(selectAlertFlyoutVisibility);
 
   useEffect(() => {
-    dispatch(getExistingAlertAction.get({ monitorId }));
+    dispatch(getAnomalyAlertAction.get({ monitorId }));
   }, [monitorId, lastRefresh, dispatch, alertFlyoutVisible]);
 
   return anomalyAlert;
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/location_map/embeddables/__tests__/__mocks__/mock.ts b/x-pack/plugins/uptime/public/components/monitor/status_details/location_map/embeddables/__tests__/__mocks__/poly_layer_mock.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/components/monitor/status_details/location_map/embeddables/__tests__/__mocks__/mock.ts
rename to x-pack/plugins/uptime/public/components/monitor/status_details/location_map/embeddables/__tests__/__mocks__/poly_layer_mock.ts
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/location_map/embeddables/__tests__/map_config.test.ts b/x-pack/plugins/uptime/public/components/monitor/status_details/location_map/embeddables/__tests__/map_config.test.ts
index 18b43434da24b..582c60f048bed 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/location_map/embeddables/__tests__/map_config.test.ts
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/location_map/embeddables/__tests__/map_config.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { getLayerList } from '../map_config';
-import { mockLayerList } from './__mocks__/mock';
+import { mockLayerList } from './__mocks__/poly_layer_mock';
 import { LocationPoint } from '../embedded_map';
 import { UptimeAppColors } from '../../../../../../apps/uptime_app';
 
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
index 4898ec00b38e2..e177f1cf01147 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
@@ -1055,9 +1055,26 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 </span>
               </div>
             </th>
+            <th
+              class="euiTableHeaderCell"
+              data-test-subj="tableHeaderCell_Status alert_5"
+              role="columnheader"
+              scope="col"
+              style="width:150px"
+            >
+              <div
+                class="euiTableCellContent euiTableCellContent--alignCenter"
+              >
+                <span
+                  class="euiTableCellContent__text"
+                >
+                  Status alert
+                </span>
+              </div>
+            </th>
             <td
               class="euiTableHeaderCell"
-              data-test-subj="tableHeaderCell_monitor_id_5"
+              data-test-subj="tableHeaderCell_monitor_id_6"
               role="columnheader"
               scope="col"
               style="width:24px"
@@ -1228,6 +1245,52 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 </span>
               </div>
             </td>
+            <td
+              class="euiTableRowCell"
+              style="width:150px"
+            >
+              <div
+                class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
+              >
+                Status alert
+              </div>
+              <div
+                class="euiTableCellContent euiTableCellContent--alignCenter euiTableCellContent--overflowingContent"
+              >
+                <div
+                  class="euiPopover euiPopover--anchorDownCenter"
+                >
+                  <div
+                    class="euiPopover__anchor"
+                  >
+                    <div
+                      class="euiSwitch euiSwitch--compressed"
+                    >
+                      <button
+                        aria-checked="false"
+                        aria-label="Enable status alert"
+                        class="euiSwitch__button"
+                        data-test-subj="uptimeDisplayDefineConnector"
+                        id="defineAlertSettingsSwitch"
+                        role="switch"
+                        type="button"
+                      >
+                        <span
+                          class="euiSwitch__body"
+                        >
+                          <span
+                            class="euiSwitch__thumb"
+                          />
+                          <span
+                            class="euiSwitch__track"
+                          />
+                        </span>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </td>
             <td
               class="euiTableRowCell euiTableRowCell--isExpander"
               style="width:24px"
@@ -1405,6 +1468,52 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 </span>
               </div>
             </td>
+            <td
+              class="euiTableRowCell"
+              style="width:150px"
+            >
+              <div
+                class="euiTableRowCell__mobileHeader euiTableRowCell--hideForDesktop"
+              >
+                Status alert
+              </div>
+              <div
+                class="euiTableCellContent euiTableCellContent--alignCenter euiTableCellContent--overflowingContent"
+              >
+                <div
+                  class="euiPopover euiPopover--anchorDownCenter"
+                >
+                  <div
+                    class="euiPopover__anchor"
+                  >
+                    <div
+                      class="euiSwitch euiSwitch--compressed"
+                    >
+                      <button
+                        aria-checked="false"
+                        aria-label="Enable status alert"
+                        class="euiSwitch__button"
+                        data-test-subj="uptimeDisplayDefineConnector"
+                        id="defineAlertSettingsSwitch"
+                        role="switch"
+                        type="button"
+                      >
+                        <span
+                          class="euiSwitch__body"
+                        >
+                          <span
+                            class="euiSwitch__thumb"
+                          />
+                          <span
+                            class="euiSwitch__track"
+                          />
+                        </span>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </td>
             <td
               class="euiTableRowCell euiTableRowCell--isExpander"
               style="width:24px"
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/__tests__/__snapshots__/enable_alert.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/__tests__/__snapshots__/enable_alert.test.tsx.snap
new file mode 100644
index 0000000000000..486414ab8a052
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/__tests__/__snapshots__/enable_alert.test.tsx.snap
@@ -0,0 +1,89 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EnableAlertComponent renders without errors for valid props 1`] = `
+<div
+  class="euiPopover euiPopover--anchorDownCenter"
+>
+  <div
+    class="euiPopover__anchor"
+  >
+    <div
+      class="euiSwitch euiSwitch--compressed"
+    >
+      <button
+        aria-checked="false"
+        aria-label="Enable status alert"
+        class="euiSwitch__button"
+        data-test-subj="uptimeDisplayDefineConnector"
+        id="defineAlertSettingsSwitch"
+        role="switch"
+        type="button"
+      >
+        <span
+          class="euiSwitch__body"
+        >
+          <span
+            class="euiSwitch__thumb"
+          />
+          <span
+            class="euiSwitch__track"
+          />
+        </span>
+      </button>
+    </div>
+  </div>
+</div>
+`;
+
+exports[`EnableAlertComponent shallow renders without errors for valid props 1`] = `
+<Provider
+  store={
+    Object {
+      "dispatch": [MockFunction],
+      "getState": [MockFunction],
+      "replaceReducer": [MockFunction],
+      "subscribe": [MockFunction],
+    }
+  }
+>
+  <Router
+    history={
+      Object {
+        "action": "POP",
+        "block": [Function],
+        "canGo": [Function],
+        "createHref": [Function],
+        "entries": Array [
+          Object {
+            "hash": "",
+            "key": "TestKeyForTesting",
+            "pathname": "/",
+            "search": "",
+            "state": undefined,
+          },
+        ],
+        "go": [Function],
+        "goBack": [Function],
+        "goForward": [Function],
+        "index": 0,
+        "length": 1,
+        "listen": [Function],
+        "location": Object {
+          "hash": "",
+          "key": "TestKeyForTesting",
+          "pathname": "/",
+          "search": "",
+          "state": undefined,
+        },
+        "push": [Function],
+        "replace": [Function],
+      }
+    }
+  >
+    <EnableMonitorAlert
+      monitorId="testMonitor"
+      monitorName="My website"
+    />
+  </Router>
+</Provider>
+`;
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/__tests__/enable_alert.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/__tests__/enable_alert.test.tsx
new file mode 100644
index 0000000000000..4f41ea4c0b895
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/__tests__/enable_alert.test.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { EnableMonitorAlert } from '../enable_alert';
+import * as redux from 'react-redux';
+import {
+  mountWithRouterRedux,
+  renderWithRouterRedux,
+  shallowWithRouterRedux,
+} from '../../../../../lib';
+import { EuiPopover, EuiText } from '@elastic/eui';
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../../../../common/constants';
+
+describe('EnableAlertComponent', () => {
+  let defaultConnectors: string[] = [];
+  let alerts: any = [];
+
+  beforeEach(() => {
+    jest.spyOn(redux, 'useDispatch').mockReturnValue(jest.fn());
+
+    jest.spyOn(redux, 'useSelector').mockImplementation((fn, d) => {
+      if (fn.name === 'selectDynamicSettings') {
+        return {
+          settings: Object.assign(DYNAMIC_SETTINGS_DEFAULTS, {
+            defaultConnectors,
+          }),
+        };
+      }
+      if (fn.name === 'alertsSelector') {
+        return {
+          data: {
+            data: alerts,
+          },
+          loading: false,
+        };
+      }
+      return {};
+    });
+  });
+
+  it('shallow renders without errors for valid props', () => {
+    const wrapper = shallowWithRouterRedux(
+      <EnableMonitorAlert monitorId={'testMonitor'} monitorName={'My website'} />
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('renders without errors for valid props', () => {
+    const wrapper = renderWithRouterRedux(
+      <EnableMonitorAlert monitorId={'testMonitor'} monitorName={'My website'} />
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it('displays define connectors when there is none', () => {
+    defaultConnectors = [];
+    const wrapper = mountWithRouterRedux(
+      <EnableMonitorAlert monitorId={'testMonitor'} monitorName={'My website'} />
+    );
+    expect(wrapper.find(EuiPopover)).toHaveLength(1);
+    wrapper.find('button').simulate('click');
+    expect(wrapper.find(EuiText).text()).toBe(
+      'To start enabling alerts, please define a default alert action connector in Settings'
+    );
+  });
+
+  it('does not displays define connectors when there is connector', () => {
+    defaultConnectors = ['infra-slack-connector-id'];
+    const wrapper = mountWithRouterRedux(
+      <EnableMonitorAlert monitorId={'testMonitor'} monitorName={'My website'} />
+    );
+
+    expect(wrapper.find(EuiPopover)).toHaveLength(0);
+  });
+
+  it('displays disable when alert is there', () => {
+    alerts = [{ id: 'test-alert', params: { search: 'testMonitor' } }];
+    defaultConnectors = ['infra-slack-connector-id'];
+
+    const wrapper = mountWithRouterRedux(
+      <EnableMonitorAlert monitorId={'testMonitor'} monitorName={'My website'} />
+    );
+
+    expect(wrapper.find('button').prop('aria-label')).toBe('Disable status alert');
+  });
+});
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/define_connectors.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/define_connectors.tsx
new file mode 100644
index 0000000000000..673588688db84
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/define_connectors.tsx
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState } from 'react';
+import { EuiPopover, EuiSwitch, EuiText } from '@elastic/eui';
+import { useRouteMatch } from 'react-router-dom';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { ReactRouterEuiLink } from '../../../common/react_router_helpers';
+import { MONITOR_ROUTE, SETTINGS_ROUTE } from '../../../../../common/constants';
+import { ENABLE_STATUS_ALERT } from './translations';
+import { SETTINGS_LINK_TEXT } from '../../../../pages/page_header';
+
+export const DefineAlertConnectors = () => {
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+
+  const onButtonClick = () => setIsPopoverOpen((val) => !val);
+  const closePopover = () => setIsPopoverOpen(false);
+
+  const isMonitorPage = useRouteMatch(MONITOR_ROUTE);
+
+  return (
+    <EuiPopover
+      button={
+        <EuiSwitch
+          id={'defineAlertSettingsSwitch'}
+          label={ENABLE_STATUS_ALERT}
+          showLabel={!!isMonitorPage}
+          aria-label={ENABLE_STATUS_ALERT}
+          onChange={onButtonClick}
+          checked={false}
+          compressed={!isMonitorPage}
+          data-test-subj={'uptimeDisplayDefineConnector'}
+        />
+      }
+      isOpen={isPopoverOpen}
+      closePopover={closePopover}
+    >
+      <EuiText style={{ width: '350px' }} data-test-subj={'uptimeSettingsDefineConnector'}>
+        <FormattedMessage
+          id="xpack.uptime.monitorList.defineConnector.description"
+          defaultMessage="To start enabling alerts, please define a default alert action connector in"
+        />{' '}
+        <ReactRouterEuiLink
+          to={SETTINGS_ROUTE + '?focusConnectorField=true'}
+          data-test-subj={'uptimeSettingsLink'}
+        >
+          {SETTINGS_LINK_TEXT}
+        </ReactRouterEuiLink>
+      </EuiText>
+    </EuiPopover>
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.tsx
new file mode 100644
index 0000000000000..8a5a72891c3e7
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/enable_alert.tsx
@@ -0,0 +1,130 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect, useState } from 'react';
+import { EuiLoadingSpinner, EuiToolTip, EuiSwitch } from '@elastic/eui';
+import { useRouteMatch } from 'react-router-dom';
+import { useDispatch, useSelector } from 'react-redux';
+import { selectDynamicSettings } from '../../../../state/selectors';
+import {
+  alertsSelector,
+  connectorsSelector,
+  createAlertAction,
+  deleteAlertAction,
+  isAlertDeletedSelector,
+  newAlertSelector,
+} from '../../../../state/alerts/alerts';
+import { MONITOR_ROUTE } from '../../../../../common/constants';
+import { DefineAlertConnectors } from './define_connectors';
+import { DISABLE_STATUS_ALERT, ENABLE_STATUS_ALERT } from './translations';
+
+interface Props {
+  monitorId: string;
+  monitorName?: string;
+}
+
+export const EnableMonitorAlert = ({ monitorId, monitorName }: Props) => {
+  const [isLoading, setIsLoading] = useState(false);
+
+  const { settings } = useSelector(selectDynamicSettings);
+
+  const isMonitorPage = useRouteMatch(MONITOR_ROUTE);
+
+  const dispatch = useDispatch();
+
+  const { data: actionConnectors } = useSelector(connectorsSelector);
+
+  const { data: alerts, loading: alertsLoading } = useSelector(alertsSelector);
+
+  const { data: deletedAlertId } = useSelector(isAlertDeletedSelector);
+
+  const { data: newAlert } = useSelector(newAlertSelector);
+
+  const isNewAlert = newAlert?.params.search.includes(monitorId);
+
+  let hasAlert = (alerts?.data ?? []).find((alert) => alert.params.search.includes(monitorId));
+
+  if (isNewAlert) {
+    // if it's newly created alert, we assign that quickly without waiting for find alert result
+    hasAlert = newAlert!;
+  }
+  if (deletedAlertId === hasAlert?.id) {
+    // if it just got deleted, we assign that quickly without waiting for find alert result
+    hasAlert = undefined;
+  }
+
+  const defaultActions = (actionConnectors ?? []).filter((act) =>
+    settings?.defaultConnectors?.includes(act.id)
+  );
+
+  const enableAlert = () => {
+    dispatch(
+      createAlertAction.get({
+        defaultActions,
+        monitorId,
+        monitorName,
+      })
+    );
+    setIsLoading(true);
+  };
+
+  const disableAlert = () => {
+    if (hasAlert) {
+      dispatch(
+        deleteAlertAction.get({
+          alertId: hasAlert.id,
+        })
+      );
+      setIsLoading(true);
+    }
+  };
+
+  useEffect(() => {
+    setIsLoading(false);
+  }, [hasAlert, deletedAlertId]);
+
+  const hasDefaultConnectors = (settings?.defaultConnectors ?? []).length > 0;
+
+  const showSpinner = isLoading || (alertsLoading && !alerts);
+
+  const onAlertClick = () => {
+    if (hasAlert) {
+      disableAlert();
+    } else {
+      enableAlert();
+    }
+  };
+  const btnLabel = hasAlert ? DISABLE_STATUS_ALERT : ENABLE_STATUS_ALERT;
+
+  return hasDefaultConnectors || hasAlert ? (
+    <div className="eui-displayInlineBlock" style={{ marginRight: 10 }}>
+      {
+        <EuiToolTip content={btnLabel}>
+          <>
+            <EuiSwitch
+              id={'enableDisableAlertSwitch'}
+              compressed={!isMonitorPage}
+              disabled={showSpinner}
+              label={btnLabel}
+              showLabel={!!isMonitorPage}
+              aria-label={btnLabel}
+              onChange={onAlertClick}
+              checked={!!hasAlert}
+              data-test-subj={
+                hasAlert
+                  ? 'uptimeDisableSimpleDownAlert' + monitorId
+                  : 'uptimeEnableSimpleDownAlert' + monitorId
+              }
+            />{' '}
+            {showSpinner && <EuiLoadingSpinner className="eui-alignMiddle" />}
+          </>
+        </EuiToolTip>
+      }
+    </div>
+  ) : (
+    <DefineAlertConnectors />
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/translations.ts b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/translations.ts
new file mode 100644
index 0000000000000..421072ab603c2
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/columns/translations.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const ENABLE_STATUS_ALERT = i18n.translate('xpack.uptime.monitorList.enableDownAlert', {
+  defaultMessage: 'Enable status alert',
+});
+
+export const DISABLE_STATUS_ALERT = i18n.translate('xpack.uptime.monitorList.disableDownAlert', {
+  defaultMessage: 'Disable status alert',
+});
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
index ce4c518d82255..718e9e9948081 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
@@ -31,6 +31,8 @@ import { MonitorList } from '../../../state/reducers/monitor_list';
 import { CertStatusColumn } from './cert_status_column';
 import { MonitorListHeader } from './monitor_list_header';
 import { URL_LABEL } from '../../common/translations';
+import { EnableMonitorAlert } from './columns/enable_alert';
+import { STATUS_ALERT_COLUMN } from './translations';
 
 interface Props extends MonitorListProps {
   pageSize: number;
@@ -49,7 +51,13 @@ export const noItemsMessage = (loading: boolean, filters?: string) => {
   return !!filters ? labels.NO_MONITOR_ITEM_SELECTED : labels.NO_DATA_MESSAGE;
 };
 
-export const MonitorListComponent: React.FC<Props> = ({
+export const MonitorListComponent: ({
+  filters,
+  monitorList: { list, error, loading },
+  linkParameters,
+  pageSize,
+  setPageSize,
+}: Props) => any = ({
   filters,
   monitorList: { list, error, loading },
   linkParameters,
@@ -69,7 +77,7 @@ export const MonitorListComponent: React.FC<Props> = ({
         ...map,
         [id]: (
           <MonitorListDrawer
-            summary={items.find(({ monitor_id: monitorId }) => monitorId === id)}
+            summary={items.find(({ monitor_id: monitorId }) => monitorId === id)!}
           />
         ),
       };
@@ -135,6 +143,18 @@ export const MonitorListComponent: React.FC<Props> = ({
         <MonitorBarSeries histogramSeries={histogramSeries} />
       ),
     },
+    {
+      align: 'center' as const,
+      field: '',
+      name: STATUS_ALERT_COLUMN,
+      width: '150px',
+      render: (item: MonitorSummary) => (
+        <EnableMonitorAlert
+          monitorId={item.monitor_id}
+          monitorName={item.state.monitor.name || item.monitor_id}
+        />
+      ),
+    },
     {
       align: 'right' as const,
       field: 'monitor_id',
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
index 42c885dfaf515..e4450e67ae5b3 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/monitor_list_drawer.test.tsx.snap
@@ -86,6 +86,7 @@ exports[`MonitorListDrawer component renders a MonitorListDrawer when there are
     }
   >
     <MonitorListDrawerComponent
+      loading={false}
       monitorDetails={
         Object {
           "error": Object {
@@ -261,6 +262,7 @@ exports[`MonitorListDrawer component renders a MonitorListDrawer when there is o
     }
   >
     <MonitorListDrawerComponent
+      loading={false}
       monitorDetails={
         Object {
           "error": Object {
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap
index 0a280ac6b24b8..c9dd0b2659317 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/__snapshots__/most_recent_error.test.tsx.snap
@@ -21,7 +21,7 @@ Array [
   >
     <a
       data-test-subj="monitor-page-link-bad-ssl"
-      href="/monitor/YmFkLXNzbA==/?selectedPingStatus=down"
+      href="/monitor/YmFkLXNzbA==/?selectedPingStatus=down&focusConnectorField=false"
     >
       Get https://expired.badssl.com: x509: certificate has expired or is not yet valid
     </a>
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
index 502ccd53ef80c..302137199276b 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
@@ -52,7 +52,11 @@ describe('MonitorListDrawer component', () => {
 
   it('renders nothing when no summary data is present', () => {
     const component = shallowWithRouter(
-      <MonitorListDrawerComponent summary={summary} monitorDetails={monitorDetails} />
+      <MonitorListDrawerComponent
+        summary={summary}
+        monitorDetails={monitorDetails}
+        loading={false}
+      />
     );
     expect(component).toEqual({});
   });
@@ -60,14 +64,22 @@ describe('MonitorListDrawer component', () => {
   it('renders nothing when no check data is present', () => {
     delete summary.state.summaryPings;
     const component = shallowWithRouter(
-      <MonitorListDrawerComponent summary={summary} monitorDetails={monitorDetails} />
+      <MonitorListDrawerComponent
+        summary={summary}
+        monitorDetails={monitorDetails}
+        loading={false}
+      />
     );
     expect(component).toEqual({});
   });
 
   it('renders a MonitorListDrawer when there is only one check', () => {
     const component = shallowWithRouter(
-      <MonitorListDrawerComponent summary={summary} monitorDetails={monitorDetails} />
+      <MonitorListDrawerComponent
+        summary={summary}
+        monitorDetails={monitorDetails}
+        loading={false}
+      />
     );
     expect(component).toMatchSnapshot();
   });
@@ -88,7 +100,11 @@ describe('MonitorListDrawer component', () => {
     }
 
     const component = shallowWithRouter(
-      <MonitorListDrawerComponent summary={summary} monitorDetails={monitorDetails} />
+      <MonitorListDrawerComponent
+        summary={summary}
+        monitorDetails={monitorDetails}
+        loading={false}
+      />
     );
     expect(component).toMatchSnapshot();
   });
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
new file mode 100644
index 0000000000000..d869c6d78ec11
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/enabled_alerts.tsx
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useContext } from 'react';
+import { EuiCallOut, EuiListGroup, EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui';
+import { EuiListGroupItemProps } from '@elastic/eui/src/components/list_group/list_group_item';
+import { i18n } from '@kbn/i18n';
+import { UptimeSettingsContext } from '../../../../contexts';
+import { Alert } from '../../../../../../triggers_actions_ui/public';
+
+interface Props {
+  monitorAlerts: Alert[];
+  loading: boolean;
+}
+
+export const EnabledAlerts = ({ monitorAlerts, loading }: Props) => {
+  const { basePath } = useContext(UptimeSettingsContext);
+
+  const listItems: EuiListGroupItemProps[] = [];
+
+  (monitorAlerts ?? []).forEach((alert, ind) => {
+    listItems.push({
+      label: alert.name,
+      href: basePath + '/app/management/insightsAndAlerting/triggersActions/alert/' + alert.id,
+      size: 's',
+      'data-test-subj': 'uptimeMonitorListDrawerAlert' + ind,
+    });
+  });
+
+  return (
+    <>
+      <EuiSpacer />
+      <span>
+        <EuiText size="xs">
+          <h3>
+            {i18n.translate('xpack.uptime.monitorList.enabledAlerts.title', {
+              defaultMessage: 'Enabled alerts:',
+              description: 'Alerts enabled for this monitor',
+            })}
+          </h3>
+        </EuiText>
+      </span>
+      {listItems.length === 0 && !loading && (
+        <EuiCallOut
+          size="s"
+          title={i18n.translate('xpack.uptime.monitorList.enabledAlerts.noAlert', {
+            defaultMessage: 'No alert is enabled for this monitor.',
+          })}
+        />
+      )}
+      {loading ? <EuiLoadingSpinner /> : <EuiListGroup listItems={listItems} />}
+    </>
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx
index bec32ace27f2b..fd68a487a21e4 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/list_drawer_container.tsx
@@ -4,44 +4,52 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useEffect } from 'react';
-import { connect } from 'react-redux';
+import React, { useContext, useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
 import { AppState } from '../../../../state';
-import { monitorDetailsSelector } from '../../../../state/selectors';
-import { MonitorDetailsActionPayload } from '../../../../state/actions/types';
+import { monitorDetailsLoadingSelector, monitorDetailsSelector } from '../../../../state/selectors';
 import { getMonitorDetailsAction } from '../../../../state/actions/monitor';
 import { MonitorListDrawerComponent } from './monitor_list_drawer';
 import { useGetUrlParams } from '../../../../hooks';
-import { MonitorDetails, MonitorSummary } from '../../../../../common/runtime_types';
+import { MonitorSummary } from '../../../../../common/runtime_types';
+import { alertsSelector } from '../../../../state/alerts/alerts';
+import { UptimeRefreshContext } from '../../../../contexts';
 
 interface ContainerProps {
   summary: MonitorSummary;
-  monitorDetails: MonitorDetails;
-  loadMonitorDetails: typeof getMonitorDetailsAction;
 }
 
-const Container: React.FC<ContainerProps> = ({ summary, loadMonitorDetails, monitorDetails }) => {
+export const MonitorListDrawer: React.FC<ContainerProps> = ({ summary }) => {
+  const { lastRefresh } = useContext(UptimeRefreshContext);
+
   const monitorId = summary?.monitor_id;
 
   const { dateRangeStart: dateStart, dateRangeEnd: dateEnd } = useGetUrlParams();
 
-  useEffect(() => {
-    loadMonitorDetails({
-      dateStart,
-      dateEnd,
-      monitorId,
-    });
-  }, [dateStart, dateEnd, monitorId, loadMonitorDetails]);
-  return <MonitorListDrawerComponent monitorDetails={monitorDetails} summary={summary} />;
-};
+  const monitorDetails = useSelector((state: AppState) => monitorDetailsSelector(state, summary));
+
+  const isLoading = useSelector(monitorDetailsLoadingSelector);
 
-const mapStateToProps = (state: AppState, { summary }: any) => ({
-  monitorDetails: monitorDetailsSelector(state, summary),
-});
+  const dispatch = useDispatch();
 
-const mapDispatchToProps = (dispatch: any) => ({
-  loadMonitorDetails: (actionPayload: MonitorDetailsActionPayload) =>
-    dispatch(getMonitorDetailsAction(actionPayload)),
-});
+  const { data: alerts, loading: alertsLoading } = useSelector(alertsSelector);
 
-export const MonitorListDrawer = connect(mapStateToProps, mapDispatchToProps)(Container);
+  const hasAlert = (alerts?.data ?? []).find((alert) => alert.params.search.includes(monitorId));
+
+  useEffect(() => {
+    dispatch(
+      getMonitorDetailsAction.get({
+        dateStart,
+        dateEnd,
+        monitorId,
+      })
+    );
+  }, [dateStart, dateEnd, monitorId, dispatch, hasAlert, lastRefresh]);
+  return (
+    <MonitorListDrawerComponent
+      monitorDetails={monitorDetails}
+      summary={summary}
+      loading={isLoading || alertsLoading}
+    />
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
index 305455c8ba573..4b359099bc58c 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/monitor_list_drawer.tsx
@@ -6,11 +6,13 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import { EuiLink, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui';
+import { EuiLink, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui';
 import { MostRecentError } from './most_recent_error';
 import { MonitorStatusList } from './monitor_status_list';
 import { MonitorDetails, MonitorSummary } from '../../../../../common/runtime_types';
 import { ActionsPopover } from './actions_popover/actions_popover_container';
+import { EnabledAlerts } from './enabled_alerts';
+import { Alert } from '../../../../../../triggers_actions_ui/public';
 
 const ContainerDiv = styled.div`
   padding: 10px;
@@ -27,13 +29,18 @@ interface MonitorListDrawerProps {
    * Monitor details to be fetched from rest api using monitorId
    */
   monitorDetails: MonitorDetails;
+  loading: boolean;
 }
 
 /**
  * The elements shown when the user expands the monitor list rows.
  */
 
-export function MonitorListDrawerComponent({ summary, monitorDetails }: MonitorListDrawerProps) {
+export function MonitorListDrawerComponent({
+  summary,
+  monitorDetails,
+  loading,
+}: MonitorListDrawerProps) {
   const monitorUrl = summary?.state?.url?.full || '';
 
   return summary && summary.state.summaryPings ? (
@@ -51,8 +58,8 @@ export function MonitorListDrawerComponent({ summary, monitorDetails }: MonitorL
           <ActionsPopover summary={summary} />
         </EuiFlexItem>
       </EuiFlexGroup>
-      <EuiSpacer size="m" />
       <MonitorStatusList summaryPings={summary.state.summaryPings} />
+      <EnabledAlerts loading={loading} monitorAlerts={monitorDetails?.alerts as Alert[]} />
       {monitorDetails && monitorDetails.error && (
         <MostRecentError
           error={monitorDetails.error}
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/translations.ts b/x-pack/plugins/uptime/public/components/overview/monitor_list/translations.ts
index ee922a9ef803f..559d4bc6514df 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/translations.ts
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/translations.ts
@@ -76,3 +76,7 @@ export const RESPONSE_ANOMALY_SCORE = i18n.translate(
     defaultMessage: 'Response Anomaly Score',
   }
 );
+
+export const STATUS_ALERT_COLUMN = i18n.translate('xpack.uptime.monitorList.statusAlert.label', {
+  defaultMessage: 'Status alert',
+});
diff --git a/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap b/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
index 55c66183de946..52815be86cdcd 100644
--- a/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/certificate_form.test.tsx.snap
@@ -91,6 +91,7 @@ exports[`CertificateForm shallow renders expected elements for valid props 1`] =
         Object {
           "certAgeThreshold": 36,
           "certExpirationThreshold": 7,
+          "defaultConnectors": Array [],
           "heartbeatIndices": "heartbeat-8*",
         }
       }
diff --git a/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap b/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
index 2eb434ffbaf40..687865b32a46e 100644
--- a/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/settings/__tests__/__snapshots__/indices_form.test.tsx.snap
@@ -91,6 +91,7 @@ exports[`CertificateForm shallow renders expected elements for valid props 1`] =
         Object {
           "certAgeThreshold": 36,
           "certExpirationThreshold": 7,
+          "defaultConnectors": Array [],
           "heartbeatIndices": "heartbeat-8*",
         }
       }
diff --git a/x-pack/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx b/x-pack/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx
index 2b587d23247e2..9a67bf28f33de 100644
--- a/x-pack/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx
+++ b/x-pack/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx
@@ -19,6 +19,7 @@ describe('CertificateForm', () => {
             heartbeatIndices: 'heartbeat-8*',
             certExpirationThreshold: 7,
             certAgeThreshold: 36,
+            defaultConnectors: [],
           }}
           fieldErrors={null}
           isDisabled={false}
@@ -37,6 +38,7 @@ describe('CertificateForm', () => {
           heartbeatIndices: 'heartbeat-8*',
           certExpirationThreshold: 7,
           certAgeThreshold: 36,
+          defaultConnectors: [],
         }}
         fieldErrors={null}
         isDisabled={false}
@@ -90,6 +92,7 @@ describe('CertificateForm', () => {
           heartbeatIndices: 'heartbeat-8*',
           certExpirationThreshold: 7,
           certAgeThreshold: 36,
+          defaultConnectors: [],
         }}
         fieldErrors={null}
         isDisabled={false}
diff --git a/x-pack/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx b/x-pack/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx
index 68a0d96d491b6..01b66263d3e93 100644
--- a/x-pack/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx
+++ b/x-pack/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx
@@ -19,6 +19,7 @@ describe('CertificateForm', () => {
             heartbeatIndices: 'heartbeat-8*',
             certAgeThreshold: 36,
             certExpirationThreshold: 7,
+            defaultConnectors: [],
           }}
           fieldErrors={null}
           isDisabled={false}
diff --git a/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx b/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
new file mode 100644
index 0000000000000..60c0807ae89a8
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect, useState } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { useDispatch } from 'react-redux';
+import { EuiButtonEmpty } from '@elastic/eui';
+import {
+  ActionsConnectorsContextProvider,
+  ConnectorAddFlyout,
+} from '../../../../triggers_actions_ui/public';
+
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { getConnectorsAction } from '../../state/alerts/alerts';
+
+interface Props {
+  focusInput: () => void;
+}
+export const AddConnectorFlyout = ({ focusInput }: Props) => {
+  const [addFlyoutVisible, setAddFlyoutVisibility] = useState<boolean>(false);
+
+  const {
+    services: {
+      triggers_actions_ui: { actionTypeRegistry },
+      application,
+      docLinks,
+      http,
+      notifications,
+    },
+  } = useKibana();
+
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(getConnectorsAction.get());
+    focusInput();
+  }, [addFlyoutVisible, dispatch, focusInput]);
+
+  return (
+    <>
+      <EuiButtonEmpty
+        iconType="plusInCircleFilled"
+        iconSide="left"
+        onClick={() => setAddFlyoutVisibility(true)}
+      >
+        <FormattedMessage
+          id="xpack.uptime.alerts.settings.createConnector"
+          defaultMessage="Create connector"
+        />
+      </EuiButtonEmpty>
+      <ActionsConnectorsContextProvider
+        value={{
+          http,
+          docLinks,
+          actionTypeRegistry,
+          toastNotifications: notifications?.toasts,
+          capabilities: application?.capabilities,
+        }}
+      >
+        <ConnectorAddFlyout
+          addFlyoutVisible={addFlyoutVisible}
+          setAddFlyoutVisibility={setAddFlyoutVisibility}
+        />
+      </ActionsConnectorsContextProvider>
+    </>
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx b/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
new file mode 100644
index 0000000000000..b3b38a84e4f22
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
@@ -0,0 +1,182 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect, useState, useRef, useCallback } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  EuiDescribedFormGroup,
+  EuiFormRow,
+  EuiTitle,
+  EuiSpacer,
+  EuiComboBox,
+  EuiIcon,
+  EuiComboBoxOptionOption,
+} from '@elastic/eui';
+import { useSelector } from 'react-redux';
+import styled from 'styled-components';
+import { SettingsFormProps } from '../../pages/settings';
+import { connectorsSelector } from '../../state/alerts/alerts';
+import { AddConnectorFlyout } from './add_connector_flyout';
+import { useGetUrlParams, useUrlParams } from '../../hooks';
+import { alertFormI18n } from './translations';
+import { useInitApp } from '../../hooks/use_init_app';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+
+type ConnectorOption = EuiComboBoxOptionOption<string>;
+
+const ConnectorSpan = styled.span`
+  .euiIcon {
+    margin-right: 5px;
+  }
+  > img {
+    width: 16px;
+    height: 20px;
+  }
+`;
+
+export const AlertDefaultsForm: React.FC<SettingsFormProps> = ({
+  onChange,
+  loading,
+  formFields,
+  fieldErrors,
+  isDisabled,
+}) => {
+  const {
+    services: {
+      triggers_actions_ui: { actionTypeRegistry },
+    },
+  } = useKibana();
+  const { focusConnectorField } = useGetUrlParams();
+
+  const updateUrlParams = useUrlParams()[1];
+
+  const inputRef = useRef<HTMLInputElement | null>(null);
+
+  useInitApp();
+
+  useEffect(() => {
+    if (focusConnectorField && inputRef.current && !loading) {
+      inputRef.current.focus();
+    }
+  }, [focusConnectorField, inputRef, loading]);
+
+  const { data = [] } = useSelector(connectorsSelector);
+
+  const [error, setError] = useState<string | undefined>(undefined);
+
+  const onBlur = () => {
+    if (inputRef.current) {
+      const { value } = inputRef.current;
+      setError(value.length === 0 ? undefined : `"${value}" is not a valid option`);
+    }
+    if (inputRef.current && !loading && focusConnectorField) {
+      updateUrlParams({ focusConnectorField: undefined });
+    }
+  };
+
+  const onSearchChange = (value: string, hasMatchingOptions?: boolean) => {
+    setError(
+      value.length === 0 || hasMatchingOptions ? undefined : `"${value}" is not a valid option`
+    );
+  };
+
+  const options = (data ?? []).map((connectorAction) => ({
+    value: connectorAction.id,
+    label: connectorAction.name,
+    'data-test-subj': connectorAction.name,
+  }));
+
+  const renderOption = (option: ConnectorOption) => {
+    const { label, value } = option;
+
+    const { actionTypeId: type } = data?.find((dt) => dt.id === value) ?? {};
+    return (
+      <ConnectorSpan>
+        <EuiIcon type={actionTypeRegistry.get(type as string).iconClass} />
+        <span>{label}</span>
+      </ConnectorSpan>
+    );
+  };
+
+  const onOptionChange = (selectedOptions: ConnectorOption[]) => {
+    onChange({
+      defaultConnectors: selectedOptions.map((item) => {
+        const conOpt = data?.find((dt) => dt.id === item.value)!;
+        return conOpt.id;
+      }),
+    });
+  };
+
+  return (
+    <>
+      <EuiTitle size="s">
+        <h3>
+          <FormattedMessage
+            id="xpack.uptime.sourceConfiguration.alertDefaults"
+            defaultMessage="Alert defaults"
+          />
+        </h3>
+      </EuiTitle>
+      <EuiSpacer size="m" />
+      <EuiDescribedFormGroup
+        title={
+          <h4>
+            <FormattedMessage
+              id="xpack.uptime.sourceConfiguration.alertConnectors"
+              defaultMessage="Alert Connectors"
+            />
+          </h4>
+        }
+        description={
+          <FormattedMessage
+            id="xpack.uptime.sourceConfiguration.defaultConnectors.description"
+            defaultMessage="Default connectors to be used to send an alert."
+          />
+        }
+      >
+        <EuiFormRow
+          describedByIds={['defaultConnectors']}
+          error={error}
+          fullWidth
+          isInvalid={!!error}
+          label={
+            <FormattedMessage
+              id="xpack.uptime.sourceConfiguration.defaultConnectors"
+              defaultMessage="Default connectors"
+            />
+          }
+        >
+          <EuiComboBox
+            placeholder={alertFormI18n.inputPlaceHolder}
+            options={options}
+            selectedOptions={options.filter((opt) =>
+              formFields?.defaultConnectors?.includes(opt.value)
+            )}
+            inputRef={(input) => {
+              inputRef.current = input;
+            }}
+            onSearchChange={onSearchChange}
+            onBlur={onBlur}
+            isLoading={loading}
+            isDisabled={isDisabled}
+            onChange={onOptionChange}
+            data-test-subj={`default-connectors-input-${loading ? 'loading' : 'loaded'}`}
+            renderOption={renderOption}
+          />
+        </EuiFormRow>
+        <span>
+          <AddConnectorFlyout
+            focusInput={useCallback(() => {
+              if (inputRef.current) {
+                inputRef.current.focus();
+              }
+            }, [])}
+          />
+        </span>
+      </EuiDescribedFormGroup>
+    </>
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/settings/translations.ts b/x-pack/plugins/uptime/public/components/settings/translations.ts
index 2de25a44165c6..f9f3b0b6af9a9 100644
--- a/x-pack/plugins/uptime/public/components/settings/translations.ts
+++ b/x-pack/plugins/uptime/public/components/settings/translations.ts
@@ -22,3 +22,12 @@ export const certificateFormTranslations = {
     }
   ),
 };
+
+export const alertFormI18n = {
+  inputPlaceHolder: i18n.translate(
+    'xpack.uptime.sourceConfiguration.alertDefaultForm.selectConnector',
+    {
+      defaultMessage: 'Please select one or more connectors',
+    }
+  ),
+};
diff --git a/x-pack/plugins/uptime/public/hooks/__tests__/__snapshots__/use_url_params.test.tsx.snap b/x-pack/plugins/uptime/public/hooks/__tests__/__snapshots__/use_url_params.test.tsx.snap
index 5d2565b7210da..5bbb606b6142f 100644
--- a/x-pack/plugins/uptime/public/hooks/__tests__/__snapshots__/use_url_params.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/hooks/__tests__/__snapshots__/use_url_params.test.tsx.snap
@@ -209,7 +209,7 @@ exports[`useUrlParams deletes keys that do not have truthy values 1`] = `
         }
       >
         <div>
-          {"absoluteDateRangeStart":20,"absoluteDateRangeEnd":20,"autorefreshInterval":60000,"autorefreshIsPaused":false,"dateRangeStart":"now-12","dateRangeEnd":"now","filters":"","search":"","selectedPingStatus":"","statusFilter":"","pagination":"foo"}
+          {"absoluteDateRangeStart":20,"absoluteDateRangeEnd":20,"autorefreshInterval":60000,"autorefreshIsPaused":false,"dateRangeStart":"now-12","dateRangeEnd":"now","filters":"","search":"","selectedPingStatus":"","statusFilter":"","pagination":"foo","focusConnectorField":false}
         </div>
         <button
           id="setUrlParams"
@@ -433,7 +433,7 @@ exports[`useUrlParams gets the expected values using the context 1`] = `
         hook={[Function]}
       >
         <div>
-          {"absoluteDateRangeStart":20,"absoluteDateRangeEnd":20,"autorefreshInterval":60000,"autorefreshIsPaused":false,"dateRangeStart":"now-15m","dateRangeEnd":"now","filters":"","search":"","selectedPingStatus":"","statusFilter":""}
+          {"absoluteDateRangeStart":20,"absoluteDateRangeEnd":20,"autorefreshInterval":60000,"autorefreshIsPaused":false,"dateRangeStart":"now-15m","dateRangeEnd":"now","filters":"","search":"","selectedPingStatus":"","statusFilter":"","focusConnectorField":false}
         </div>
         <button
           id="setUrlParams"
diff --git a/x-pack/plugins/uptime/public/hooks/use_init_app.ts b/x-pack/plugins/uptime/public/hooks/use_init_app.ts
new file mode 100644
index 0000000000000..79854e4f900b8
--- /dev/null
+++ b/x-pack/plugins/uptime/public/hooks/use_init_app.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import { getConnectorsAction } from '../state/alerts/alerts';
+
+// this hook will be use to reload all the data required in common view in app
+export const useInitApp = () => {
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(getConnectorsAction.get());
+  }, [dispatch]);
+};
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/index.ts b/x-pack/plugins/uptime/public/lib/__mocks__/index.ts
deleted file mode 100644
index 45ef5787927e1..0000000000000
--- a/x-pack/plugins/uptime/public/lib/__mocks__/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { mockHistory } from './react_router_history.mock';
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts b/x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts
new file mode 100644
index 0000000000000..313120639b38b
--- /dev/null
+++ b/x-pack/plugins/uptime/public/lib/__mocks__/uptime_store.mock.ts
@@ -0,0 +1,120 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../common/constants';
+
+/**
+ * NOTE: This variable name MUST start with 'mock*' in order for
+ * Jest to accept its use within a jest.mock()
+ */
+export const mockStore = {
+  overviewFilters: {
+    filters: {
+      locations: [],
+      ports: [],
+      schemes: [],
+      tags: [],
+    },
+    errors: [],
+    loading: false,
+  },
+  dynamicSettings: {
+    settings: DYNAMIC_SETTINGS_DEFAULTS,
+    loading: false,
+  },
+  monitor: {
+    monitorDetailsList: [],
+    monitorLocationsList: new Map(),
+    loading: false,
+    errors: [],
+  },
+  snapshot: {
+    count: {
+      up: 2,
+      down: 0,
+      total: 2,
+    },
+    errors: [],
+    loading: false,
+  },
+  ui: {
+    alertFlyoutVisible: false,
+    basePath: 'yyz',
+    esKuery: '',
+    integrationsPopoverOpen: null,
+    searchText: '',
+    monitorId: '',
+  },
+  monitorStatus: {
+    status: null,
+    loading: false,
+  },
+  indexPattern: {
+    index_pattern: null,
+    loading: false,
+    errors: [],
+  },
+  ping: {
+    pingHistogram: null,
+    loading: false,
+    errors: [],
+  },
+  pingList: {
+    loading: false,
+    pingList: {
+      total: 0,
+      locations: [],
+      pings: [],
+    },
+  },
+  monitorDuration: {
+    durationLines: null,
+    loading: false,
+    errors: [],
+  },
+  monitorList: {
+    list: {
+      prevPagePagination: null,
+      nextPagePagination: null,
+      summaries: [],
+      totalSummaryCount: 0,
+    },
+    loading: false,
+  },
+  ml: {
+    mlJob: {
+      data: null,
+      loading: false,
+    },
+    createJob: { data: null, loading: false },
+    deleteJob: { data: null, loading: false },
+    mlCapabilities: { data: null, loading: false },
+    anomalies: {
+      data: null,
+      loading: false,
+    },
+  },
+  indexStatus: {
+    indexStatus: {
+      data: null,
+      loading: false,
+    },
+  },
+  certificates: {
+    certs: {
+      data: null,
+      loading: false,
+    },
+  },
+  selectedFilters: null,
+  alerts: {
+    alertDeletion: { data: null, loading: false },
+    anomalyAlert: { data: null, loading: false },
+    alerts: { data: null, loading: false },
+    connectors: { data: null, loading: false },
+    newAlert: { data: null, loading: false },
+  },
+};
diff --git a/x-pack/plugins/uptime/public/lib/__mocks__/react_router_history.mock.ts b/x-pack/plugins/uptime/public/lib/__mocks__/ut_router_history.mock.ts
similarity index 100%
rename from x-pack/plugins/uptime/public/lib/__mocks__/react_router_history.mock.ts
rename to x-pack/plugins/uptime/public/lib/__mocks__/ut_router_history.mock.ts
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts b/x-pack/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts
index 6af817c82ad95..0ee78f5e4d81a 100644
--- a/x-pack/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts
+++ b/x-pack/plugins/uptime/public/lib/alert_types/__tests__/monitor_status.test.ts
@@ -26,9 +26,9 @@ describe('monitor status alert type', () => {
           "errors": Object {
             "typeCheckFailure": "Provided parameters do not conform to the expected type.",
             "typeCheckParsingMessage": Array [
-              "Invalid value undefined supplied to : ({ numTimes: number, timerangeCount: number, timerangeUnit: string } & Partial<{ search: string, filters: { monitor.type: Array<string>, observer.geo.name: Array<string>, tags: Array<string>, url.port: Array<string> }, shouldCheckStatus: boolean }>)/0: { numTimes: number, timerangeCount: number, timerangeUnit: string }/numTimes: number",
-              "Invalid value undefined supplied to : ({ numTimes: number, timerangeCount: number, timerangeUnit: string } & Partial<{ search: string, filters: { monitor.type: Array<string>, observer.geo.name: Array<string>, tags: Array<string>, url.port: Array<string> }, shouldCheckStatus: boolean }>)/0: { numTimes: number, timerangeCount: number, timerangeUnit: string }/timerangeCount: number",
-              "Invalid value undefined supplied to : ({ numTimes: number, timerangeCount: number, timerangeUnit: string } & Partial<{ search: string, filters: { monitor.type: Array<string>, observer.geo.name: Array<string>, tags: Array<string>, url.port: Array<string> }, shouldCheckStatus: boolean }>)/0: { numTimes: number, timerangeCount: number, timerangeUnit: string }/timerangeUnit: string",
+              "Invalid value undefined supplied to : ({ numTimes: number, timerangeCount: number, timerangeUnit: string } & Partial<{ search: string, filters: { monitor.type: Array<string>, observer.geo.name: Array<string>, tags: Array<string>, url.port: Array<string> }, shouldCheckStatus: boolean, isAutoGenerated: boolean }>)/0: { numTimes: number, timerangeCount: number, timerangeUnit: string }/numTimes: number",
+              "Invalid value undefined supplied to : ({ numTimes: number, timerangeCount: number, timerangeUnit: string } & Partial<{ search: string, filters: { monitor.type: Array<string>, observer.geo.name: Array<string>, tags: Array<string>, url.port: Array<string> }, shouldCheckStatus: boolean, isAutoGenerated: boolean }>)/0: { numTimes: number, timerangeCount: number, timerangeUnit: string }/timerangeCount: number",
+              "Invalid value undefined supplied to : ({ numTimes: number, timerangeCount: number, timerangeUnit: string } & Partial<{ search: string, filters: { monitor.type: Array<string>, observer.geo.name: Array<string>, tags: Array<string>, url.port: Array<string> }, shouldCheckStatus: boolean, isAutoGenerated: boolean }>)/0: { numTimes: number, timerangeCount: number, timerangeUnit: string }/timerangeUnit: string",
             ],
           },
         }
@@ -151,7 +151,7 @@ describe('monitor status alert type', () => {
             "errors": Object {
               "typeCheckFailure": "Provided parameters do not conform to the expected type.",
               "typeCheckParsingMessage": Array [
-                "Invalid value undefined supplied to : ({ numTimes: number, timerangeCount: number, timerangeUnit: string } & Partial<{ search: string, filters: { monitor.type: Array<string>, observer.geo.name: Array<string>, tags: Array<string>, url.port: Array<string> }, shouldCheckStatus: boolean }>)/0: { numTimes: number, timerangeCount: number, timerangeUnit: string }/numTimes: number",
+                "Invalid value undefined supplied to : ({ numTimes: number, timerangeCount: number, timerangeUnit: string } & Partial<{ search: string, filters: { monitor.type: Array<string>, observer.geo.name: Array<string>, tags: Array<string>, url.port: Array<string> }, shouldCheckStatus: boolean, isAutoGenerated: boolean }>)/0: { numTimes: number, timerangeCount: number, timerangeUnit: string }/numTimes: number",
               ],
             },
           }
@@ -164,7 +164,7 @@ describe('monitor status alert type', () => {
             "errors": Object {
               "typeCheckFailure": "Provided parameters do not conform to the expected type.",
               "typeCheckParsingMessage": Array [
-                "Invalid value \\"this isn't a number\\" supplied to : ({ numTimes: number, timerangeCount: number, timerangeUnit: string } & Partial<{ search: string, filters: { monitor.type: Array<string>, observer.geo.name: Array<string>, tags: Array<string>, url.port: Array<string> }, shouldCheckStatus: boolean }>)/0: { numTimes: number, timerangeCount: number, timerangeUnit: string }/numTimes: number",
+                "Invalid value \\"this isn't a number\\" supplied to : ({ numTimes: number, timerangeCount: number, timerangeUnit: string } & Partial<{ search: string, filters: { monitor.type: Array<string>, observer.geo.name: Array<string>, tags: Array<string>, url.port: Array<string> }, shouldCheckStatus: boolean, isAutoGenerated: boolean }>)/0: { numTimes: number, timerangeCount: number, timerangeUnit: string }/numTimes: number",
               ],
             },
           }
diff --git a/x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx b/x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx
new file mode 100644
index 0000000000000..9c35110e9d8c4
--- /dev/null
+++ b/x-pack/plugins/uptime/public/lib/alert_types/alert_messages.tsx
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React from 'react';
+import { toMountPoint } from '../../../../../../src/plugins/kibana_react/public';
+import { ActionConnector } from '../../state/alerts/alerts';
+
+export const simpleAlertEnabled = (defaultActions: ActionConnector[]) => {
+  return {
+    title: i18n.translate('xpack.uptime.overview.alerts.enabled.success', {
+      defaultMessage: 'Alert successfully enabled ',
+    }),
+    text: toMountPoint(
+      <FormattedMessage
+        id="xpack.uptime.overview.alerts.enabled.success.description"
+        defaultMessage="Message will be send to {actionConnectors} when monitor is down."
+        values={{
+          actionConnectors: <strong>{defaultActions.map(({ name }) => name).join(', ')}</strong>,
+        }}
+      />
+    ),
+  };
+};
diff --git a/x-pack/plugins/uptime/public/lib/helper/helper_with_redux.tsx b/x-pack/plugins/uptime/public/lib/helper/helper_with_redux.tsx
index a68184dbdff97..3c17d3510bfda 100644
--- a/x-pack/plugins/uptime/public/lib/helper/helper_with_redux.tsx
+++ b/x-pack/plugins/uptime/public/lib/helper/helper_with_redux.tsx
@@ -6,12 +6,13 @@
 
 import React from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
+import { AppState } from '../../state';
 
-export const MountWithReduxProvider: React.FC = ({ children }) => (
+export const MountWithReduxProvider: React.FC<{ store?: AppState }> = ({ children, store }) => (
   <ReduxProvider
     store={{
       dispatch: jest.fn(),
-      getState: jest.fn().mockReturnValue({ selectedFilters: null }),
+      getState: jest.fn().mockReturnValue(store || { selectedFilters: null }),
       subscribe: jest.fn(),
       replaceReducer: jest.fn(),
     }}
diff --git a/x-pack/plugins/uptime/public/lib/helper/helper_with_router.tsx b/x-pack/plugins/uptime/public/lib/helper/helper_with_router.tsx
index 74d6cbf0a5a97..7da570e909425 100644
--- a/x-pack/plugins/uptime/public/lib/helper/helper_with_router.tsx
+++ b/x-pack/plugins/uptime/public/lib/helper/helper_with_router.tsx
@@ -10,12 +10,16 @@ import { Router } from 'react-router-dom';
 import { MemoryHistory } from 'history/createMemoryHistory';
 import { createMemoryHistory } from 'history';
 import { mountWithIntl, renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { AppState } from '../../state';
+import { MountWithReduxProvider } from './helper_with_redux';
 
 const helperWithRouter: <R>(
   helper: (node: ReactElement) => R,
   component: ReactElement,
-  customHistory?: MemoryHistory
-) => R = (helper, component, customHistory) => {
+  customHistory?: MemoryHistory,
+  wrapReduxStore?: boolean,
+  storeState?: AppState
+) => R = (helper, component, customHistory, wrapReduxStore, storeState) => {
   if (customHistory) {
     customHistory.location.key = 'TestKeyForTesting';
     return helper(<Router history={customHistory}>{component}</Router>);
@@ -23,6 +27,14 @@ const helperWithRouter: <R>(
   const history = createMemoryHistory();
   history.location.key = 'TestKeyForTesting';
 
+  if (wrapReduxStore) {
+    return helper(
+      <MountWithReduxProvider store={storeState}>
+        <Router history={history}>{component}</Router>
+      </MountWithReduxProvider>
+    );
+  }
+
   return helper(<Router history={history}>{component}</Router>);
 };
 
@@ -37,3 +49,24 @@ export const shallowWithRouter = (component: ReactElement, customHistory?: Memor
 export const mountWithRouter = (component: ReactElement, customHistory?: MemoryHistory) => {
   return helperWithRouter(mountWithIntl, component, customHistory);
 };
+
+export const renderWithRouterRedux = (component: ReactElement, customHistory?: MemoryHistory) => {
+  return helperWithRouter(renderWithIntl, component, customHistory, true);
+};
+
+export const shallowWithRouterRedux = (component: ReactElement, customHistory?: MemoryHistory) => {
+  return helperWithRouter(shallowWithIntl, component, customHistory, true);
+};
+
+export const mountWithRouterRedux = (
+  component: ReactElement,
+  options?: { customHistory?: MemoryHistory; storeState?: AppState }
+) => {
+  return helperWithRouter(
+    mountWithIntl,
+    component,
+    options?.customHistory,
+    true,
+    options?.storeState
+  );
+};
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/__snapshots__/get_supported_url_params.test.ts.snap b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/__snapshots__/get_supported_url_params.test.ts.snap
index 5e6e9dd05f722..7452915d94073 100644
--- a/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/__snapshots__/get_supported_url_params.test.ts.snap
+++ b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/__snapshots__/get_supported_url_params.test.ts.snap
@@ -9,6 +9,7 @@ Object {
   "dateRangeEnd": "now",
   "dateRangeStart": "now-15m",
   "filters": "",
+  "focusConnectorField": false,
   "pagination": undefined,
   "search": "",
   "selectedPingStatus": "",
@@ -25,6 +26,7 @@ Object {
   "dateRangeEnd": "now",
   "dateRangeStart": "now-15m",
   "filters": "",
+  "focusConnectorField": false,
   "pagination": undefined,
   "search": "",
   "selectedPingStatus": "",
@@ -41,6 +43,7 @@ Object {
   "dateRangeEnd": "now",
   "dateRangeStart": "now-15m",
   "filters": "",
+  "focusConnectorField": false,
   "pagination": undefined,
   "search": "monitor.status: down",
   "selectedPingStatus": "up",
@@ -57,6 +60,7 @@ Object {
   "dateRangeEnd": "now",
   "dateRangeStart": "now-15m",
   "filters": "",
+  "focusConnectorField": false,
   "pagination": undefined,
   "search": "",
   "selectedPingStatus": "",
@@ -73,6 +77,7 @@ Object {
   "dateRangeEnd": "now",
   "dateRangeStart": "now-18d",
   "filters": "",
+  "focusConnectorField": false,
   "pagination": undefined,
   "search": "",
   "selectedPingStatus": "",
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/get_supported_url_params.test.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/get_supported_url_params.test.ts
index 483fed28ea6d4..bdbac90868467 100644
--- a/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/get_supported_url_params.test.ts
+++ b/x-pack/plugins/uptime/public/lib/helper/url_params/__tests__/get_supported_url_params.test.ts
@@ -59,6 +59,8 @@ describe('getSupportedUrlParams', () => {
       dateRangeStart: DATE_RANGE_START,
       dateRangeEnd: DATE_RANGE_END,
       filters: FILTERS,
+      focusConnectorField: false,
+      pagination: undefined,
       search: SEARCH,
       selectedPingStatus: SELECTED_PING_LIST_STATUS,
       statusFilter: STATUS_FILTER,
diff --git a/x-pack/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts b/x-pack/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts
index 2df664401621a..ff621f994bf4e 100644
--- a/x-pack/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts
+++ b/x-pack/plugins/uptime/public/lib/helper/url_params/get_supported_url_params.ts
@@ -21,6 +21,7 @@ export interface UptimeUrlParams {
   search: string;
   selectedPingStatus: string;
   statusFilter: string;
+  focusConnectorField?: boolean;
 }
 
 const {
@@ -75,6 +76,7 @@ export const getSupportedUrlParams = (params: {
     selectedPingStatus,
     statusFilter,
     pagination,
+    focusConnectorField,
   } = filteredParams;
 
   return {
@@ -97,5 +99,6 @@ export const getSupportedUrlParams = (params: {
       selectedPingStatus === undefined ? SELECTED_PING_LIST_STATUS : selectedPingStatus,
     statusFilter: statusFilter || STATUS_FILTER,
     pagination,
+    focusConnectorField: !!focusConnectorField,
   };
 };
diff --git a/x-pack/plugins/uptime/public/lib/index.ts b/x-pack/plugins/uptime/public/lib/index.ts
index 92787737d579f..7e800cc1eae95 100644
--- a/x-pack/plugins/uptime/public/lib/index.ts
+++ b/x-pack/plugins/uptime/public/lib/index.ts
@@ -5,4 +5,4 @@
  */
 
 export { MountWithReduxProvider } from './helper';
-export { renderWithRouter, shallowWithRouter, mountWithRouter } from './helper/helper_with_router';
+export * from './helper/helper_with_router';
diff --git a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap
index d7c56a1b8db8d..7a5f498ced85c 100644
--- a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap
@@ -2,25 +2,21 @@
 
 exports[`PageHeader shallow renders extra links: page_header_with_extra_links 1`] = `
 Array [
-  .c0 {
-  white-space: nowrap;
-}
-
-@media only screen and (max-width:1024px) and (min-width:868px) {
-  .c1.c1.c1 .euiSuperDatePicker__flexWrapper {
+  @media only screen and (max-width:1024px) and (min-width:868px) {
+  .c0.c0.c0 .euiSuperDatePicker__flexWrapper {
     width: 500px;
   }
 }
 
 @media only screen and (max-width:880px) {
-  .c1.c1.c1 {
+  .c0.c0.c0 {
     -webkit-box-flex: 1;
     -webkit-flex-grow: 1;
     -ms-flex-positive: 1;
     flex-grow: 1;
   }
 
-  .c1.c1.c1 .euiSuperDatePicker__flexWrapper {
+  .c0.c0.c0 .euiSuperDatePicker__flexWrapper {
     width: calc(100% + 8px);
   }
 }
@@ -32,7 +28,7 @@ Array [
       class="euiFlexItem"
     >
       <h1
-        class="c0 euiTitle euiTitle--medium"
+        class="euiTitle euiTitle--medium eui-textNoWrap"
       >
         TestingHeading
       </h1>
@@ -124,7 +120,7 @@ Array [
       </div>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero c1"
+      class="euiFlexItem euiFlexItem--flexGrowZero c0"
       style="flex-basis:485px"
     >
       <div
@@ -234,25 +230,21 @@ Array [
 
 exports[`PageHeader shallow renders with the date picker: page_header_with_date_picker 1`] = `
 Array [
-  .c0 {
-  white-space: nowrap;
-}
-
-@media only screen and (max-width:1024px) and (min-width:868px) {
-  .c1.c1.c1 .euiSuperDatePicker__flexWrapper {
+  @media only screen and (max-width:1024px) and (min-width:868px) {
+  .c0.c0.c0 .euiSuperDatePicker__flexWrapper {
     width: 500px;
   }
 }
 
 @media only screen and (max-width:880px) {
-  .c1.c1.c1 {
+  .c0.c0.c0 {
     -webkit-box-flex: 1;
     -webkit-flex-grow: 1;
     -ms-flex-positive: 1;
     flex-grow: 1;
   }
 
-  .c1.c1.c1 .euiSuperDatePicker__flexWrapper {
+  .c0.c0.c0 .euiSuperDatePicker__flexWrapper {
     width: calc(100% + 8px);
   }
 }
@@ -264,16 +256,13 @@ Array [
       class="euiFlexItem"
     >
       <h1
-        class="c0 euiTitle euiTitle--medium"
+        class="euiTitle euiTitle--medium eui-textNoWrap"
       >
         TestingHeading
       </h1>
     </div>
     <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
-    />
-    <div
-      class="euiFlexItem euiFlexItem--flexGrowZero c1"
+      class="euiFlexItem euiFlexItem--flexGrowZero c0"
       style="flex-basis:485px"
     >
       <div
@@ -383,25 +372,18 @@ Array [
 
 exports[`PageHeader shallow renders without the date picker: page_header_no_date_picker 1`] = `
 Array [
-  .c0 {
-  white-space: nowrap;
-}
-
-<div
+  <div
     class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--wrap"
   >
     <div
       class="euiFlexItem"
     >
       <h1
-        class="c0 euiTitle euiTitle--medium"
+        class="euiTitle euiTitle--medium eui-textNoWrap"
       >
         TestingHeading
       </h1>
     </div>
-    <div
-      class="euiFlexItem euiFlexItem--flexGrowZero"
-    />
   </div>,
   <div
     class="euiSpacer euiSpacer--s"
diff --git a/x-pack/plugins/uptime/public/pages/monitor.tsx b/x-pack/plugins/uptime/public/pages/monitor.tsx
index f7012fc5119e9..d0173d2d96220 100644
--- a/x-pack/plugins/uptime/public/pages/monitor.tsx
+++ b/x-pack/plugins/uptime/public/pages/monitor.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiSpacer } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import React, { useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 import { monitorStatusSelector } from '../state/selectors';
@@ -17,6 +17,9 @@ import { MonitorStatusDetails, PingList } from '../components/monitor';
 import { getDynamicSettings } from '../state/actions/dynamic_settings';
 import { Ping } from '../../common/runtime_types/ping';
 import { setSelectedMonitorId } from '../state/actions';
+import { EnableMonitorAlert } from '../components/overview/monitor_list/columns/enable_alert';
+import { getMonitorAlertsAction } from '../state/alerts/alerts';
+import { useInitApp } from '../hooks/use_init_app';
 
 const isAutogeneratedId = (id: string) => {
   const autoGeneratedId = /^auto-(icmp|http|tcp)-OX[A-F0-9]{16}-[a-f0-9]{16}/;
@@ -38,6 +41,8 @@ const getPageTitle = (monId: string, selectedMonitor: Ping | null) => {
 export const MonitorPage: React.FC = () => {
   const dispatch = useDispatch();
 
+  useInitApp();
+
   useEffect(() => {
     dispatch(getDynamicSettings());
   }, [dispatch]);
@@ -46,6 +51,7 @@ export const MonitorPage: React.FC = () => {
 
   useEffect(() => {
     dispatch(setSelectedMonitorId(monitorId));
+    dispatch(getMonitorAlertsAction.get());
   }, [monitorId, dispatch]);
 
   const selectedMonitor = useSelector(monitorStatusSelector);
@@ -57,7 +63,20 @@ export const MonitorPage: React.FC = () => {
   useBreadcrumbs([{ text: nameOrId }]);
   return (
     <>
-      <PageHeader headingText={nameOrId} datePicker={true} />
+      <PageHeader
+        headingText={
+          <EuiFlexGroup wrap={false}>
+            <EuiFlexItem grow={false}>{nameOrId}</EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EnableMonitorAlert
+                monitorId={monitorId}
+                monitorName={selectedMonitor?.monitor?.name || selectedMonitor?.url?.full}
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        }
+        datePicker={true}
+      />
       <EuiSpacer size="s" />
       <MonitorStatusDetails monitorId={monitorId} />
       <EuiSpacer size="s" />
diff --git a/x-pack/plugins/uptime/public/pages/overview.tsx b/x-pack/plugins/uptime/public/pages/overview.tsx
index 3b58ea1e5cf84..9594819e385c0 100644
--- a/x-pack/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/plugins/uptime/public/pages/overview.tsx
@@ -8,6 +8,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import React, { useEffect } from 'react';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
+import { useDispatch } from 'react-redux';
 import { useGetUrlParams } from '../hooks';
 import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
 import { PageHeader } from './page_header';
@@ -18,6 +19,8 @@ import { useTrackPageview } from '../../../observability/public';
 import { MonitorList } from '../components/overview/monitor_list/monitor_list_container';
 import { EmptyState, FilterGroup, KueryBar, ParsingErrorCallout } from '../components/overview';
 import { StatusPanel } from '../components/overview/status_panel';
+import { getConnectorsAction, getMonitorAlertsAction } from '../state/alerts/alerts';
+import { useInitApp } from '../hooks/use_init_app';
 
 interface Props {
   loading: boolean;
@@ -45,12 +48,21 @@ export const OverviewPageComponent = React.memo(
     useTrackPageview({ app: 'uptime', path: 'overview' });
     useTrackPageview({ app: 'uptime', path: 'overview', delay: 15000 });
 
+    useInitApp();
+
     const [esFilters, error] = useUpdateKueryString(indexPattern, search, urlFilters);
 
     useEffect(() => {
       setEsKueryFilters(esFilters ?? '');
     }, [esFilters, setEsKueryFilters]);
 
+    const dispatch = useDispatch();
+
+    useEffect(() => {
+      dispatch(getConnectorsAction.get());
+      dispatch(getMonitorAlertsAction.get());
+    }, [dispatch]);
+
     const linkParameters = stringifyUrlParams(params, true);
 
     const heading = i18n.translate('xpack.uptime.overviewPage.headerText', {
diff --git a/x-pack/plugins/uptime/public/pages/page_header.tsx b/x-pack/plugins/uptime/public/pages/page_header.tsx
index 325d82696d47c..600185e7cc216 100644
--- a/x-pack/plugins/uptime/public/pages/page_header.tsx
+++ b/x-pack/plugins/uptime/public/pages/page_header.tsx
@@ -20,7 +20,7 @@ interface PageHeaderProps {
   datePicker?: boolean;
 }
 
-const SETTINGS_LINK_TEXT = i18n.translate('xpack.uptime.page_header.settingsLink', {
+export const SETTINGS_LINK_TEXT = i18n.translate('xpack.uptime.page_header.settingsLink', {
   defaultMessage: 'Settings',
 });
 
@@ -44,10 +44,6 @@ const StyledPicker = styled(EuiFlexItem)`
   }
 `;
 
-const H1Text = styled.h1`
-  white-space: nowrap;
-`;
-
 export const PageHeader = React.memo(
   ({ headingText, extraLinks = false, datePicker = true }: PageHeaderProps) => {
     const DatePickerComponent = () =>
@@ -96,10 +92,10 @@ export const PageHeader = React.memo(
         >
           <EuiFlexItem grow={true}>
             <EuiTitle>
-              <H1Text>{headingText}</H1Text>
+              <h1 className="eui-textNoWrap">{headingText}</h1>
             </EuiTitle>
           </EuiFlexItem>
-          <EuiFlexItem grow={false}>{extraLinkComponents}</EuiFlexItem>
+          {extraLinks && <EuiFlexItem grow={false}>{extraLinkComponents}</EuiFlexItem>}
           <DatePickerComponent />
         </EuiFlexGroup>
         <EuiSpacer size="s" />
diff --git a/x-pack/plugins/uptime/public/pages/settings.tsx b/x-pack/plugins/uptime/public/pages/settings.tsx
index 83a465af55d9c..72d52b3497bb1 100644
--- a/x-pack/plugins/uptime/public/pages/settings.tsx
+++ b/x-pack/plugins/uptime/public/pages/settings.tsx
@@ -34,6 +34,7 @@ import {
   VALUE_MUST_BE_AN_INTEGER,
 } from '../../common/translations';
 import { ReactRouterEuiButtonEmpty } from '../components/common/react_router_helpers';
+import { AlertDefaultsForm } from '../components/settings/alert_defaults_form';
 
 interface SettingsPageFieldErrors {
   heartbeatIndices: string | '';
@@ -83,7 +84,8 @@ const isDirtyForm = (formFields: DynamicSettings | null, settings?: DynamicSetti
   return (
     settings?.certAgeThreshold !== formFields?.certAgeThreshold ||
     settings?.certExpirationThreshold !== formFields?.certExpirationThreshold ||
-    settings?.heartbeatIndices !== formFields?.heartbeatIndices
+    settings?.heartbeatIndices !== formFields?.heartbeatIndices ||
+    JSON.stringify(settings?.defaultConnectors) !== JSON.stringify(formFields?.defaultConnectors)
   );
 };
 
@@ -161,7 +163,7 @@ export const SettingsPage: React.FC = () => {
         </EuiFlexGroup>
         <EuiFlexGroup>
           <EuiFlexItem grow={false}>
-            <form onSubmit={onApply}>
+            <div id="settings-form">
               <EuiForm>
                 <IndicesForm
                   loading={dss.loading}
@@ -170,6 +172,13 @@ export const SettingsPage: React.FC = () => {
                   fieldErrors={fieldErrors}
                   isDisabled={isFormDisabled}
                 />
+                <AlertDefaultsForm
+                  loading={dss.loading}
+                  formFields={formFields}
+                  onChange={onChangeFormField}
+                  fieldErrors={fieldErrors}
+                  isDisabled={isFormDisabled}
+                />
                 <CertificateExpirationForm
                   loading={dss.loading}
                   onChange={onChangeFormField}
@@ -197,7 +206,7 @@ export const SettingsPage: React.FC = () => {
                   <EuiFlexItem grow={false}>
                     <EuiButton
                       data-test-subj="apply-settings-button"
-                      type="submit"
+                      onClick={onApply}
                       color="primary"
                       isDisabled={!isFormDirty || !isFormValid || isFormDisabled}
                       fill
@@ -210,7 +219,7 @@ export const SettingsPage: React.FC = () => {
                   </EuiFlexItem>
                 </EuiFlexGroup>
               </EuiForm>
-            </form>
+            </div>
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiPanel>
diff --git a/x-pack/plugins/uptime/public/state/actions/monitor.ts b/x-pack/plugins/uptime/public/state/actions/monitor.ts
index 30ea8e71265e0..a48b68db8126d 100644
--- a/x-pack/plugins/uptime/public/state/actions/monitor.ts
+++ b/x-pack/plugins/uptime/public/state/actions/monitor.ts
@@ -9,6 +9,7 @@ import { MonitorDetailsActionPayload } from './types';
 import { MonitorError } from '../../../common/runtime_types';
 import { MonitorLocations } from '../../../common/runtime_types';
 import { QueryParams } from './types';
+import { createAsyncAction } from './utils';
 
 export interface MonitorLocationsPayload extends QueryParams {
   monitorId: string;
@@ -19,13 +20,10 @@ export interface MonitorDetailsState {
   error: MonitorError;
 }
 
-export const getMonitorDetailsAction = createAction<MonitorDetailsActionPayload>(
-  'GET_MONITOR_DETAILS'
-);
-export const getMonitorDetailsActionSuccess = createAction<MonitorDetailsState>(
-  'GET_MONITOR_DETAILS_SUCCESS'
-);
-export const getMonitorDetailsActionFail = createAction<Error>('GET_MONITOR_DETAILS_FAIL');
+export const getMonitorDetailsAction = createAsyncAction<
+  MonitorDetailsActionPayload,
+  MonitorDetailsState
+>('GET_MONITOR_DETAILS');
 
 export const getMonitorLocationsAction = createAction<MonitorLocationsPayload>(
   'GET_MONITOR_LOCATIONS'
diff --git a/x-pack/plugins/uptime/public/state/actions/types.ts b/x-pack/plugins/uptime/public/state/actions/types.ts
index d752c8b3781fc..8d87ae5d52cb2 100644
--- a/x-pack/plugins/uptime/public/state/actions/types.ts
+++ b/x-pack/plugins/uptime/public/state/actions/types.ts
@@ -6,6 +6,7 @@
 
 import { Action } from 'redux-actions';
 import { IHttpFetchError } from 'src/core/public';
+import { Alert } from '../../../../triggers_actions_ui/public';
 
 export interface AsyncAction<Payload, SuccessPayload> {
   get: (payload: Payload) => Action<Payload>;
@@ -53,3 +54,10 @@ export interface DeleteJobResults {
     error?: any;
   };
 }
+
+export interface AlertsResult {
+  page: number;
+  perPage: number;
+  total: number;
+  data: Alert[];
+}
diff --git a/x-pack/plugins/uptime/public/state/alerts/alerts.ts b/x-pack/plugins/uptime/public/state/alerts/alerts.ts
new file mode 100644
index 0000000000000..5273a33102565
--- /dev/null
+++ b/x-pack/plugins/uptime/public/state/alerts/alerts.ts
@@ -0,0 +1,165 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { handleActions, Action } from 'redux-actions';
+import { call, put, select, takeLatest } from 'redux-saga/effects';
+import { createAsyncAction } from '../actions/utils';
+import { asyncInitState, handleAsyncAction } from '../reducers/utils';
+import { AppState } from '../index';
+import { AsyncInitState } from '../reducers/types';
+import { fetchEffectFactory } from '../effects/fetch_effect';
+import {
+  createAlert,
+  disableAlertById,
+  fetchAlertRecords,
+  fetchConnectors,
+  fetchMonitorAlertRecords,
+  NewAlertParams,
+} from '../api/alerts';
+import {
+  ActionConnector as RawActionConnector,
+  Alert,
+} from '../../../../triggers_actions_ui/public';
+import { kibanaService } from '../kibana_service';
+import { monitorIdSelector } from '../selectors';
+import { AlertsResult, MonitorIdParam } from '../actions/types';
+import { simpleAlertEnabled } from '../../lib/alert_types/alert_messages';
+
+export type ActionConnector = Omit<RawActionConnector, 'secrets'>;
+
+export const createAlertAction = createAsyncAction<NewAlertParams, Alert | null>('CREATE ALERT');
+export const getConnectorsAction = createAsyncAction<{}, ActionConnector[]>('GET CONNECTORS');
+export const getMonitorAlertsAction = createAsyncAction<{}, AlertsResult | null>('GET ALERTS');
+
+export const getAnomalyAlertAction = createAsyncAction<MonitorIdParam, Alert>(
+  'GET EXISTING ALERTS'
+);
+export const deleteAlertAction = createAsyncAction<{ alertId: string }, string | null>(
+  'DELETE ALERTS'
+);
+export const deleteAnomalyAlertAction = createAsyncAction<{ alertId: string }, any>(
+  'DELETE ANOMALY ALERT'
+);
+
+interface AlertState {
+  connectors: AsyncInitState<ActionConnector[]>;
+  newAlert: AsyncInitState<Alert>;
+  alerts: AsyncInitState<AlertsResult>;
+  anomalyAlert: AsyncInitState<Alert>;
+  alertDeletion: AsyncInitState<string>;
+  anomalyAlertDeletion: AsyncInitState<boolean>;
+}
+
+const initialState = {
+  connectors: asyncInitState(),
+  newAlert: asyncInitState(),
+  alerts: asyncInitState(),
+  anomalyAlert: asyncInitState(),
+  alertDeletion: asyncInitState(),
+  anomalyAlertDeletion: asyncInitState(),
+};
+
+export const alertsReducer = handleActions<AlertState>(
+  {
+    ...handleAsyncAction<AlertState>('connectors', getConnectorsAction),
+    ...handleAsyncAction<AlertState>('newAlert', createAlertAction),
+    ...handleAsyncAction<AlertState>('alerts', getMonitorAlertsAction),
+    ...handleAsyncAction<AlertState>('anomalyAlert', getAnomalyAlertAction),
+    ...handleAsyncAction<AlertState>('alertDeletion', deleteAlertAction),
+    ...handleAsyncAction<AlertState>('anomalyAlertDeletion', deleteAnomalyAlertAction),
+  },
+  initialState
+);
+
+const showAlertDisabledSuccess = () => {
+  kibanaService.core.notifications.toasts.addSuccess(
+    i18n.translate('xpack.uptime.overview.alerts.disabled.success', {
+      defaultMessage: 'Alert successfully disabled!',
+    })
+  );
+};
+
+const showAlertDisabledFailed = (err: Error) => {
+  kibanaService.core.notifications.toasts.addError(err, {
+    title: i18n.translate('xpack.uptime.overview.alerts.disabled.failed', {
+      defaultMessage: 'Alert cannot be disabled!',
+    }),
+  });
+};
+
+export function* fetchAlertsEffect() {
+  yield takeLatest(
+    getAnomalyAlertAction.get,
+    fetchEffectFactory(fetchAlertRecords, getAnomalyAlertAction.success, getAnomalyAlertAction.fail)
+  );
+
+  yield takeLatest(deleteAnomalyAlertAction.get, function* (action: Action<{ alertId: string }>) {
+    try {
+      yield call(disableAlertById, action.payload);
+      yield put(deleteAnomalyAlertAction.success(action.payload.alertId));
+      showAlertDisabledSuccess();
+      const monitorId = yield select(monitorIdSelector);
+      yield put(getAnomalyAlertAction.get({ monitorId }));
+    } catch (err) {
+      showAlertDisabledFailed(err);
+      yield put(deleteAnomalyAlertAction.fail(err));
+    }
+  });
+
+  yield takeLatest(deleteAlertAction.get, function* (action: Action<{ alertId: string }>) {
+    try {
+      yield call(disableAlertById, action.payload);
+      // clear previous state
+      yield put(createAlertAction.success(null));
+      yield put(deleteAlertAction.success(action.payload.alertId));
+
+      showAlertDisabledSuccess();
+      yield put(getMonitorAlertsAction.get());
+    } catch (err) {
+      showAlertDisabledFailed(err);
+      yield put(deleteAlertAction.fail(err));
+    }
+  });
+
+  yield takeLatest(
+    getConnectorsAction.get,
+    fetchEffectFactory(fetchConnectors, getConnectorsAction.success, getConnectorsAction.fail)
+  );
+  yield takeLatest(
+    getMonitorAlertsAction.get,
+    fetchEffectFactory(
+      fetchMonitorAlertRecords,
+      getMonitorAlertsAction.success,
+      getMonitorAlertsAction.fail
+    )
+  );
+  yield takeLatest(createAlertAction.get, function* (action: Action<NewAlertParams>) {
+    try {
+      const response = yield call(createAlert, action.payload);
+      yield put(createAlertAction.success(response));
+
+      kibanaService.core.notifications.toasts.addSuccess(
+        simpleAlertEnabled(action.payload.defaultActions)
+      );
+      yield put(getMonitorAlertsAction.get());
+    } catch (err) {
+      kibanaService.core.notifications.toasts.addError(err, {
+        title: i18n.translate('xpack.uptime.overview.alerts.enabled.failed', {
+          defaultMessage: 'Alert cannot be enabled!',
+        }),
+      });
+      yield put(createAlertAction.fail(err));
+    }
+  });
+}
+
+export const connectorsSelector = ({ alerts }: AppState) => alerts.connectors;
+export const newAlertSelector = ({ alerts }: AppState) => alerts.newAlert;
+export const alertsSelector = ({ alerts }: AppState) => alerts.alerts;
+export const isAlertDeletedSelector = ({ alerts }: AppState) => alerts.alertDeletion;
+
+export const anomalyAlertSelector = ({ alerts }: AppState) => alerts.anomalyAlert;
diff --git a/x-pack/plugins/uptime/public/state/api/alerts.ts b/x-pack/plugins/uptime/public/state/api/alerts.ts
index 526abd6b303e5..da86da12a70ca 100644
--- a/x-pack/plugins/uptime/public/state/api/alerts.ts
+++ b/x-pack/plugins/uptime/public/state/api/alerts.ts
@@ -4,10 +4,81 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ACTION_GROUP_DEFINITIONS, CLIENT_ALERT_TYPES } from '../../../common/constants/alerts';
 import { apiService } from './utils';
+import { ActionConnector } from '../alerts/alerts';
+
+import { AlertsResult, MonitorIdParam } from '../actions/types';
+import { Alert, AlertAction } from '../../../../triggers_actions_ui/public';
 import { API_URLS } from '../../../common/constants';
-import { MonitorIdParam } from '../actions/types';
-import { Alert } from '../../../../triggers_actions_ui/public';
+import { MonitorStatusTranslations } from '../../../common/translations';
+
+const { MONITOR_STATUS } = ACTION_GROUP_DEFINITIONS;
+
+const UPTIME_AUTO_ALERT = 'UPTIME_AUTO';
+
+export const fetchConnectors = async () => {
+  return await apiService.get(API_URLS.ALERT_ACTIONS);
+};
+
+export interface NewAlertParams {
+  monitorId: string;
+  monitorName?: string;
+  defaultActions: ActionConnector[];
+}
+
+export const createAlert = async ({
+  defaultActions,
+  monitorId,
+  monitorName,
+}: NewAlertParams): Promise<Alert> => {
+  const actions: AlertAction[] = [];
+  defaultActions.forEach((aId) => {
+    actions.push({
+      id: aId.id,
+      actionTypeId: aId.actionTypeId,
+      group: MONITOR_STATUS.id,
+      params: {
+        message: MonitorStatusTranslations.defaultActionMessage,
+      },
+    });
+  });
+
+  const data = {
+    actions,
+    params: {
+      numTimes: 1,
+      timerangeUnit: 'm',
+      timerangeCount: 1,
+      shouldCheckStatus: true,
+      shouldCheckAvailability: false,
+      isAutoGenerated: true,
+      search: `monitor.id : ${monitorId} `,
+      filters: { 'url.port': [], 'observer.geo.name': [], 'monitor.type': [], tags: [] },
+    },
+    consumer: 'uptime',
+    alertTypeId: CLIENT_ALERT_TYPES.MONITOR_STATUS,
+    schedule: { interval: '1m' },
+    tags: [UPTIME_AUTO_ALERT],
+    name: `${monitorName} (Simple status alert)`,
+  };
+
+  return await apiService.post(API_URLS.CREATE_ALERT, data);
+};
+
+export const fetchMonitorAlertRecords = async (): Promise<AlertsResult> => {
+  const data = {
+    page: 1,
+    per_page: 500,
+    filter: 'alert.attributes.alertTypeId:(xpack.uptime.alerts.monitorStatus)',
+    default_search_operator: 'AND',
+    sort_field: 'name.keyword',
+    sort_order: 'asc',
+    search_fields: ['name', 'tags'],
+    search: 'UPTIME_AUTO',
+  };
+  return await apiService.get(API_URLS.ALERTS_FIND, data);
+};
 
 export const fetchAlertRecords = async ({ monitorId }: MonitorIdParam): Promise<Alert> => {
   const data = {
@@ -22,6 +93,6 @@ export const fetchAlertRecords = async ({ monitorId }: MonitorIdParam): Promise<
   return alerts.data.find((alert: Alert) => alert.params.monitorId === monitorId);
 };
 
-export const disableAnomalyAlert = async ({ alertId }: { alertId: string }) => {
+export const disableAlertById = async ({ alertId }: { alertId: string }) => {
   return await apiService.delete(API_URLS.ALERT + alertId);
 };
diff --git a/x-pack/plugins/uptime/public/state/certificates/certificates.ts b/x-pack/plugins/uptime/public/state/certificates/certificates.ts
index 81d2cec7d81f6..ad17b8c79d065 100644
--- a/x-pack/plugins/uptime/public/state/certificates/certificates.ts
+++ b/x-pack/plugins/uptime/public/state/certificates/certificates.ts
@@ -7,10 +7,10 @@
 import { handleActions } from 'redux-actions';
 import { takeLatest } from 'redux-saga/effects';
 import { createAsyncAction } from '../actions/utils';
-import { getAsyncInitialState, handleAsyncAction } from '../reducers/utils';
+import { asyncInitState, handleAsyncAction } from '../reducers/utils';
 import { CertResult, GetCertsParams } from '../../../common/runtime_types';
 import { AppState } from '../index';
-import { AsyncInitialState } from '../reducers/types';
+import { AsyncInitState } from '../reducers/types';
 import { fetchEffectFactory } from '../effects/fetch_effect';
 import { fetchCertificates } from '../api/certificates';
 
@@ -19,11 +19,11 @@ export const getCertificatesAction = createAsyncAction<GetCertsParams, CertResul
 );
 
 interface CertificatesState {
-  certs: AsyncInitialState<CertResult>;
+  certs: AsyncInitState<CertResult>;
 }
 
 const initialState = {
-  certs: getAsyncInitialState(),
+  certs: asyncInitState(),
 };
 
 export const certificatesReducer = handleActions<CertificatesState>(
diff --git a/x-pack/plugins/uptime/public/state/effects/alerts.ts b/x-pack/plugins/uptime/public/state/effects/alerts.ts
index 5f71b0bea7b2c..8aa955b7f58f0 100644
--- a/x-pack/plugins/uptime/public/state/effects/alerts.ts
+++ b/x-pack/plugins/uptime/public/state/effects/alerts.ts
@@ -8,7 +8,7 @@ import { Action } from 'redux-actions';
 import { call, put, takeLatest, select } from 'redux-saga/effects';
 import { fetchEffectFactory } from './fetch_effect';
 import { deleteAlertAction, getExistingAlertAction } from '../actions/alerts';
-import { disableAnomalyAlert, fetchAlertRecords } from '../api/alerts';
+import { disableAlertById, fetchAlertRecords } from '../api/alerts';
 import { kibanaService } from '../kibana_service';
 import { monitorIdSelector } from '../selectors';
 
@@ -24,7 +24,7 @@ export function* fetchAlertsEffect() {
 
   yield takeLatest(String(deleteAlertAction.get), function* (action: Action<{ alertId: string }>) {
     try {
-      const response = yield call(disableAnomalyAlert, action.payload);
+      const response = yield call(disableAlertById, action.payload);
       yield put(deleteAlertAction.success(response));
       kibanaService.core.notifications.toasts.addSuccess('Alert successfully deleted!');
       const monitorId = yield select(monitorIdSelector);
diff --git a/x-pack/plugins/uptime/public/state/effects/index.ts b/x-pack/plugins/uptime/public/state/effects/index.ts
index b13ba7f1a9107..a2a5dd58dcf4d 100644
--- a/x-pack/plugins/uptime/public/state/effects/index.ts
+++ b/x-pack/plugins/uptime/public/state/effects/index.ts
@@ -17,7 +17,7 @@ import { fetchMonitorDurationEffect } from './monitor_duration';
 import { fetchMLJobEffect } from './ml_anomaly';
 import { fetchIndexStatusEffect } from './index_status';
 import { fetchCertificatesEffect } from '../certificates/certificates';
-import { fetchAlertsEffect } from './alerts';
+import { fetchAlertsEffect } from '../alerts/alerts';
 
 export function* rootEffect() {
   yield fork(fetchMonitorDetailsEffect);
diff --git a/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts b/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts
index 00f8a388c689f..be137e497181a 100644
--- a/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts
+++ b/x-pack/plugins/uptime/public/state/effects/ml_anomaly.ts
@@ -21,9 +21,8 @@ import {
   deleteMLJob,
   getMLCapabilities,
 } from '../api/ml_anomaly';
-import { deleteAlertAction } from '../actions/alerts';
-import { alertSelector } from '../selectors';
 import { MonitorIdParam } from '../actions/types';
+import { anomalyAlertSelector, deleteAlertAction } from '../alerts/alerts';
 
 export function* fetchMLJobEffect() {
   yield takeLatest(
@@ -49,7 +48,7 @@ export function* fetchMLJobEffect() {
       yield put(deleteMLJobAction.success(response));
 
       // let's delete alert as well if it's there
-      const { data: anomalyAlert } = yield select(alertSelector);
+      const { data: anomalyAlert } = yield select(anomalyAlertSelector);
       if (anomalyAlert) {
         yield put(deleteAlertAction.get({ alertId: anomalyAlert.id as string }));
       }
diff --git a/x-pack/plugins/uptime/public/state/effects/monitor.ts b/x-pack/plugins/uptime/public/state/effects/monitor.ts
index ed21f315476d4..d0960497b2afe 100644
--- a/x-pack/plugins/uptime/public/state/effects/monitor.ts
+++ b/x-pack/plugins/uptime/public/state/effects/monitor.ts
@@ -7,8 +7,6 @@
 import { takeLatest } from 'redux-saga/effects';
 import {
   getMonitorDetailsAction,
-  getMonitorDetailsActionSuccess,
-  getMonitorDetailsActionFail,
   getMonitorLocationsAction,
   getMonitorLocationsActionSuccess,
   getMonitorLocationsActionFail,
@@ -18,11 +16,11 @@ import { fetchEffectFactory } from './fetch_effect';
 
 export function* fetchMonitorDetailsEffect() {
   yield takeLatest(
-    getMonitorDetailsAction,
+    getMonitorDetailsAction.get,
     fetchEffectFactory(
       fetchMonitorDetails,
-      getMonitorDetailsActionSuccess,
-      getMonitorDetailsActionFail
+      getMonitorDetailsAction.success,
+      getMonitorDetailsAction.fail
     )
   );
 
diff --git a/x-pack/plugins/uptime/public/state/reducers/alerts.ts b/x-pack/plugins/uptime/public/state/reducers/alerts.ts
deleted file mode 100644
index a2cd844e24964..0000000000000
--- a/x-pack/plugins/uptime/public/state/reducers/alerts.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { handleActions } from 'redux-actions';
-import { getAsyncInitialState, handleAsyncAction } from './utils';
-import { AsyncInitialState } from './types';
-import { deleteAlertAction, getExistingAlertAction } from '../actions/alerts';
-import { Alert } from '../../../../triggers_actions_ui/public';
-
-export interface AlertsState {
-  alert: AsyncInitialState<Alert>;
-  alertDeletion: AsyncInitialState<boolean>;
-}
-
-const initialState: AlertsState = {
-  alert: getAsyncInitialState(),
-  alertDeletion: getAsyncInitialState(),
-};
-
-export const alertsReducer = handleActions<AlertsState>(
-  {
-    ...handleAsyncAction<AlertsState>('alert', getExistingAlertAction),
-    ...handleAsyncAction<AlertsState>('alertDeletion', deleteAlertAction),
-  },
-  initialState
-);
diff --git a/x-pack/plugins/uptime/public/state/reducers/index.ts b/x-pack/plugins/uptime/public/state/reducers/index.ts
index 01baf7cf07c92..a1aa8b9fbaf5b 100644
--- a/x-pack/plugins/uptime/public/state/reducers/index.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/index.ts
@@ -20,7 +20,7 @@ import { indexStatusReducer } from './index_status';
 import { mlJobsReducer } from './ml_anomaly';
 import { certificatesReducer } from '../certificates/certificates';
 import { selectedFiltersReducer } from './selected_filters';
-import { alertsReducer } from './alerts';
+import { alertsReducer } from '../alerts/alerts';
 
 export const rootReducer = combineReducers({
   monitor: monitorReducer,
diff --git a/x-pack/plugins/uptime/public/state/reducers/index_status.ts b/x-pack/plugins/uptime/public/state/reducers/index_status.ts
index 1a93eb43775f3..1bc0b55a58180 100644
--- a/x-pack/plugins/uptime/public/state/reducers/index_status.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/index_status.ts
@@ -6,16 +6,16 @@
 
 import { handleActions } from 'redux-actions';
 import { indexStatusAction } from '../actions';
-import { getAsyncInitialState, handleAsyncAction } from './utils';
-import { AsyncInitialState } from './types';
+import { asyncInitState, handleAsyncAction } from './utils';
+import { AsyncInitState } from './types';
 import { StatesIndexStatus } from '../../../common/runtime_types';
 
 export interface IndexStatusState {
-  indexStatus: AsyncInitialState<StatesIndexStatus | null>;
+  indexStatus: AsyncInitState<StatesIndexStatus | null>;
 }
 
 const initialState: IndexStatusState = {
-  indexStatus: getAsyncInitialState(),
+  indexStatus: asyncInitState(),
 };
 
 type PayLoad = StatesIndexStatus & Error;
diff --git a/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts b/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
index 0500bc97eb090..a17e7cba358da 100644
--- a/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/ml_anomaly.ts
@@ -14,25 +14,25 @@ import {
   AnomalyRecords,
   getMLCapabilitiesAction,
 } from '../actions';
-import { getAsyncInitialState, handleAsyncAction } from './utils';
-import { AsyncInitialState } from './types';
+import { asyncInitState, handleAsyncAction } from './utils';
+import { AsyncInitState } from './types';
 import { MlCapabilitiesResponse, JobExistResult } from '../../../../../plugins/ml/public';
 import { CreateMLJobSuccess, DeleteJobResults } from '../actions/types';
 
 export interface MLJobState {
-  mlJob: AsyncInitialState<JobExistResult>;
-  createJob: AsyncInitialState<CreateMLJobSuccess>;
-  deleteJob: AsyncInitialState<DeleteJobResults>;
-  anomalies: AsyncInitialState<AnomalyRecords>;
-  mlCapabilities: AsyncInitialState<MlCapabilitiesResponse>;
+  mlJob: AsyncInitState<JobExistResult>;
+  createJob: AsyncInitState<CreateMLJobSuccess>;
+  deleteJob: AsyncInitState<DeleteJobResults>;
+  anomalies: AsyncInitState<AnomalyRecords>;
+  mlCapabilities: AsyncInitState<MlCapabilitiesResponse>;
 }
 
 const initialState: MLJobState = {
-  mlJob: getAsyncInitialState(),
-  createJob: getAsyncInitialState(),
-  deleteJob: getAsyncInitialState(),
-  anomalies: getAsyncInitialState(),
-  mlCapabilities: getAsyncInitialState(),
+  mlJob: asyncInitState(),
+  createJob: asyncInitState(),
+  deleteJob: asyncInitState(),
+  anomalies: asyncInitState(),
+  mlCapabilities: asyncInitState(),
 };
 
 export const mlJobsReducer = handleActions<MLJobState>(
diff --git a/x-pack/plugins/uptime/public/state/reducers/monitor.ts b/x-pack/plugins/uptime/public/state/reducers/monitor.ts
index 632f3a270e1a1..a0f89adbdac8f 100644
--- a/x-pack/plugins/uptime/public/state/reducers/monitor.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/monitor.ts
@@ -9,8 +9,6 @@ import {
   MonitorDetailsState,
   getMonitorDetailsAction,
   getMonitorLocationsAction,
-  getMonitorDetailsActionSuccess,
-  getMonitorDetailsActionFail,
   getMonitorLocationsActionSuccess,
   getMonitorLocationsActionFail,
 } from '../actions/monitor';
@@ -34,12 +32,12 @@ const initialState: MonitorState = {
 
 export function monitorReducer(state = initialState, action: Action<any>): MonitorState {
   switch (action.type) {
-    case String(getMonitorDetailsAction):
+    case String(getMonitorDetailsAction.get):
       return {
         ...state,
         loading: true,
       };
-    case String(getMonitorDetailsActionSuccess):
+    case String(getMonitorDetailsAction.success):
       const { monitorId } = action.payload;
       return {
         ...state,
@@ -49,10 +47,11 @@ export function monitorReducer(state = initialState, action: Action<any>): Monit
         },
         loading: false,
       };
-    case String(getMonitorDetailsActionFail):
+    case String(getMonitorDetailsAction.fail):
       return {
         ...state,
         errors: [...state.errors, action.payload],
+        loading: false,
       };
     case String(getMonitorLocationsAction):
       return {
diff --git a/x-pack/plugins/uptime/public/state/reducers/types.ts b/x-pack/plugins/uptime/public/state/reducers/types.ts
index 885296c0928ac..d63ccd36a2ba2 100644
--- a/x-pack/plugins/uptime/public/state/reducers/types.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/types.ts
@@ -6,7 +6,7 @@
 
 import { IHttpFetchError } from 'src/core/public';
 
-export interface AsyncInitialState<ReduceStateType> {
+export interface AsyncInitState<ReduceStateType> {
   data: ReduceStateType | null;
   loading: boolean;
   error?: IHttpFetchError | null;
diff --git a/x-pack/plugins/uptime/public/state/reducers/utils.ts b/x-pack/plugins/uptime/public/state/reducers/utils.ts
index 15e49e7f6de8b..104460d1e1394 100644
--- a/x-pack/plugins/uptime/public/state/reducers/utils.ts
+++ b/x-pack/plugins/uptime/public/state/reducers/utils.ts
@@ -8,7 +8,7 @@ import { Action } from 'redux-actions';
 import { AsyncAction } from '../actions/types';
 
 export function handleAsyncAction<ReducerState>(
-  storeKey: string,
+  storeKey: keyof ReducerState,
   asyncAction: AsyncAction<any, any>
 ) {
   return {
@@ -20,14 +20,16 @@ export function handleAsyncAction<ReducerState>(
       },
     }),
 
-    [String(asyncAction.success)]: (state: ReducerState, action: Action<any>) => ({
-      ...state,
-      [storeKey]: {
-        ...(state as any)[storeKey],
-        data: action.payload,
-        loading: false,
-      },
-    }),
+    [String(asyncAction.success)]: (state: ReducerState, action: Action<any>) => {
+      return {
+        ...state,
+        [storeKey]: {
+          ...(state as any)[storeKey],
+          data: action.payload,
+          loading: false,
+        },
+      };
+    },
 
     [String(asyncAction.fail)]: (state: ReducerState, action: Action<any>) => ({
       ...state,
@@ -41,7 +43,7 @@ export function handleAsyncAction<ReducerState>(
   };
 }
 
-export function getAsyncInitialState(initialData = null) {
+export function asyncInitState(initialData = null) {
   return {
     data: initialData,
     loading: false,
diff --git a/x-pack/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/plugins/uptime/public/state/selectors/__tests__/index.test.ts
index de8615c7016a7..1a8929990ab55 100644
--- a/x-pack/plugins/uptime/public/state/selectors/__tests__/index.test.ts
+++ b/x-pack/plugins/uptime/public/state/selectors/__tests__/index.test.ts
@@ -111,7 +111,11 @@ describe('state selectors', () => {
     selectedFilters: null,
     alerts: {
       alertDeletion: { data: null, loading: false },
-      alert: { data: null, loading: false },
+      anomalyAlert: { data: null, loading: false },
+      alerts: { data: null, loading: false },
+      connectors: { data: null, loading: false },
+      newAlert: { data: null, loading: false },
+      anomalyAlertDeletion: { data: null, loading: false },
     },
   };
 
diff --git a/x-pack/plugins/uptime/public/state/selectors/index.ts b/x-pack/plugins/uptime/public/state/selectors/index.ts
index bf6c9b3666a6a..6b3b46cc15137 100644
--- a/x-pack/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/plugins/uptime/public/state/selectors/index.ts
@@ -18,6 +18,8 @@ export const monitorDetailsSelector = (state: AppState, summary: any) => {
   return state.monitor.monitorDetailsList[summary.monitor_id];
 };
 
+export const monitorDetailsLoadingSelector = (state: AppState) => state.monitor.loading;
+
 export const monitorLocationsSelector = (state: AppState, monitorId: string) => {
   return state.monitor.monitorLocationsList?.get(monitorId);
 };
@@ -92,5 +94,3 @@ export const searchTextSelector = ({ ui: { searchText } }: AppState) => searchTe
 export const selectedFiltersSelector = ({ selectedFilters }: AppState) => selectedFilters;
 
 export const monitorIdSelector = ({ ui: { monitorId } }: AppState) => monitorId;
-
-export const alertSelector = ({ alerts }: AppState) => alerts.alert;
diff --git a/x-pack/plugins/uptime/server/kibana.index.ts b/x-pack/plugins/uptime/server/kibana.index.ts
index ab8d7a068b19d..76359a3b60a6a 100644
--- a/x-pack/plugins/uptime/server/kibana.index.ts
+++ b/x-pack/plugins/uptime/server/kibana.index.ts
@@ -43,7 +43,7 @@ export const initServerWithKibana = (server: UptimeCoreSetup, plugins: UptimeCor
       all: {
         app: ['uptime', 'kibana'],
         catalogue: ['uptime'],
-        api: ['uptime-read', 'uptime-write'],
+        api: ['uptime-read', 'uptime-write', 'lists-all'],
         savedObject: {
           all: [umDynamicSettings.name, 'alert'],
           read: [],
@@ -54,12 +54,12 @@ export const initServerWithKibana = (server: UptimeCoreSetup, plugins: UptimeCor
         management: {
           insightsAndAlerting: ['triggersActions'],
         },
-        ui: ['save', 'configureSettings', 'show'],
+        ui: ['save', 'configureSettings', 'show', 'alerting:save'],
       },
       read: {
         app: ['uptime', 'kibana'],
         catalogue: ['uptime'],
-        api: ['uptime-read'],
+        api: ['uptime-read', 'lists-read'],
         savedObject: {
           all: ['alert'],
           read: [umDynamicSettings.name],
@@ -70,7 +70,7 @@ export const initServerWithKibana = (server: UptimeCoreSetup, plugins: UptimeCor
         management: {
           insightsAndAlerting: ['triggersActions'],
         },
-        ui: ['show'],
+        ui: ['show', 'alerting:save'],
       },
     },
   });
diff --git a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
index 75d9c8aa959b1..b75c729c2104a 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
@@ -7,23 +7,19 @@
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import {
   IRouter,
-  LegacyCallAPIOptions,
   SavedObjectsClientContract,
   ISavedObjectsRepository,
+  ILegacyScopedClusterClient,
 } from 'src/core/server';
 import { UMKibanaRoute } from '../../../rest_api';
 import { PluginSetupContract } from '../../../../../features/server';
 import { DynamicSettings } from '../../../../common/runtime_types';
 import { MlPluginSetup as MlSetup } from '../../../../../ml/server';
 
-export type APICaller = (
-  endpoint: string,
-  clientParams: Record<string, any>,
-  options?: LegacyCallAPIOptions
-) => Promise<any>;
+export type ESAPICaller = ILegacyScopedClusterClient['callAsCurrentUser'];
 
 export type UMElasticsearchQueryFn<P, R = any> = (
-  params: { callES: APICaller; dynamicSettings: DynamicSettings } & P
+  params: { callES: ESAPICaller; dynamicSettings: DynamicSettings } & P
 ) => Promise<R>;
 
 export type UMSavedObjectsQueryFn<T = any, P = undefined> = (
diff --git a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
index 44b95515039d8..149dbb4244c86 100644
--- a/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
+++ b/x-pack/plugins/uptime/server/lib/adapters/telemetry/kibana_telemetry_adapter.ts
@@ -8,7 +8,7 @@ import moment from 'moment';
 import { ISavedObjectsRepository, SavedObjectsClientContract } from 'kibana/server';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import { PageViewParams, UptimeTelemetry, Usage } from './types';
-import { APICaller } from '../framework';
+import { ESAPICaller } from '../framework';
 import { savedObjectsAdapter } from '../../saved_objects';
 
 interface UptimeTelemetryCollector {
@@ -69,7 +69,7 @@ export class KibanaTelemetryAdapter {
           },
         },
       },
-      fetch: async (callCluster: APICaller) => {
+      fetch: async (callCluster: ESAPICaller) => {
         const savedObjectsClient = getSavedObjectsClient()!;
         if (savedObjectsClient) {
           await this.countNoOfUniqueMonitorAndLocations(callCluster, savedObjectsClient);
@@ -125,7 +125,7 @@ export class KibanaTelemetryAdapter {
   }
 
   public static async countNoOfUniqueMonitorAndLocations(
-    callCluster: APICaller,
+    callCluster: ESAPICaller,
     savedObjectsClient: ISavedObjectsRepository | SavedObjectsClientContract
   ) {
     const dynamicSettings = await savedObjectsAdapter.getUptimeDynamicSettings(savedObjectsClient);
diff --git a/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts b/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts
index c522de4284f6e..06b298aedeb2b 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/__tests__/status_check.test.ts
@@ -98,6 +98,7 @@ describe('status check alert', () => {
             "dynamicSettings": Object {
               "certAgeThreshold": 730,
               "certExpirationThreshold": 30,
+              "defaultConnectors": Array [],
               "heartbeatIndices": "heartbeat-8*",
             },
             "filters": undefined,
@@ -153,6 +154,7 @@ describe('status check alert', () => {
             "dynamicSettings": Object {
               "certAgeThreshold": 730,
               "certExpirationThreshold": 30,
+              "defaultConnectors": Array [],
               "heartbeatIndices": "heartbeat-8*",
             },
             "filters": undefined,
@@ -331,6 +333,7 @@ describe('status check alert', () => {
             "dynamicSettings": Object {
               "certAgeThreshold": 730,
               "certExpirationThreshold": 30,
+              "defaultConnectors": Array [],
               "heartbeatIndices": "heartbeat-8*",
             },
             "filters": Object {
@@ -568,6 +571,7 @@ describe('status check alert', () => {
             "dynamicSettings": Object {
               "certAgeThreshold": 730,
               "certExpirationThreshold": 30,
+              "defaultConnectors": Array [],
               "heartbeatIndices": "heartbeat-8*",
             },
             "filters": Object {
@@ -754,6 +758,7 @@ describe('status check alert', () => {
             "dynamicSettings": Object {
               "certAgeThreshold": 730,
               "certExpirationThreshold": 30,
+              "defaultConnectors": Array [],
               "heartbeatIndices": "heartbeat-8*",
             },
             "filters": "{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"match\\":{\\"url.port\\":12349}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"match\\":{\\"url.port\\":5601}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"match\\":{\\"url.port\\":443}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"match\\":{\\"observer.geo.name\\":\\"harrisburg\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"filter\\":[{\\"bool\\":{\\"should\\":[{\\"match\\":{\\"monitor.type\\":\\"http\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"match\\":{\\"tags\\":\\"unsecured\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"bool\\":{\\"should\\":[{\\"match\\":{\\"tags\\":\\"containers\\"}}],\\"minimum_should_match\\":1}},{\\"bool\\":{\\"should\\":[{\\"match_phrase\\":{\\"tags\\":\\"org:google\\"}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}],\\"minimum_should_match\\":1}}]}}]}}]}}",
@@ -808,6 +813,7 @@ describe('status check alert', () => {
             "dynamicSettings": Object {
               "certAgeThreshold": 730,
               "certExpirationThreshold": 30,
+              "defaultConnectors": Array [],
               "heartbeatIndices": "heartbeat-8*",
             },
             "filters": "{\\"bool\\":{\\"should\\":[{\\"exists\\":{\\"field\\":\\"ur.port\\"}}],\\"minimum_should_match\\":1}}",
@@ -851,6 +857,7 @@ describe('status check alert', () => {
             "dynamicSettings": Object {
               "certAgeThreshold": 730,
               "certExpirationThreshold": 30,
+              "defaultConnectors": Array [],
               "heartbeatIndices": "heartbeat-8*",
             },
             "filters": undefined,
@@ -886,6 +893,7 @@ describe('status check alert', () => {
           "timerangeUnit",
           "timerange",
           "version",
+          "isAutoGenerated",
         ]
       `);
     });
diff --git a/x-pack/plugins/uptime/server/lib/alerts/status_check.ts b/x-pack/plugins/uptime/server/lib/alerts/status_check.ts
index 134472ba0693f..b9dc7945e9579 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/status_check.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/status_check.ts
@@ -6,7 +6,6 @@
 
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
-import { ILegacyScopedClusterClient } from 'kibana/server';
 import Mustache from 'mustache';
 import { UptimeAlertTypeFactory } from './types';
 import { esKuery, IIndexPattern } from '../../../../../../src/plugins/data/server';
@@ -22,11 +21,13 @@ import { updateState } from './common';
 import { commonMonitorStateI18, commonStateTranslations, DOWN_LABEL } from './translations';
 import { stringifyKueries, combineFiltersAndUserSearch } from '../../../common/lib';
 import { GetMonitorAvailabilityResult } from '../requests/get_monitor_availability';
-import { UMServerLibs } from '../lib';
 import { GetMonitorStatusResult } from '../requests/get_monitor_status';
 import { UNNAMED_LOCATION } from '../../../common/constants';
 import { uptimeAlertWrapper } from './uptime_alert_wrapper';
 import { MonitorStatusTranslations } from '../../../common/translations';
+import { ESAPICaller } from '../adapters/framework';
+import { getUptimeIndexPattern } from '../requests/get_index_pattern';
+import { UMServerLibs } from '../lib';
 
 const { MONITOR_STATUS } = ACTION_GROUP_DEFINITIONS;
 
@@ -77,19 +78,21 @@ export const generateFilterDSL = async (
   );
 };
 
-const formatFilterString = async (
-  libs: UMServerLibs,
+export const formatFilterString = async (
   dynamicSettings: DynamicSettings,
-  callES: ILegacyScopedClusterClient['callAsCurrentUser'],
+  callES: ESAPICaller,
   filters: StatusCheckFilters,
-  search: string
+  search: string,
+  libs?: UMServerLibs
 ) =>
   await generateFilterDSL(
     () =>
-      libs.requests.getIndexPattern({
-        callES,
-        dynamicSettings,
-      }),
+      libs?.requests?.getIndexPattern
+        ? libs?.requests?.getIndexPattern({ callES, dynamicSettings })
+        : getUptimeIndexPattern({
+            callES,
+            dynamicSettings,
+          }),
     filters,
     search
   );
@@ -197,6 +200,7 @@ export const statusCheckAlertFactory: UptimeAlertTypeFactory = (_server, libs) =
           })
         ),
         version: schema.maybe(schema.number()),
+        isAutoGenerated: schema.maybe(schema.boolean()),
       }),
     },
     defaultActionGroupId: MONITOR_STATUS.id,
@@ -244,26 +248,19 @@ export const statusCheckAlertFactory: UptimeAlertTypeFactory = (_server, libs) =
         availability,
         shouldCheckAvailability,
         shouldCheckStatus,
+        isAutoGenerated,
         timerange: oldVersionTimeRange,
       } = rawParams;
 
+      const filterString = await formatFilterString(dynamicSettings, callES, filters, search, libs);
+
       const timerange = oldVersionTimeRange || {
-        from: `now-${String(timerangeCount) + timerangeUnit}`,
+        from: isAutoGenerated
+          ? state.lastCheckedAt
+          : `now-${String(timerangeCount) + timerangeUnit}`,
         to: 'now',
       };
 
-      const filterString = await formatFilterString(libs, dynamicSettings, callES, filters, search);
-
-      let availabilityResults: GetMonitorAvailabilityResult[] = [];
-      if (shouldCheckAvailability) {
-        availabilityResults = await libs.requests.getMonitorAvailability({
-          callES,
-          dynamicSettings,
-          ...availability,
-          filters: JSON.stringify(filterString) || undefined,
-        });
-      }
-
       let downMonitorsByLocation: GetMonitorStatusResult[] = [];
 
       // if oldVersionTimeRange present means it's 7.7 format and
@@ -279,6 +276,37 @@ export const statusCheckAlertFactory: UptimeAlertTypeFactory = (_server, libs) =
         });
       }
 
+      if (isAutoGenerated) {
+        for (const monitorLoc of downMonitorsByLocation) {
+          const monitorInfo = monitorLoc.monitorInfo;
+
+          const alertInstance = alertInstanceFactory(MONITOR_STATUS.id + monitorLoc.location);
+
+          const monitorSummary = getMonitorSummary(monitorInfo);
+          const statusMessage = getStatusMessage(monitorInfo);
+
+          alertInstance.replaceState({
+            ...state,
+            ...monitorSummary,
+            statusMessage,
+            ...updateState(state, true),
+          });
+
+          alertInstance.scheduleActions(MONITOR_STATUS.id);
+        }
+        return updateState(state, downMonitorsByLocation.length > 0);
+      }
+
+      let availabilityResults: GetMonitorAvailabilityResult[] = [];
+      if (shouldCheckAvailability) {
+        availabilityResults = await libs.requests.getMonitorAvailability({
+          callES,
+          dynamicSettings,
+          ...availability,
+          filters: JSON.stringify(filterString) || undefined,
+        });
+      }
+
       const mergedIdsByLoc = getUniqueIdsByLoc(downMonitorsByLocation, availabilityResults);
 
       mergedIdsByLoc.forEach((monIdByLoc) => {
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_certs.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_certs.test.ts
index 5fa5c331d398e..4faaed53bebf2 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_certs.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_certs.test.ts
@@ -94,6 +94,7 @@ describe('getCerts', () => {
         heartbeatIndices: 'heartbeat*',
         certAgeThreshold: DYNAMIC_SETTINGS_DEFAULTS.certAgeThreshold,
         certExpirationThreshold: DYNAMIC_SETTINGS_DEFAULTS.certExpirationThreshold,
+        defaultConnectors: [],
       },
       index: 1,
       from: 'now-2d',
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
index 669033fc6524a..7fe6a42c807ee 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
@@ -32,7 +32,7 @@ describe('getLatestMonitor', () => {
           },
         },
         size: 1,
-        _source: ['url', 'monitor', 'observer', '@timestamp', 'tls.*', 'http'],
+        _source: ['url', 'monitor', 'observer', '@timestamp', 'tls.*', 'http', 'error'],
         sort: {
           '@timestamp': { order: 'desc' },
         },
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
index 3b4aeaf92c508..c15d245f74cc7 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
@@ -16,6 +16,10 @@ export interface GetLatestMonitorParams {
 
   /** @member monitorId optional limit to monitorId */
   monitorId?: string | null;
+
+  observerLocation?: string;
+
+  status?: string;
 }
 
 // Get The monitor latest state sorted by timestamp with date range
@@ -25,6 +29,8 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
   dateStart,
   dateEnd,
   monitorId,
+  observerLocation,
+  status,
 }) => {
   const params = {
     index: dynamicSettings.heartbeatIndices,
@@ -40,12 +46,14 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
                 },
               },
             },
+            ...(status ? [{ term: { 'monitor.status': status } }] : []),
             ...(monitorId ? [{ term: { 'monitor.id': monitorId } }] : []),
+            ...(observerLocation ? [{ term: { 'observer.geo.name': observerLocation } }] : []),
           ],
         },
       },
       size: 1,
-      _source: ['url', 'monitor', 'observer', '@timestamp', 'tls.*', 'http'],
+      _source: ['url', 'monitor', 'observer', '@timestamp', 'tls.*', 'http', 'error'],
       sort: {
         '@timestamp': { order: 'desc' },
       },
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts
index cf4ffa339ddfc..fbcbc37ae0cc2 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_details.ts
@@ -4,19 +4,87 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UMElasticsearchQueryFn } from '../adapters';
+import { ESAPICaller, UMElasticsearchQueryFn } from '../adapters';
 import { MonitorDetails, MonitorError } from '../../../common/runtime_types';
+import { formatFilterString } from '../alerts/status_check';
 
 export interface GetMonitorDetailsParams {
   monitorId: string;
   dateStart: string;
   dateEnd: string;
+  alertsClient: any;
 }
 
+const getMonitorAlerts = async (
+  callES: ESAPICaller,
+  dynamicSettings: any,
+  alertsClient: any,
+  monitorId: string
+) => {
+  const options: any = {
+    page: 1,
+    perPage: 500,
+    filter: 'alert.attributes.alertTypeId:(xpack.uptime.alerts.monitorStatus)',
+    defaultSearchOperator: 'AND',
+    sortField: 'name.keyword',
+  };
+
+  const { data } = await alertsClient.find({ options });
+  const monitorAlerts = [];
+  for (let i = 0; i < data.length; i++) {
+    const currAlert = data[i];
+
+    if (currAlert.params.search?.includes(monitorId)) {
+      monitorAlerts.push(currAlert);
+      continue;
+    }
+    const esParams: any = {
+      index: dynamicSettings.heartbeatIndices,
+      body: {
+        query: {
+          bool: {
+            filter: [
+              {
+                term: {
+                  'monitor.id': monitorId,
+                },
+              },
+            ],
+          },
+        },
+        size: 0,
+        aggs: {
+          monitors: {
+            terms: {
+              field: 'monitor.id',
+              size: 1000,
+            },
+          },
+        },
+      },
+    };
+
+    const parsedFilters = await formatFilterString(
+      dynamicSettings,
+      callES,
+      currAlert.params.filters,
+      currAlert.params.search
+    );
+    esParams.body.query.bool = Object.assign({}, esParams.body.query.bool, parsedFilters?.bool);
+
+    const result = await callES('search', esParams);
+
+    if (result.hits.total.value > 0) {
+      monitorAlerts.push(currAlert);
+    }
+  }
+  return monitorAlerts;
+};
+
 export const getMonitorDetails: UMElasticsearchQueryFn<
   GetMonitorDetailsParams,
   MonitorDetails
-> = async ({ callES, dynamicSettings, monitorId, dateStart, dateEnd }) => {
+> = async ({ callES, dynamicSettings, monitorId, dateStart, dateEnd, alertsClient }) => {
   const queryFilters: any = [
     {
       range: {
@@ -66,10 +134,11 @@ export const getMonitorDetails: UMElasticsearchQueryFn<
 
   const monitorError: MonitorError | undefined = data?.error;
   const errorTimestamp: string | undefined = data?.['@timestamp'];
-
+  const monAlerts = await getMonitorAlerts(callES, dynamicSettings, alertsClient, monitorId);
   return {
     monitorId,
     error: monitorError,
     timestamp: errorTimestamp,
+    alerts: monAlerts,
   };
 };
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
index 0788880994200..beed8e8335314 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
@@ -142,7 +142,7 @@ export const getMonitorStatus: UMElasticsearchQueryFn<
   } while (afterKey !== undefined);
 
   return monitors
-    .filter((monitor: any) => monitor?.doc_count > numTimes)
+    .filter((monitor: any) => monitor?.doc_count >= numTimes)
     .map(({ key, doc_count: count, fields }: any) => ({
       ...key,
       count,
diff --git a/x-pack/plugins/uptime/server/lib/saved_objects.ts b/x-pack/plugins/uptime/server/lib/saved_objects.ts
index 8024aba198058..2eec9e233f5d2 100644
--- a/x-pack/plugins/uptime/server/lib/saved_objects.ts
+++ b/x-pack/plugins/uptime/server/lib/saved_objects.ts
@@ -36,6 +36,9 @@ export const umDynamicSettings: SavedObjectsType = {
       certExpirationThreshold: {
         type: 'long',
       },
+      defaultConnectors: {
+        type: 'keyword',
+      },
       */
     },
   },
diff --git a/x-pack/plugins/uptime/server/rest_api/__tests__/dynamic_settings.test.ts b/x-pack/plugins/uptime/server/rest_api/__tests__/dynamic_settings.test.ts
index 32e6385bc9fa2..cec27401c4dd1 100644
--- a/x-pack/plugins/uptime/server/rest_api/__tests__/dynamic_settings.test.ts
+++ b/x-pack/plugins/uptime/server/rest_api/__tests__/dynamic_settings.test.ts
@@ -14,6 +14,7 @@ describe('dynamic settings', () => {
           certAgeThreshold: -1,
           certExpirationThreshold: 2,
           heartbeatIndices: 'foo',
+          defaultConnectors: [],
         })
       ).toMatchInlineSnapshot(`
         Object {
@@ -28,6 +29,7 @@ describe('dynamic settings', () => {
           certAgeThreshold: 10.2,
           certExpirationThreshold: 2,
           heartbeatIndices: 'foo',
+          defaultConnectors: [],
         })
       ).toMatchInlineSnapshot(`
         Object {
@@ -42,6 +44,7 @@ describe('dynamic settings', () => {
           certAgeThreshold: 2,
           certExpirationThreshold: -1,
           heartbeatIndices: 'foo',
+          defaultConnectors: [],
         })
       ).toMatchInlineSnapshot(`
         Object {
@@ -56,6 +59,7 @@ describe('dynamic settings', () => {
           certAgeThreshold: 2,
           certExpirationThreshold: 1.23,
           heartbeatIndices: 'foo',
+          defaultConnectors: [],
         })
       ).toMatchInlineSnapshot(`
         Object {
@@ -70,6 +74,7 @@ describe('dynamic settings', () => {
           certAgeThreshold: 2,
           certExpirationThreshold: 13,
           heartbeatIndices: 'foo',
+          defaultConnectors: [],
         })
       ).toBeUndefined();
     });
diff --git a/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts b/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts
index 6dba36ec0613d..98e995173d811 100644
--- a/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts
+++ b/x-pack/plugins/uptime/server/rest_api/dynamic_settings.ts
@@ -54,6 +54,7 @@ export const createPostDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMSe
       heartbeatIndices: schema.string(),
       certAgeThreshold: schema.number(),
       certExpirationThreshold: schema.number(),
+      defaultConnectors: schema.arrayOf(schema.string()),
     }),
   },
   writeAccess: true,
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts b/x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts
index 69e719efb0719..bb54effc0d57e 100644
--- a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts
+++ b/x-pack/plugins/uptime/server/rest_api/monitors/monitors_details.ts
@@ -19,8 +19,11 @@ export const createGetMonitorDetailsRoute: UMRestApiRouteFactory = (libs: UMServ
       dateEnd: schema.maybe(schema.string()),
     }),
   },
-  handler: async ({ callES, dynamicSettings }, _context, request, response): Promise<any> => {
+  handler: async ({ callES, dynamicSettings }, context, request, response): Promise<any> => {
     const { monitorId, dateStart, dateEnd } = request.query;
+
+    const alertsClient = context.alerting?.getAlertsClient();
+
     return response.ok({
       body: {
         ...(await libs.requests.getMonitorDetails({
@@ -29,6 +32,7 @@ export const createGetMonitorDetailsRoute: UMRestApiRouteFactory = (libs: UMServ
           monitorId,
           dateStart,
           dateEnd,
+          alertsClient,
         })),
       },
     });
diff --git a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_durations.ts b/x-pack/plugins/uptime/server/rest_api/monitors/monitors_durations.ts
index 34313211061b0..a4e024e795b46 100644
--- a/x-pack/plugins/uptime/server/rest_api/monitors/monitors_durations.ts
+++ b/x-pack/plugins/uptime/server/rest_api/monitors/monitors_durations.ts
@@ -22,6 +22,7 @@ export const createGetMonitorDurationRoute: UMRestApiRouteFactory = (libs: UMSer
   },
   handler: async ({ callES, dynamicSettings }, _context, request, response): Promise<any> => {
     const { monitorId, dateStart, dateEnd } = request.query;
+
     return response.ok({
       body: {
         ...(await libs.requests.getMonitorDurationChart({
diff --git a/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts b/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
index 22e08d9feb1cd..4008be8d37768 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/dynamic_settings.ts
@@ -27,6 +27,7 @@ export default function ({ getService }: FtrProviderContext) {
         heartbeatIndices: 'myIndex1*',
         certAgeThreshold: 15,
         certExpirationThreshold: 5,
+        defaultConnectors: [],
       };
       const postResponse = await supertest
         .post(`/api/uptime/dynamic_settings`)
diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts
index 261f685eeb9cc..9def6c9bd3450 100644
--- a/x-pack/test/functional/apps/uptime/index.ts
+++ b/x-pack/test/functional/apps/uptime/index.ts
@@ -12,6 +12,28 @@ import {
 
 const ARCHIVE = 'uptime/full_heartbeat';
 
+export const deleteUptimeSettingsObject = async (server: any) => {
+  // delete the saved object
+  try {
+    await server.savedObjects.delete({
+      type: settingsObjectType,
+      id: settingsObjectId,
+    });
+  } catch (e) {
+    // a 404 just means the doc is already missing
+    if (e.response.status !== 404) {
+      const { status, statusText, data, headers, config } = e.response;
+      throw new Error(
+        `error attempting to delete settings:\n${JSON.stringify(
+          { status, statusText, data, headers, config },
+          null,
+          2
+        )}`
+      );
+    }
+  }
+};
+
 export default ({ loadTestFile, getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
@@ -22,25 +44,7 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
     this.tags('ciGroup6');
 
     beforeEach('delete settings', async () => {
-      // delete the saved object
-      try {
-        await server.savedObjects.delete({
-          type: settingsObjectType,
-          id: settingsObjectId,
-        });
-      } catch (e) {
-        // a 404 just means the doc is already missing
-        if (e.response.status !== 404) {
-          const { status, statusText, data, headers, config } = e.response;
-          throw new Error(
-            `error attempting to delete settings:\n${JSON.stringify(
-              { status, statusText, data, headers, config },
-              null,
-              2
-            )}`
-          );
-        }
-      }
+      await deleteUptimeSettingsObject(server);
     });
 
     describe('with generated data', () => {
diff --git a/x-pack/test/functional/apps/uptime/settings.ts b/x-pack/test/functional/apps/uptime/settings.ts
index 744b9120028d7..c0493dfca8c20 100644
--- a/x-pack/test/functional/apps/uptime/settings.ts
+++ b/x-pack/test/functional/apps/uptime/settings.ts
@@ -63,6 +63,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         heartbeatIndices: 'new*',
         certAgeThreshold: 365,
         certExpirationThreshold: 30,
+        defaultConnectors: [],
       };
       await settings.changeHeartbeatIndicesInput(newFieldValues.heartbeatIndices);
       await settings.apply();
diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts
index 8102d8b95680e..d0b610ec861b8 100644
--- a/x-pack/test/functional/page_objects/uptime_page.ts
+++ b/x-pack/test/functional/page_objects/uptime_page.ts
@@ -39,6 +39,7 @@ export function UptimePageProvider({ getPageObjects, getService }: FtrProviderCo
       if (monitorIdToCheck) {
         await commonService.monitorIdExists(monitorIdToCheck);
       }
+      await pageObjects.header.waitUntilLoadingHasFinished();
     }
 
     public async loadDataAndGoToMonitorPage(dateStart: string, dateEnd: string, monitorId: string) {
diff --git a/x-pack/test/functional/services/uptime/common.ts b/x-pack/test/functional/services/uptime/common.ts
index 13c9ead89d09d..dc61776d91f0e 100644
--- a/x-pack/test/functional/services/uptime/common.ts
+++ b/x-pack/test/functional/services/uptime/common.ts
@@ -6,12 +6,14 @@
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-export function UptimeCommonProvider({ getService }: FtrProviderContext) {
+export function UptimeCommonProvider({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
   const retry = getService('retry');
   const find = getService('find');
 
+  const { header } = getPageObjects(['header']);
+
   return {
     async assertExists(key: string) {
       if (!(await testSubjects.exists(key))) {
@@ -92,9 +94,11 @@ export function UptimeCommonProvider({ getService }: FtrProviderContext) {
       );
     },
     async waitUntilDataIsLoaded() {
+      await header.waitUntilLoadingHasFinished();
       return retry.tryForTime(60 * 1000, async () => {
         if (await testSubjects.exists('data-missing')) {
           await testSubjects.click('superDatePickerApplyTimeButton');
+          await header.waitUntilLoadingHasFinished();
         }
         await testSubjects.missingOrFail('data-missing');
       });
diff --git a/x-pack/test/functional/services/uptime/navigation.ts b/x-pack/test/functional/services/uptime/navigation.ts
index 710923c886cbe..e725cb8914c8b 100644
--- a/x-pack/test/functional/services/uptime/navigation.ts
+++ b/x-pack/test/functional/services/uptime/navigation.ts
@@ -16,6 +16,7 @@ export function UptimeNavigationProvider({ getService, getPageObjects }: FtrProv
     await retry.tryForTime(60 * 1000, async () => {
       if (await testSubjects.exists('uptimeSettingsToOverviewLink', { timeout: 0 })) {
         await testSubjects.click('uptimeSettingsToOverviewLink');
+        await PageObjects.header.waitUntilLoadingHasFinished();
         await testSubjects.existOrFail('uptimeOverviewPage', { timeout: 2000 });
       } else {
         await PageObjects.common.navigateToApp('uptime');
diff --git a/x-pack/test/functional/services/uptime/overview.ts b/x-pack/test/functional/services/uptime/overview.ts
index e96aef859d746..6fe7be632f08e 100644
--- a/x-pack/test/functional/services/uptime/overview.ts
+++ b/x-pack/test/functional/services/uptime/overview.ts
@@ -30,5 +30,9 @@ export function UptimeOverviewProvider({ getService }: FtrProviderContext) {
       await testSubjects.click('xpack.uptime.alertsPopover.toggleButton');
       return testSubjects.click('xpack.uptime.openAlertContextPanel');
     },
+
+    async displaysDefineConnector() {
+      return await testSubjects.existOrFail('uptimeSettingsDefineConnector');
+    },
   };
 }
diff --git a/x-pack/test/functional/services/uptime/settings.ts b/x-pack/test/functional/services/uptime/settings.ts
index 50c5c7093f34c..53dd5f49afceb 100644
--- a/x-pack/test/functional/services/uptime/settings.ts
+++ b/x-pack/test/functional/services/uptime/settings.ts
@@ -43,6 +43,7 @@ export function UptimeSettingsProvider({ getService }: FtrProviderContext) {
         heartbeatIndices,
         certAgeThreshold: parseInt(age, 10),
         certExpirationThreshold: parseInt(expiration, 10),
+        defaultConnectors: [],
       };
     },
     applyButtonIsDisabled: async () => {
diff --git a/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts b/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts
index 3016bd6d68f95..20d035c2e8127 100644
--- a/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts
@@ -23,6 +23,7 @@ export default ({ getService, loadTestFile }: FtrProviderContext) => {
 
       loadTestFile(require.resolve('./alert_flyout'));
       loadTestFile(require.resolve('./anomaly_alert'));
+      loadTestFile(require.resolve('./simple_down_alert'));
     });
   });
 };
diff --git a/x-pack/test/functional_with_es_ssl/apps/uptime/simple_down_alert.ts b/x-pack/test/functional_with_es_ssl/apps/uptime/simple_down_alert.ts
new file mode 100644
index 0000000000000..b85013ea8438b
--- /dev/null
+++ b/x-pack/test/functional_with_es_ssl/apps/uptime/simple_down_alert.ts
@@ -0,0 +1,109 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { deleteUptimeSettingsObject } from '../../../functional/apps/uptime';
+
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
+  describe('uptime simple status alert', () => {
+    const pageObjects = getPageObjects(['common', 'header', 'uptime']);
+    const server = getService('kibanaServer');
+    const uptimeService = getService('uptime');
+    const retry = getService('retry');
+    const supertest = getService('supertest');
+
+    const testSubjects = getService('testSubjects');
+
+    const monitorId = '0000-intermittent';
+
+    const uptime = getService('uptime');
+
+    const DEFAULT_DATE_START = 'Sep 10, 2019 @ 12:40:08.078';
+    const DEFAULT_DATE_END = 'Sep 11, 2019 @ 19:40:08.078';
+
+    before(async () => {
+      // delete the saved object
+      await deleteUptimeSettingsObject(server);
+
+      await uptime.navigation.goToUptime();
+
+      await pageObjects.uptime.goToUptimeOverviewAndLoadData(DEFAULT_DATE_START, DEFAULT_DATE_END);
+    });
+
+    beforeEach(async () => {
+      await pageObjects.header.waitUntilLoadingHasFinished();
+    });
+
+    it('displays to define default connector', async () => {
+      await testSubjects.click('uptimeDisplayDefineConnector');
+      await testSubjects.existOrFail('uptimeSettingsDefineConnector');
+    });
+
+    it('go to settings to define connector', async () => {
+      await testSubjects.click('uptimeSettingsLink');
+      await uptimeService.common.waitUntilDataIsLoaded();
+      await testSubjects.existOrFail('comboBoxInput');
+    });
+
+    it('define default connector', async () => {
+      await testSubjects.click('comboBoxInput');
+      await testSubjects.click('Slack#xyztest');
+      await testSubjects.click('apply-settings-button');
+      await uptimeService.navigation.goToUptime();
+    });
+
+    it('enable simple status alert', async () => {
+      await pageObjects.uptime.goToUptimeOverviewAndLoadData(DEFAULT_DATE_START, DEFAULT_DATE_END);
+      await testSubjects.click('uptimeEnableSimpleDownAlert' + monitorId);
+      await pageObjects.header.waitUntilLoadingHasFinished();
+    });
+
+    it('displays relevant alert in list drawer', async () => {
+      await testSubjects.click(`xpack.uptime.monitorList.${monitorId}.expandMonitorDetail`);
+      await pageObjects.header.waitUntilLoadingHasFinished();
+      await testSubjects.existOrFail('uptimeMonitorListDrawerAlert0');
+    });
+
+    it('has created a valid simple alert with expected parameters', async () => {
+      let alert: any;
+      await retry.tryForTime(15000, async () => {
+        const apiResponse = await supertest.get(`/api/alerts/_find?search=Simple status alert`);
+        const alertsFromThisTest = apiResponse.body.data.filter(({ params }: { params: any }) =>
+          params.search.includes(monitorId)
+        );
+        expect(alertsFromThisTest).to.have.length(1);
+        alert = alertsFromThisTest[0];
+      });
+
+      const { actions, alertTypeId, consumer, id, tags } = alert ?? {};
+      try {
+        expect(actions).to.eql([
+          {
+            actionTypeId: '.slack',
+            group: 'xpack.uptime.alerts.actionGroups.monitorStatus',
+            id: 'my-slack1',
+            params: {
+              message:
+                'Monitor {{state.monitorName}} with url {{{state.monitorUrl}}} is {{state.statusMessage}} from {{state.observerLocation}}. The latest error message is {{{state.latestErrorMessage}}}',
+            },
+          },
+        ]);
+        expect(alertTypeId).to.eql('xpack.uptime.alerts.monitorStatus');
+        expect(consumer).to.eql('uptime');
+        expect(tags).to.eql(['UPTIME_AUTO']);
+      } catch (e) {
+        await supertest.delete(`/api/alerts/alert/${id}`).set('kbn-xsrf', 'true').expect(204);
+      }
+    });
+
+    it('disable simple status alert', async () => {
+      await testSubjects.click('uptimeDisableSimpleDownAlert' + monitorId);
+      await pageObjects.header.waitUntilLoadingHasFinished();
+      await testSubjects.existOrFail('uptimeEnableSimpleDownAlert' + monitorId);
+    });
+  });
+};

From e488c087fc836b93baaf305eedff20c53ccf6292 Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Thu, 27 Aug 2020 09:03:36 +0200
Subject: [PATCH 086/148] [ML] fix tooltip content for scheduled events
 (#75973)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../application/components/chart_tooltip/chart_tooltip.tsx | 7 ++++++-
 .../explorer_charts/explorer_chart_single_metric.js        | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx b/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
index 07e33a43d3ff9..0d94c5ccdfe08 100644
--- a/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
+++ b/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip.tsx
@@ -72,6 +72,11 @@ const Tooltip: FC<{ service: ChartTooltipService }> = React.memo(({ service }) =
                     // eslint-disable-next-line @typescript-eslint/naming-convention
                     echTooltip__rowHighlighted: isHighlighted,
                   });
+
+                  const renderValue = Array.isArray(value)
+                    ? value.map((v) => <div key={v}>{v}</div>)
+                    : value;
+
                   return (
                     <div
                       key={`${seriesIdentifier.key}__${valueAccessor}`}
@@ -88,7 +93,7 @@ const Tooltip: FC<{ service: ChartTooltipService }> = React.memo(({ service }) =
                           {label}
                         </EuiFlexItem>
                         <EuiFlexItem className="eui-textBreakAll mlChartTooltip__value">
-                          {value}
+                          {renderValue}
                         </EuiFlexItem>
                       </EuiFlexGroup>
                     </div>
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js
index 4d53e747d4855..0a76211f2e330 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js
@@ -37,7 +37,6 @@ import {
 } from '../../util/chart_utils';
 import { LoadingIndicator } from '../../components/loading_indicator/loading_indicator';
 import { getTimeBucketsFromCache } from '../../util/time_buckets';
-import { mlEscape } from '../../util/string_utils';
 import { mlFieldFormatService } from '../../services/field_format_service';
 
 const CONTENT_WRAPPER_HEIGHT = 215;
@@ -486,7 +485,7 @@ export class ExplorerChartSingleMetric extends React.Component {
           label: i18n.translate('xpack.ml.explorer.singleMetricChart.scheduledEventsLabel', {
             defaultMessage: 'Scheduled events',
           }),
-          value: marker.scheduledEvents.map(mlEscape).join('<br/>'),
+          value: marker.scheduledEvents,
           seriesIdentifier: {
             key: seriesKey,
           },

From 37ec1e1053620b8bd3c294a10571f952c841a71d Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Thu, 27 Aug 2020 11:28:02 +0300
Subject: [PATCH 087/148] Update to TS v4 (#73924)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* bump ts to v4

* MOAR RAM

* fix type errors for OSS

* first pass on x-pack errors

* second pass on x-pack type errors

* 3rd pass on x-pack type-errors

* mute errors if complex cases

* don't delete if spread suffices

* mute other complex cases

* make User fields optional

* fix optional types

* fix tests

* fix typings for time_range

* fix type errors in x-pack/tests

* rebuild kbn-pm

* remove leftovers from master update

* fix alert tests

* [Telemetry Checker] TS4 Fixes

* bump to 4.0.1-rc

* fix new errors in master

* bump typescript-eslint to version supporting TS v4 syntax

* fix merge commit errors

* update to the stable TS version 4.0.2

* bump ts-eslint to version supporting ts v4

* fix typo

* fix type errors after merge

* update ts in another new package.json

* TEMP: remove me

* Revert "TEMP: remove me"

This reverts commit dc0fc3bae67a5eab43af06cf9fec80119966d3fc.

* [Telemetry] Update snapshot for new TS4 SyntaxKind

* bump prettier to support TS v4 syntax

* fix prettier rules

* last style change

* fix new type errors

Co-authored-by: Alejandro Fernández Haro <alejandro.haro@elastic.co>
---
 .../public/book/book_embeddable.tsx           |  3 +-
 package.json                                  | 12 +--
 packages/eslint-config-kibana/package.json    |  4 +-
 packages/kbn-analytics/package.json           |  2 +-
 packages/kbn-config-schema/package.json       |  2 +-
 packages/kbn-dev-utils/package.json           |  2 +-
 packages/kbn-i18n/package.json                |  2 +-
 packages/kbn-monaco/package.json              |  2 +-
 packages/kbn-plugin-generator/package.json    |  2 +-
 packages/kbn-plugin-helpers/package.json      |  2 +-
 packages/kbn-pm/dist/index.js                 |  1 +
 packages/kbn-pm/package.json                  |  4 +-
 packages/kbn-release-notes/package.json       |  4 +-
 packages/kbn-spec-to-console/package.json     |  2 +-
 packages/kbn-telemetry-tools/package.json     |  2 +-
 .../extract_collectors.test.ts.snap           | 30 +++----
 .../src/tools/serializer.ts                   | 17 ++--
 src/fixtures/agg_resp/date_histogram.js       |  2 +-
 src/fixtures/agg_resp/range.js                |  2 +-
 src/legacy/server/status/lib/metrics.test.js  |  8 +-
 .../management_app/advanced_settings.tsx      |  2 +-
 .../__jest__/url_autocomplete.test.js         | 18 ++--
 src/plugins/dashboard/common/bwc/types.ts     |  2 +-
 .../application/dashboard_app_controller.tsx  |  1 +
 .../common/es_query/kuery/ast/ast.test.ts     |  4 +-
 .../embeddable/search_embeddable.ts           |  3 +-
 .../public/lib/containers/container.ts        |  9 +-
 .../public/context/context.test.tsx           |  4 +-
 .../ops_stats/ops_stats_collector.ts          |  2 +
 .../maps_legacy/public/map/grid_dimensions.js | 24 ++---
 src/plugins/share/public/types.ts             |  2 +-
 .../public/components/agg_select.tsx          |  6 +-
 .../components/controls/date_ranges.tsx       |  3 +-
 .../public/components/controls/filter.tsx     |  9 +-
 .../public/components/controls/filters.tsx    |  5 +-
 .../public/components/controls/precision.tsx  |  3 +-
 .../components/sidebar/sidebar_title.tsx      |  3 +-
 .../vis_type_vega/public/data_model/types.ts  |  6 +-
 .../public/data_model/vega_parser.ts          |  4 +-
 .../helpers/point_series/point_series.ts      |  1 +
 .../public/vis_types/react_vis_type.test.ts   |  1 +
 .../components/visualize_editor.tsx           |  2 +-
 .../utils/use/use_saved_vis_instance.test.ts  |  1 +
 .../plugins/kbn_tp_run_pipeline/package.json  |  2 +-
 .../plugins/app_link_test/package.json        |  2 +-
 .../plugins/core_app_status/package.json      |  2 +-
 .../plugins/core_plugin_a/package.json        |  2 +-
 .../plugins/core_plugin_appleave/package.json |  2 +-
 .../plugins/core_plugin_b/package.json        |  2 +-
 .../core_plugin_chromeless/package.json       |  2 +-
 .../core_plugin_route_timeouts/package.json   |  2 +-
 .../core_plugin_static_assets/package.json    |  2 +-
 .../plugins/core_provider_plugin/package.json |  2 +-
 .../plugins/doc_views_plugin/package.json     |  2 +-
 .../elasticsearch_client_plugin/package.json  |  2 +-
 .../plugins/index_patterns/package.json       |  4 +-
 .../kbn_sample_panel_action/package.json      |  2 +-
 .../plugins/kbn_top_nav/package.json          |  2 +-
 .../kbn_tp_custom_visualizations/package.json |  2 +-
 .../management_test_plugin/package.json       |  2 +-
 .../plugins/rendering_plugin/package.json     |  2 +-
 .../plugins/ui_settings_plugin/package.json   |  2 +-
 .../ui_actions_enhanced_examples/package.json |  2 +-
 x-pack/package.json                           |  2 +-
 .../lib/send_email.test.ts                    |  9 ++
 ...configured_action_disabled_modification.ts |  3 +-
 .../alerts/server/alert_type_registry.test.ts | 23 ++---
 x-pack/plugins/apm/e2e/package.json           |  2 +-
 .../app/Main/ProvideBreadcrumbs.test.tsx      |  1 +
 x-pack/plugins/apm/public/plugin.ts           |  8 +-
 .../server/lib/transaction_groups/fetcher.ts  |  1 +
 .../lib/ui_filters/local_ui_filters/index.ts  |  7 +-
 .../beats_management/common/domain_types.ts   |  2 +-
 .../beats_management/server/lib/beats.ts      |  2 +-
 .../lib/aeroelastic/layout_functions.js       | 20 ++---
 .../public/state/actions/elements.test.js     |  6 +-
 .../state/reducers/resolved_args.test.js      |  8 +-
 .../explore_data_chart_action.test.ts         |  1 +
 .../explore_data/explore_data_chart_action.ts |  3 +-
 .../explore_data_context_menu_action.test.ts  |  1 +
 .../explore_data_context_menu_action.ts       |  3 +-
 .../edit_policy/edit_policy.test.ts           |  1 +
 .../services/policies/cold_phase.ts           |  2 +
 .../services/policies/warm_phase.ts           |  3 +
 .../template_form/template_form.tsx           |  1 +
 .../inventory/components/alert_flyout.tsx     | 11 ++-
 .../components/alert_flyout.tsx               | 13 ++-
 .../components/alerting/logs/alert_flyout.tsx | 13 ++-
 .../subscription_splash_content.tsx           |  3 +-
 .../infra/public/hooks/use_trial_status.tsx   |  5 +-
 .../pages/link_to/redirect_to_node_logs.tsx   |  3 +-
 .../public/pages/logs/page_providers.tsx      |  3 +-
 .../ingest_manager/hooks/use_core.ts          |  2 +-
 .../create_package_policy_page/index.tsx      |  2 +-
 .../edit_package_policy_page/index.tsx        |  2 +-
 .../saved_objects/migrations/to_v7_10_0.ts    |  2 +
 .../pipeline_processors_editor/deserialize.ts |  1 +
 .../create_endpoint_list_item_schema.test.ts  |  4 +
 .../create_exception_list_item_schema.test.ts |  5 ++
 .../delete_endpoint_list_item_schema.test.ts  |  1 +
 .../request/delete_list_schema.test.ts        |  1 +
 .../export_list_item_query_schema.test.ts     |  1 +
 .../request/import_list_item_schema.test.ts   |  1 +
 .../request/patch_list_item_schema.test.ts    |  1 +
 .../schemas/request/patch_list_schema.test.ts |  1 +
 .../read_endpoint_list_item_schema.test.ts    |  1 +
 .../schemas/request/read_list_schema.test.ts  |  1 +
 .../update_endpoint_list_item_schema.test.ts  |  4 +
 .../update_exception_list_item_schema.test.ts |  4 +
 .../update_exception_list_schema.test.ts      |  3 +
 .../response/acknowledge_schema.test.ts       |  1 +
 .../create_endpoint_list_schema.test.ts       |  2 +
 .../exception_list_item_schema.test.ts        | 14 +++
 .../response/exception_list_schema.test.ts    | 11 +++
 .../found_exception_list_item_schema.test.ts  |  4 +
 .../found_exception_list_schema.test.ts       |  4 +
 .../list_item_index_exist_schema.test.ts      |  2 +
 .../schemas/response/list_item_schema.test.ts |  9 ++
 .../schemas/response/list_schema.test.ts      |  9 ++
 .../schemas/types/update_comment.test.ts      |  1 +
 .../lists/public/exceptions/api.test.ts       | 11 +++
 .../mvt_single_layer_vector_source.tsx        |  3 +-
 .../properties/dynamic_style_property.tsx     |  3 +-
 .../anomaly_detection_jobs/combined_job.ts    |  1 +
 x-pack/plugins/ml/common/types/custom_urls.ts |  2 +-
 .../application/util/custom_url_utils.ts      |  4 +-
 .../models/calendar/calendar_manager.ts       |  7 +-
 .../models/data_recognizer/data_recognizer.ts |  1 +
 .../ml/server/models/filter/filter_manager.ts |  5 +-
 .../validate_model_memory_limit.test.ts       |  1 +
 .../public/application/store/reducer.ts       |  2 +-
 x-pack/plugins/security/common/model/user.ts  |  4 +-
 .../role_mappings/role_mappings_api_client.ts | 10 +--
 .../management/roles/roles_api_client.ts      |  1 +
 .../session_management/session_cookie.test.ts |  1 +
 .../add_prepackged_rules_schema.test.ts       |  1 +
 .../request/create_rules_bulk_schema.test.ts  |  5 ++
 .../request/import_rules_schema.test.ts       |  1 +
 .../request/update_rules_bulk_schema.test.ts  |  5 ++
 .../schemas/response/error_schema.test.ts     |  1 +
 .../response/find_rules_schema.test.ts        |  2 +
 .../response/prepackaged_rules_schema.test.ts |  2 +
 .../prepackaged_rules_status_schema.test.ts   |  1 +
 .../response/rules_bulk_schema.test.ts        |  2 +
 .../schemas/types/lists.test.ts               |  2 +
 .../components/user_action_tree/index.tsx     |  2 +-
 .../user_action_tree/user_action_title.tsx    |  2 +-
 .../public/cases/pages/case_details.tsx       |  2 +-
 .../components/header_section/index.tsx       | 10 +--
 .../common/components/utility_bar/styles.tsx  | 12 ++-
 .../common/hooks/endpoint/ingest_enabled.ts   | 10 +--
 .../rules/create/helpers.test.ts              |  2 +
 .../detection_engine/rules/details/index.tsx  |  2 +-
 .../detection_engine/rules/edit/index.tsx     |  2 +-
 .../public/hosts/pages/hosts.tsx              |  2 +-
 .../pages/policy/view/policy_details.tsx      |  2 +-
 .../pages/policy/view/policy_list.tsx         |  3 +-
 .../public/network/pages/network.tsx          |  2 +-
 .../timelines/store/timeline/reducer.test.ts  |  1 +
 .../notifications/read_notifications.test.ts  |  1 +
 .../routes/rules/import_rules_route.test.ts   |  2 +
 .../routes/rules/validate.test.ts             |  3 +
 .../detection_engine/rules/read_rules.test.ts |  1 +
 .../signals/build_bulk_body.test.ts           |  4 +
 .../detection_engine/tags/read_tags.test.ts   |  1 +
 .../lib/events/elasticsearch_adapter.ts       |  5 +-
 .../server/lib/events/mock.ts                 |  1 +
 .../public/app/common/pivot_group_by.ts       |  8 +-
 .../transform_list/expanded_row.tsx           |  6 +-
 .../public/application/app.tsx                |  4 +-
 .../application/context/alerts_context.tsx    |  7 +-
 .../action_factory_definition.ts              |  3 +-
 .../alerts/uptime_alerts_context_provider.tsx | 28 +++++-
 .../overview/kuery_bar/kuery_bar.tsx          |  7 +-
 .../__tests__/monitor_list_drawer.test.tsx    |  1 +
 .../settings/add_connector_flyout.tsx         | 13 ++-
 .../settings/alert_defaults_form.tsx          |  7 +-
 .../uptime/public/hooks/use_monitor.ts        |  2 +-
 .../__tests__/get_infra_href.test.ts          |  3 +
 .../__tests__/get_logging_href.test.ts        |  3 +
 .../common/fixtures/plugins/aad/package.json  |  2 +-
 .../plugins/actions_simulators/package.json   |  2 +-
 .../fixtures/plugins/alerts/package.json      |  2 +-
 .../plugins/alerts_restricted/package.json    |  2 +-
 .../plugins/task_manager_fixture/package.json |  2 +-
 .../common/lib/alert_utils.ts                 |  8 +-
 .../plugins/iframe_embedded/package.json      |  2 +-
 .../fixtures/plugins/alerts/package.json      |  2 +-
 .../services/alerting/actions.ts              |  9 +-
 .../plugins/elasticsearch_client/package.json |  2 +-
 .../plugins/event_log/package.json            |  2 +-
 .../plugins/sample_task_plugin/package.json   |  2 +-
 .../task_manager_performance/package.json     |  2 +-
 .../csv_saved_search.ts                       |  2 +-
 yarn.lock                                     | 88 +++++++++----------
 195 files changed, 568 insertions(+), 319 deletions(-)

diff --git a/examples/embeddable_examples/public/book/book_embeddable.tsx b/examples/embeddable_examples/public/book/book_embeddable.tsx
index 33876ab24414e..b033fe86cd1c7 100644
--- a/examples/embeddable_examples/public/book/book_embeddable.tsx
+++ b/examples/embeddable_examples/public/book/book_embeddable.tsx
@@ -60,7 +60,8 @@ function getHasMatch(search?: string, savedAttributes?: BookSavedObjectAttribute
   );
 }
 
-export class BookEmbeddable extends Embeddable<BookEmbeddableInput, BookEmbeddableOutput>
+export class BookEmbeddable
+  extends Embeddable<BookEmbeddableInput, BookEmbeddableOutput>
   implements ReferenceOrValueEmbeddable<BookByValueInput, BookByReferenceInput> {
   public readonly type = BOOK_EMBEDDABLE;
   private subscription: Subscription;
diff --git a/package.json b/package.json
index 1bf6e8b977af8..b8cf2e1e27774 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "**/@types/chai": "^4.2.11",
     "**/cypress/@types/lodash": "^4.14.159",
     "**/cypress/lodash": "^4.17.20",
-    "**/typescript": "3.9.5",
+    "**/typescript": "4.0.2",
     "**/graphql-toolkit/lodash": "^4.17.15",
     "**/hoist-non-react-statics": "^3.3.2",
     "**/isomorphic-git/**/base64-js": "^1.2.1",
@@ -338,8 +338,8 @@
     "@types/vinyl": "^2.0.4",
     "@types/vinyl-fs": "^2.4.11",
     "@types/zen-observable": "^0.8.0",
-    "@typescript-eslint/eslint-plugin": "^3.7.1",
-    "@typescript-eslint/parser": "^3.7.1",
+    "@typescript-eslint/eslint-plugin": "^3.10.0",
+    "@typescript-eslint/parser": "^3.10.0",
     "angular-aria": "^1.8.0",
     "angular-mocks": "^1.7.9",
     "angular-recursion": "^1.0.5",
@@ -381,7 +381,7 @@
     "eslint-plugin-no-unsanitized": "^3.0.2",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prefer-object-spread": "^1.2.1",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-react": "^7.20.3",
     "eslint-plugin-react-hooks": "^4.0.4",
     "eslint-plugin-react-perf": "^3.2.3",
@@ -443,7 +443,7 @@
     "pkg-up": "^2.0.0",
     "pngjs": "^3.4.0",
     "postcss": "^7.0.32",
-    "prettier": "^2.0.5",
+    "prettier": "^2.1.1",
     "prop-types": "15.6.0",
     "proxyquire": "1.8.0",
     "react-grid-layout": "^0.16.2",
@@ -469,7 +469,7 @@
     "tape": "^4.13.0",
     "topojson-client": "3.0.0",
     "tree-kill": "^1.2.2",
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "typings-tester": "^0.3.2",
     "ui-select": "0.19.8",
     "vega": "^5.13.0",
diff --git a/packages/eslint-config-kibana/package.json b/packages/eslint-config-kibana/package.json
index 618f71daf0339..4ec3bcdfd7c05 100644
--- a/packages/eslint-config-kibana/package.json
+++ b/packages/eslint-config-kibana/package.json
@@ -15,8 +15,8 @@
   },
   "homepage": "https://github.com/elastic/kibana/tree/master/packages/eslint-config-kibana",
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "^3.7.1",
-    "@typescript-eslint/parser": "^3.7.1",
+    "@typescript-eslint/eslint-plugin": "^3.10.0",
+    "@typescript-eslint/parser": "^3.10.0",
     "babel-eslint": "^10.0.3",
     "eslint": "^6.8.0",
     "eslint-plugin-babel": "^5.3.0",
diff --git a/packages/kbn-analytics/package.json b/packages/kbn-analytics/package.json
index 873252ceb0a1a..b04b5b32d0746 100644
--- a/packages/kbn-analytics/package.json
+++ b/packages/kbn-analytics/package.json
@@ -17,6 +17,6 @@
     "@babel/cli": "^7.10.5",
     "@kbn/dev-utils": "1.0.0",
     "@kbn/babel-preset": "1.0.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/packages/kbn-config-schema/package.json b/packages/kbn-config-schema/package.json
index 10b607dcd4312..10b1741d98441 100644
--- a/packages/kbn-config-schema/package.json
+++ b/packages/kbn-config-schema/package.json
@@ -10,7 +10,7 @@
     "kbn:bootstrap": "yarn build"
   },
   "devDependencies": {
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "tsd": "^0.7.4"
   },
   "peerDependencies": {
diff --git a/packages/kbn-dev-utils/package.json b/packages/kbn-dev-utils/package.json
index 7ce433f80bed0..768a67794517f 100644
--- a/packages/kbn-dev-utils/package.json
+++ b/packages/kbn-dev-utils/package.json
@@ -25,7 +25,7 @@
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "@kbn/expect": "1.0.0",
     "chance": "1.0.18"
   }
diff --git a/packages/kbn-i18n/package.json b/packages/kbn-i18n/package.json
index 0f830acb284a0..680c789bc9d9d 100644
--- a/packages/kbn-i18n/package.json
+++ b/packages/kbn-i18n/package.json
@@ -21,7 +21,7 @@
     "del": "^5.1.0",
     "getopts": "^2.2.4",
     "supports-color": "^7.0.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   },
   "dependencies": {
     "intl-format-cache": "^2.1.0",
diff --git a/packages/kbn-monaco/package.json b/packages/kbn-monaco/package.json
index 3e5a3cd216225..ca133010fe230 100644
--- a/packages/kbn-monaco/package.json
+++ b/packages/kbn-monaco/package.json
@@ -20,7 +20,7 @@
     "del": "^5.1.0",
     "raw-loader": "3.1.0",
     "supports-color": "^7.0.0",
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "webpack": "^4.41.5",
     "webpack-cli": "^3.3.10"
   }
diff --git a/packages/kbn-plugin-generator/package.json b/packages/kbn-plugin-generator/package.json
index 89e4251bd7802..1d9637c8279da 100644
--- a/packages/kbn-plugin-generator/package.json
+++ b/packages/kbn-plugin-generator/package.json
@@ -14,7 +14,7 @@
     "execa": "^4.0.2",
     "inquirer": "^7.3.3",
     "normalize-path": "^3.0.0",
-    "prettier": "^2.0.5",
+    "prettier": "^2.1.1",
     "vinyl": "^2.2.0",
     "vinyl-fs": "^3.0.3"
   },
diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
index 9cc34bcda1af4..ba39528a1f809 100644
--- a/packages/kbn-plugin-helpers/package.json
+++ b/packages/kbn-plugin-helpers/package.json
@@ -35,7 +35,7 @@
     "@types/through2": "^2.0.35",
     "@types/through2-map": "^3.0.0",
     "@types/vinyl": "^2.0.4",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   },
   "peerDependencies": {
     "@kbn/babel-preset": "1.0.0"
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 1d4c13e605f27..eb2d0d2581a34 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -562,6 +562,7 @@ module.exports = require("path");
  * under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ToolingLogCollectingWriter = exports.parseLogLevel = exports.pickLevelFromFlags = exports.ToolingLogTextWriter = exports.ToolingLog = void 0;
 var tooling_log_1 = __webpack_require__(6);
 Object.defineProperty(exports, "ToolingLog", { enumerable: true, get: function () { return tooling_log_1.ToolingLog; } });
 var tooling_log_text_writer_1 = __webpack_require__(110);
diff --git a/packages/kbn-pm/package.json b/packages/kbn-pm/package.json
index 6b36f14df95e9..914ca2fd65fa2 100644
--- a/packages/kbn-pm/package.json
+++ b/packages/kbn-pm/package.json
@@ -51,7 +51,7 @@
     "multimatch": "^4.0.0",
     "ncp": "^2.0.0",
     "ora": "^1.4.0",
-    "prettier": "^2.0.5",
+    "prettier": "^2.1.1",
     "read-pkg": "^5.2.0",
     "rxjs": "^6.5.5",
     "spawn-sync": "^1.0.15",
@@ -59,7 +59,7 @@
     "strip-ansi": "^4.0.0",
     "strong-log-transformer": "^2.1.0",
     "tempy": "^0.3.0",
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "unlazy-loader": "^0.1.3",
     "webpack": "^4.41.5",
     "webpack-cli": "^3.3.10",
diff --git a/packages/kbn-release-notes/package.json b/packages/kbn-release-notes/package.json
index 25e1816b6cc1e..12d0122f9a4d3 100644
--- a/packages/kbn-release-notes/package.json
+++ b/packages/kbn-release-notes/package.json
@@ -18,6 +18,6 @@
   },
   "devDependencies": {
     "markdown-it": "^10.0.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/kbn-spec-to-console/package.json b/packages/kbn-spec-to-console/package.json
index 5423bc3fd4ecd..63ce93ac54f46 100644
--- a/packages/kbn-spec-to-console/package.json
+++ b/packages/kbn-spec-to-console/package.json
@@ -18,7 +18,7 @@
   "homepage": "https://github.com/jbudz/spec-to-console#readme",
   "devDependencies": {
     "jest": "^25.5.4",
-    "prettier": "^2.0.5"
+    "prettier": "^2.1.1"
   },
   "dependencies": {
     "commander": "^3.0.0",
diff --git a/packages/kbn-telemetry-tools/package.json b/packages/kbn-telemetry-tools/package.json
index 5593a72ecd965..63a8fcf30335e 100644
--- a/packages/kbn-telemetry-tools/package.json
+++ b/packages/kbn-telemetry-tools/package.json
@@ -17,6 +17,6 @@
     "normalize-path": "^3.0.0",
     "@types/lodash": "^3.10.1",
     "moment": "^2.24.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap b/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap
index bf1d5ffc1101e..68b068b0cfe06 100644
--- a/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap
+++ b/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap
@@ -9,7 +9,7 @@ Array [
       "fetch": Object {
         "typeDescriptor": Object {
           "locale": Object {
-            "kind": 143,
+            "kind": 146,
             "type": "StringKeyword",
           },
         },
@@ -31,7 +31,7 @@ Array [
       "fetch": Object {
         "typeDescriptor": Object {
           "locale": Object {
-            "kind": 143,
+            "kind": 146,
             "type": "StringKeyword",
           },
         },
@@ -53,7 +53,7 @@ Array [
       "fetch": Object {
         "typeDescriptor": Object {
           "locale": Object {
-            "kind": 143,
+            "kind": 146,
             "type": "StringKeyword",
           },
         },
@@ -75,7 +75,7 @@ Array [
       "fetch": Object {
         "typeDescriptor": Object {
           "locale": Object {
-            "kind": 143,
+            "kind": 146,
             "type": "StringKeyword",
           },
         },
@@ -99,11 +99,11 @@ Array [
           "": Object {
             "@@INDEX@@": Object {
               "count_1": Object {
-                "kind": 140,
+                "kind": 143,
                 "type": "NumberKeyword",
               },
               "count_2": Object {
-                "kind": 140,
+                "kind": 143,
                 "type": "NumberKeyword",
               },
             },
@@ -129,7 +129,7 @@ Array [
       "fetch": Object {
         "typeDescriptor": Object {
           "locale": Object {
-            "kind": 143,
+            "kind": 146,
             "type": "StringKeyword",
           },
         },
@@ -151,43 +151,43 @@ Array [
       "fetch": Object {
         "typeDescriptor": Object {
           "flat": Object {
-            "kind": 143,
+            "kind": 146,
             "type": "StringKeyword",
           },
           "my_array": Object {
             "total": Object {
-              "kind": 140,
+              "kind": 143,
               "type": "NumberKeyword",
             },
             "type": Object {
-              "kind": 128,
+              "kind": 131,
               "type": "BooleanKeyword",
             },
           },
           "my_index_signature_prop": Object {
             "": Object {
               "@@INDEX@@": Object {
-                "kind": 140,
+                "kind": 143,
                 "type": "NumberKeyword",
               },
             },
           },
           "my_objects": Object {
             "total": Object {
-              "kind": 140,
+              "kind": 143,
               "type": "NumberKeyword",
             },
             "type": Object {
-              "kind": 128,
+              "kind": 131,
               "type": "BooleanKeyword",
             },
           },
           "my_str": Object {
-            "kind": 143,
+            "kind": 146,
             "type": "StringKeyword",
           },
           "my_str_array": Object {
-            "kind": 143,
+            "kind": 146,
             "type": "StringKeyword",
           },
         },
diff --git a/packages/kbn-telemetry-tools/src/tools/serializer.ts b/packages/kbn-telemetry-tools/src/tools/serializer.ts
index f945402ec5fc2..d5412f64f3615 100644
--- a/packages/kbn-telemetry-tools/src/tools/serializer.ts
+++ b/packages/kbn-telemetry-tools/src/tools/serializer.ts
@@ -142,14 +142,11 @@ export function getDescriptor(node: ts.Node, program: ts.Program): Descriptor |
   }
 
   if (ts.isUnionTypeNode(node)) {
-    const types = node.types.filter((typeNode) => {
-      return (
-        typeNode.kind !== ts.SyntaxKind.NullKeyword &&
-        typeNode.kind !== ts.SyntaxKind.UndefinedKeyword
-      );
-    });
+    const types = node.types.filter(discardNullOrUndefined);
 
-    const kinds = types.map((typeNode) => getDescriptor(typeNode, program));
+    const kinds = types
+      .map((typeNode) => getDescriptor(typeNode, program))
+      .filter(discardNullOrUndefined);
 
     const uniqueKinds = uniq(kinds, 'kind');
 
@@ -172,3 +169,9 @@ export function getDescriptor(node: ts.Node, program: ts.Program): Descriptor |
       throw new Error(`Unknown type ${ts.SyntaxKind[node.kind]}; ${node.getText()}`);
   }
 }
+
+function discardNullOrUndefined(typeNode: ts.TypeNode | Descriptor | DescriptorValue) {
+  return (
+    typeNode.kind !== ts.SyntaxKind.NullKeyword && typeNode.kind !== ts.SyntaxKind.UndefinedKeyword
+  );
+}
diff --git a/src/fixtures/agg_resp/date_histogram.js b/src/fixtures/agg_resp/date_histogram.js
index 5e898697a154c..12bc4e7daf3e5 100644
--- a/src/fixtures/agg_resp/date_histogram.js
+++ b/src/fixtures/agg_resp/date_histogram.js
@@ -31,7 +31,7 @@ export default {
     hits: [],
   },
   aggregations: {
-    '1': {
+    1: {
       buckets: [
         {
           key_as_string: '2015-01-30T01:00:00.000Z',
diff --git a/src/fixtures/agg_resp/range.js b/src/fixtures/agg_resp/range.js
index 6f02d9b7c7a0a..71729a06f590f 100644
--- a/src/fixtures/agg_resp/range.js
+++ b/src/fixtures/agg_resp/range.js
@@ -31,7 +31,7 @@ export default {
     hits: [],
   },
   aggregations: {
-    '1': {
+    1: {
       buckets: {
         '*-1024.0': {
           to: 1024,
diff --git a/src/legacy/server/status/lib/metrics.test.js b/src/legacy/server/status/lib/metrics.test.js
index 6a734941eb70c..cc9c2607a2b59 100644
--- a/src/legacy/server/status/lib/metrics.test.js
+++ b/src/legacy/server/status/lib/metrics.test.js
@@ -100,8 +100,8 @@ describe('Metrics', function () {
       Object.defineProperty(process, 'pid', { get: pidMock }); //
 
       const hapiEvent = {
-        requests: { '5603': { total: 22, disconnects: 0, statusCodes: { '200': 22 } } },
-        responseTimes: { '5603': { avg: 1.8636363636363635, max: 4 } },
+        requests: { 5603: { total: 22, disconnects: 0, statusCodes: { 200: 22 } } },
+        responseTimes: { 5603: { avg: 1.8636363636363635, max: 4 } },
         osload: [2.20751953125, 2.02294921875, 1.89794921875],
         osmem: { total: 17179869184, free: 102318080 },
         osup: 1008991,
@@ -150,9 +150,9 @@ describe('Metrics', function () {
     it('parses event with missing fields / NaN for responseTimes.avg', async () => {
       const hapiEvent = {
         requests: {
-          '5603': { total: 22, disconnects: 0, statusCodes: { '200': 22 } },
+          5603: { total: 22, disconnects: 0, statusCodes: { 200: 22 } },
         },
-        responseTimes: { '5603': { avg: NaN, max: 4 } },
+        responseTimes: { 5603: { avg: NaN, max: 4 } },
         host: 'blahblah.local',
       };
 
diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
index 4afcba14abef4..bbc3f3632bf64 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
@@ -243,7 +243,7 @@ export class AdvancedSettingsComponent extends Component<
 }
 
 export const AdvancedSettings = (props: AdvancedSettingsProps) => {
-  const { query } = useParams();
+  const { query } = useParams<{ query: string }>();
   return (
     <AdvancedSettingsComponent
       queryText={query || ''}
diff --git a/src/plugins/console/public/lib/autocomplete/__jest__/url_autocomplete.test.js b/src/plugins/console/public/lib/autocomplete/__jest__/url_autocomplete.test.js
index 0c3fcbafbe9f9..0f97416f053ee 100644
--- a/src/plugins/console/public/lib/autocomplete/__jest__/url_autocomplete.test.js
+++ b/src/plugins/console/public/lib/autocomplete/__jest__/url_autocomplete.test.js
@@ -93,7 +93,7 @@ describe('Url autocomplete', () => {
 
   (function () {
     const endpoints = {
-      '1': {
+      1: {
         patterns: ['a/b'],
         methods: ['GET'],
       },
@@ -125,11 +125,11 @@ describe('Url autocomplete', () => {
 
   (function () {
     const endpoints = {
-      '1': {
+      1: {
         patterns: ['a/b', 'a/b/{p}'],
         methods: ['GET'],
       },
-      '2': {
+      2: {
         patterns: ['a/c'],
         methods: ['GET'],
       },
@@ -176,14 +176,14 @@ describe('Url autocomplete', () => {
 
   (function () {
     const endpoints = {
-      '1': {
+      1: {
         patterns: ['a/{p}'],
         url_components: {
           p: ['a', 'b'],
         },
         methods: ['GET'],
       },
-      '2': {
+      2: {
         patterns: ['a/c'],
         methods: ['GET'],
       },
@@ -230,18 +230,18 @@ describe('Url autocomplete', () => {
 
   (function () {
     const endpoints = {
-      '1': {
+      1: {
         patterns: ['a/{p}'],
         url_components: {
           p: ['a', 'b'],
         },
         methods: ['GET'],
       },
-      '2': {
+      2: {
         patterns: ['b/{p}'],
         methods: ['GET'],
       },
-      '3': {
+      3: {
         patterns: ['b/{l}/c'],
         methods: ['GET'],
         url_components: {
@@ -315,7 +315,7 @@ describe('Url autocomplete', () => {
 
   (function () {
     const endpoints = {
-      '1': {
+      1: {
         patterns: ['a/b/{p}/c/e'],
         methods: ['GET'],
       },
diff --git a/src/plugins/dashboard/common/bwc/types.ts b/src/plugins/dashboard/common/bwc/types.ts
index 2427799345463..421ea44fa7a24 100644
--- a/src/plugins/dashboard/common/bwc/types.ts
+++ b/src/plugins/dashboard/common/bwc/types.ts
@@ -53,7 +53,7 @@ interface DashboardAttributes extends SavedObjectAttributes {
 interface DashboardAttributesTo720 extends SavedObjectAttributes {
   panelsJSON: string;
   description: string;
-  uiStateJSON: string;
+  uiStateJSON?: string;
   version: number;
   timeRestore: boolean;
   useMargins?: boolean;
diff --git a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
index e10265376f2de..0d20fdee07df5 100644
--- a/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
+++ b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx
@@ -464,6 +464,7 @@ export class DashboardAppController {
                 );
               } else if ('input' in incomingEmbeddable) {
                 const input = incomingEmbeddable.input;
+                // @ts-expect-error
                 delete input.id;
                 const explicitInput = {
                   savedVis: input,
diff --git a/src/plugins/data/common/es_query/kuery/ast/ast.test.ts b/src/plugins/data/common/es_query/kuery/ast/ast.test.ts
index 6a69d52d72134..7795497dbec8d 100644
--- a/src/plugins/data/common/es_query/kuery/ast/ast.test.ts
+++ b/src/plugins/data/common/es_query/kuery/ast/ast.test.ts
@@ -350,12 +350,14 @@ describe('kuery AST API', () => {
       expect(toElasticsearchQuery((null as unknown) as KueryNode, undefined)).toEqual(expected);
 
       const noTypeNode = nodeTypes.function.buildNode('exists', 'foo');
+
+      // @ts-expect-error
       delete noTypeNode.type;
       expect(toElasticsearchQuery(noTypeNode)).toEqual(expected);
 
       const unknownTypeNode = nodeTypes.function.buildNode('exists', 'foo');
 
-      // @ts-ignore
+      // @ts-expect-error
       unknownTypeNode.type = 'notValid';
       expect(toElasticsearchQuery(unknownTypeNode)).toEqual(expected);
     });
diff --git a/src/plugins/discover/public/application/embeddable/search_embeddable.ts b/src/plugins/discover/public/application/embeddable/search_embeddable.ts
index b621017677c58..1de62fe5a0348 100644
--- a/src/plugins/discover/public/application/embeddable/search_embeddable.ts
+++ b/src/plugins/discover/public/application/embeddable/search_embeddable.ts
@@ -78,7 +78,8 @@ interface SearchEmbeddableConfig {
   filterManager: FilterManager;
 }
 
-export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
+export class SearchEmbeddable
+  extends Embeddable<SearchInput, SearchOutput>
   implements ISearchEmbeddable {
   private readonly savedSearch: SavedSearch;
   private $rootScope: ng.IRootScopeService;
diff --git a/src/plugins/embeddable/public/lib/containers/container.ts b/src/plugins/embeddable/public/lib/containers/container.ts
index 8cf3d1a15883b..38975cc220bc2 100644
--- a/src/plugins/embeddable/public/lib/containers/container.ts
+++ b/src/plugins/embeddable/public/lib/containers/container.ts
@@ -35,10 +35,11 @@ import { isSavedObjectEmbeddableInput } from '../embeddables/saved_object_embedd
 const getKeys = <T extends {}>(o: T): Array<keyof T> => Object.keys(o) as Array<keyof T>;
 
 export abstract class Container<
-  TChildInput extends Partial<EmbeddableInput> = {},
-  TContainerInput extends ContainerInput<TChildInput> = ContainerInput<TChildInput>,
-  TContainerOutput extends ContainerOutput = ContainerOutput
-> extends Embeddable<TContainerInput, TContainerOutput>
+    TChildInput extends Partial<EmbeddableInput> = {},
+    TContainerInput extends ContainerInput<TChildInput> = ContainerInput<TChildInput>,
+    TContainerOutput extends ContainerOutput = ContainerOutput
+  >
+  extends Embeddable<TContainerInput, TContainerOutput>
   implements IContainer<TChildInput, TContainerInput, TContainerOutput> {
   public readonly isContainer: boolean = true;
   protected readonly children: {
diff --git a/src/plugins/kibana_react/public/context/context.test.tsx b/src/plugins/kibana_react/public/context/context.test.tsx
index 4008daf69f25d..a873d1cc2ce30 100644
--- a/src/plugins/kibana_react/public/context/context.test.tsx
+++ b/src/plugins/kibana_react/public/context/context.test.tsx
@@ -122,7 +122,7 @@ test('<KibanaContextProvider> provider provides default kibana-react context', (
 
 test('<KibanaContextProvider> can set custom services in context', () => {
   const Test: React.FC = () => {
-    const { services } = useKibana();
+    const { services } = useKibana<{ test: string }>();
     expect(services.test).toBe('quux');
     return null;
   };
@@ -137,7 +137,7 @@ test('<KibanaContextProvider> can set custom services in context', () => {
 
 test('nested <KibanaContextProvider> override and merge services', () => {
   const Test: React.FC = () => {
-    const { services } = useKibana();
+    const { services } = useKibana<{ foo: string; bar: string; baz: string }>();
     expect(services.foo).toBe('foo2');
     expect(services.bar).toBe('bar');
     expect(services.baz).toBe('baz3');
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts
index df9d6eb146eab..6e8b71d675f7b 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ops_stats/ops_stats_collector.ts
@@ -43,11 +43,13 @@ export function getOpsStatsCollector(
   metrics$.subscribe((_metrics) => {
     const metrics = cloneDeep(_metrics);
     // Ensure we only include the same data that Metricbeat collection would get
+    // @ts-expect-error
     delete metrics.process.pid;
     const responseTimes = {
       average: metrics.response_times.avg_in_millis,
       max: metrics.response_times.max_in_millis,
     };
+    // @ts-expect-error
     delete metrics.requests.statusCodes;
     lastMetrics = {
       ...metrics,
diff --git a/src/plugins/maps_legacy/public/map/grid_dimensions.js b/src/plugins/maps_legacy/public/map/grid_dimensions.js
index b3438914d5636..d146adf2ca67f 100644
--- a/src/plugins/maps_legacy/public/map/grid_dimensions.js
+++ b/src/plugins/maps_legacy/public/map/grid_dimensions.js
@@ -22,18 +22,18 @@ import _ from 'lodash';
 // geohash precision mapping of geohash grid cell dimensions (width x height, in meters) at equator.
 // https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-geohashgrid-aggregation.html#_cell_dimensions_at_the_equator
 const gridAtEquator = {
-  '1': [5009400, 4992600],
-  '2': [1252300, 624100],
-  '3': [156500, 156000],
-  '4': [39100, 19500],
-  '5': [4900, 4900],
-  '6': [1200, 609.4],
-  '7': [152.9, 152.4],
-  '8': [38.2, 19],
-  '9': [4.8, 4.8],
-  '10': [1.2, 0.595],
-  '11': [0.149, 0.149],
-  '12': [0.037, 0.019],
+  1: [5009400, 4992600],
+  2: [1252300, 624100],
+  3: [156500, 156000],
+  4: [39100, 19500],
+  5: [4900, 4900],
+  6: [1200, 609.4],
+  7: [152.9, 152.4],
+  8: [38.2, 19],
+  9: [4.8, 4.8],
+  10: [1.2, 0.595],
+  11: [0.149, 0.149],
+  12: [0.037, 0.019],
 };
 
 export function gridDimensions(precision) {
diff --git a/src/plugins/share/public/types.ts b/src/plugins/share/public/types.ts
index 8dda9f1195a39..9dcfc3d9e8143 100644
--- a/src/plugins/share/public/types.ts
+++ b/src/plugins/share/public/types.ts
@@ -55,7 +55,7 @@ export interface ShareContext {
  * */
 export interface ShareContextMenuPanelItem extends Omit<EuiContextMenuPanelItemDescriptor, 'name'> {
   name: string; // EUI will accept a `ReactNode` for the `name` prop, but `ShareContentMenu` assumes a `string`.
-  sortOrder: number;
+  sortOrder?: number;
 }
 
 /**
diff --git a/src/plugins/vis_default_editor/public/components/agg_select.tsx b/src/plugins/vis_default_editor/public/components/agg_select.tsx
index 04b5e48c65e8e..cccfb043cf0af 100644
--- a/src/plugins/vis_default_editor/public/components/agg_select.tsx
+++ b/src/plugins/vis_default_editor/public/components/agg_select.tsx
@@ -22,8 +22,9 @@ import React, { useEffect, useCallback, useState } from 'react';
 import { EuiComboBox, EuiComboBoxOptionOption, EuiFormRow, EuiLink, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-
 import { IAggType, IndexPattern } from 'src/plugins/data/public';
+
+import { DocLinksStart } from '../../../../core/public';
 import { useKibana } from '../../../kibana_react/public';
 import { ComboBoxGroupedOptions } from '../utils';
 import { AGG_TYPE_ACTION_KEYS, AggTypeAction } from './agg_params_state';
@@ -52,7 +53,7 @@ function DefaultEditorAggSelect({
   onChangeAggType,
 }: DefaultEditorAggSelectProps) {
   const [isDirty, setIsDirty] = useState(false);
-  const { services } = useKibana();
+  const { services } = useKibana<{ docLinks: DocLinksStart }>();
   const selectedOptions: ComboBoxGroupedOptions<IAggType> = value
     ? [{ label: value.title, target: value }]
     : [];
@@ -71,6 +72,7 @@ function DefaultEditorAggSelect({
 
   let aggHelpLink: string | undefined;
   if (has(value, 'name')) {
+    // @ts-expect-error
     aggHelpLink = services.docLinks.links.aggs[value.name];
   }
 
diff --git a/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx b/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx
index d3cf87c9ef14a..4afc85ba3b5c2 100644
--- a/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/date_ranges.tsx
@@ -37,6 +37,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { isEqual, omit } from 'lodash';
 import { useMount } from 'react-use';
+import { DocLinksStart } from 'src/core/public';
 
 import { useKibana } from '../../../../kibana_react/public';
 import { AggParamEditorProps } from '../agg_param_props';
@@ -67,7 +68,7 @@ function DateRangesParamEditor({
   setValue,
   setValidity,
 }: AggParamEditorProps<DateRangeValues[]>) {
-  const { services } = useKibana();
+  const { services } = useKibana<{ docLinks: DocLinksStart }>();
   const [ranges, setRanges] = useState(() =>
     value.map((range) => ({ ...range, id: generateId() }))
   );
diff --git a/src/plugins/vis_default_editor/public/components/controls/filter.tsx b/src/plugins/vis_default_editor/public/components/controls/filter.tsx
index 94fd2d9bc9151..101ca3e8ad457 100644
--- a/src/plugins/vis_default_editor/public/components/controls/filter.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/filter.tsx
@@ -21,7 +21,12 @@ import React, { useState } from 'react';
 import { EuiForm, EuiButtonIcon, EuiFieldText, EuiFormRow, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { IAggConfig, Query, QueryStringInput } from '../../../../data/public';
+import {
+  IAggConfig,
+  Query,
+  QueryStringInput,
+  DataPublicPluginStart,
+} from '../../../../data/public';
 import { useKibana } from '../../../../kibana_react/public';
 
 interface FilterRowProps {
@@ -49,7 +54,7 @@ function FilterRow({
   onChangeValue,
   onRemoveFilter,
 }: FilterRowProps) {
-  const { services } = useKibana();
+  const { services } = useKibana<{ data: DataPublicPluginStart; appName: string }>();
   const [showCustomLabel, setShowCustomLabel] = useState(false);
   const filterLabel = i18n.translate('visDefaultEditor.controls.filters.filterLabel', {
     defaultMessage: 'Filter {index}',
diff --git a/src/plugins/vis_default_editor/public/components/controls/filters.tsx b/src/plugins/vis_default_editor/public/components/controls/filters.tsx
index fc676e25ff6d7..b2e6373edfc10 100644
--- a/src/plugins/vis_default_editor/public/components/controls/filters.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/filters.tsx
@@ -23,7 +23,8 @@ import { htmlIdGenerator, EuiButton, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { useMount } from 'react-use';
 
-import { Query } from '../../../../data/public';
+import { Query, DataPublicPluginStart } from '../../../../data/public';
+import { IUiSettingsClient } from '../../../../../core/public';
 import { useKibana } from '../../../../kibana_react/public';
 import { FilterRow } from './filter';
 import { AggParamEditorProps } from '../agg_param_props';
@@ -64,7 +65,7 @@ function FiltersParamEditor({ agg, value = [], setValue }: AggParamEditorProps<F
     setFilters(updatedFilters);
   };
 
-  const { services } = useKibana();
+  const { services } = useKibana<{ uiSettings: IUiSettingsClient; data: DataPublicPluginStart }>();
 
   const onAddFilter = () =>
     updateFilters([
diff --git a/src/plugins/vis_default_editor/public/components/controls/precision.tsx b/src/plugins/vis_default_editor/public/components/controls/precision.tsx
index ad2011513b171..1826c0ac4b9e6 100644
--- a/src/plugins/vis_default_editor/public/components/controls/precision.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/precision.tsx
@@ -21,12 +21,13 @@ import React from 'react';
 
 import { EuiRange, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { IUiSettingsClient } from '../../../../../core/public';
 
 import { useKibana } from '../../../../kibana_react/public';
 import { AggParamEditorProps } from '../agg_param_props';
 
 function PrecisionParamEditor({ agg, value, setValue }: AggParamEditorProps<number>) {
-  const { services } = useKibana();
+  const { services } = useKibana<{ uiSettings: IUiSettingsClient }>();
   const label = i18n.translate('visDefaultEditor.controls.precisionLabel', {
     defaultMessage: 'Precision',
   });
diff --git a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
index 11ceb5885dd31..4889e6ca049ca 100644
--- a/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
+++ b/src/plugins/vis_default_editor/public/components/sidebar/sidebar_title.tsx
@@ -37,6 +37,7 @@ import { i18n } from '@kbn/i18n';
 
 import { Vis } from 'src/plugins/visualizations/public';
 import { SavedObject } from 'src/plugins/saved_objects/public';
+import { ApplicationStart } from '../../../../../core/public';
 import { useKibana } from '../../../../kibana_react/public';
 
 interface LinkedSearchProps {
@@ -55,7 +56,7 @@ export function LinkedSearch({ savedSearch, eventEmitter }: LinkedSearchProps) {
   const [showPopover, setShowPopover] = useState(false);
   const {
     services: { application },
-  } = useKibana();
+  } = useKibana<{ application: ApplicationStart }>();
 
   const closePopover = useCallback(() => setShowPopover(false), []);
   const onClickButtonLink = useCallback(() => setShowPopover((v) => !v), []);
diff --git a/src/plugins/vis_type_vega/public/data_model/types.ts b/src/plugins/vis_type_vega/public/data_model/types.ts
index b830b24c92082..14848bf5e8739 100644
--- a/src/plugins/vis_type_vega/public/data_model/types.ts
+++ b/src/plugins/vis_type_vega/public/data_model/types.ts
@@ -63,7 +63,7 @@ interface Mark {
 type Renderer = 'svg' | 'canvas';
 
 interface VegaSpecConfig extends KibanaConfig {
-  kibana: KibanaConfig;
+  kibana?: KibanaConfig;
   padding: Padding;
   projection: Projection;
   autosize: AutoSize;
@@ -103,8 +103,8 @@ export interface VegaSpec {
   encoding?: Encoding;
   mark?: string;
   title?: string;
-  autosize: AutoSize;
-  projections: Projection[];
+  autosize?: AutoSize;
+  projections?: Projection[];
   width?: number;
   height?: number;
   padding?: number | Padding;
diff --git a/src/plugins/vis_type_vega/public/data_model/vega_parser.ts b/src/plugins/vis_type_vega/public/data_model/vega_parser.ts
index da5c76fa6beab..b3fb2d54cb266 100644
--- a/src/plugins/vis_type_vega/public/data_model/vega_parser.ts
+++ b/src/plugins/vis_type_vega/public/data_model/vega_parser.ts
@@ -243,13 +243,13 @@ The URL is an identifier only. Kibana and your browser will never access this UR
         // and will be automatically updated on resize events.
         // We delete width & height if the autosize is set to "fit"
         // We also set useResize=true in case autosize=none, and width & height are not set
-        const autosize = this.spec.autosize.type || this.spec.autosize;
+        const autosize = this.spec.autosize?.type || this.spec.autosize;
         if (autosize === 'fit' || (autosize === 'none' && !this.spec.width && !this.spec.height)) {
           this.useResize = true;
         }
       }
 
-      if (this.useResize && this.spec.padding && this.spec.autosize.contains !== 'padding') {
+      if (this.useResize && this.spec.padding && this.spec.autosize?.contains !== 'padding') {
         if (typeof this.spec.padding === 'object') {
           this.paddingWidth += (+this.spec.padding.left || 0) + (+this.spec.padding.right || 0);
           this.paddingHeight += (+this.spec.padding.top || 0) + (+this.spec.padding.bottom || 0);
diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.ts
index a1681e0d71bd3..4ba3101d34898 100644
--- a/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.ts
+++ b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.ts
@@ -113,6 +113,7 @@ export const buildPointSeriesData = (table: Table, dimensions: Dimensions) => {
 
   chart.series = getSeries(table, chart);
 
+  // @ts-expect-error
   delete chart.aspects;
   return chart;
 };
diff --git a/src/plugins/visualizations/public/vis_types/react_vis_type.test.ts b/src/plugins/visualizations/public/vis_types/react_vis_type.test.ts
index 134106bb3d42a..ecdac06c915fd 100644
--- a/src/plugins/visualizations/public/vis_types/react_vis_type.test.ts
+++ b/src/plugins/visualizations/public/vis_types/react_vis_type.test.ts
@@ -33,6 +33,7 @@ describe('React Vis Type', () => {
     it('should throw if component is not set', () => {
       expect(() => {
         const missingConfig = cloneDeep(visConfig);
+        // @ts-expect-error TS knows it's a required property
         delete missingConfig.visConfig.component;
         new ReactVisType(missingConfig);
       }).toThrow();
diff --git a/src/plugins/visualize/public/application/components/visualize_editor.tsx b/src/plugins/visualize/public/application/components/visualize_editor.tsx
index 0bf5b26e1339f..6a0bd26a16faa 100644
--- a/src/plugins/visualize/public/application/components/visualize_editor.tsx
+++ b/src/plugins/visualize/public/application/components/visualize_editor.tsx
@@ -34,7 +34,7 @@ import { VisualizeServices } from '../types';
 import { VisualizeEditorCommon } from './visualize_editor_common';
 
 export const VisualizeEditor = () => {
-  const { id: visualizationIdFromUrl } = useParams();
+  const { id: visualizationIdFromUrl } = useParams<{ id: string }>();
   const [originatingApp, setOriginatingApp] = useState<string>();
   const { services } = useKibana<VisualizeServices>();
   const [eventEmitter] = useState(new EventEmitter());
diff --git a/src/plugins/visualize/public/application/utils/use/use_saved_vis_instance.test.ts b/src/plugins/visualize/public/application/utils/use/use_saved_vis_instance.test.ts
index a6b6d8ca0e837..ce0f5fe965d7d 100644
--- a/src/plugins/visualize/public/application/utils/use/use_saved_vis_instance.test.ts
+++ b/src/plugins/visualize/public/application/utils/use/use_saved_vis_instance.test.ts
@@ -149,6 +149,7 @@ describe('useSavedVisInstance', () => {
         pathname: VisualizeConstants.CREATE_PATH,
         search: '?type=area&indexPattern=1a2b3c4d',
       };
+      // @ts-ignore-error
       delete mockSavedVisInstance.savedVis.id;
     });
 
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index e1ee1153a28ac..f2e4039f8c2bd 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -16,6 +16,6 @@
     "@kbn/plugin-helpers": "9.0.2",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/app_link_test/package.json b/test/plugin_functional/plugins/app_link_test/package.json
index 9ee3527a237d3..39b56d89a8f0b 100644
--- a/test/plugin_functional/plugins/app_link_test/package.json
+++ b/test/plugin_functional/plugins/app_link_test/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/core_app_status/package.json b/test/plugin_functional/plugins/core_app_status/package.json
index 1f3e4c0b577f2..2bcd741d5a563 100644
--- a/test/plugin_functional/plugins/core_app_status/package.json
+++ b/test/plugin_functional/plugins/core_app_status/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/core_plugin_a/package.json b/test/plugin_functional/plugins/core_plugin_a/package.json
index fea4d4cd9ac65..4cdecda569dbf 100644
--- a/test/plugin_functional/plugins/core_plugin_a/package.json
+++ b/test/plugin_functional/plugins/core_plugin_a/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/core_plugin_appleave/package.json b/test/plugin_functional/plugins/core_plugin_appleave/package.json
index c80b5659d0167..8a63854c83e87 100644
--- a/test/plugin_functional/plugins/core_plugin_appleave/package.json
+++ b/test/plugin_functional/plugins/core_plugin_appleave/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/core_plugin_b/package.json b/test/plugin_functional/plugins/core_plugin_b/package.json
index 370776a2e42bb..2b4501cb306a9 100644
--- a/test/plugin_functional/plugins/core_plugin_b/package.json
+++ b/test/plugin_functional/plugins/core_plugin_b/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/package.json b/test/plugin_functional/plugins/core_plugin_chromeless/package.json
index e78f9249fb875..976ca197a6d51 100644
--- a/test/plugin_functional/plugins/core_plugin_chromeless/package.json
+++ b/test/plugin_functional/plugins/core_plugin_chromeless/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json b/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json
index a9c520338457b..a198e6ed70018 100644
--- a/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json
+++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/core_plugin_static_assets/package.json b/test/plugin_functional/plugins/core_plugin_static_assets/package.json
index 3de8f7845b1a7..0e944276605ff 100644
--- a/test/plugin_functional/plugins/core_plugin_static_assets/package.json
+++ b/test/plugin_functional/plugins/core_plugin_static_assets/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/core_provider_plugin/package.json b/test/plugin_functional/plugins/core_provider_plugin/package.json
index 061b897cd9eea..ce76df7fdf992 100644
--- a/test/plugin_functional/plugins/core_provider_plugin/package.json
+++ b/test/plugin_functional/plugins/core_provider_plugin/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/doc_views_plugin/package.json b/test/plugin_functional/plugins/doc_views_plugin/package.json
index 6189ed2e024ab..e6999fc6fe46c 100644
--- a/test/plugin_functional/plugins/doc_views_plugin/package.json
+++ b/test/plugin_functional/plugins/doc_views_plugin/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/package.json b/test/plugin_functional/plugins/elasticsearch_client_plugin/package.json
index 02c2955f26c86..575363e83f029 100644
--- a/test/plugin_functional/plugins/elasticsearch_client_plugin/package.json
+++ b/test/plugin_functional/plugins/elasticsearch_client_plugin/package.json
@@ -10,6 +10,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/index_patterns/package.json b/test/plugin_functional/plugins/index_patterns/package.json
index eaba6ca624bd8..831f54cf9de8e 100644
--- a/test/plugin_functional/plugins/index_patterns/package.json
+++ b/test/plugin_functional/plugins/index_patterns/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
-}
\ No newline at end of file
+}
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
index b3cef400089b0..0e1a0b550ca15 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
@@ -14,6 +14,6 @@
   "devDependencies": {
     "@elastic/eui": "27.4.1",
     "react": "^16.12.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/kbn_top_nav/package.json b/test/plugin_functional/plugins/kbn_top_nav/package.json
index 101593e7258e8..65986d7288381 100644
--- a/test/plugin_functional/plugins/kbn_top_nav/package.json
+++ b/test/plugin_functional/plugins/kbn_top_nav/package.json
@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
 
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index 9250a4499662f..fd1fb0aa1fca9 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -15,6 +15,6 @@
     "@elastic/eui": "27.4.1",
     "@kbn/plugin-helpers": "9.0.2",
     "react": "^16.12.0",
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/management_test_plugin/package.json b/test/plugin_functional/plugins/management_test_plugin/package.json
index d4919970f06e7..2854e8e332203 100644
--- a/test/plugin_functional/plugins/management_test_plugin/package.json
+++ b/test/plugin_functional/plugins/management_test_plugin/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/rendering_plugin/package.json b/test/plugin_functional/plugins/rendering_plugin/package.json
index 5554669758aff..a53b47c9a1ecc 100644
--- a/test/plugin_functional/plugins/rendering_plugin/package.json
+++ b/test/plugin_functional/plugins/rendering_plugin/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/package.json b/test/plugin_functional/plugins/ui_settings_plugin/package.json
index 1c5abcf2a65c2..ec3185f8f49f6 100644
--- a/test/plugin_functional/plugins/ui_settings_plugin/package.json
+++ b/test/plugin_functional/plugins/ui_settings_plugin/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/x-pack/examples/ui_actions_enhanced_examples/package.json b/x-pack/examples/ui_actions_enhanced_examples/package.json
index 4c8b2a716d98f..057a0706b59b6 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/package.json
+++ b/x-pack/examples/ui_actions_enhanced_examples/package.json
@@ -12,6 +12,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/x-pack/package.json b/x-pack/package.json
index 247130f4895bb..dd8cb589dc232 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -259,7 +259,7 @@
     "topojson-client": "3.0.0",
     "tree-kill": "^1.2.2",
     "ts-loader": "^6.0.4",
-    "typescript": "3.9.5",
+    "typescript": "4.0.2",
     "typescript-fsa": "^3.0.0",
     "typescript-fsa-reducers": "^1.2.1",
     "unstated": "^2.1.1",
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
index 8287ee944bca9..f69a2fc1d209c 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.test.ts
@@ -76,8 +76,11 @@ describe('send_email module', () => {
         rejectUnauthorizedCertificates: false,
       }
     );
+    // @ts-expect-error
     delete sendEmailOptions.transport.service;
+    // @ts-expect-error
     delete sendEmailOptions.transport.user;
+    // @ts-expect-error
     delete sendEmailOptions.transport.password;
     const result = await sendEmail(mockLogger, sendEmailOptions);
     expect(result).toBe(sendMailMockResult);
@@ -123,8 +126,11 @@ describe('send_email module', () => {
         port: 1025,
       },
     });
+    // @ts-expect-error
     delete sendEmailOptions.transport.service;
+    // @ts-expect-error
     delete sendEmailOptions.transport.user;
+    // @ts-expect-error
     delete sendEmailOptions.transport.password;
     const result = await sendEmail(mockLogger, sendEmailOptions);
     expect(result).toBe(sendMailMockResult);
@@ -166,8 +172,11 @@ describe('send_email module', () => {
         secure: true,
       },
     });
+    // @ts-expect-error
     delete sendEmailOptions.transport.service;
+    // @ts-expect-error
     delete sendEmailOptions.transport.user;
+    // @ts-expect-error
     delete sendEmailOptions.transport.password;
 
     const result = await sendEmail(mockLogger, sendEmailOptions);
diff --git a/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts b/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts
index 884353e132b9c..20790d7cf5128 100644
--- a/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts
+++ b/x-pack/plugins/actions/server/lib/errors/preconfigured_action_disabled_modification.ts
@@ -9,7 +9,8 @@ import { ErrorThatHandlesItsOwnResponse } from './types';
 
 export type PreconfiguredActionDisabledFrom = 'update' | 'delete';
 
-export class PreconfiguredActionDisabledModificationError extends Error
+export class PreconfiguredActionDisabledModificationError
+  extends Error
   implements ErrorThatHandlesItsOwnResponse {
   public readonly disabledFrom: PreconfiguredActionDisabledFrom;
 
diff --git a/x-pack/plugins/alerts/server/alert_type_registry.test.ts b/x-pack/plugins/alerts/server/alert_type_registry.test.ts
index 60adde80e883f..048cc3d5a4440 100644
--- a/x-pack/plugins/alerts/server/alert_type_registry.test.ts
+++ b/x-pack/plugins/alerts/server/alert_type_registry.test.ts
@@ -316,22 +316,13 @@ function alertTypeWithVariables(id: string, context: string, state: string): Ale
     producer: 'alerts',
   };
 
-  if (!context && !state) {
-    return baseAlert;
-  }
+  if (!context && !state) return baseAlert;
 
-  const actionVariables = {
-    context: [{ name: context, description: `${id} context` }],
-    state: [{ name: state, description: `${id} state` }],
+  return {
+    ...baseAlert,
+    actionVariables: {
+      ...(context ? { context: [{ name: context, description: `${id} context` }] } : {}),
+      ...(state ? { state: [{ name: state, description: `${id} state` }] } : {}),
+    },
   };
-
-  if (!context) {
-    delete actionVariables.context;
-  }
-
-  if (!state) {
-    delete actionVariables.state;
-  }
-
-  return { ...baseAlert, actionVariables };
 }
diff --git a/x-pack/plugins/apm/e2e/package.json b/x-pack/plugins/apm/e2e/package.json
index d113b465fdf2f..56204b5fb9f9d 100644
--- a/x-pack/plugins/apm/e2e/package.json
+++ b/x-pack/plugins/apm/e2e/package.json
@@ -17,7 +17,7 @@
     "p-limit": "^3.0.1",
     "p-retry": "^4.2.0",
     "ts-loader": "^7.0.5",
-    "typescript": "3.9.6",
+    "typescript": "4.0.2",
     "wait-on": "^5.0.1",
     "webpack": "^4.43.0",
     "yargs": "^15.4.0"
diff --git a/x-pack/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.test.tsx b/x-pack/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.test.tsx
index c6e2c0eff8166..bf1cd75432ff5 100644
--- a/x-pack/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/Main/ProvideBreadcrumbs.test.tsx
@@ -74,6 +74,7 @@ Array [
     const location = getLocation();
     const routes = getTestRoutes();
 
+    // @ts-expect-error
     delete routes[2].breadcrumb;
 
     const breadcrumbs = getBreadcrumbs({ location, routes });
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index 27662585d01fa..0d25ececd5156 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -145,8 +145,8 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
         defaultMessage: 'Error rate',
       }),
       iconClass: 'bell',
-      alertParamsExpression: lazy(() =>
-        import('./components/shared/ErrorRateAlertTrigger')
+      alertParamsExpression: lazy(
+        () => import('./components/shared/ErrorRateAlertTrigger')
       ),
       validate: () => ({
         errors: [],
@@ -160,8 +160,8 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
         defaultMessage: 'Transaction duration',
       }),
       iconClass: 'bell',
-      alertParamsExpression: lazy(() =>
-        import('./components/shared/TransactionDurationAlertTrigger')
+      alertParamsExpression: lazy(
+        () => import('./components/shared/TransactionDurationAlertTrigger')
       ),
       validate: () => ({
         errors: [],
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
index b06d1a8af3bc5..2a1a581c79574 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
@@ -110,6 +110,7 @@ export async function transactionGroupsFetcher(
 
   const isTopTraces = options.type === 'top_traces';
 
+  // @ts-expect-error
   delete projection.body.aggs;
 
   // traces overview is hardcoded to 10000
diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts
index 12c02679d0859..78c4abd75f2ee 100644
--- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts
+++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/index.ts
@@ -52,10 +52,9 @@ export async function getLocalUIFilters({
           buckets.map((bucket) => {
             return {
               name: bucket.key as string,
-              count:
-                'bucket_count' in bucket
-                  ? bucket.bucket_count.value
-                  : bucket.doc_count,
+              count: bucket.bucket_count
+                ? bucket.bucket_count.value
+                : bucket.doc_count,
             };
           }),
           'count',
diff --git a/x-pack/plugins/beats_management/common/domain_types.ts b/x-pack/plugins/beats_management/common/domain_types.ts
index 32e1d81451c65..77c1c05667d47 100644
--- a/x-pack/plugins/beats_management/common/domain_types.ts
+++ b/x-pack/plugins/beats_management/common/domain_types.ts
@@ -41,7 +41,7 @@ export interface CMBeat {
   status?: BeatEvent;
   enrollment_token: string;
   active: boolean;
-  access_token: string;
+  access_token?: string;
   verified_on?: string;
   type: string;
   version?: string;
diff --git a/x-pack/plugins/beats_management/server/lib/beats.ts b/x-pack/plugins/beats_management/server/lib/beats.ts
index e8a6e6f999ca3..c539e9480af2b 100644
--- a/x-pack/plugins/beats_management/server/lib/beats.ts
+++ b/x-pack/plugins/beats_management/server/lib/beats.ts
@@ -72,7 +72,7 @@ export class CMBeatsDomain {
 
     if (typeof userOrToken === 'string') {
       const { verified: isAccessTokenValid } = this.tokens.verifyToken(
-        beat ? beat.access_token : '',
+        beat?.access_token ?? '',
         userOrToken
       );
       if (!isAccessTokenValid) {
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js b/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js
index c2c6f77fb167c..0bc6c099106a6 100644
--- a/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js
+++ b/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js
@@ -106,18 +106,18 @@ const cornerVertices = [
 const resizeMultiplierHorizontal = { left: -1, center: 0, right: 1 };
 const resizeMultiplierVertical = { top: -1, center: 0, bottom: 1 };
 
-const xNames = { '-1': 'left', '0': 'center', '1': 'right' };
-const yNames = { '-1': 'top', '0': 'center', '1': 'bottom' };
+const xNames = { '-1': 'left', 0: 'center', 1: 'right' };
+const yNames = { '-1': 'top', 0: 'center', 1: 'bottom' };
 
 const bidirectionalCursors = {
-  '0': 'ns-resize',
-  '45': 'nesw-resize',
-  '90': 'ew-resize',
-  '135': 'nwse-resize',
-  '180': 'ns-resize',
-  '225': 'nesw-resize',
-  '270': 'ew-resize',
-  '315': 'nwse-resize',
+  0: 'ns-resize',
+  45: 'nesw-resize',
+  90: 'ew-resize',
+  135: 'nwse-resize',
+  180: 'ns-resize',
+  225: 'nesw-resize',
+  270: 'ew-resize',
+  315: 'nwse-resize',
 };
 
 const identityAABB = () => [
diff --git a/x-pack/plugins/canvas/public/state/actions/elements.test.js b/x-pack/plugins/canvas/public/state/actions/elements.test.js
index a790e81e65e25..fc27e422682e1 100644
--- a/x-pack/plugins/canvas/public/state/actions/elements.test.js
+++ b/x-pack/plugins/canvas/public/state/actions/elements.test.js
@@ -12,7 +12,7 @@ describe('getSiblingContext', () => {
       resolvedArgs: {
         'element-foo': {
           expressionContext: {
-            '0': {
+            0: {
               state: 'ready',
               value: {
                 type: 'datatable',
@@ -28,7 +28,7 @@ describe('getSiblingContext', () => {
               },
               error: null,
             },
-            '1': {
+            1: {
               state: 'ready',
               value: {
                 type: 'datatable',
@@ -44,7 +44,7 @@ describe('getSiblingContext', () => {
               },
               error: null,
             },
-            '2': {
+            2: {
               state: 'ready',
               value: {
                 type: 'pointseries',
diff --git a/x-pack/plugins/canvas/public/state/reducers/resolved_args.test.js b/x-pack/plugins/canvas/public/state/reducers/resolved_args.test.js
index 74f1544403e67..987e468031713 100644
--- a/x-pack/plugins/canvas/public/state/reducers/resolved_args.test.js
+++ b/x-pack/plugins/canvas/public/state/reducers/resolved_args.test.js
@@ -162,22 +162,22 @@ describe('resolved args reducer', () => {
         resolvedArgs: {
           'element-1': {
             expressionContext: {
-              '1': {
+              1: {
                 state: 'ready',
                 value: 'test-1',
                 error: null,
               },
-              '2': {
+              2: {
                 state: 'ready',
                 value: 'test-2',
                 error: null,
               },
-              '3': {
+              3: {
                 state: 'ready',
                 value: 'test-3',
                 error: null,
               },
-              '4': {
+              4: {
                 state: 'ready',
                 value: 'test-4',
                 error: null,
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts
index b6bdafc26b445..e57c2af5b83cf 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.test.ts
@@ -156,6 +156,7 @@ describe('"Explore underlying data" panel action', () => {
 
     test('returns false if embeddable does not have index patterns', async () => {
       const { action, output, context } = setup();
+      // @ts-expect-error
       delete output.indexPatterns;
 
       const isCompatible = await action.isCompatible(context);
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
index 44ad3c57f7e24..0a7be858691af 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_chart_action.ts
@@ -25,7 +25,8 @@ export const ACTION_EXPLORE_DATA_CHART = 'ACTION_EXPLORE_DATA_CHART';
  * This is "Explore underlying data" action which appears in popup context
  * menu when user clicks a value in visualization or brushes a time range.
  */
-export class ExploreDataChartAction extends AbstractExploreDataAction<ExploreDataChartActionContext>
+export class ExploreDataChartAction
+  extends AbstractExploreDataAction<ExploreDataChartActionContext>
   implements Action<ExploreDataChartActionContext> {
   public readonly id = ACTION_EXPLORE_DATA_CHART;
 
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts
index 6baf6747f4bba..cd76fe29a5dc2 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.test.ts
@@ -140,6 +140,7 @@ describe('"Explore underlying data" panel action', () => {
 
     test('returns false if embeddable does not have index patterns', async () => {
       const { action, output, context } = setup();
+      // @ts-expect-error
       delete output.indexPatterns;
 
       const isCompatible = await action.isCompatible(context);
diff --git a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts
index bc74748806beb..6e748030fe107 100644
--- a/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts
+++ b/x-pack/plugins/discover_enhanced/public/actions/explore_data/explore_data_context_menu_action.ts
@@ -17,7 +17,8 @@ export const ACTION_EXPLORE_DATA = 'ACTION_EXPLORE_DATA';
  * This is "Explore underlying data" action which appears in the context
  * menu of a dashboard panel.
  */
-export class ExploreDataContextMenuAction extends AbstractExploreDataAction<EmbeddableContext>
+export class ExploreDataContextMenuAction
+  extends AbstractExploreDataAction<EmbeddableContext>
   implements Action<EmbeddableContext> {
   public readonly id = ACTION_EXPLORE_DATA;
 
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
index 36feb3f6203c8..b465afb8b5d9f 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.test.ts
@@ -101,6 +101,7 @@ describe('<EditPolicy />', () => {
           },
         },
       };
+
       delete expected.phases.delete.actions.wait_for_snapshot;
 
       const latestRequest = server.requests[server.requests.length - 1];
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts
index d9ed7a0bf51eb..6cc43042ed4ff 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts
@@ -90,6 +90,7 @@ export const coldPhaseToES = (
     };
   } else {
     if (esPhase.actions.allocate) {
+      // @ts-expect-error
       delete esPhase.actions.allocate.require;
     }
   }
@@ -99,6 +100,7 @@ export const coldPhaseToES = (
     esPhase.actions.allocate.number_of_replicas = parseInt(phase.selectedReplicaCount, 10);
   } else {
     if (esPhase.actions.allocate) {
+      // @ts-expect-error
       delete esPhase.actions.allocate.number_of_replicas;
     }
   }
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/warm_phase.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/warm_phase.ts
index 3ca1a1cc83371..c331f4ccce38f 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/warm_phase.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/warm_phase.ts
@@ -96,6 +96,7 @@ export const warmPhaseToES = (
   // An index lifecycle switches to warm phase when rollover occurs, so you cannot specify a warm phase time
   // They are mutually exclusive
   if (phase.warmPhaseOnRollover) {
+    // @ts-expect-error
     delete esPhase.min_age;
   }
 
@@ -109,6 +110,7 @@ export const warmPhaseToES = (
     };
   } else {
     if (esPhase.actions.allocate) {
+      // @ts-expect-error
       delete esPhase.actions.allocate.require;
     }
   }
@@ -118,6 +120,7 @@ export const warmPhaseToES = (
     esPhase.actions.allocate.number_of_replicas = parseInt(phase.selectedReplicaCount, 10);
   } else {
     if (esPhase.actions.allocate) {
+      // @ts-expect-error
       delete esPhase.actions.allocate.number_of_replicas;
     }
   }
diff --git a/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx b/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
index 151b31b527228..537f421173358 100644
--- a/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
+++ b/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
@@ -180,6 +180,7 @@ export const TemplateForm = ({
       delete outputTemplate.template.aliases;
     }
     if (Object.keys(outputTemplate.template).length === 0) {
+      // @ts-expect-error
       delete outputTemplate.template;
     }
 
diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
index 834afefd74712..f7f7048aedf48 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/alert_flyout.tsx
@@ -5,6 +5,8 @@
  */
 
 import React, { useContext } from 'react';
+import { ApplicationStart, DocLinksStart, HttpStart, NotificationsStart } from 'src/core/public';
+
 import { AlertsContextProvider, AlertAdd } from '../../../../../triggers_actions_ui/public';
 import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
@@ -22,9 +24,16 @@ interface Props {
   setVisible: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
+interface KibanaDeps {
+  notifications: NotificationsStart;
+  http: HttpStart;
+  docLinks: DocLinksStart;
+  application: ApplicationStart;
+}
+
 export const AlertFlyout = ({ options, nodeType, filter, visible, setVisible }: Props) => {
   const { triggersActionsUI } = useContext(TriggerActionsContext);
-  const { services } = useKibana();
+  const { services } = useKibana<KibanaDeps>();
 
   const { inventoryPrefill } = useAlertPrefillContext();
   const { customMetrics } = inventoryPrefill;
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
index b19a399b0e50d..1f1af38809a3e 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/alert_flyout.tsx
@@ -5,6 +5,8 @@
  */
 
 import React, { useContext } from 'react';
+import { ApplicationStart, DocLinksStart, HttpStart, NotificationsStart } from 'src/core/public';
+
 import { AlertsContextProvider, AlertAdd } from '../../../../../triggers_actions_ui/public';
 import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
@@ -20,9 +22,16 @@ interface Props {
   setVisible: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
+interface KibanaDeps {
+  notifications: NotificationsStart;
+  http: HttpStart;
+  docLinks: DocLinksStart;
+  application: ApplicationStart;
+}
+
 export const AlertFlyout = (props: Props) => {
   const { triggersActionsUI } = useContext(TriggerActionsContext);
-  const { services } = useKibana();
+  const { services } = useKibana<KibanaDeps>();
 
   return (
     <>
@@ -33,7 +42,7 @@ export const AlertFlyout = (props: Props) => {
               currentOptions: props.options,
               series: props.series,
             },
-            toastNotifications: services.notifications?.toasts,
+            toastNotifications: services.notifications.toasts,
             http: services.http,
             docLinks: services.docLinks,
             capabilities: services.application.capabilities,
diff --git a/x-pack/plugins/infra/public/components/alerting/logs/alert_flyout.tsx b/x-pack/plugins/infra/public/components/alerting/logs/alert_flyout.tsx
index bd889bff8cd0e..45e4f8576892c 100644
--- a/x-pack/plugins/infra/public/components/alerting/logs/alert_flyout.tsx
+++ b/x-pack/plugins/infra/public/components/alerting/logs/alert_flyout.tsx
@@ -5,6 +5,8 @@
  */
 
 import React, { useContext } from 'react';
+import { ApplicationStart, DocLinksStart, HttpStart, NotificationsStart } from 'src/core/public';
+
 import { AlertsContextProvider, AlertAdd } from '../../../../../triggers_actions_ui/public';
 import { TriggerActionsContext } from '../../../utils/triggers_actions_context';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
@@ -15,9 +17,16 @@ interface Props {
   setVisible: React.Dispatch<React.SetStateAction<boolean>>;
 }
 
+interface KibanaDeps {
+  notifications: NotificationsStart;
+  http: HttpStart;
+  docLinks: DocLinksStart;
+  application: ApplicationStart;
+}
+
 export const AlertFlyout = (props: Props) => {
   const { triggersActionsUI } = useContext(TriggerActionsContext);
-  const { services } = useKibana();
+  const { services } = useKibana<KibanaDeps>();
 
   return (
     <>
@@ -27,7 +36,7 @@ export const AlertFlyout = (props: Props) => {
             metadata: {
               isInternal: true,
             },
-            toastNotifications: services.notifications?.toasts,
+            toastNotifications: services.notifications.toasts,
             http: services.http,
             docLinks: services.docLinks,
             capabilities: services.application.capabilities,
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/subscription_splash_content.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/subscription_splash_content.tsx
index 81f52f986cab8..366d31897fe06 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_setup/subscription_splash_content.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_setup/subscription_splash_content.tsx
@@ -20,6 +20,7 @@ import {
   EuiImage,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { HttpStart } from 'src/core/public';
 import { LoadingPage } from '../../loading_page';
 
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
@@ -27,7 +28,7 @@ import { euiStyled } from '../../../../../observability/public';
 import { useTrialStatus } from '../../../hooks/use_trial_status';
 
 export const SubscriptionSplashContent: React.FC = () => {
-  const { services } = useKibana();
+  const { services } = useKibana<{ http: HttpStart }>();
   const { loadState, isTrialAvailable, checkTrialAvailability } = useTrialStatus();
 
   useEffect(() => {
diff --git a/x-pack/plugins/infra/public/hooks/use_trial_status.tsx b/x-pack/plugins/infra/public/hooks/use_trial_status.tsx
index 9cc118d09c7e0..3fb7fcfd8edf1 100644
--- a/x-pack/plugins/infra/public/hooks/use_trial_status.tsx
+++ b/x-pack/plugins/infra/public/hooks/use_trial_status.tsx
@@ -6,8 +6,9 @@
 
 import { boolean } from 'io-ts';
 import { i18n } from '@kbn/i18n';
-
 import { useState } from 'react';
+import { HttpStart, NotificationsStart } from 'src/core/public';
+
 import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 import { API_BASE_PATH as LICENSE_MANAGEMENT_API_BASE_PATH } from '../../../license_management/common/constants';
 import { useTrackedPromise } from '../utils/use_tracked_promise';
@@ -20,7 +21,7 @@ interface UseTrialStatusState {
 }
 
 export function useTrialStatus(): UseTrialStatusState {
-  const { services } = useKibana();
+  const { services } = useKibana<{ http: HttpStart; notifications: NotificationsStart }>();
   const [isTrialAvailable, setIsTrialAvailable] = useState<boolean>(false);
 
   const [loadState, checkTrialAvailability] = useTrackedPromise(
diff --git a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
index d1d4b829fefc1..a32e1e68141b5 100644
--- a/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
+++ b/x-pack/plugins/infra/public/pages/link_to/redirect_to_node_logs.tsx
@@ -9,6 +9,7 @@ import flowRight from 'lodash/flowRight';
 import React from 'react';
 import { Redirect, RouteComponentProps } from 'react-router-dom';
 import { useMount } from 'react-use';
+import { HttpStart } from 'src/core/public';
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { findInventoryFields } from '../../../common/inventory_models';
 import { InventoryItemType } from '../../../common/inventory_models/types';
@@ -32,7 +33,7 @@ export const RedirectToNodeLogs = ({
   },
   location,
 }: RedirectToNodeLogsType) => {
-  const { services } = useKibana();
+  const { services } = useKibana<{ http: HttpStart }>();
   const { isLoading, loadSourceConfiguration, sourceConfiguration } = useLogSource({
     fetch: services.http.fetch,
     sourceId,
diff --git a/x-pack/plugins/infra/public/pages/logs/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/page_providers.tsx
index 1e053d8d4abc3..a3d0c2bafad40 100644
--- a/x-pack/plugins/infra/public/pages/logs/page_providers.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/page_providers.tsx
@@ -5,6 +5,7 @@
  */
 
 import React from 'react';
+import { HttpStart } from 'src/core/public';
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { LogAnalysisCapabilitiesProvider } from '../../containers/logs/log_analysis';
 import { LogSourceProvider } from '../../containers/logs/log_source';
@@ -12,7 +13,7 @@ import { useSourceId } from '../../containers/source_id';
 
 export const LogsPageProviders: React.FunctionComponent = ({ children }) => {
   const [sourceId] = useSourceId();
-  const { services } = useKibana();
+  const { services } = useKibana<{ http: HttpStart }>();
   return (
     <LogSourceProvider sourceId={sourceId} fetch={services.http.fetch}>
       <LogAnalysisCapabilitiesProvider>{children}</LogAnalysisCapabilitiesProvider>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_core.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_core.ts
index 9ce1e95aa91d5..dad2eaa1d8e0f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_core.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_core.ts
@@ -8,7 +8,7 @@ import { CoreStart } from 'kibana/public';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
 export function useCore(): CoreStart {
-  const { services } = useKibana();
+  const { services } = useKibana<CoreStart>();
   if (services === null) {
     throw new Error('KibanaContextProvider not initialized');
   }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
index bdd43b8385ae8..1456d56222b4f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/create_package_policy_page/index.tsx
@@ -65,7 +65,7 @@ export const CreatePackagePolicyPage: React.FunctionComponent = () => {
   } = useConfig();
   const {
     params: { policyId, pkgkey },
-  } = useRouteMatch();
+  } = useRouteMatch<{ policyId: string; pkgkey: string }>();
   const { getHref, getPath } = useLink();
   const history = useHistory();
   const routeState = useIntraAppState<CreatePackagePolicyRouteState>();
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx
index fc3d28c9392ce..db76c3db9a983 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -53,7 +53,7 @@ export const EditPackagePolicyPage: React.FunctionComponent = () => {
   } = useConfig();
   const {
     params: { policyId, packagePolicyId },
-  } = useRouteMatch();
+  } = useRouteMatch<{ policyId: string; packagePolicyId: string }>();
   const history = useHistory();
   const { getHref, getPath } = useLink();
   const [isNavDrawerLocked, setIsNavDrawerLocked] = useState(false);
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
index f45b69eaaa79c..b60903dbd2bd0 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/migrations/to_v7_10_0.ts
@@ -42,6 +42,7 @@ export const migrateAgentPolicyToV7100: SavedObjectMigrationFn<
   AgentPolicy
 > = (agentPolicyDoc) => {
   agentPolicyDoc.attributes.package_policies = agentPolicyDoc.attributes.package_configs;
+  // @ts-expect-error
   delete agentPolicyDoc.attributes.package_configs;
 
   return agentPolicyDoc;
@@ -66,6 +67,7 @@ export const migratePackagePolicyToV7100: SavedObjectMigrationFn<
   PackagePolicy
 > = (packagePolicyDoc) => {
   packagePolicyDoc.attributes.policy_id = packagePolicyDoc.attributes.config_id;
+  // @ts-expect-error
   delete packagePolicyDoc.attributes.config_id;
 
   return packagePolicyDoc;
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.ts
index 01788c49ec2f1..50f35becc52ba 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.ts
@@ -91,6 +91,7 @@ export const deserializeVerboseTestOutput = (
         // The tag is added programatically as a way to map
         // the results to each processor
         // It is not something we need to surface to the user, so we delete it
+        // @ts-expect-error
         delete result.tag;
 
         processorResultsById[resultId] = result;
diff --git a/x-pack/plugins/lists/common/schemas/request/create_endpoint_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/create_endpoint_list_item_schema.test.ts
index e40a80a0d589d..624de2fb30d17 100644
--- a/x-pack/plugins/lists/common/schemas/request/create_endpoint_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/create_endpoint_list_item_schema.test.ts
@@ -31,6 +31,7 @@ describe('create_endpoint_list_item_schema', () => {
 
   test('it should fail validation when supplied an undefined for "description"', () => {
     const payload = getCreateEndpointListItemSchemaMock();
+    // @ts-expect-error
     delete payload.description;
     const decoded = createEndpointListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -43,6 +44,7 @@ describe('create_endpoint_list_item_schema', () => {
 
   test('it should fail validation when supplied an undefined for "name"', () => {
     const payload = getCreateEndpointListItemSchemaMock();
+    // @ts-expect-error
     delete payload.name;
     const decoded = createEndpointListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -55,6 +57,7 @@ describe('create_endpoint_list_item_schema', () => {
 
   test('it should fail validation when supplied an undefined for "type"', () => {
     const payload = getCreateEndpointListItemSchemaMock();
+    // @ts-expect-error
     delete payload.type;
     const decoded = createEndpointListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -145,6 +148,7 @@ describe('create_endpoint_list_item_schema', () => {
   test('it should fail validation when supplied an undefined for "entries"', () => {
     const inputPayload = getCreateEndpointListItemSchemaMock();
     const outputPayload = getCreateEndpointListItemSchemaMock();
+    // @ts-expect-error
     delete inputPayload.entries;
     outputPayload.entries = [];
     const decoded = createEndpointListItemSchema.decode(inputPayload);
diff --git a/x-pack/plugins/lists/common/schemas/request/create_exception_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/create_exception_list_item_schema.test.ts
index d2ad69d1ee7b6..4a4c3972dc1e3 100644
--- a/x-pack/plugins/lists/common/schemas/request/create_exception_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/create_exception_list_item_schema.test.ts
@@ -31,6 +31,7 @@ describe('create_exception_list_item_schema', () => {
 
   test('it should fail validation when supplied an undefined for "description"', () => {
     const payload = getCreateExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.description;
     const decoded = createExceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -43,6 +44,7 @@ describe('create_exception_list_item_schema', () => {
 
   test('it should fail validation when supplied an undefined for "name"', () => {
     const payload = getCreateExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.name;
     const decoded = createExceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -55,6 +57,7 @@ describe('create_exception_list_item_schema', () => {
 
   test('it should fail validation when supplied an undefined for "type"', () => {
     const payload = getCreateExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.type;
     const decoded = createExceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -67,6 +70,7 @@ describe('create_exception_list_item_schema', () => {
 
   test('it should fail validation when supplied an undefined for "list_id"', () => {
     const inputPayload = getCreateExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete inputPayload.list_id;
     const decoded = createExceptionListItemSchema.decode(inputPayload);
     const checked = exactCheck(inputPayload, decoded);
@@ -133,6 +137,7 @@ describe('create_exception_list_item_schema', () => {
   test('it should fail validation when supplied an undefined for "entries"', () => {
     const inputPayload = getCreateExceptionListItemSchemaMock();
     const outputPayload = getCreateExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete inputPayload.entries;
     outputPayload.entries = [];
     const decoded = createExceptionListItemSchema.decode(inputPayload);
diff --git a/x-pack/plugins/lists/common/schemas/request/delete_endpoint_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/delete_endpoint_list_item_schema.test.ts
index fa3c1ef3b02f5..e881e8dd28adb 100644
--- a/x-pack/plugins/lists/common/schemas/request/delete_endpoint_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/delete_endpoint_list_item_schema.test.ts
@@ -30,6 +30,7 @@ describe('delete_endpoint_list_item_schema', () => {
     const payload: DeleteEndpointListItemSchema & {
       namespace_type: string;
     } = { ...getDeleteEndpointListItemSchemaMock(), namespace_type: 'single' };
+    // @ts-expect-error
     delete payload.namespace_type;
     const decoded = deleteEndpointListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/request/delete_list_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/delete_list_schema.test.ts
index 65ca2f3f457e9..d099bdcff6710 100644
--- a/x-pack/plugins/lists/common/schemas/request/delete_list_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/delete_list_schema.test.ts
@@ -25,6 +25,7 @@ describe('delete_list_schema', () => {
 
   test('it should NOT accept an undefined for an id', () => {
     const payload = getDeleteListSchemaMock();
+    // @ts-expect-error
     delete payload.id;
     const decoded = deleteListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/request/export_list_item_query_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/export_list_item_query_schema.test.ts
index cd6f4c1b147db..828544d392a3b 100644
--- a/x-pack/plugins/lists/common/schemas/request/export_list_item_query_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/export_list_item_query_schema.test.ts
@@ -28,6 +28,7 @@ describe('export_list_item_schema', () => {
 
   test('it should NOT accept an undefined for an id', () => {
     const payload = getExportListItemQuerySchemaMock();
+    // @ts-expect-error
     delete payload.list_id;
     const decoded = exportListItemQuerySchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/request/import_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/import_list_item_schema.test.ts
index 4de77b66610d3..a52824dd8be8e 100644
--- a/x-pack/plugins/lists/common/schemas/request/import_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/import_list_item_schema.test.ts
@@ -25,6 +25,7 @@ describe('import_list_item_schema', () => {
 
   test('it should NOT accept an undefined for a file', () => {
     const payload = getImportListItemSchemaMock();
+    // @ts-expect-error
     delete payload.file;
     const decoded = importListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/request/patch_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/patch_list_item_schema.test.ts
index b148f19da8a86..35852954d5c46 100644
--- a/x-pack/plugins/lists/common/schemas/request/patch_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/patch_list_item_schema.test.ts
@@ -25,6 +25,7 @@ describe('patch_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "id"', () => {
     const payload = getPathListItemSchemaMock();
+    // @ts-expect-error
     delete payload.id;
     const decoded = patchListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/request/patch_list_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/patch_list_schema.test.ts
index dea48df3f1702..7ce0a1c2d8086 100644
--- a/x-pack/plugins/lists/common/schemas/request/patch_list_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/patch_list_schema.test.ts
@@ -25,6 +25,7 @@ describe('patch_list_schema', () => {
 
   test('it should NOT accept an undefined for "id"', () => {
     const payload = getPathListSchemaMock();
+    // @ts-expect-error
     delete payload.id;
     const decoded = patchListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/request/read_endpoint_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/read_endpoint_list_item_schema.test.ts
index adec476ea5ad7..a0e790bef6e1e 100644
--- a/x-pack/plugins/lists/common/schemas/request/read_endpoint_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/read_endpoint_list_item_schema.test.ts
@@ -52,6 +52,7 @@ describe('read_endpoint_list_item_schema', () => {
     const payload: ReadEndpointListItemSchema & {
       namespace_type: string;
     } = { ...getReadEndpointListItemSchemaMock(), namespace_type: 'single' };
+    // @ts-expect-error
     delete payload.namespace_type;
     const decoded = readEndpointListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/request/read_list_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/read_list_schema.test.ts
index 0b7e92c23f77a..2f234766aff01 100644
--- a/x-pack/plugins/lists/common/schemas/request/read_list_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/read_list_schema.test.ts
@@ -25,6 +25,7 @@ describe('read_list_schema', () => {
 
   test('it should NOT accept an undefined for "id"', () => {
     const payload = getReadListSchemaMock();
+    // @ts-expect-error
     delete payload.id;
     const decoded = readListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/request/update_endpoint_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/update_endpoint_list_item_schema.test.ts
index ecbbb250a88f6..671e38ceb5266 100644
--- a/x-pack/plugins/lists/common/schemas/request/update_endpoint_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/update_endpoint_list_item_schema.test.ts
@@ -27,6 +27,7 @@ describe('update_endpoint_list_item_schema', () => {
 
   test('it should not accept an undefined for "description"', () => {
     const payload = getUpdateEndpointListItemSchemaMock();
+    // @ts-expect-error
     delete payload.description;
     const decoded = updateEndpointListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -39,6 +40,7 @@ describe('update_endpoint_list_item_schema', () => {
 
   test('it should not accept an undefined for "name"', () => {
     const payload = getUpdateEndpointListItemSchemaMock();
+    // @ts-expect-error
     delete payload.name;
     const decoded = updateEndpointListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -51,6 +53,7 @@ describe('update_endpoint_list_item_schema', () => {
 
   test('it should not accept an undefined for "type"', () => {
     const payload = getUpdateEndpointListItemSchemaMock();
+    // @ts-expect-error
     delete payload.type;
     const decoded = updateEndpointListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -100,6 +103,7 @@ describe('update_endpoint_list_item_schema', () => {
   test('it should NOT accept an undefined for "entries"', () => {
     const inputPayload = getUpdateEndpointListItemSchemaMock();
     const outputPayload = getUpdateEndpointListItemSchemaMock();
+    // @ts-expect-error
     delete inputPayload.entries;
     outputPayload.entries = [];
     const decoded = updateEndpointListItemSchema.decode(inputPayload);
diff --git a/x-pack/plugins/lists/common/schemas/request/update_exception_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/update_exception_list_item_schema.test.ts
index a49a5552603fd..da320a4983de3 100644
--- a/x-pack/plugins/lists/common/schemas/request/update_exception_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/update_exception_list_item_schema.test.ts
@@ -27,6 +27,7 @@ describe('update_exception_list_item_schema', () => {
 
   test('it should not accept an undefined for "description"', () => {
     const payload = getUpdateExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.description;
     const decoded = updateExceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -39,6 +40,7 @@ describe('update_exception_list_item_schema', () => {
 
   test('it should not accept an undefined for "name"', () => {
     const payload = getUpdateExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.name;
     const decoded = updateExceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -51,6 +53,7 @@ describe('update_exception_list_item_schema', () => {
 
   test('it should not accept an undefined for "type"', () => {
     const payload = getUpdateExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.type;
     const decoded = updateExceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -100,6 +103,7 @@ describe('update_exception_list_item_schema', () => {
   test('it should NOT accept an undefined for "entries"', () => {
     const inputPayload = getUpdateExceptionListItemSchemaMock();
     const outputPayload = getUpdateExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete inputPayload.entries;
     outputPayload.entries = [];
     const decoded = updateExceptionListItemSchema.decode(inputPayload);
diff --git a/x-pack/plugins/lists/common/schemas/request/update_exception_list_schema.test.ts b/x-pack/plugins/lists/common/schemas/request/update_exception_list_schema.test.ts
index 650cbd439ad2b..32f114ae34d8e 100644
--- a/x-pack/plugins/lists/common/schemas/request/update_exception_list_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/request/update_exception_list_schema.test.ts
@@ -27,6 +27,7 @@ describe('update_exception_list_schema', () => {
 
   test('it should not accept an undefined for "description"', () => {
     const payload = getUpdateExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.description;
     const decoded = updateExceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -39,6 +40,7 @@ describe('update_exception_list_schema', () => {
 
   test('it should not accept an undefined for "name"', () => {
     const payload = getUpdateExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.name;
     const decoded = updateExceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -51,6 +53,7 @@ describe('update_exception_list_schema', () => {
 
   test('it should not accept an undefined for "type"', () => {
     const payload = getUpdateExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.type;
     const decoded = updateExceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/response/acknowledge_schema.test.ts b/x-pack/plugins/lists/common/schemas/response/acknowledge_schema.test.ts
index a59a93b06e34d..c735e8ebaeb89 100644
--- a/x-pack/plugins/lists/common/schemas/response/acknowledge_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/response/acknowledge_schema.test.ts
@@ -24,6 +24,7 @@ describe('acknowledge_schema', () => {
   });
   test('it should NOT accept an undefined for "ok"', () => {
     const payload = getAcknowledgeSchemaResponseMock();
+    // @ts-expect-error
     delete payload.acknowledged;
     const decoded = acknowledgeSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/response/create_endpoint_list_schema.test.ts b/x-pack/plugins/lists/common/schemas/response/create_endpoint_list_schema.test.ts
index 8c1392109979e..380a1e3a4cfd5 100644
--- a/x-pack/plugins/lists/common/schemas/response/create_endpoint_list_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/response/create_endpoint_list_schema.test.ts
@@ -35,6 +35,7 @@ describe('create_endpoint_list_schema', () => {
 
   test('it should NOT accept an undefined for "list_id"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.list_id;
     const decoded = createEndpointListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -48,6 +49,7 @@ describe('create_endpoint_list_schema', () => {
 
   test('it should NOT allow missing fields', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.list_id;
     const decoded = createEndpointListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/response/exception_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/response/exception_list_item_schema.test.ts
index 32b55104e4fdf..58c6ed029a5e8 100644
--- a/x-pack/plugins/lists/common/schemas/response/exception_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/response/exception_list_item_schema.test.ts
@@ -25,6 +25,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "id"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.id;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -36,6 +37,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "list_id"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.list_id;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -49,6 +51,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "item_id"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.item_id;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -62,6 +65,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "comments"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.comments;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -75,6 +79,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "entries"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.entries;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -88,6 +93,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "name"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.name;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -101,6 +107,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should accept an undefined for "namespace_type" and return "single" as a default value for "namespace_type"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.namespace_type;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -112,6 +119,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "description"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.description;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -136,6 +144,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "created_at"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.created_at;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -149,6 +158,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "created_by"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.created_by;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -162,6 +172,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "tie_breaker_id"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.tie_breaker_id;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -175,6 +186,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "type"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.type;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -188,6 +200,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "updated_at"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.updated_at;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -201,6 +214,7 @@ describe('exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "updated_by"', () => {
     const payload = getExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.updated_by;
     const decoded = exceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/response/exception_list_schema.test.ts b/x-pack/plugins/lists/common/schemas/response/exception_list_schema.test.ts
index 1b5ef08b02d5f..934ff070561f6 100644
--- a/x-pack/plugins/lists/common/schemas/response/exception_list_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/response/exception_list_schema.test.ts
@@ -25,6 +25,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "id"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.id;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -36,6 +37,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "list_id"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.list_id;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -49,6 +51,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "name"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.name;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -62,6 +65,7 @@ describe('exception_list_schema', () => {
 
   test('it should accept an undefined for "namespace_type" and make "namespace_type" that of "single"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.namespace_type;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -73,6 +77,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "description"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.description;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -97,6 +102,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "created_at"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.created_at;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -110,6 +116,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "created_by"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.created_by;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -123,6 +130,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "tie_breaker_id"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.tie_breaker_id;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -136,6 +144,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "type"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.type;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -149,6 +158,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "updated_at"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.updated_at;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -162,6 +172,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "updated_by"', () => {
     const payload = getExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.updated_by;
     const decoded = exceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/response/found_exception_list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/response/found_exception_list_item_schema.test.ts
index 5da3accccd9c2..46fc655614411 100644
--- a/x-pack/plugins/lists/common/schemas/response/found_exception_list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/response/found_exception_list_item_schema.test.ts
@@ -87,6 +87,7 @@ describe('found_exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "page"', () => {
     const payload = getFoundExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.page;
     const decoded = foundExceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -100,6 +101,7 @@ describe('found_exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "per_page"', () => {
     const payload = getFoundExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.per_page;
     const decoded = foundExceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -113,6 +115,7 @@ describe('found_exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "total"', () => {
     const payload = getFoundExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.total;
     const decoded = foundExceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -126,6 +129,7 @@ describe('found_exception_list_item_schema', () => {
 
   test('it should NOT accept an undefined for "data"', () => {
     const payload = getFoundExceptionListItemSchemaMock();
+    // @ts-expect-error
     delete payload.data;
     const decoded = foundExceptionListItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/response/found_exception_list_schema.test.ts b/x-pack/plugins/lists/common/schemas/response/found_exception_list_schema.test.ts
index d4fa8ee0e3481..c367cec02d58b 100644
--- a/x-pack/plugins/lists/common/schemas/response/found_exception_list_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/response/found_exception_list_schema.test.ts
@@ -84,6 +84,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "page"', () => {
     const payload = getFoundExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.page;
     const decoded = foundExceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -97,6 +98,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "per_page"', () => {
     const payload = getFoundExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.per_page;
     const decoded = foundExceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -110,6 +112,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "total"', () => {
     const payload = getFoundExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.total;
     const decoded = foundExceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -123,6 +126,7 @@ describe('exception_list_schema', () => {
 
   test('it should NOT accept an undefined for "data"', () => {
     const payload = getFoundExceptionListSchemaMock();
+    // @ts-expect-error
     delete payload.data;
     const decoded = foundExceptionListSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/response/list_item_index_exist_schema.test.ts b/x-pack/plugins/lists/common/schemas/response/list_item_index_exist_schema.test.ts
index 2b072d8f95cd8..4732da0213934 100644
--- a/x-pack/plugins/lists/common/schemas/response/list_item_index_exist_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/response/list_item_index_exist_schema.test.ts
@@ -25,6 +25,7 @@ describe('list_item_index_exist_schema', () => {
 
   test('it should NOT accept an undefined for "list_index"', () => {
     const payload = getListItemIndexExistSchemaResponseMock();
+    // @ts-expect-error
     delete payload.list_index;
     const decoded = listItemIndexExistSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -38,6 +39,7 @@ describe('list_item_index_exist_schema', () => {
 
   test('it should NOT accept an undefined for "list_item_index"', () => {
     const payload = getListItemIndexExistSchemaResponseMock();
+    // @ts-expect-error
     delete payload.list_item_index;
     const decoded = listItemIndexExistSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/response/list_item_schema.test.ts b/x-pack/plugins/lists/common/schemas/response/list_item_schema.test.ts
index ec4c8d2c2d1ea..47f2e29fcb5ef 100644
--- a/x-pack/plugins/lists/common/schemas/response/list_item_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/response/list_item_schema.test.ts
@@ -25,6 +25,7 @@ describe('list_item_schema', () => {
 
   test('it should NOT accept an undefined for "id"', () => {
     const payload = getListItemResponseMock();
+    // @ts-expect-error
     delete payload.id;
     const decoded = listItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -36,6 +37,7 @@ describe('list_item_schema', () => {
 
   test('it should NOT accept an undefined for "list_id"', () => {
     const payload = getListItemResponseMock();
+    // @ts-expect-error
     delete payload.list_id;
     const decoded = listItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -82,6 +84,7 @@ describe('list_item_schema', () => {
 
   test('it should NOT accept an undefined for "created_at"', () => {
     const payload = getListItemResponseMock();
+    // @ts-expect-error
     delete payload.created_at;
     const decoded = listItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -95,6 +98,7 @@ describe('list_item_schema', () => {
 
   test('it should NOT accept an undefined for "created_by"', () => {
     const payload = getListItemResponseMock();
+    // @ts-expect-error
     delete payload.created_by;
     const decoded = listItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -108,6 +112,7 @@ describe('list_item_schema', () => {
 
   test('it should NOT accept an undefined for "tie_breaker_id"', () => {
     const payload = getListItemResponseMock();
+    // @ts-expect-error
     delete payload.tie_breaker_id;
     const decoded = listItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -121,6 +126,7 @@ describe('list_item_schema', () => {
 
   test('it should NOT accept an undefined for "type"', () => {
     const payload = getListItemResponseMock();
+    // @ts-expect-error
     delete payload.type;
     const decoded = listItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -134,6 +140,7 @@ describe('list_item_schema', () => {
 
   test('it should NOT accept an undefined for "updated_at"', () => {
     const payload = getListItemResponseMock();
+    // @ts-expect-error
     delete payload.updated_at;
     const decoded = listItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -147,6 +154,7 @@ describe('list_item_schema', () => {
 
   test('it should NOT accept an undefined for "updated_by"', () => {
     const payload = getListItemResponseMock();
+    // @ts-expect-error
     delete payload.updated_by;
     const decoded = listItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -160,6 +168,7 @@ describe('list_item_schema', () => {
 
   test('it should NOT accept an undefined for "value"', () => {
     const payload = getListItemResponseMock();
+    // @ts-expect-error
     delete payload.value;
     const decoded = listItemSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/response/list_schema.test.ts b/x-pack/plugins/lists/common/schemas/response/list_schema.test.ts
index 87e56e5dd95ac..ab1d17b97c57d 100644
--- a/x-pack/plugins/lists/common/schemas/response/list_schema.test.ts
+++ b/x-pack/plugins/lists/common/schemas/response/list_schema.test.ts
@@ -25,6 +25,7 @@ describe('list_schema', () => {
 
   test('it should NOT accept an undefined for "id"', () => {
     const payload = getListResponseMock();
+    // @ts-expect-error
     delete payload.id;
     const decoded = listSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -69,6 +70,7 @@ describe('list_schema', () => {
 
   test('it should NOT accept an undefined for "created_at"', () => {
     const payload = getListResponseMock();
+    // @ts-expect-error
     delete payload.created_at;
     const decoded = listSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -82,6 +84,7 @@ describe('list_schema', () => {
 
   test('it should NOT accept an undefined for "created_by"', () => {
     const payload = getListResponseMock();
+    // @ts-expect-error
     delete payload.created_by;
     const decoded = listSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -95,6 +98,7 @@ describe('list_schema', () => {
 
   test('it should NOT accept an undefined for "tie_breaker_id"', () => {
     const payload = getListResponseMock();
+    // @ts-expect-error
     delete payload.tie_breaker_id;
     const decoded = listSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -108,6 +112,7 @@ describe('list_schema', () => {
 
   test('it should NOT accept an undefined for "type"', () => {
     const payload = getListResponseMock();
+    // @ts-expect-error
     delete payload.type;
     const decoded = listSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -121,6 +126,7 @@ describe('list_schema', () => {
 
   test('it should NOT accept an undefined for "updated_at"', () => {
     const payload = getListResponseMock();
+    // @ts-expect-error
     delete payload.updated_at;
     const decoded = listSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -134,6 +140,7 @@ describe('list_schema', () => {
 
   test('it should NOT accept an undefined for "updated_by"', () => {
     const payload = getListResponseMock();
+    // @ts-expect-error
     delete payload.updated_by;
     const decoded = listSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -147,6 +154,7 @@ describe('list_schema', () => {
 
   test('it should NOT accept an undefined for "name"', () => {
     const payload = getListResponseMock();
+    // @ts-expect-error
     delete payload.name;
     const decoded = listSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -160,6 +168,7 @@ describe('list_schema', () => {
 
   test('it should NOT accept an undefined for "description"', () => {
     const payload = getListResponseMock();
+    // @ts-expect-error
     delete payload.description;
     const decoded = listSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/lists/common/schemas/types/update_comment.test.ts b/x-pack/plugins/lists/common/schemas/types/update_comment.test.ts
index ba07421fe60f4..6b2f70506a81f 100644
--- a/x-pack/plugins/lists/common/schemas/types/update_comment.test.ts
+++ b/x-pack/plugins/lists/common/schemas/types/update_comment.test.ts
@@ -32,6 +32,7 @@ describe('CommentsUpdate', () => {
 
     test('it should fail validation when supplied an undefined for "comment"', () => {
       const payload = getUpdateCommentMock();
+      // @ts-expect-error
       delete payload.comment;
       const decoded = updateComment.decode(payload);
       const message = pipe(decoded, foldLeftRight);
diff --git a/x-pack/plugins/lists/public/exceptions/api.test.ts b/x-pack/plugins/lists/public/exceptions/api.test.ts
index 457a8708ec341..7e79b212f69cb 100644
--- a/x-pack/plugins/lists/public/exceptions/api.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/api.test.ts
@@ -89,6 +89,7 @@ describe('Exceptions Lists API', () => {
     test('it returns error if response payload fails decode', async () => {
       const payload = getCreateExceptionListSchemaMock();
       const badPayload = getExceptionListSchemaMock();
+      // @ts-expect-error
       delete badPayload.id;
       httpMock.fetch.mockResolvedValue(badPayload);
 
@@ -150,6 +151,7 @@ describe('Exceptions Lists API', () => {
     test('it returns error if response payload fails decode', async () => {
       const payload = getCreateExceptionListItemSchemaMock();
       const badPayload = getExceptionListItemSchemaMock();
+      // @ts-expect-error
       delete badPayload.id;
       httpMock.fetch.mockResolvedValue(badPayload);
 
@@ -196,6 +198,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error and does not make request if request payload fails decode', async () => {
       const payload = getUpdateExceptionListSchemaMock();
+      // @ts-expect-error
       delete payload.description;
 
       await expect(
@@ -210,6 +213,7 @@ describe('Exceptions Lists API', () => {
     test('it returns error if response payload fails decode', async () => {
       const payload = getUpdateExceptionListSchemaMock();
       const badPayload = getExceptionListSchemaMock();
+      // @ts-expect-error
       delete badPayload.id;
       httpMock.fetch.mockResolvedValue(badPayload);
 
@@ -256,6 +260,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error and does not make request if request payload fails decode', async () => {
       const payload = getUpdateExceptionListItemSchemaMock();
+      // @ts-expect-error
       delete payload.description;
 
       await expect(
@@ -270,6 +275,7 @@ describe('Exceptions Lists API', () => {
     test('it returns error if response payload fails decode', async () => {
       const payload = getUpdateExceptionListItemSchemaMock();
       const badPayload = getExceptionListItemSchemaMock();
+      // @ts-expect-error
       delete badPayload.id;
       httpMock.fetch.mockResolvedValue(badPayload);
 
@@ -329,6 +335,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error if response payload fails decode', async () => {
       const badPayload = getExceptionListSchemaMock();
+      // @ts-expect-error
       delete badPayload.id;
       httpMock.fetch.mockResolvedValue(badPayload);
 
@@ -532,6 +539,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error if response payload fails decode', async () => {
       const badPayload = getExceptionListItemSchemaMock();
+      // @ts-expect-error
       delete badPayload.id;
       httpMock.fetch.mockResolvedValue(badPayload);
 
@@ -599,6 +607,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error if response payload fails decode', async () => {
       const badPayload = getExceptionListItemSchemaMock();
+      // @ts-expect-error
       delete badPayload.id;
       httpMock.fetch.mockResolvedValue(badPayload);
 
@@ -659,6 +668,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error if response payload fails decode', async () => {
       const badPayload = getExceptionListSchemaMock();
+      // @ts-expect-error
       delete badPayload.id;
       httpMock.fetch.mockResolvedValue(badPayload);
 
@@ -719,6 +729,7 @@ describe('Exceptions Lists API', () => {
 
     test('it returns error if response payload fails decode', async () => {
       const badPayload = getExceptionListItemSchemaMock();
+      // @ts-expect-error
       delete badPayload.id;
       httpMock.fetch.mockResolvedValue(badPayload);
 
diff --git a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
index e64d20138cfb8..52dc89a6bba58 100644
--- a/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/mvt_single_layer_vector_source/mvt_single_layer_vector_source.tsx
@@ -36,7 +36,8 @@ export const sourceTitle = i18n.translate(
   }
 );
 
-export class MVTSingleLayerVectorSource extends AbstractSource
+export class MVTSingleLayerVectorSource
+  extends AbstractSource
   implements ITiledSingleLayerVectorSource {
   static createDescriptor({
     urlTemplate,
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
index 826acd41e27a9..b16755e69f92d 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_style_property.tsx
@@ -50,7 +50,8 @@ export interface IDynamicStyleProperty<T> extends IStyleProperty<T> {
 
 export type FieldFormatter = (value: string | number | undefined) => string | number;
 
-export class DynamicStyleProperty<T> extends AbstractStyleProperty<T>
+export class DynamicStyleProperty<T>
+  extends AbstractStyleProperty<T>
   implements IDynamicStyleProperty<T> {
   static type = STYLE_TYPE.DYNAMIC;
 
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.ts
index 6df7643c5221f..42dee46e71fd6 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.ts
@@ -29,6 +29,7 @@ export function expandCombinedJobConfig(combinedJob: CombinedJob) {
   const combinedJobClone = cloneDeep(combinedJob);
   const job = combinedJobClone;
   const datafeed = combinedJobClone.datafeed_config;
+  // @ts-expect-error
   delete job.datafeed_config;
 
   return { job, datafeed };
diff --git a/x-pack/plugins/ml/common/types/custom_urls.ts b/x-pack/plugins/ml/common/types/custom_urls.ts
index b6b074934cc63..e20e16bae87f2 100644
--- a/x-pack/plugins/ml/common/types/custom_urls.ts
+++ b/x-pack/plugins/ml/common/types/custom_urls.ts
@@ -15,7 +15,7 @@ export interface BaseUrlConfig {
 }
 
 export interface KibanaUrlConfig extends BaseUrlConfig {
-  time_range: string;
+  time_range?: string;
 }
 
 export type UrlConfig = BaseUrlConfig | KibanaUrlConfig;
diff --git a/x-pack/plugins/ml/public/application/util/custom_url_utils.ts b/x-pack/plugins/ml/public/application/util/custom_url_utils.ts
index 9c843af36192e..8263def2034aa 100644
--- a/x-pack/plugins/ml/public/application/util/custom_url_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/custom_url_utils.ts
@@ -34,7 +34,9 @@ export function replaceTokensInUrlValue(
   const urlValue = customUrlConfig.url_value;
   const timestamp = doc[timeFieldName];
   const timeRangeInterval =
-    'time_range' in customUrlConfig ? parseInterval(customUrlConfig.time_range) : null;
+    'time_range' in customUrlConfig && customUrlConfig.time_range
+      ? parseInterval(customUrlConfig.time_range)
+      : null;
   const record = { ...doc } as CustomUrlAnomalyRecordDoc;
   if (urlValue.includes('$earliest$')) {
     const earliestMoment = moment(timestamp);
diff --git a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
index 43f4dc3cba7e2..b461e71c006ff 100644
--- a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
+++ b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
@@ -70,13 +70,10 @@ export class CalendarManager {
   }
 
   async newCalendar(calendar: FormCalendar) {
-    const calendarId = calendar.calendarId;
-    const events = calendar.events;
-    delete calendar.calendarId;
-    delete calendar.events;
+    const { calendarId, events, ...newCalendar } = calendar;
     await this._callAsInternalUser('ml.addCalendar', {
       calendarId,
-      body: calendar,
+      body: newCalendar,
     });
 
     if (events.length) {
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
index 21e178dcc7e76..cc42a545c11e2 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -1209,6 +1209,7 @@ export class DataRecognizer {
       const job = jobs.find((j) => j.id === `${jobPrefix}${jobSpecificOverride.job_id}`);
       if (job !== undefined) {
         // delete the job_id in the override as this shouldn't be overridden
+        // @ts-expect-error
         delete jobSpecificOverride.job_id;
         merge(job.config, jobSpecificOverride);
         processArrayValues(job.config, jobSpecificOverride);
diff --git a/x-pack/plugins/ml/server/models/filter/filter_manager.ts b/x-pack/plugins/ml/server/models/filter/filter_manager.ts
index 20dc95e92a86c..768ca1f893b68 100644
--- a/x-pack/plugins/ml/server/models/filter/filter_manager.ts
+++ b/x-pack/plugins/ml/server/models/filter/filter_manager.ts
@@ -136,11 +136,10 @@ export class FilterManager {
   }
 
   async newFilter(filter: FormFilter) {
-    const filterId = filter.filterId;
-    delete filter.filterId;
+    const { filterId, ...body } = filter;
     try {
       // Returns the newly created filter.
-      return await this._callAsInternalUser('ml.addFilter', { filterId, body: filter });
+      return await this._callAsInternalUser('ml.addFilter', { filterId, body });
     } catch (error) {
       throw Boom.badRequest(error);
     }
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
index 61af960847f7f..6ffb0e320982b 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.test.ts
@@ -208,6 +208,7 @@ describe('ML - validateModelMemoryLimit', () => {
     const dtrs = createDetectors(2);
     const job = getJobConfig(['instance'], dtrs);
     const duration = { start: 0, end: 1 };
+    // @ts-expect-error
     delete mlInfoResponse.limits.max_model_memory_limit;
     // @ts-expect-error
     job.analysis_limits.model_memory_limit = '10mb';
diff --git a/x-pack/plugins/searchprofiler/public/application/store/reducer.ts b/x-pack/plugins/searchprofiler/public/application/store/reducer.ts
index 5366dcec3fcf0..8b2f14b3ed45a 100644
--- a/x-pack/plugins/searchprofiler/public/application/store/reducer.ts
+++ b/x-pack/plugins/searchprofiler/public/application/store/reducer.ts
@@ -39,7 +39,7 @@ export const reducer: Reducer<State, Action> = (state, action) => {
         indexName: value.indexName,
         operation: Object.freeze(restOfOperation),
         // prettier-ignore
-        shardName: `[${/* shard id */value.shard.id[0]}][${/* shard number */value.shard.id[2] }]`
+        shardName: `[${/* shard id */value.shard.id[0]}][${/* shard number */value.shard.id[2] }]`,
       };
     } else {
       nextState.highlightDetails = null;
diff --git a/x-pack/plugins/security/common/model/user.ts b/x-pack/plugins/security/common/model/user.ts
index ae6de7f4c5fbc..6e68f125f6f71 100644
--- a/x-pack/plugins/security/common/model/user.ts
+++ b/x-pack/plugins/security/common/model/user.ts
@@ -18,8 +18,8 @@ export interface User {
 }
 
 export interface EditUser extends User {
-  password: string;
-  confirmPassword: string;
+  password?: string;
+  confirmPassword?: string;
 }
 
 export function getUserDisplayName(user: User) {
diff --git a/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts b/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts
index 8e8bae42d4ad8..5eec3a0cfba37 100644
--- a/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts
+++ b/x-pack/plugins/security/public/management/role_mappings/role_mappings_api_client.ts
@@ -36,13 +36,11 @@ export class RoleMappingsAPIClient {
   }
 
   public async saveRoleMapping(roleMapping: RoleMapping) {
-    const payload = { ...roleMapping };
-    delete payload.name;
+    const { name, ...payload } = roleMapping;
 
-    return this.http.post(
-      `/internal/security/role_mapping/${encodeURIComponent(roleMapping.name)}`,
-      { body: JSON.stringify(payload) }
-    );
+    return this.http.post(`/internal/security/role_mapping/${encodeURIComponent(name)}`, {
+      body: JSON.stringify(payload),
+    });
   }
 
   public async deleteRoleMappings(names: string[]): Promise<DeleteRoleMappingsResponse> {
diff --git a/x-pack/plugins/security/public/management/roles/roles_api_client.ts b/x-pack/plugins/security/public/management/roles/roles_api_client.ts
index 50c490d2924ba..444f1eaaaf364 100644
--- a/x-pack/plugins/security/public/management/roles/roles_api_client.ts
+++ b/x-pack/plugins/security/public/management/roles/roles_api_client.ts
@@ -52,6 +52,7 @@ export class RolesAPIClient {
       }
     });
 
+    // @ts-expect-error
     delete role.name;
     delete role.transient_metadata;
     delete role._unrecognized_applications;
diff --git a/x-pack/plugins/security/server/session_management/session_cookie.test.ts b/x-pack/plugins/security/server/session_management/session_cookie.test.ts
index 584988d201a22..cccdde0cc004f 100644
--- a/x-pack/plugins/security/server/session_management/session_cookie.test.ts
+++ b/x-pack/plugins/security/server/session_management/session_cookie.test.ts
@@ -110,6 +110,7 @@ describe('Session cookie', () => {
 
     it('returns `null` and clears session value if it is in incompatible format', async () => {
       const invalidValue = sessionCookieMock.createValue();
+      // @ts-expect-error
       delete invalidValue.sid;
 
       mockSessionStorage.get.mockResolvedValue(invalidValue);
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackged_rules_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackged_rules_schema.test.ts
index 95297124b563a..137b40eb648ba 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackged_rules_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/add_prepackged_rules_schema.test.ts
@@ -618,6 +618,7 @@ describe('add prepackaged rules schema', () => {
 
   test('rule_id is required', () => {
     const payload: AddPrepackagedRulesSchema = getAddPrepackagedRulesSchemaMock();
+    // @ts-expect-error
     delete payload.rule_id;
 
     const decoded = addPrepackagedRulesSchema.decode(payload);
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_bulk_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_bulk_schema.test.ts
index d335cafdb7885..5c086511e6760 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_bulk_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/create_rules_bulk_schema.test.ts
@@ -73,6 +73,7 @@ describe('create_rules_bulk_schema', () => {
 
   test('single array element with a missing value (risk_score) will not validate', () => {
     const singleItem = getCreateRulesSchemaMock();
+    // @ts-expect-error
     delete singleItem.risk_score;
     const payload: CreateRulesBulkSchema = [singleItem];
 
@@ -88,6 +89,7 @@ describe('create_rules_bulk_schema', () => {
   test('two array elements where the first is valid but the second is invalid (risk_score) will not validate', () => {
     const singleItem = getCreateRulesSchemaMock();
     const secondItem = getCreateRulesSchemaMock();
+    // @ts-expect-error
     delete secondItem.risk_score;
     const payload: CreateRulesBulkSchema = [singleItem, secondItem];
 
@@ -103,6 +105,7 @@ describe('create_rules_bulk_schema', () => {
   test('two array elements where the first is invalid (risk_score) but the second is valid will not validate', () => {
     const singleItem = getCreateRulesSchemaMock();
     const secondItem = getCreateRulesSchemaMock();
+    // @ts-expect-error
     delete singleItem.risk_score;
     const payload: CreateRulesBulkSchema = [singleItem, secondItem];
 
@@ -118,7 +121,9 @@ describe('create_rules_bulk_schema', () => {
   test('two array elements where both are invalid (risk_score) will not validate', () => {
     const singleItem = getCreateRulesSchemaMock();
     const secondItem = getCreateRulesSchemaMock();
+    // @ts-expect-error
     delete singleItem.risk_score;
+    // @ts-expect-error
     delete secondItem.risk_score;
     const payload: CreateRulesBulkSchema = [singleItem, secondItem];
 
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.test.ts
index db2e9acc4615f..0515bee0052d7 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/import_rules_schema.test.ts
@@ -1178,6 +1178,7 @@ describe('import rules schema', () => {
       ...getImportRulesSchemaMock(),
       id: 'c4e80a0d-e20f-4efc-84c1-08112da5a612',
     };
+    // @ts-expect-error
     delete payload.rule_id;
 
     const decoded = importRulesSchema.decode(payload);
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_bulk_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_bulk_schema.test.ts
index 33a22d9a5f805..a82a3abc8c0ac 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_bulk_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/update_rules_bulk_schema.test.ts
@@ -69,6 +69,7 @@ describe('update_rules_bulk_schema', () => {
 
   test('single array element with a missing value (risk_score) will not validate', () => {
     const singleItem = getUpdateRulesSchemaMock();
+    // @ts-expect-error
     delete singleItem.risk_score;
     const payload: UpdateRulesBulkSchema = [singleItem];
 
@@ -84,6 +85,7 @@ describe('update_rules_bulk_schema', () => {
   test('two array elements where the first is valid but the second is invalid (risk_score) will not validate', () => {
     const singleItem = getUpdateRulesSchemaMock();
     const secondItem = getUpdateRulesSchemaMock();
+    // @ts-expect-error
     delete secondItem.risk_score;
     const payload: UpdateRulesBulkSchema = [singleItem, secondItem];
 
@@ -99,6 +101,7 @@ describe('update_rules_bulk_schema', () => {
   test('two array elements where the first is invalid (risk_score) but the second is valid will not validate', () => {
     const singleItem = getUpdateRulesSchemaMock();
     const secondItem = getUpdateRulesSchemaMock();
+    // @ts-expect-error
     delete singleItem.risk_score;
     const payload: UpdateRulesBulkSchema = [singleItem, secondItem];
 
@@ -114,7 +117,9 @@ describe('update_rules_bulk_schema', () => {
   test('two array elements where both are invalid (risk_score) will not validate', () => {
     const singleItem = getUpdateRulesSchemaMock();
     const secondItem = getUpdateRulesSchemaMock();
+    // @ts-expect-error
     delete singleItem.risk_score;
+    // @ts-expect-error
     delete secondItem.risk_score;
     const payload: UpdateRulesBulkSchema = [singleItem, secondItem];
 
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/error_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/error_schema.test.ts
index d9e16105351bd..460ea0584cc3d 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/error_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/error_schema.test.ts
@@ -47,6 +47,7 @@ describe('error_schema', () => {
 
   test('it should NOT validate an error when it has required elements deleted from it', () => {
     const error = getErrorSchemaMock();
+    // @ts-expect-error
     delete error.error;
     const decoded = errorSchema.decode(error);
     const checked = exactCheck(error, decoded);
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/find_rules_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/find_rules_schema.test.ts
index fc1ab9b87795d..4db1e081c5610 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/find_rules_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/find_rules_schema.test.ts
@@ -65,6 +65,7 @@ describe('find_rules_schema', () => {
   test('it should invalidate a typical single find rules response if the rule is missing a required field such as name', () => {
     const payload = getFindRulesSchemaMock();
     const invalidRule = getRulesSchemaMock();
+    // @ts-expect-error
     delete invalidRule.name;
     payload.data = [invalidRule];
     const decoded = findRulesSchema.decode(payload);
@@ -79,6 +80,7 @@ describe('find_rules_schema', () => {
 
   test('it should invalidate a typical single find rules response if it is missing perPage', () => {
     const payload = getFindRulesSchemaMock();
+    // @ts-expect-error
     delete payload.perPage;
     const decoded = findRulesSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/prepackaged_rules_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/prepackaged_rules_schema.test.ts
index 61d3ede852ee1..f5c1a51b633cc 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/prepackaged_rules_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/prepackaged_rules_schema.test.ts
@@ -86,6 +86,7 @@ describe('prepackaged_rules_schema', () => {
       timelines_installed: 0,
       timelines_updated: 0,
     };
+    // @ts-expect-error
     delete payload.rules_installed;
     const decoded = prePackagedRulesAndTimelinesSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
@@ -104,6 +105,7 @@ describe('prepackaged_rules_schema', () => {
       timelines_installed: 0,
       timelines_updated: 0,
     };
+    // @ts-expect-error
     delete payload.rules_updated;
     const decoded = prePackagedRulesAndTimelinesSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/prepackaged_rules_status_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/prepackaged_rules_status_schema.test.ts
index 09cb7148fe90a..7931f1c7eca51 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/prepackaged_rules_status_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/prepackaged_rules_status_schema.test.ts
@@ -141,6 +141,7 @@ describe('prepackaged_rules_schema', () => {
       timelines_not_installed: 0,
       timelines_not_updated: 0,
     };
+    // @ts-expect-error
     delete payload.rules_installed;
     const decoded = prePackagedRulesAndTimelinesStatusSchema.decode(payload);
     const checked = exactCheck(payload, decoded);
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_bulk_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_bulk_schema.test.ts
index a169ac3deb9b9..3541fed7458e2 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_bulk_schema.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/response/rules_bulk_schema.test.ts
@@ -49,6 +49,7 @@ describe('prepackaged_rule_schema', () => {
 
   test('it should NOT validate a rule with a deleted value', () => {
     const rule = getRulesSchemaMock();
+    // @ts-expect-error
     delete rule.name;
     const payload: RulesBulkSchema = [rule];
     const decoded = rulesBulkSchema.decode(payload);
@@ -64,6 +65,7 @@ describe('prepackaged_rule_schema', () => {
 
   test('it should NOT validate an invalid error message with a deleted value', () => {
     const error = getErrorSchemaMock('fake id');
+    // @ts-expect-error
     delete error.error;
     const payload: RulesBulkSchema = [error];
     const decoded = rulesBulkSchema.decode(payload);
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/types/lists.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/types/lists.test.ts
index 7a2c167bfd855..d7cda0790bda5 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/types/lists.test.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/types/lists.test.ts
@@ -41,6 +41,7 @@ describe('Lists', () => {
 
     test('it should NOT validate a list without an "id"', () => {
       const payload = getListMock();
+      // @ts-expect-error
       delete payload.id;
       const decoded = list.decode(payload);
       const message = pipe(decoded, foldLeftRight);
@@ -53,6 +54,7 @@ describe('Lists', () => {
 
     test('it should NOT validate a list without "namespace_type"', () => {
       const payload = getListMock();
+      // @ts-expect-error
       delete payload.namespace_type;
       const decoded = list.decode(payload);
       const message = pipe(decoded, foldLeftRight);
diff --git a/x-pack/plugins/security_solution/public/cases/components/user_action_tree/index.tsx b/x-pack/plugins/security_solution/public/cases/components/user_action_tree/index.tsx
index 733e3db3c25e6..d1263ab13f41b 100644
--- a/x-pack/plugins/security_solution/public/cases/components/user_action_tree/index.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/user_action_tree/index.tsx
@@ -56,7 +56,7 @@ export const UserActionTree = React.memo(
     updateCase,
     userCanCrud,
   }: UserActionTreeProps) => {
-    const { commentId } = useParams();
+    const { commentId } = useParams<{ commentId?: string }>();
     const handlerTimeoutId = useRef(0);
     const addCommentRef = useRef<AddCommentRefObject>(null);
     const [initLoading, setInitLoading] = useState(true);
diff --git a/x-pack/plugins/security_solution/public/cases/components/user_action_tree/user_action_title.tsx b/x-pack/plugins/security_solution/public/cases/components/user_action_tree/user_action_title.tsx
index 0bd6100b05df6..9477299e563a8 100644
--- a/x-pack/plugins/security_solution/public/cases/components/user_action_tree/user_action_title.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/user_action_tree/user_action_title.tsx
@@ -65,7 +65,7 @@ export const UserActionTitle = ({
   updatedAt,
   username = i18n.UNKNOWN,
 }: UserActionTitleProps) => {
-  const { detailName: caseId } = useParams();
+  const { detailName: caseId } = useParams<{ detailName: string }>();
   const urlSearch = useGetUrlSearch(navTabs.case);
   const propertyActions = useMemo(() => {
     return [
diff --git a/x-pack/plugins/security_solution/public/cases/pages/case_details.tsx b/x-pack/plugins/security_solution/public/cases/pages/case_details.tsx
index c3538f0c18ed5..0d41e22719bba 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/case_details.tsx
+++ b/x-pack/plugins/security_solution/public/cases/pages/case_details.tsx
@@ -20,7 +20,7 @@ import { savedObjectReadOnlyErrorMessage, CaseCallOut } from '../components/call
 export const CaseDetailsPage = React.memo(() => {
   const history = useHistory();
   const userPermissions = useGetUserSavedObjectPermissions();
-  const { detailName: caseId } = useParams();
+  const { detailName: caseId } = useParams<{ detailName?: string }>();
   const search = useGetUrlSearch(navTabs.case);
 
   if (userPermissions != null && !userPermissions.read) {
diff --git a/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx b/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx
index f49001bd5d7af..df655bf179f5b 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_section/index.tsx
@@ -19,11 +19,11 @@ interface HeaderProps {
 const Header = styled.header.attrs(() => ({
   className: 'siemHeaderSection',
 }))<HeaderProps>`
-${({ height }) =>
-  height &&
-  css`
-    height: ${height}px;
-  `}
+  ${({ height }) =>
+    height &&
+    css`
+      height: ${height}px;
+    `}
   margin-bottom: ${({ height, theme }) => (height ? 0 : theme.eui.euiSizeL)};
   user-select: text;
 
diff --git a/x-pack/plugins/security_solution/public/common/components/utility_bar/styles.tsx b/x-pack/plugins/security_solution/public/common/components/utility_bar/styles.tsx
index dd6b66350052e..0efd27c6ecbc6 100644
--- a/x-pack/plugins/security_solution/public/common/components/utility_bar/styles.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/utility_bar/styles.tsx
@@ -26,13 +26,11 @@ export const Bar = styled.aside.attrs({
   className: 'siemUtilityBar',
 })<BarProps>`
   ${({ border, theme }) => css`
-    ${
-      border &&
-      css`
-        border-bottom: ${theme.eui.euiBorderThin};
-        padding-bottom: ${theme.eui.paddingSizes.s};
-      `
-    }
+    ${border &&
+    css`
+      border-bottom: ${theme.eui.euiBorderThin};
+      padding-bottom: ${theme.eui.paddingSizes.s};
+    `}
 
     @media only screen and (min-width: ${theme.eui.euiBreakpoints.l}) {
       display: flex;
diff --git a/x-pack/plugins/security_solution/public/common/hooks/endpoint/ingest_enabled.ts b/x-pack/plugins/security_solution/public/common/hooks/endpoint/ingest_enabled.ts
index c201d85a270c0..e48f48e501903 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/endpoint/ingest_enabled.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/endpoint/ingest_enabled.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ApplicationStart } from 'src/core/public';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
-
 /**
  * Returns an object which ingest permissions are allowed
  */
@@ -15,12 +15,12 @@ export const useIngestEnabledCheck = (): {
   write: boolean;
   read: boolean;
 } => {
-  const { services } = useKibana();
+  const { services } = useKibana<{ application: ApplicationStart }>();
 
   // Check if Ingest Manager is present in the configuration
-  const show = services.application.capabilities.ingestManager?.show ?? false;
-  const write = services.application.capabilities.ingestManager?.write ?? false;
-  const read = services.application.capabilities.ingestManager?.read ?? false;
+  const show = Boolean(services.application.capabilities.ingestManager?.show);
+  const write = Boolean(services.application.capabilities.ingestManager?.write);
+  const read = Boolean(services.application.capabilities.ingestManager?.read);
 
   // Check if all Ingest Manager permissions are enabled
   const allEnabled = show && read && write ? true : false;
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.test.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.test.ts
index 4f2055424ca61..d6dc97fbae158 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.test.ts
@@ -132,6 +132,7 @@ describe('helpers', () => {
       const mockStepData = {
         ...mockData,
       };
+      // @ts-expect-error
       delete mockStepData.timeline.id;
 
       const result: DefineStepRuleJson = formatDefineStepData(mockStepData);
@@ -180,6 +181,7 @@ describe('helpers', () => {
           id: '86aa74d0-2136-11ea-9864-ebc8cc1cb8c2',
         },
       };
+      // @ts-expect-error
       delete mockStepData.timeline.title;
       const result: DefineStepRuleJson = formatDefineStepData(mockStepData);
 
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
index 8a969a4cf098c..f48dc64966bfc 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.tsx
@@ -138,7 +138,7 @@ export const RuleDetailsPageComponent: FC<PropsFromRedux> = ({
     needsConfiguration: needsListsConfiguration,
   } = useListsConfig();
   const loading = userInfoLoading || listsConfigLoading;
-  const { detailName: ruleId } = useParams();
+  const { detailName: ruleId } = useParams<{ detailName: string }>();
   const { rule: maybeRule, refresh: refreshRule, loading: ruleLoading } = useRuleAsync(ruleId);
   const [rule, setRule] = useState<Rule | null>(null);
   const isLoading = ruleLoading && rule == null;
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx
index 13855a4b81494..4033d247c4ecb 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx
@@ -84,7 +84,7 @@ const EditRulePageComponent: FC = () => {
     needsConfiguration: needsListsConfiguration,
   } = useListsConfig();
   const initLoading = userInfoLoading || listsConfigLoading;
-  const { detailName: ruleId } = useParams();
+  const { detailName: ruleId } = useParams<{ detailName: string | undefined }>();
   const [loading, rule] = useRule(ruleId);
 
   const [initForm, setInitForm] = useState(false);
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx b/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx
index 2b19249dc426f..ef88c255b1735 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/hosts.tsx
@@ -57,7 +57,7 @@ export const HostsComponent = React.memo<HostsComponentProps & PropsFromRedux>(
     const { globalFullScreen } = useFullScreen();
     const capabilities = useMlCapabilities();
     const kibana = useKibana();
-    const { tabName } = useParams();
+    const { tabName } = useParams<{ tabName: string }>();
     const tabsFilters = React.useMemo(() => {
       if (tabName === HostsTableType.alerts) {
         return filters.length > 0 ? [...filters, ...filterHostData] : filterHostData;
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
index 4135a4c595d6a..235f150637116 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_details.tsx
@@ -54,7 +54,7 @@ export const PolicyDetails = React.memo(() => {
     services: {
       application: { navigateToApp },
     },
-  } = useKibana();
+  } = useKibana<{ application: ApplicationStart }>();
   const toasts = useToasts();
   const { formatUrl } = useFormatUrl(SecurityPageName.administration);
   const { state: locationRouteState } = useLocation<PolicyDetailsRouteState>();
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
index ff9c40675def8..647204a6dbbe9 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_list.tsx
@@ -30,6 +30,7 @@ import { useDispatch } from 'react-redux';
 import { useLocation, useHistory } from 'react-router-dom';
 import { createStructuredSelector } from 'reselect';
 import styled from 'styled-components';
+import { ApplicationStart } from 'src/core/public';
 import { CreateStructuredSelector } from '../../../../common/store';
 import * as selectors from '../store/policy_list/selectors';
 import { usePolicyListSelector } from './policy_hooks';
@@ -122,7 +123,7 @@ const PolicyLink: React.FC<{ name: string; route: string; href: string }> = ({
 
 const selector = (createStructuredSelector as CreateStructuredSelector)(selectors);
 export const PolicyList = React.memo(() => {
-  const { services } = useKibana();
+  const { services } = useKibana<{ application: ApplicationStart }>();
   const toasts = useToasts();
   const history = useHistory();
   const location = useLocation();
diff --git a/x-pack/plugins/security_solution/public/network/pages/network.tsx b/x-pack/plugins/security_solution/public/network/pages/network.tsx
index 601bae89f7a4d..848dc94acff61 100644
--- a/x-pack/plugins/security_solution/public/network/pages/network.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/network.tsx
@@ -62,7 +62,7 @@ const NetworkComponent = React.memo<NetworkComponentProps & PropsFromRedux>(
     const { to, from, setQuery, isInitializing } = useGlobalTime();
     const { globalFullScreen } = useFullScreen();
     const kibana = useKibana();
-    const { tabName } = useParams();
+    const { tabName } = useParams<{ tabName: string }>();
 
     const tabsFilters = useMemo(() => {
       if (tabName === NetworkRouteType.alerts) {
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
index 55451882d96fa..45bdbd0979276 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/reducer.test.ts
@@ -806,6 +806,7 @@ describe('Timeline', () => {
       };
       // temporary, we will have to decouple DataProvider & DataProvidersAnd
       // that's bigger a refactor than just fixing a bug
+      // @ts-expect-error
       delete andProviderToAdd.and;
       const update = addTimelineProvider({
         id: 'foo',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/read_notifications.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/read_notifications.test.ts
index a46f65da58043..672842bd992ad 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/read_notifications.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/notifications/read_notifications.test.ts
@@ -41,6 +41,7 @@ describe('read_notifications', () => {
     });
     test('should return null if saved object found by alerts client given id is not alert type', async () => {
       const result = getNotificationResult();
+      // @ts-expect-error
       delete result.alertTypeId;
       alertsClient.get.mockResolvedValue(result);
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
index f6a903ca9a4ee..81c9387c6f39c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.test.ts
@@ -233,7 +233,9 @@ describe('import_rules_route', () => {
       const rulesWithoutRuleIds = ['rule-1', 'rule-2'].map((ruleId) =>
         getImportRulesWithIdSchemaMock(ruleId)
       );
+      // @ts-expect-error
       delete rulesWithoutRuleIds[0].rule_id;
+      // @ts-expect-error
       delete rulesWithoutRuleIds[1].rule_id;
       const badPayload = buildHapiStream(rulesToNdJsonString(rulesWithoutRuleIds));
       const badRequest = getImportRulesRequest(badPayload);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.test.ts
index d03dd72937b01..06ec22b2f61b4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/validate.test.ts
@@ -93,6 +93,7 @@ describe('validate', () => {
 
     test('it should do an in-validation correctly of a partial alert', () => {
       const ruleAlert = getResult();
+      // @ts-expect-error
       delete ruleAlert.name;
       const [validated, errors] = transformValidate(ruleAlert);
       expect(validated).toEqual(null);
@@ -110,6 +111,7 @@ describe('validate', () => {
 
     test('it should do an in-validation correctly of a partial alert', () => {
       const findResult: FindResult = { data: [getResult()], page: 1, perPage: 0, total: 0 };
+      // @ts-expect-error
       delete findResult.page;
       const [validated, errors] = transformValidateFindAlerts(findResult, []);
       expect(validated).toEqual(null);
@@ -126,6 +128,7 @@ describe('validate', () => {
 
     test('it should do an in-validation correctly of a rule id', () => {
       const ruleAlert = getResult();
+      // @ts-expect-error
       delete ruleAlert.name;
       const validatedOrError = transformValidateBulkError('rule-1', ruleAlert);
       const expected: BulkError = {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts
index b17a7358cfa52..c43ff6d203fec 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/read_rules.test.ts
@@ -40,6 +40,7 @@ describe('read_rules', () => {
     test('should return null if saved object found by alerts client given id is not alert type', async () => {
       const alertsClient = alertsClientMock.create();
       const result = getResult();
+      // @ts-expect-error
       delete result.alertTypeId;
       alertsClient.get.mockResolvedValue(result);
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts
index fe2e0f2d96fd8..ee83c826371bc 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts
@@ -39,6 +39,7 @@ describe('buildBulkBody', () => {
       throttle: 'no_actions',
     });
     // Timestamp will potentially always be different so remove it for the test
+    // @ts-expect-error
     delete fakeSignalSourceHit['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { someKey: 'someValue' } = {
       someKey: 'someValue',
@@ -132,6 +133,7 @@ describe('buildBulkBody', () => {
       throttle: 'no_actions',
     });
     // Timestamp will potentially always be different so remove it for the test
+    // @ts-expect-error
     delete fakeSignalSourceHit['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { someKey: 'someValue' } = {
       someKey: 'someValue',
@@ -233,6 +235,7 @@ describe('buildBulkBody', () => {
       throttle: 'no_actions',
     });
     // Timestamp will potentially always be different so remove it for the test
+    // @ts-expect-error
     delete fakeSignalSourceHit['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { someKey: 'someValue' } = {
       someKey: 'someValue',
@@ -331,6 +334,7 @@ describe('buildBulkBody', () => {
       throttle: 'no_actions',
     });
     // Timestamp will potentially always be different so remove it for the test
+    // @ts-expect-error
     delete fakeSignalSourceHit['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { someKey: 'someValue' } = {
       someKey: 'someValue',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts
index d07fa382e114a..5c5d8605d7811 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/tags/read_tags.test.ts
@@ -287,6 +287,7 @@ describe('read_tags', () => {
       const result2 = getResult();
       result2.id = '99979e67-19a7-455f-b452-8eded6135716';
       result2.params.ruleId = 'rule-2';
+      // @ts-expect-error
       delete result2.tags;
 
       const result3 = getResult();
diff --git a/x-pack/plugins/security_solution/server/lib/events/elasticsearch_adapter.ts b/x-pack/plugins/security_solution/server/lib/events/elasticsearch_adapter.ts
index aabb18d419098..dda52e26ca42b 100644
--- a/x-pack/plugins/security_solution/server/lib/events/elasticsearch_adapter.ts
+++ b/x-pack/plugins/security_solution/server/lib/events/elasticsearch_adapter.ts
@@ -51,12 +51,11 @@ export class ElasticsearchEventsAdapter implements EventsAdapter {
     request: FrameworkRequest,
     options: TimelineRequestOptions
   ): Promise<TimelineData> {
-    const queryOptions = cloneDeep(options);
+    const { fieldRequested, ...queryOptions } = cloneDeep(options);
     queryOptions.fields = uniq([
-      ...queryOptions.fieldRequested,
+      ...fieldRequested,
       ...reduceFields(queryOptions.fields, eventFieldsMap),
     ]);
-    delete queryOptions.fieldRequested;
     const dsl = buildTimelineQuery(queryOptions);
     const response = await this.framework.callWithRequest<EventHit, TermAggregation>(
       request,
diff --git a/x-pack/plugins/security_solution/server/lib/events/mock.ts b/x-pack/plugins/security_solution/server/lib/events/mock.ts
index f5fb2f481ca77..a3350a08c7d34 100644
--- a/x-pack/plugins/security_solution/server/lib/events/mock.ts
+++ b/x-pack/plugins/security_solution/server/lib/events/mock.ts
@@ -2875,6 +2875,7 @@ export const mockQueryDsl = {
 };
 
 const mockTimelineDetailsInspectResponse = cloneDeep(mockResponseSearchTimelineDetails);
+// @ts-expect-error
 delete mockTimelineDetailsInspectResponse.hits.hits[0]._source;
 
 export const mockTimelineDetailsResult = {
diff --git a/x-pack/plugins/transform/public/app/common/pivot_group_by.ts b/x-pack/plugins/transform/public/app/common/pivot_group_by.ts
index bd5a5a26d9019..7da52fc018338 100644
--- a/x-pack/plugins/transform/public/app/common/pivot_group_by.ts
+++ b/x-pack/plugins/transform/public/app/common/pivot_group_by.ts
@@ -132,13 +132,9 @@ export type PivotGroupBy = GenericAgg | TermsAgg | HistogramAgg | DateHistogramA
 export type PivotGroupByDict = Dictionary<PivotGroupBy>;
 
 export function getEsAggFromGroupByConfig(groupByConfig: GroupByConfigBase): GenericAgg {
-  const esAgg = { ...groupByConfig };
-
-  delete esAgg.agg;
-  delete esAgg.aggName;
-  delete esAgg.dropDownName;
+  const { agg, aggName, dropDownName, ...esAgg } = groupByConfig;
 
   return {
-    [groupByConfig.agg]: esAgg,
+    [agg]: esAgg,
   };
 }
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.tsx
index 311aed19e0706..15efa46dfb891 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/transform_list/expanded_row.tsx
@@ -7,7 +7,7 @@
 import React, { FC } from 'react';
 
 import { EuiTabbedContent } from '@elastic/eui';
-
+import { Optional } from '@kbn/utility-types';
 import { i18n } from '@kbn/i18n';
 
 import moment from 'moment-timezone';
@@ -35,8 +35,10 @@ interface Props {
   item: TransformListRow;
 }
 
+type StateValues = Optional<TransformListRow['stats'], 'stats' | 'checkpointing'>;
+
 export const ExpandedRow: FC<Props> = ({ item }) => {
-  const stateValues = { ...item.stats };
+  const stateValues: StateValues = { ...item.stats };
   delete stateValues.stats;
   delete stateValues.checkpointing;
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
index 1f9352d8405d2..c53dc0c105084 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/app.tsx
@@ -26,8 +26,8 @@ import { PluginStartContract as AlertingStart } from '../../../alerts/public';
 import { suspendedComponentWithProps } from './lib/suspended_component_with_props';
 
 const TriggersActionsUIHome = lazy(async () => import('./home'));
-const AlertDetailsRoute = lazy(() =>
-  import('./sections/alert_details/components/alert_details_route')
+const AlertDetailsRoute = lazy(
+  () => import('./sections/alert_details/components/alert_details_route')
 );
 
 export interface AppDeps {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/context/alerts_context.tsx b/x-pack/plugins/triggers_actions_ui/public/application/context/alerts_context.tsx
index 95620a5be8474..953a444500084 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/context/alerts_context.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/context/alerts_context.tsx
@@ -8,7 +8,7 @@ import React, { useContext, createContext } from 'react';
 import {
   HttpSetup,
   IUiSettingsClient,
-  ToastsApi,
+  ToastsStart,
   DocLinksStart,
   ApplicationStart,
 } from 'kibana/public';
@@ -22,10 +22,7 @@ export interface AlertsContextValue<MetaData = Record<string, any>> {
   http: HttpSetup;
   alertTypeRegistry: TypeRegistry<AlertTypeModel>;
   actionTypeRegistry: TypeRegistry<ActionTypeModel>;
-  toastNotifications: Pick<
-    ToastsApi,
-    'get$' | 'add' | 'remove' | 'addSuccess' | 'addWarning' | 'addDanger' | 'addError'
-  >;
+  toastNotifications: ToastsStart;
   uiSettings?: IUiSettingsClient;
   charts?: ChartsPluginSetup;
   docLinks: DocLinksStart;
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts
index 0acd3ea3e51a7..d79614e47ccd4 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory_definition.ts
@@ -24,8 +24,7 @@ export interface ActionFactoryDefinition<
     triggers: SupportedTriggers[];
   },
   ActionContext extends TriggerContextMapping[SupportedTriggers] = TriggerContextMapping[SupportedTriggers]
->
-  extends Partial<Omit<Presentable<FactoryContext>, 'getHref'>>,
+> extends Partial<Omit<Presentable<FactoryContext>, 'getHref'>>,
     Configurable<Config, FactoryContext> {
   /**
    * Unique ID of the action factory. This ID is used to identify this action
diff --git a/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_context_provider.tsx b/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_context_provider.tsx
index d1c6f076d6749..e59c55210c179 100644
--- a/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_context_provider.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/alerts/uptime_alerts_context_provider.tsx
@@ -5,9 +5,33 @@
  */
 
 import React from 'react';
-import { AlertsContextProvider } from '../../../../../../plugins/triggers_actions_ui/public';
+import {
+  HttpStart,
+  NotificationsStart,
+  IUiSettingsClient,
+  DocLinksStart,
+  ApplicationStart,
+} from 'src/core/public';
+import { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
+import { ChartsPluginStart } from '../../../../../../../src/plugins/charts/public';
+import {
+  AlertsContextProvider,
+  TriggersAndActionsUIPublicPluginStart,
+} from '../../../../../../plugins/triggers_actions_ui/public';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 
+interface KibanaDeps {
+  http: HttpStart;
+  notifications: NotificationsStart;
+  uiSettings: IUiSettingsClient;
+  docLinks: DocLinksStart;
+  application: ApplicationStart;
+
+  data: DataPublicPluginStart;
+  charts: ChartsPluginStart;
+  triggers_actions_ui: TriggersAndActionsUIPublicPluginStart;
+}
+
 export const UptimeAlertsContextProvider: React.FC = ({ children }) => {
   const {
     services: {
@@ -20,7 +44,7 @@ export const UptimeAlertsContextProvider: React.FC = ({ children }) => {
       docLinks,
       application: { capabilities },
     },
-  } = useKibana();
+  } = useKibana<KibanaDeps>();
 
   return (
     <AlertsContextProvider
diff --git a/x-pack/plugins/uptime/public/components/overview/kuery_bar/kuery_bar.tsx b/x-pack/plugins/uptime/public/components/overview/kuery_bar/kuery_bar.tsx
index 9e373949aea12..61402008363da 100644
--- a/x-pack/plugins/uptime/public/components/overview/kuery_bar/kuery_bar.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/kuery_bar/kuery_bar.tsx
@@ -15,6 +15,7 @@ import {
   esKuery,
   IIndexPattern,
   QuerySuggestion,
+  DataPublicPluginStart,
 } from '../../../../../../../src/plugins/data/public';
 import { useIndexPattern } from './use_index_pattern';
 
@@ -55,7 +56,7 @@ export function KueryBar({
     services: {
       data: { autocomplete },
     },
-  } = useKibana();
+  } = useKibana<{ data: DataPublicPluginStart }>();
 
   const [state, setState] = useState<State>({
     suggestions: [],
@@ -102,8 +103,8 @@ export function KueryBar({
           language: 'kuery',
           indexPatterns: [indexPattern],
           query: inputValue,
-          selectionStart,
-          selectionEnd: selectionStart,
+          selectionStart: selectionStart || 0,
+          selectionEnd: selectionStart || 0,
           boolFilter: [
             {
               range: {
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
index 302137199276b..4e8ffc64cfe92 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list_drawer/__tests__/monitor_list_drawer.test.tsx
@@ -62,6 +62,7 @@ describe('MonitorListDrawer component', () => {
   });
 
   it('renders nothing when no check data is present', () => {
+    // @ts-expect-error According to the code, the property is optional
     delete summary.state.summaryPings;
     const component = shallowWithRouter(
       <MonitorListDrawerComponent
diff --git a/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx b/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
index 60c0807ae89a8..9dc64374f4d63 100644
--- a/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
+++ b/x-pack/plugins/uptime/public/components/settings/add_connector_flyout.tsx
@@ -8,17 +8,26 @@ import React, { useEffect, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { useDispatch } from 'react-redux';
 import { EuiButtonEmpty } from '@elastic/eui';
+import { HttpStart, DocLinksStart, NotificationsStart, ApplicationStart } from 'src/core/public';
 import {
   ActionsConnectorsContextProvider,
   ConnectorAddFlyout,
+  TriggersAndActionsUIPublicPluginStart,
 } from '../../../../triggers_actions_ui/public';
-
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { getConnectorsAction } from '../../state/alerts/alerts';
 
 interface Props {
   focusInput: () => void;
 }
+interface KibanaDeps {
+  triggers_actions_ui: TriggersAndActionsUIPublicPluginStart;
+  application: ApplicationStart;
+  docLinks: DocLinksStart;
+  http: HttpStart;
+  notifications: NotificationsStart;
+}
+
 export const AddConnectorFlyout = ({ focusInput }: Props) => {
   const [addFlyoutVisible, setAddFlyoutVisibility] = useState<boolean>(false);
 
@@ -30,7 +39,7 @@ export const AddConnectorFlyout = ({ focusInput }: Props) => {
       http,
       notifications,
     },
-  } = useKibana();
+  } = useKibana<KibanaDeps>();
 
   const dispatch = useDispatch();
 
diff --git a/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx b/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
index b3b38a84e4f22..7636d4ede4bab 100644
--- a/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
+++ b/x-pack/plugins/uptime/public/components/settings/alert_defaults_form.tsx
@@ -24,9 +24,14 @@ import { useGetUrlParams, useUrlParams } from '../../hooks';
 import { alertFormI18n } from './translations';
 import { useInitApp } from '../../hooks/use_init_app';
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
+import { TriggersAndActionsUIPublicPluginStart } from '../../../../triggers_actions_ui/public/';
 
 type ConnectorOption = EuiComboBoxOptionOption<string>;
 
+interface KibanaDeps {
+  triggers_actions_ui: TriggersAndActionsUIPublicPluginStart;
+}
+
 const ConnectorSpan = styled.span`
   .euiIcon {
     margin-right: 5px;
@@ -48,7 +53,7 @@ export const AlertDefaultsForm: React.FC<SettingsFormProps> = ({
     services: {
       triggers_actions_ui: { actionTypeRegistry },
     },
-  } = useKibana();
+  } = useKibana<KibanaDeps>();
   const { focusConnectorField } = useGetUrlParams();
 
   const updateUrlParams = useUrlParams()[1];
diff --git a/x-pack/plugins/uptime/public/hooks/use_monitor.ts b/x-pack/plugins/uptime/public/hooks/use_monitor.ts
index 8080ce2696a3c..000e497b29cff 100644
--- a/x-pack/plugins/uptime/public/hooks/use_monitor.ts
+++ b/x-pack/plugins/uptime/public/hooks/use_monitor.ts
@@ -7,7 +7,7 @@
 import { useParams } from 'react-router-dom';
 
 export const useMonitorId = (): string => {
-  const { monitorId } = useParams();
+  const { monitorId } = useParams<{ monitorId: string }>();
 
   // decode 64 base string, it was decoded to make it a valid url, since monitor id can be a url
   return atob(monitorId || '');
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts
index befa11d74df4a..b1247ad5b8935 100644
--- a/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts
+++ b/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_infra_href.test.ts
@@ -79,6 +79,7 @@ describe('getInfraHref', () => {
   });
 
   it('getInfraContainerHref returns undefined when summaryPings are undefined', () => {
+    // @ts-expect-error
     delete summary.state.summaryPings;
     expect(getInfraContainerHref(summary, '')).toBeUndefined();
   });
@@ -125,6 +126,7 @@ describe('getInfraHref', () => {
   });
 
   it('getInfraKubernetesHref returns undefined when summaryPings are undefined', () => {
+    // @ts-expect-error
     delete summary.state.summaryPings;
     expect(getInfraKubernetesHref(summary, '')).toBeUndefined();
   });
@@ -183,6 +185,7 @@ describe('getInfraHref', () => {
   });
 
   it('getInfraIpHref returns undefined if summaryPings are undefined', () => {
+    // @ts-expect-error
     delete summary.state.summaryPings;
     expect(getInfraIpHref(summary, 'foo')).toBeUndefined();
   });
diff --git a/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts b/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts
index 203d5b84c433a..d2a7a96a8b6f9 100644
--- a/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts
+++ b/x-pack/plugins/uptime/public/lib/helper/observability_integration/__tests__/get_logging_href.test.ts
@@ -93,6 +93,7 @@ describe('getLoggingHref', () => {
   });
 
   it('returns undefined if necessary container is not present', () => {
+    // @ts-expect-error According to the code, the property is optional
     delete summary.state.summaryPings;
     expect(getLoggingContainerHref(summary, '')).toBeUndefined();
   });
@@ -103,6 +104,7 @@ describe('getLoggingHref', () => {
   });
 
   it('returns undefined if necessary pod is not present', () => {
+    // @ts-expect-error According to the code, the property is optional
     delete summary.state.summaryPings;
     expect(getLoggingKubernetesHref(summary, '')).toBeUndefined();
   });
@@ -113,6 +115,7 @@ describe('getLoggingHref', () => {
   });
 
   it('returns undefined ip href if ip is not present', () => {
+    // @ts-expect-error According to the code, the property is optional
     delete summary.state.summaryPings;
     expect(getLoggingIpHref(summary, '')).toBeUndefined();
   });
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/package.json b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/package.json
index 50016592ba1ac..fbc4d8d92203a 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/package.json
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/aad/package.json
@@ -11,7 +11,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   },
   "license": "Apache-2.0",
   "dependencies": {
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/package.json b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/package.json
index 84e4783072f31..20afe49fc1f19 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/package.json
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/actions_simulators/package.json
@@ -11,7 +11,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   },
   "license": "Apache-2.0",
   "dependencies": {
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/package.json b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/package.json
index 7796538997de1..41147ab62d359 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/package.json
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts/package.json
@@ -11,7 +11,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   },
   "license": "Apache-2.0",
   "dependencies": {
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/package.json b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/package.json
index fe3b905106ee0..8d7010879b7d7 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/package.json
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/alerts_restricted/package.json
@@ -11,7 +11,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.7.2"
+    "typescript": "4.0.2"
   },
   "license": "Apache-2.0",
   "dependencies": {
diff --git a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/package.json b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/package.json
index 5b486da23c9e4..8b8532af6eecf 100644
--- a/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/package.json
+++ b/x-pack/test/alerting_api_integration/common/fixtures/plugins/task_manager_fixture/package.json
@@ -11,7 +11,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   },
   "license": "Apache-2.0",
   "dependencies": {
diff --git a/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts b/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts
index a68f8de39d48e..a9e5d0c832c8c 100644
--- a/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/alert_utils.ts
@@ -214,10 +214,10 @@ export class AlertUtils {
       .set('kbn-xsrf', 'foo')
       .auth(user.username, user.password);
 
-    const alertBody = getDefaultAlwaysFiringAlertData(reference, actionId);
-    delete alertBody.alertTypeId;
-    delete alertBody.enabled;
-    delete alertBody.consumer;
+    const { alertTypeId, enabled, consumer, ...alertBody } = getDefaultAlwaysFiringAlertData(
+      reference,
+      actionId
+    );
 
     const response = await request.send({ ...alertBody, ...overwrites });
     return response;
diff --git a/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json b/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
index 9fa1554e5312b..c74aa683d6f32 100644
--- a/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
+++ b/x-pack/test/functional_embedded/plugins/iframe_embedded/package.json
@@ -9,6 +9,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/package.json b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/package.json
index 289017d37d634..f8bafad602269 100644
--- a/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/package.json
+++ b/x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/package.json
@@ -10,6 +10,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/x-pack/test/functional_with_es_ssl/services/alerting/actions.ts b/x-pack/test/functional_with_es_ssl/services/alerting/actions.ts
index cff5b3c3ce9c3..060c4f13e70c7 100644
--- a/x-pack/test/functional_with_es_ssl/services/alerting/actions.ts
+++ b/x-pack/test/functional_with_es_ssl/services/alerting/actions.ts
@@ -30,10 +30,11 @@ export class Actions {
   }) {
     this.log.debug(`creating action ${actionParams.name}`);
 
-    const { data: action, status: actionStatus, actionStatusText } = await this.axios.post(
-      `/api/actions/action`,
-      actionParams
-    );
+    const {
+      data: action,
+      status: actionStatus,
+      statusText: actionStatusText,
+    } = await this.axios.post(`/api/actions/action`, actionParams);
     if (actionStatus !== 200) {
       throw new Error(
         `Expected status code of 200, received ${actionStatus} ${actionStatusText}: ${util.inspect(
diff --git a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/package.json b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/package.json
index ed31989472134..c12de16b9b4af 100644
--- a/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/package.json
+++ b/x-pack/test/plugin_api_integration/plugins/elasticsearch_client/package.json
@@ -9,6 +9,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/package.json b/x-pack/test/plugin_api_integration/plugins/event_log/package.json
index 92c5fb5f36cfc..03bef5b8272ba 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/package.json
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/package.json
@@ -10,6 +10,6 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   }
 }
diff --git a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/package.json b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/package.json
index f8de67e9c6974..513443486ad8e 100644
--- a/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/package.json
+++ b/x-pack/test/plugin_api_integration/plugins/sample_task_plugin/package.json
@@ -11,7 +11,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   },
   "license": "Apache-2.0",
   "dependencies": {}
diff --git a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/package.json b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/package.json
index 2b174a8cae076..542c8358114f4 100644
--- a/x-pack/test/plugin_api_perf/plugins/task_manager_performance/package.json
+++ b/x-pack/test/plugin_api_perf/plugins/task_manager_performance/package.json
@@ -16,7 +16,7 @@
     "pretty-ms": "5.0.0"
   },
   "devDependencies": {
-    "typescript": "3.9.5"
+    "typescript": "4.0.2"
   },
   "license": "Apache-2.0"
 }
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/csv_saved_search.ts b/x-pack/test/reporting_api_integration/reporting_and_security/csv_saved_search.ts
index 7c08f377c9b15..9a7d17c971dfe 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/csv_saved_search.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/csv_saved_search.ts
@@ -293,7 +293,7 @@ export default function ({ getService }: FtrProviderContext) {
           searchId: 'search:a6d51430-ace2-11ea-815f-39e12f89a8c2',
           postPayload: {
             timerange: { timezone: 'UTC', min: '1979-01-01T10:00:00Z', max: '1981-01-01T10:00:00Z' }, // prettier-ignore
-            state: { query: { bool: { filter: [ { bool: { filter: [ { bool: { minimum_should_match: 1, should: [{ query_string: { fields: ['name'], query: 'Fel*' } }] } } ] } } ] } } } // prettier-ignore
+            state: { query: { bool: { filter: [ { bool: { filter: [ { bool: { minimum_should_match: 1, should: [{ query_string: { fields: ['name'], query: 'Fel*' } }] } } ] } } ] } } }, // prettier-ignore
           },
           isImmediate: true,
         };
diff --git a/yarn.lock b/yarn.lock
index 845685ff36f7d..d3994337301cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4999,26 +4999,26 @@
   resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
   integrity sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg==
 
-"@typescript-eslint/eslint-plugin@^3.7.1":
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.1.tgz#d144c49a9a0ffe8dd704bb179c243df76c111bc9"
-  integrity sha512-3DB9JDYkMrc8Au00rGFiJLK2Ja9CoMP6Ut0sHsXp3ZtSugjNxvSSHTnKLfo4o+QmjYBJqEznDqsG1zj4F2xnsg==
+"@typescript-eslint/eslint-plugin@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.0.tgz#40fd53e81639c0d1a515b44e5fdf4c03dfd3cd39"
+  integrity sha512-Bbeg9JAnSzZ85Y0gpInZscSpifA6SbEgRryaKdP5ZlUjhTKsvZS4GUIE6xAZCjhNTrf4zXXsySo83ZdHL7it0w==
   dependencies:
-    "@typescript-eslint/experimental-utils" "3.7.1"
+    "@typescript-eslint/experimental-utils" "3.10.0"
     debug "^4.1.1"
     functional-red-black-tree "^1.0.1"
     regexpp "^3.0.0"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@3.7.1":
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.1.tgz#ab036caaed4c870d22531d41f9352f3147364d61"
-  integrity sha512-TqE97pv7HrqWcGJbLbZt1v59tcqsSVpWTOf1AqrWK7n8nok2sGgVtYRuGXeNeLw3wXlLEbY1MKP3saB2HsO/Ng==
+"@typescript-eslint/experimental-utils@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.0.tgz#f97a669a84a78319ab324cd51169d0c52853a360"
+  integrity sha512-e5ZLSTuXgqC/Gq3QzK2orjlhTZVXzwxDujQmTBOM1NIVBZgW3wiIZjaXuVutk9R4UltFlwC9UD2+bdxsA7yyNg==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/types" "3.7.1"
-    "@typescript-eslint/typescript-estree" "3.7.1"
+    "@typescript-eslint/types" "3.10.0"
+    "@typescript-eslint/typescript-estree" "3.10.0"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
@@ -5031,21 +5031,21 @@
     "@typescript-eslint/typescript-estree" "2.15.0"
     eslint-scope "^5.0.0"
 
-"@typescript-eslint/parser@^3.7.1":
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.7.1.tgz#5d9ccecb116d12d9c6073e9861c57c9b1aa88128"
-  integrity sha512-W4QV/gXvfIsccN8225784LNOorcm7ch68Fi3V4Wg7gmkWSQRKevO4RrRqWo6N/Z/myK1QAiGgeaXN57m+R/8iQ==
+"@typescript-eslint/parser@^3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.10.0.tgz#820322d990a82265a78f4c1fc9aae03ce95b76ac"
+  integrity sha512-iJyf3f2HVwscvJR7ySGMXw2DJgIAPKEz8TeU17XVKzgJRV4/VgCeDFcqLzueRe7iFI2gv+Tln4AV88ZOnsCNXg==
   dependencies:
     "@types/eslint-visitor-keys" "^1.0.0"
-    "@typescript-eslint/experimental-utils" "3.7.1"
-    "@typescript-eslint/types" "3.7.1"
-    "@typescript-eslint/typescript-estree" "3.7.1"
+    "@typescript-eslint/experimental-utils" "3.10.0"
+    "@typescript-eslint/types" "3.10.0"
+    "@typescript-eslint/typescript-estree" "3.10.0"
     eslint-visitor-keys "^1.1.0"
 
-"@typescript-eslint/types@3.7.1":
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.7.1.tgz#90375606b2fd73c1224fe9e397ee151e28fa1e0c"
-  integrity sha512-PZe8twm5Z4b61jt7GAQDor6KiMhgPgf4XmUb9zdrwTbgtC/Sj29gXP1dws9yEn4+aJeyXrjsD9XN7AWFhmnUfg==
+"@typescript-eslint/types@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.0.tgz#b81906674eca94a884345ba0bc1aaf6cd4da912a"
+  integrity sha512-ktUWSa75heQNwH85GRM7qP/UUrXqx9d6yIdw0iLO9/uE1LILW+i+3+B64dUodUS2WFWLzKTlwfi9giqrODibWg==
 
 "@typescript-eslint/typescript-estree@2.15.0":
   version "2.15.0"
@@ -5060,13 +5060,13 @@
     semver "^6.3.0"
     tsutils "^3.17.1"
 
-"@typescript-eslint/typescript-estree@3.7.1":
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.1.tgz#ce1ffbd0fa53f34d4ce851a7a364e392432f6eb3"
-  integrity sha512-m97vNZkI08dunYOr2lVZOHoyfpqRs0KDpd6qkGaIcLGhQ2WPtgHOd/eVbsJZ0VYCQvupKrObAGTOvk3tfpybYA==
+"@typescript-eslint/typescript-estree@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.0.tgz#65df13579a5e53c12afb4f1c5309589e3855a5de"
+  integrity sha512-yjuY6rmVHRhcUKgXaSPNVloRueGWpFNhxR5EQLzxXfiFSl1U/+FBqHhbaGwtPPEgCSt61QNhZgiFjWT27bgAyw==
   dependencies:
-    "@typescript-eslint/types" "3.7.1"
-    "@typescript-eslint/visitor-keys" "3.7.1"
+    "@typescript-eslint/types" "3.10.0"
+    "@typescript-eslint/visitor-keys" "3.10.0"
     debug "^4.1.1"
     glob "^7.1.6"
     is-glob "^4.0.1"
@@ -5082,10 +5082,10 @@
     lodash.unescape "4.0.1"
     semver "5.5.0"
 
-"@typescript-eslint/visitor-keys@3.7.1":
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.1.tgz#b90191e74efdee656be8c5a30f428ed16dda46d1"
-  integrity sha512-xn22sQbEya+Utj2IqJHGLA3i1jDzR43RzWupxojbSWnj3nnPLavaQmWe5utw03CwYao3r00qzXfgJMGNkrzrAA==
+"@typescript-eslint/visitor-keys@3.10.0":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.0.tgz#6c0cac867e705a42e2c71b359bf6a10a88a28985"
+  integrity sha512-g4qftk8lWb/rHZe9uEp8oZSvsJhUvR2cfp7F7qE6DyUD2SsovEs8JDQTRP1xHzsD+pERsEpYNqkDgQXW6+ob5A==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
@@ -11979,10 +11979,10 @@ eslint-plugin-prefer-object-spread@^1.2.1:
   resolved "https://registry.yarnpkg.com/eslint-plugin-prefer-object-spread/-/eslint-plugin-prefer-object-spread-1.2.1.tgz#27fb91853690cceb3ae6101d9c8aecc6a67a402c"
   integrity sha1-J/uRhTaQzOs65hAdnIrsxqZ6QCw=
 
-eslint-plugin-prettier@^3.1.3:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz#ae116a0fc0e598fdae48743a4430903de5b4e6ca"
-  integrity sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==
+eslint-plugin-prettier@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"
+  integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
@@ -22451,10 +22451,10 @@ prettier@1.16.4:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.16.4.tgz#73e37e73e018ad2db9c76742e2647e21790c9717"
   integrity sha512-ZzWuos7TI5CKUeQAtFd6Zhm2s6EpAD/ZLApIhsF9pRvRtM1RFo61dM/4MSRUA0SuLugA/zgrZD8m0BaY46Og7g==
 
-prettier@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
-  integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==
+prettier@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6"
+  integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==
 
 pretty-bytes@5.3.0:
   version "5.3.0"
@@ -28143,10 +28143,10 @@ typescript-tuple@^2.2.1:
   dependencies:
     typescript-compare "^0.0.2"
 
-typescript@3.9.5, typescript@^3.0.1, typescript@^3.0.3, typescript@^3.2.2, typescript@^3.3.3333, typescript@^3.4.5, typescript@~3.7.2:
-  version "3.9.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
-  integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==
+typescript@4.0.2, typescript@^3.0.1, typescript@^3.0.3, typescript@^3.2.2, typescript@^3.3.3333, typescript@^3.4.5, typescript@~3.7.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2"
+  integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ==
 
 typings-tester@^0.3.2:
   version "0.3.2"

From 8e2cb5684e8d0a75da8762480a17e5800bfe77fb Mon Sep 17 00:00:00 2001
From: Diana Derevyankina
 <54894989+DziyanaDzeraviankina@users.noreply.github.com>
Date: Thu, 27 Aug 2020 13:35:04 +0300
Subject: [PATCH 088/148] KQL support in filter ratio in TSVB (#75033)

* KQL support in filter ratio in TSVB

Closes #67503

* Fix filter_ratio and filter_ratios tests

* fix JEST

* Refactor some code in filter_ratio, filter_ratios, filter_ratios.test

* Edit query value in filter_ratio and filter_ratios.test

* Refacor some code in filter_ratio.js and visualization_migrations.ts

* Remove duplications in vis_schema and refactor filter_ratio

* Refactor filter_ratio.js

* Update default query with getDefaultQuery()

* Fix filter_ratio and histogram_support tests

Co-authored-by: Alexey Antonov <alexwizp@gmail.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../vis_type_timeseries/common/vis_schema.ts  | 11 +--
 .../components/aggs/filter_ratio.js           | 35 +++++---
 .../components/aggs/filter_ratio.test.js      |  8 ++
 .../components/aggs/histogram_support.test.js |  9 +++
 .../series/filter_ratios.js                   | 19 +++--
 .../series/filter_ratios.test.js              | 80 ++++++++++++++-----
 .../visualization_migrations.test.ts          | 34 ++++++++
 .../saved_objects/visualization_migrations.ts | 40 ++++++++++
 8 files changed, 194 insertions(+), 42 deletions(-)

diff --git a/src/plugins/vis_type_timeseries/common/vis_schema.ts b/src/plugins/vis_type_timeseries/common/vis_schema.ts
index c1730e6a15435..d3d863df8617f 100644
--- a/src/plugins/vis_type_timeseries/common/vis_schema.ts
+++ b/src/plugins/vis_type_timeseries/common/vis_schema.ts
@@ -80,8 +80,8 @@ export const metricsItems = schema.object({
   field: stringOptionalNullable,
   id: stringRequired,
   metric_agg: stringOptionalNullable,
-  numerator: stringOptionalNullable,
-  denominator: stringOptionalNullable,
+  numerator: schema.maybe(queryObject),
+  denominator: schema.maybe(queryObject),
   sigma: stringOptionalNullable,
   unit: stringOptionalNullable,
   model_type: stringOptionalNullable,
@@ -128,12 +128,7 @@ export const metricsItems = schema.object({
 const splitFiltersItems = schema.object({
   id: stringOptionalNullable,
   color: stringOptionalNullable,
-  filter: schema.maybe(
-    schema.object({
-      language: schema.string(),
-      query: schema.string(),
-    })
-  ),
+  filter: schema.maybe(queryObject),
   label: stringOptionalNullable,
 });
 
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.js
index 2aa994c09a2ad..1c7ab65ecd298 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.js
@@ -18,25 +18,25 @@
  */
 
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 import { AggSelect } from './agg_select';
 import { FieldSelect } from './field_select';
 import { AggRow } from './agg_row';
 import { createChangeHandler } from '../lib/create_change_handler';
 import { createSelectHandler } from '../lib/create_select_handler';
-import { createTextHandler } from '../lib/create_text_handler';
 import {
   htmlIdGenerator,
   EuiFlexGroup,
   EuiFlexItem,
   EuiFormLabel,
-  EuiFieldText,
   EuiSpacer,
   EuiFormRow,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public';
 import { getSupportedFieldsByMetricType } from '../lib/get_supported_fields_by_metric_type';
+import { getDataStart } from '../../../services';
+import { QueryBarWrapper } from '../query_bar_wrapper';
 
 const isFieldHistogram = (fields, indexPattern, field) => {
   const indexFields = fields[indexPattern];
@@ -49,15 +49,24 @@ const isFieldHistogram = (fields, indexPattern, field) => {
 export const FilterRatioAgg = (props) => {
   const { series, fields, panel } = props;
 
-  const handleChange = createChangeHandler(props.onChange, props.model);
+  const handleChange = useMemo(() => createChangeHandler(props.onChange, props.model), [
+    props.model,
+    props.onChange,
+  ]);
   const handleSelectChange = createSelectHandler(handleChange);
-  const handleTextChange = createTextHandler(handleChange);
+  const handleNumeratorQueryChange = useCallback((query) => handleChange({ numerator: query }), [
+    handleChange,
+  ]);
+  const handleDenominatorQueryChange = useCallback(
+    (query) => handleChange({ denominator: query }),
+    [handleChange]
+  );
   const indexPattern =
     (series.override_index_pattern && series.series_index_pattern) || panel.index_pattern;
 
   const defaults = {
-    numerator: '*',
-    denominator: '*',
+    numerator: getDataStart().query.queryString.getDefaultQuery(),
+    denominator: getDataStart().query.queryString.getDefaultQuery(),
     metric_agg: 'count',
   };
 
@@ -101,7 +110,11 @@ export const FilterRatioAgg = (props) => {
               />
             }
           >
-            <EuiFieldText onChange={handleTextChange('numerator')} value={model.numerator} />
+            <QueryBarWrapper
+              query={model.numerator}
+              onChange={handleNumeratorQueryChange}
+              indexPatterns={[indexPattern]}
+            />
           </EuiFormRow>
         </EuiFlexItem>
 
@@ -115,7 +128,11 @@ export const FilterRatioAgg = (props) => {
               />
             }
           >
-            <EuiFieldText onChange={handleTextChange('denominator')} value={model.denominator} />
+            <QueryBarWrapper
+              query={model.denominator}
+              onChange={handleDenominatorQueryChange}
+              indexPatterns={[indexPattern]}
+            />
           </EuiFormRow>
         </EuiFlexItem>
       </EuiFlexGroup>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.test.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.test.js
index 275aa5a252479..f25cd310f6353 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.test.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.test.js
@@ -22,8 +22,16 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { FilterRatioAgg } from './filter_ratio';
 import { FIELDS, METRIC, SERIES, PANEL } from '../../../test_utils';
 import { EuiComboBox } from '@elastic/eui';
+import { dataPluginMock } from '../../../../../data/public/mocks';
+import { setDataStart } from '../../../services';
+
+jest.mock('../query_bar_wrapper', () => ({
+  QueryBarWrapper: jest.fn(() => null),
+}));
 
 describe('TSVB Filter Ratio', () => {
+  beforeAll(() => setDataStart(dataPluginMock.createStartContract()));
+
   const setup = (metric) => {
     const series = { ...SERIES, metrics: [metric] };
     const panel = { ...PANEL, series };
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/histogram_support.test.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/histogram_support.test.js
index 7af33ba11f247..aa4afda028a29 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/aggs/histogram_support.test.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/aggs/histogram_support.test.js
@@ -22,6 +22,13 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { Agg } from './agg';
 import { FieldSelect } from './field_select';
 import { FIELDS, METRIC, SERIES, PANEL } from '../../../test_utils';
+import { setDataStart } from '../../../services';
+import { dataPluginMock } from '../../../../../data/public/mocks';
+
+jest.mock('../query_bar_wrapper', () => ({
+  QueryBarWrapper: jest.fn(() => null),
+}));
+
 const runTest = (aggType, name, test, additionalProps = {}) => {
   describe(aggType, () => {
     const metric = {
@@ -55,6 +62,8 @@ const runTest = (aggType, name, test, additionalProps = {}) => {
 };
 
 describe('Histogram Types', () => {
+  beforeAll(() => setDataStart(dataPluginMock.createStartContract()));
+
   describe('supported', () => {
     const shouldHaveHistogramSupport = (aggType, additionalProps = {}) => {
       runTest(
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js
index 0706ab6be96ea..6c1699912f76f 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js
@@ -20,17 +20,22 @@
 const filter = (metric) => metric.type === 'filter_ratio';
 import { bucketTransform } from '../../helpers/bucket_transform';
 import { overwrite } from '../../helpers';
+import { esQuery } from '../../../../../../data/server';
 
-export function ratios(req, panel, series) {
+export function ratios(req, panel, series, esQueryConfig, indexPatternObject) {
   return (next) => (doc) => {
     if (series.metrics.some(filter)) {
       series.metrics.filter(filter).forEach((metric) => {
-        overwrite(doc, `aggs.${series.id}.aggs.timeseries.aggs.${metric.id}-numerator.filter`, {
-          query_string: { query: metric.numerator || '*', analyze_wildcard: true },
-        });
-        overwrite(doc, `aggs.${series.id}.aggs.timeseries.aggs.${metric.id}-denominator.filter`, {
-          query_string: { query: metric.denominator || '*', analyze_wildcard: true },
-        });
+        overwrite(
+          doc,
+          `aggs.${series.id}.aggs.timeseries.aggs.${metric.id}-numerator.filter`,
+          esQuery.buildEsQuery(indexPatternObject, metric.numerator, [], esQueryConfig)
+        );
+        overwrite(
+          doc,
+          `aggs.${series.id}.aggs.timeseries.aggs.${metric.id}-denominator.filter`,
+          esQuery.buildEsQuery(indexPatternObject, metric.denominator, [], esQueryConfig)
+        );
 
         let numeratorPath = `${metric.id}-numerator>_count`;
         let denominatorPath = `${metric.id}-denominator>_count`;
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js
index e15f045989839..d0216ebab7771 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js
@@ -19,10 +19,12 @@
 
 import { ratios } from './filter_ratios';
 
-describe('ratios(req, panel, series)', () => {
+describe('ratios(req, panel, series, esQueryConfig, indexPatternObject)', () => {
   let panel;
   let series;
   let req;
+  let esQueryConfig;
+  let indexPatternObject;
   beforeEach(() => {
     panel = {
       time_field: 'timestamp',
@@ -36,8 +38,8 @@ describe('ratios(req, panel, series)', () => {
         {
           id: 'metric-1',
           type: 'filter_ratio',
-          numerator: 'errors',
-          denominator: '*',
+          numerator: { query: 'errors', language: 'lucene' },
+          denominator: { query: 'warnings', language: 'lucene' },
           metric_agg: 'avg',
           field: 'cpu',
         },
@@ -51,17 +53,23 @@ describe('ratios(req, panel, series)', () => {
         },
       },
     };
+    esQueryConfig = {
+      allowLeadingWildcards: true,
+      queryStringOptions: { analyze_wildcard: true },
+      ignoreFilterIfFieldNotInIndex: false,
+    };
+    indexPatternObject = {};
   });
 
   test('calls next when finished', () => {
     const next = jest.fn();
-    ratios(req, panel, series)(next)({});
+    ratios(req, panel, series, esQueryConfig, indexPatternObject)(next)({});
     expect(next.mock.calls.length).toEqual(1);
   });
 
   test('returns filter ratio aggs', () => {
     const next = (doc) => doc;
-    const doc = ratios(req, panel, series)(next)({});
+    const doc = ratios(req, panel, series, esQueryConfig, indexPatternObject)(next)({});
     expect(doc).toEqual({
       aggs: {
         test: {
@@ -88,9 +96,18 @@ describe('ratios(req, panel, series)', () => {
                     },
                   },
                   filter: {
-                    query_string: {
-                      analyze_wildcard: true,
-                      query: '*',
+                    bool: {
+                      must: [
+                        {
+                          query_string: {
+                            query: 'warnings',
+                            analyze_wildcard: true,
+                          },
+                        },
+                      ],
+                      filter: [],
+                      should: [],
+                      must_not: [],
                     },
                   },
                 },
@@ -103,9 +120,18 @@ describe('ratios(req, panel, series)', () => {
                     },
                   },
                   filter: {
-                    query_string: {
-                      analyze_wildcard: true,
-                      query: 'errors',
+                    bool: {
+                      must: [
+                        {
+                          query_string: {
+                            query: 'errors',
+                            analyze_wildcard: true,
+                          },
+                        },
+                      ],
+                      filter: [],
+                      should: [],
+                      must_not: [],
                     },
                   },
                 },
@@ -120,7 +146,7 @@ describe('ratios(req, panel, series)', () => {
   test('returns empty object when field is not set', () => {
     delete series.metrics[0].field;
     const next = (doc) => doc;
-    const doc = ratios(req, panel, series)(next)({});
+    const doc = ratios(req, panel, series, esQueryConfig, indexPatternObject)(next)({});
     expect(doc).toEqual({
       aggs: {
         test: {
@@ -141,18 +167,36 @@ describe('ratios(req, panel, series)', () => {
                 'metric-1-denominator': {
                   aggs: { metric: {} },
                   filter: {
-                    query_string: {
-                      analyze_wildcard: true,
-                      query: '*',
+                    bool: {
+                      must: [
+                        {
+                          query_string: {
+                            query: 'warnings',
+                            analyze_wildcard: true,
+                          },
+                        },
+                      ],
+                      filter: [],
+                      should: [],
+                      must_not: [],
                     },
                   },
                 },
                 'metric-1-numerator': {
                   aggs: { metric: {} },
                   filter: {
-                    query_string: {
-                      analyze_wildcard: true,
-                      query: 'errors',
+                    bool: {
+                      must: [
+                        {
+                          query_string: {
+                            analyze_wildcard: true,
+                            query: 'errors',
+                          },
+                        },
+                      ],
+                      filter: [],
+                      should: [],
+                      must_not: [],
                     },
                   },
                 },
diff --git a/src/plugins/visualizations/server/saved_objects/visualization_migrations.test.ts b/src/plugins/visualizations/server/saved_objects/visualization_migrations.test.ts
index d27d021465dc9..05f00e12c172e 100644
--- a/src/plugins/visualizations/server/saved_objects/visualization_migrations.test.ts
+++ b/src/plugins/visualizations/server/saved_objects/visualization_migrations.test.ts
@@ -1544,4 +1544,38 @@ describe('migration visualization', () => {
       expect(series[0].split_color_mode).toBeUndefined();
     });
   });
+
+  describe('7.10.0 tsvb filter_ratio migration', () => {
+    const migrate = (doc: any) =>
+      visualizationSavedObjectTypeMigrations['7.10.0'](
+        doc as Parameters<SavedObjectMigrationFn>[0],
+        savedObjectMigrationContext
+      );
+
+    const testDoc1 = {
+      attributes: {
+        title: 'My Vis',
+        description: 'This is my super cool vis.',
+        visState: `{"type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417","type":"timeseries",
+        "series":[{"id":"61ca57f1-469d-11e7-af02-69e470af7417","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417",
+        "type":"filter_ratio","numerator":"Filter Bytes Test:>1000","denominator":"Filter Bytes Test:<1000"}]}]}}`,
+      },
+    };
+
+    it('should replace numerator string with a query object', () => {
+      const migratedTestDoc1 = migrate(testDoc1);
+      const metric = JSON.parse(migratedTestDoc1.attributes.visState).params.series[0].metrics[0];
+
+      expect(metric.numerator).toHaveProperty('query');
+      expect(metric.numerator).toHaveProperty('language');
+    });
+
+    it('should replace denominator string with a query object', () => {
+      const migratedTestDoc1 = migrate(testDoc1);
+      const metric = JSON.parse(migratedTestDoc1.attributes.visState).params.series[0].metrics[0];
+
+      expect(metric.denominator).toHaveProperty('query');
+      expect(metric.denominator).toHaveProperty('language');
+    });
+  });
 });
diff --git a/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts b/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts
index 74881b9d99ae8..64491d02aa0a3 100644
--- a/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts
+++ b/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts
@@ -99,6 +99,45 @@ const migratePercentileRankAggregation: SavedObjectMigrationFn<any, any> = (doc)
   return doc;
 };
 
+// [TSVB] Replace string query with object
+const migrateFilterRatioQuery: SavedObjectMigrationFn<any, any> = (doc) => {
+  const visStateJSON = get(doc, 'attributes.visState');
+  let visState;
+
+  if (visStateJSON) {
+    try {
+      visState = JSON.parse(visStateJSON);
+    } catch (e) {
+      // Let it go, the data is invalid and we'll leave it as is
+    }
+    if (visState && visState.type === 'metrics') {
+      const series: any[] = get(visState, 'params.series') || [];
+
+      series.forEach((part) => {
+        (part.metrics || []).forEach((metric: any) => {
+          if (metric.type === 'filter_ratio') {
+            if (typeof metric.numerator === 'string') {
+              metric.numerator = { query: metric.numerator, language: 'lucene' };
+            }
+            if (typeof metric.denominator === 'string') {
+              metric.denominator = { query: metric.denominator, language: 'lucene' };
+            }
+          }
+        });
+      });
+
+      return {
+        ...doc,
+        attributes: {
+          ...doc.attributes,
+          visState: JSON.stringify(visState),
+        },
+      };
+    }
+  }
+  return doc;
+};
+
 // [TSVB] Remove stale opperator key
 const migrateOperatorKeyTypo: SavedObjectMigrationFn<any, any> = (doc) => {
   const visStateJSON = get(doc, 'attributes.visState');
@@ -713,4 +752,5 @@ export const visualizationSavedObjectTypeMigrations = {
   '7.4.2': flow(transformSplitFiltersStringToQueryObject),
   '7.7.0': flow(migrateOperatorKeyTypo, migrateSplitByChartRow),
   '7.8.0': flow(migrateTsvbDefaultColorPalettes),
+  '7.10.0': flow(migrateFilterRatioQuery),
 };

From ec1516064c0ecdeb8b6d65c51c9fae69185a6efa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loix?= <sabee77@gmail.com>
Date: Thu, 27 Aug 2020 14:02:03 +0200
Subject: [PATCH 089/148] [Form lib] Correctly add field to form on component
 mount (#75796)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../components/form_data_provider.test.tsx    |  62 ++++-
 .../components/form_data_provider.ts          |  13 ++
 .../forms/hook_form_lib/hooks/use_field.ts    | 133 ++++++-----
 .../forms/hook_form_lib/hooks/use_form.ts     | 162 +++++++------
 .../static/forms/hook_form_lib/types.ts       |  10 +-
 .../component_template_form.helpers.ts        |   3 +
 .../field_parameters/name_parameter.tsx       |  33 ++-
 .../field_parameters/path_parameter.tsx       |  18 +-
 .../fields/edit_field/edit_field.tsx          |   4 +-
 .../edit_field/edit_field_header_form.tsx     |   3 +
 .../processor_settings_fields.tsx             |   2 +-
 .../processors/append.tsx                     |   1 +
 .../public/common/mock/test_providers.tsx     |   7 +-
 .../rules/risk_score_mapping/index.tsx        |  69 +++---
 .../rules/rule_actions_field/index.test.tsx   |   8 +-
 .../rules/rule_actions_field/index.tsx        |  22 +-
 .../rules/severity_mapping/index.tsx          | 221 +++++++++---------
 .../rules/step_about_rule/index.test.tsx      |  54 ++---
 .../rules/step_about_rule/schema.tsx          |  21 +-
 .../public/shared_imports.ts                  |   1 +
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 22 files changed, 479 insertions(+), 370 deletions(-)

diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider.test.tsx
index 3e4ce4a412b3b..25448dff18e8a 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider.test.tsx
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React from 'react';
+import React, { useState } from 'react';
 import { act } from 'react-dom/test-utils';
 
 import { registerTestBed, TestBed } from '../shared_imports';
@@ -36,13 +36,14 @@ describe('<FormDataProvider />', () => {
       return (
         <Form form={form}>
           <UseField path="name" defaultValue="Initial value" data-test-subj="nameField" />
-          <UseField path="lastName" defaultValue="Initial value" data-test-subj="lastNameField" />
           <FormDataProvider>
             {(formData) => {
               onFormData(formData);
               return null;
             }}
           </FormDataProvider>
+          {/* Putting one field below to make sure the order in the DOM does not affect behaviour */}
+          <UseField path="lastName" defaultValue="Initial value" data-test-subj="lastNameField" />
         </Form>
       );
     };
@@ -95,6 +96,63 @@ describe('<FormDataProvider />', () => {
     });
   });
 
+  test('should subscribe to the latest updated form data when mounting late', async () => {
+    const onFormData = jest.fn();
+
+    const TestComp = () => {
+      const { form } = useForm();
+      const [isOn, setIsOn] = useState(false);
+
+      return (
+        <Form form={form}>
+          <UseField path="name" defaultValue="Initial value" data-test-subj="nameField" />
+          <button onClick={() => setIsOn(true)} data-test-subj="btn">
+            Toggle On
+          </button>
+          {isOn && (
+            <FormDataProvider>
+              {(formData) => {
+                onFormData(formData);
+                return null;
+              }}
+            </FormDataProvider>
+          )}
+        </Form>
+      );
+    };
+
+    const setup = registerTestBed(TestComp, {
+      memoryRouter: { wrapComponent: false },
+    });
+
+    const {
+      form: { setInputValue },
+      find,
+    } = setup() as TestBed;
+
+    expect(onFormData.mock.calls.length).toBe(0); // Not present in the DOM yet
+
+    // Make some changes to the form fields
+    await act(async () => {
+      setInputValue('nameField', 'updated value');
+    });
+
+    // Update state to trigger the mounting of the FormDataProvider
+    await act(async () => {
+      find('btn').simulate('click').update();
+    });
+
+    expect(onFormData.mock.calls.length).toBe(1);
+
+    const [formDataUpdated] = onFormData.mock.calls[onFormData.mock.calls.length - 1] as Parameters<
+      OnUpdateHandler
+    >;
+
+    expect(formDataUpdated).toEqual({
+      name: 'updated value',
+    });
+  });
+
   test('props.pathsToWatch (string): should not re-render the children when the field that changed is not the one provided', async () => {
     const onFormData = jest.fn();
 
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider.ts
index 4c8e91b13b1b7..3630b902f0564 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form_data_provider.ts
@@ -31,6 +31,7 @@ export const FormDataProvider = React.memo(({ children, pathsToWatch }: Props) =
   const form = useFormContext();
   const { subscribe } = form;
   const previousRawData = useRef<FormData>(form.__getFormData$().value);
+  const isMounted = useRef(false);
   const [formData, setFormData] = useState<FormData>(previousRawData.current);
 
   const onFormData = useCallback(
@@ -59,5 +60,17 @@ export const FormDataProvider = React.memo(({ children, pathsToWatch }: Props) =
     return subscription.unsubscribe;
   }, [subscribe, onFormData]);
 
+  useEffect(() => {
+    isMounted.current = true;
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
+
+  if (!isMounted.current && Object.keys(formData).length === 0) {
+    // No field has mounted yet, don't render anything
+    return null;
+  }
+
   return children(formData);
 });
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts
index 01d9f8a59129a..9d22e4eb2ee5e 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_field.ts
@@ -43,38 +43,41 @@ export const useField = <T>(
     deserializer,
   } = config;
 
-  const { getFormData, __removeField, __updateFormDataAt, __validateFields } = form;
+  const {
+    getFormData,
+    getFields,
+    __addField,
+    __removeField,
+    __updateFormDataAt,
+    __validateFields,
+  } = form;
 
-  /**
-   * This callback is both used as the initial "value" state getter, **and** for when we reset the form
-   * (and thus reset the field value). When we reset the form, we can provide a new default value (which will be
-   * passed through this "initialValueGetter" handler).
-   */
-  const initialValueGetter = useCallback(
-    (updatedDefaultValue = initialValue) => {
-      if (typeof updatedDefaultValue === 'function') {
-        return deserializer ? deserializer(updatedDefaultValue()) : updatedDefaultValue();
+  const deserializeValue = useCallback(
+    (rawValue = initialValue) => {
+      if (typeof rawValue === 'function') {
+        return deserializer ? deserializer(rawValue()) : rawValue();
       }
-      return deserializer ? deserializer(updatedDefaultValue) : updatedDefaultValue;
+      return deserializer ? deserializer(rawValue) : rawValue;
     },
     [initialValue, deserializer]
   );
 
-  const [value, setStateValue] = useState<T>(initialValueGetter);
+  const [value, setStateValue] = useState<T>(deserializeValue);
   const [errors, setErrors] = useState<ValidationError[]>([]);
   const [isPristine, setPristine] = useState(true);
   const [isValidating, setValidating] = useState(false);
   const [isChangingValue, setIsChangingValue] = useState(false);
   const [isValidated, setIsValidated] = useState(false);
+
   const validateCounter = useRef(0);
   const changeCounter = useRef(0);
   const inflightValidation = useRef<Promise<any> | null>(null);
   const debounceTimeout = useRef<NodeJS.Timeout | null>(null);
-  const isUnmounted = useRef<boolean>(false);
+  const isMounted = useRef<boolean>(false);
 
   // -- HELPERS
   // ----------------------------------
-  const serializeOutput: FieldHook<T>['__serializeOutput'] = useCallback(
+  const serializeValue: FieldHook<T>['__serializeValue'] = useCallback(
     (rawValue = value) => {
       return serializer ? serializer(rawValue) : rawValue;
     },
@@ -121,8 +124,11 @@ export const useField = <T>(
 
     if (debounceTimeout.current) {
       clearTimeout(debounceTimeout.current);
+      debounceTimeout.current = null;
     }
 
+    setPristine(false);
+
     if (errorDisplayDelay > 0) {
       setIsChangingValue(true);
     }
@@ -135,10 +141,14 @@ export const useField = <T>(
     // Update the form data observable
     __updateFormDataAt(path, value);
 
-    // Validate field(s) and update form.isValid state
-    await __validateFields(fieldsToValidateOnChange ?? [path]);
+    // Validate field(s) (that will update form.isValid state)
+    // We only validate if the value is different than the initial or default value
+    // to avoid validating after a form.reset() call.
+    if (value !== initialValue && value !== defaultValue) {
+      await __validateFields(fieldsToValidateOnChange ?? [path]);
+    }
 
-    if (isUnmounted.current) {
+    if (isMounted.current === false) {
       return;
     }
 
@@ -160,10 +170,12 @@ export const useField = <T>(
       }
     }
   }, [
-    valueChangeListener,
-    errorDisplayDelay,
     path,
     value,
+    defaultValue,
+    initialValue,
+    valueChangeListener,
+    errorDisplayDelay,
     fieldsToValidateOnChange,
     __updateFormDataAt,
     __validateFields,
@@ -229,7 +241,7 @@ export const useField = <T>(
           inflightValidation.current = validator({
             value: (valueToValidate as unknown) as string,
             errors: validationErrors,
-            form,
+            form: { getFormData, getFields },
             formData,
             path,
           }) as Promise<ValidationError>;
@@ -273,7 +285,7 @@ export const useField = <T>(
           const validationResult = validator({
             value: (valueToValidate as unknown) as string,
             errors: validationErrors,
-            form,
+            form: { getFormData, getFields },
             formData,
             path,
           });
@@ -308,7 +320,7 @@ export const useField = <T>(
       // We first try to run the validations synchronously
       return runSync();
     },
-    [clearErrors, cancelInflightValidation, validations, form, path]
+    [clearErrors, cancelInflightValidation, validations, getFormData, getFields, path]
   );
 
   // -- API
@@ -331,12 +343,12 @@ export const useField = <T>(
       setValidating(true);
 
       // By the time our validate function has reached completion, it’s possible
-      // that validate() will have been called again. If this is the case, we need
+      // that we have called validate() again. If this is the case, we need
       // to ignore the results of this invocation and only use the results of
       // the most recent invocation to update the error state for a field
       const validateIteration = ++validateCounter.current;
 
-      const onValidationErrors = (_validationErrors: ValidationError[]): FieldValidateResponse => {
+      const onValidationResult = (_validationErrors: ValidationError[]): FieldValidateResponse => {
         if (validateIteration === validateCounter.current) {
           // This is the most recent invocation
           setValidating(false);
@@ -360,9 +372,9 @@ export const useField = <T>(
       });
 
       if (Reflect.has(validationErrors, 'then')) {
-        return (validationErrors as Promise<ValidationError[]>).then(onValidationErrors);
+        return (validationErrors as Promise<ValidationError[]>).then(onValidationResult);
       }
-      return onValidationErrors(validationErrors as ValidationError[]);
+      return onValidationResult(validationErrors as ValidationError[]);
     },
     [getFormData, value, runValidations]
   );
@@ -374,15 +386,11 @@ export const useField = <T>(
    */
   const setValue: FieldHook<T>['setValue'] = useCallback(
     (newValue) => {
-      if (isPristine) {
-        setPristine(false);
-      }
-
       const formattedValue = formatInputValue<T>(newValue);
       setStateValue(formattedValue);
       return formattedValue;
     },
-    [formatInputValue, isPristine]
+    [formatInputValue]
   );
 
   const _setErrors: FieldHook<T>['setErrors'] = useCallback((_errors) => {
@@ -447,32 +455,17 @@ export const useField = <T>(
       setErrors([]);
 
       if (resetValue) {
-        const newValue = initialValueGetter(updatedDefaultValue ?? defaultValue);
+        const newValue = deserializeValue(updatedDefaultValue ?? defaultValue);
         setValue(newValue);
         return newValue;
       }
     },
-    [setValue, initialValueGetter, defaultValue]
+    [setValue, deserializeValue, defaultValue]
   );
 
-  // -- EFFECTS
-  // ----------------------------------
-  useEffect(() => {
-    if (isPristine) {
-      // Avoid validate on mount
-      return;
-    }
-
-    onValueChange();
+  const isValid = errors.length === 0;
 
-    return () => {
-      if (debounceTimeout.current) {
-        clearTimeout(debounceTimeout.current);
-      }
-    };
-  }, [isPristine, onValueChange]);
-
-  const field: FieldHook<T> = useMemo(() => {
+  const field = useMemo<FieldHook<T>>(() => {
     return {
       path,
       type,
@@ -481,9 +474,8 @@ export const useField = <T>(
       helpText,
       value,
       errors,
-      form,
       isPristine,
-      isValid: errors.length === 0,
+      isValid,
       isValidating,
       isValidated,
       isChangingValue,
@@ -494,7 +486,7 @@ export const useField = <T>(
       clearErrors,
       validate,
       reset,
-      __serializeOutput: serializeOutput,
+      __serializeValue: serializeValue,
     };
   }, [
     path,
@@ -503,9 +495,9 @@ export const useField = <T>(
     labelAppend,
     helpText,
     value,
-    form,
     isPristine,
     errors,
+    isValid,
     isValidating,
     isValidated,
     isChangingValue,
@@ -516,18 +508,43 @@ export const useField = <T>(
     clearErrors,
     validate,
     reset,
-    serializeOutput,
+    serializeValue,
   ]);
 
-  form.__addField(field as FieldHook<any>);
+  // ----------------------------------
+  // -- EFFECTS
+  // ----------------------------------
+  useEffect(() => {
+    __addField(field as FieldHook<any>);
+  }, [field, __addField]);
 
   useEffect(() => {
     return () => {
-      // Remove field from the form when it is unmounted or if its path changes.
-      isUnmounted.current = true;
       __removeField(path);
     };
   }, [path, __removeField]);
 
+  useEffect(() => {
+    if (!isMounted.current) {
+      return;
+    }
+
+    onValueChange();
+
+    return () => {
+      if (debounceTimeout.current) {
+        clearTimeout(debounceTimeout.current);
+      }
+    };
+  }, [onValueChange]);
+
+  useEffect(() => {
+    isMounted.current = true;
+
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
+
   return field;
 };
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
index c3f6ecc7f4831..35bac5b9a58c6 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.ts
@@ -40,19 +40,26 @@ export function useForm<T extends FormData = FormData>(
   const { onSubmit, schema, serializer, deserializer, options, id = 'default', defaultValue } =
     formConfig ?? {};
 
-  const formDefaultValue = useMemo<{ [key: string]: any }>(() => {
-    if (defaultValue === undefined || Object.keys(defaultValue).length === 0) {
-      return {};
-    }
+  const initDefaultValue = useCallback(
+    (_defaultValue?: Partial<T>): { [key: string]: any } => {
+      if (_defaultValue === undefined || Object.keys(_defaultValue).length === 0) {
+        return {};
+      }
 
-    const defaultValueFiltered = Object.entries(defaultValue as object)
-      .filter(({ 1: value }) => value !== undefined)
-      .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
+      const filtered = Object.entries(_defaultValue as object)
+        .filter(({ 1: value }) => value !== undefined)
+        .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
 
-    return deserializer ? (deserializer(defaultValueFiltered) as any) : defaultValueFiltered;
-  }, [defaultValue, deserializer]);
+      return deserializer ? (deserializer(filtered) as any) : filtered;
+    },
+    [deserializer]
+  );
 
-  const defaultValueDeserialized = useRef(formDefaultValue);
+  const defaultValueMemoized = useMemo<{ [key: string]: any }>(() => {
+    return initDefaultValue(defaultValue);
+  }, [defaultValue, initDefaultValue]);
+
+  const defaultValueDeserialized = useRef(defaultValueMemoized);
 
   const { errorDisplayDelay, stripEmptyFields: doStripEmptyFields } = options ?? {};
   const formOptions = useMemo(
@@ -68,7 +75,7 @@ export function useForm<T extends FormData = FormData>(
   const [isValid, setIsValid] = useState<boolean | undefined>(undefined);
   const fieldsRefs = useRef<FieldsMap>({});
   const formUpdateSubscribers = useRef<Subscription[]>([]);
-  const isUnmounted = useRef<boolean>(false);
+  const isMounted = useRef<boolean>(false);
 
   // formData$ is an observable we can subscribe to in order to receive live
   // update of the raw form data. As an observable it does not trigger any React
@@ -77,14 +84,6 @@ export function useForm<T extends FormData = FormData>(
   // and updating its state to trigger the necessary view render.
   const formData$ = useRef<Subject<T> | null>(null);
 
-  useEffect(() => {
-    return () => {
-      formUpdateSubscribers.current.forEach((subscription) => subscription.unsubscribe());
-      formUpdateSubscribers.current = [];
-      isUnmounted.current = true;
-    };
-  }, []);
-
   // -- HELPERS
   // ----------------------------------
   const getFormData$ = useCallback((): Subject<T> => {
@@ -135,7 +134,7 @@ export function useForm<T extends FormData = FormData>(
     (getDataOptions: Parameters<FormHook<T>['getFormData']>[0] = { unflatten: true }) => {
       if (getDataOptions.unflatten) {
         const nonEmptyFields = stripEmptyFields(fieldsRefs.current);
-        const fieldsValue = mapFormFields(nonEmptyFields, (field) => field.__serializeOutput());
+        const fieldsValue = mapFormFields(nonEmptyFields, (field) => field.__serializeValue());
         return serializer
           ? (serializer(unflattenObject(fieldsValue)) as T)
           : (unflattenObject(fieldsValue) as T);
@@ -168,45 +167,53 @@ export function useForm<T extends FormData = FormData>(
 
   const isFieldValid = (field: FieldHook) => field.isValid && !field.isValidating;
 
-  const updateFormValidity = useCallback(() => {
-    if (isUnmounted.current) {
-      return;
-    }
-
-    const fieldsArray = fieldsToArray();
-    const areAllFieldsValidated = fieldsArray.every((field) => field.isValidated);
-
-    if (!areAllFieldsValidated) {
-      // If *not* all the fiels have been validated, the validity of the form is unknown, thus still "undefined"
-      return undefined;
-    }
-
-    const isFormValid = fieldsArray.every(isFieldValid);
-
-    setIsValid(isFormValid);
-    return isFormValid;
-  }, [fieldsToArray]);
-
   const validateFields: FormHook<T>['__validateFields'] = useCallback(
     async (fieldNames) => {
       const fieldsToValidate = fieldNames
         .map((name) => fieldsRefs.current[name])
         .filter((field) => field !== undefined);
 
-      if (fieldsToValidate.length === 0) {
-        // Nothing to validate
+      const formData = getFormData({ unflatten: false });
+      const validationResult = await Promise.all(
+        fieldsToValidate.map((field) => field.validate({ formData }))
+      );
+
+      if (isMounted.current === false) {
         return { areFieldsValid: true, isFormValid: true };
       }
 
-      const formData = getFormData({ unflatten: false });
-      await Promise.all(fieldsToValidate.map((field) => field.validate({ formData })));
+      const areFieldsValid = validationResult.every(Boolean);
 
-      const isFormValid = updateFormValidity();
-      const areFieldsValid = fieldsToValidate.every(isFieldValid);
+      const validationResultByPath = fieldsToValidate.reduce((acc, field, i) => {
+        acc[field.path] = validationResult[i].isValid;
+        return acc;
+      }, {} as { [key: string]: boolean });
+
+      // At this stage we have an updated field validation state inside the "validationResultByPath" object.
+      // The fields we have in our "fieldsRefs.current" have not been updated yet with the new validation state
+      // (isValid, isValidated...) as this will happen _after_, when the "useEffect" triggers and calls "addField()".
+      // This means that we have **stale state value** in our fieldsRefs.
+      // To know the current form validity, we will then merge the "validationResult" _with_ the fieldsRefs object state,
+      // the "validationResult" taking presedence over the fieldsRefs values.
+      const formFieldsValidity = fieldsToArray().map((field) => {
+        const _isValid = validationResultByPath[field.path] ?? field.isValid;
+        const _isValidated =
+          validationResultByPath[field.path] !== undefined ? true : field.isValidated;
+        return [_isValid, _isValidated];
+      });
+
+      const areAllFieldsValidated = formFieldsValidity.every(({ 1: isValidated }) => isValidated);
+
+      // If *not* all the fiels have been validated, the validity of the form is unknown, thus still "undefined"
+      const isFormValid = areAllFieldsValidated
+        ? formFieldsValidity.every(([_isValid]) => _isValid)
+        : undefined;
+
+      setIsValid(isFormValid);
 
       return { areFieldsValid, isFormValid };
     },
-    [getFormData, updateFormValidity]
+    [getFormData, fieldsToArray]
   );
 
   const validateAllFields = useCallback(async (): Promise<boolean> => {
@@ -216,19 +223,12 @@ export function useForm<T extends FormData = FormData>(
     let isFormValid: boolean | undefined;
 
     if (fieldsToValidate.length === 0) {
-      // We should never enter this condition as the form validity is updated each time
-      // a field is validated. But sometimes, during tests or race conditions it does not happen and we need
-      // to wait the next tick (hooks lifecycle being tricky) to make sure the "isValid" state is updated.
-      // In order to avoid this unintentional behaviour, we add this if condition here.
-
-      // TODO: Fix this when adding tests to the form lib.
       isFormValid = fieldsArray.every(isFieldValid);
-      setIsValid(isFormValid);
-      return isFormValid;
+    } else {
+      ({ isFormValid } = await validateFields(fieldsToValidate.map((field) => field.path)));
     }
 
-    ({ isFormValid } = await validateFields(fieldsToValidate.map((field) => field.path)));
-
+    setIsValid(isFormValid);
     return isFormValid!;
   }, [fieldsToArray, validateFields]);
 
@@ -236,11 +236,13 @@ export function useForm<T extends FormData = FormData>(
     (field) => {
       fieldsRefs.current[field.path] = field;
 
-      if (!{}.hasOwnProperty.call(getFormData$().value, field.path)) {
-        updateFormDataAt(field.path, field.value);
+      updateFormDataAt(field.path, field.value);
+
+      if (!field.isValidated) {
+        setIsValid(undefined);
       }
     },
-    [getFormData$, updateFormDataAt]
+    [updateFormDataAt]
   );
 
   const removeField: FormHook<T>['__removeField'] = useCallback(
@@ -259,9 +261,16 @@ export function useForm<T extends FormData = FormData>(
        * After removing a field, the form validity might have changed
        * (an invalid field might have been removed and now the form is valid)
        */
-      updateFormValidity();
+      setIsValid((prev) => {
+        if (prev === false) {
+          const isFormValid = fieldsToArray().every(isFieldValid);
+          return isFormValid;
+        }
+        // If the form validity is "true" or "undefined", it does not change after removing a field
+        return prev;
+      });
     },
-    [getFormData$, updateFormValidity]
+    [getFormData$, fieldsToArray]
   );
 
   const setFieldValue: FormHook<T>['setFieldValue'] = useCallback((fieldName, value) => {
@@ -310,7 +319,7 @@ export function useForm<T extends FormData = FormData>(
         await onSubmit(formData, isFormValid!);
       }
 
-      if (isUnmounted.current === false) {
+      if (isMounted.current) {
         setSubmitting(false);
       }
 
@@ -322,9 +331,7 @@ export function useForm<T extends FormData = FormData>(
   const subscribe: FormHook<T>['subscribe'] = useCallback(
     (handler) => {
       const subscription = getFormData$().subscribe((raw) => {
-        if (!isUnmounted.current) {
-          handler({ isValid, data: { raw, format: getFormData }, validate: validateAllFields });
-        }
+        handler({ isValid, data: { raw, format: getFormData }, validate: validateAllFields });
       });
 
       formUpdateSubscribers.current.push(subscription);
@@ -351,9 +358,7 @@ export function useForm<T extends FormData = FormData>(
       const currentFormData = { ...getFormData$().value } as FormData;
 
       if (updatedDefaultValue) {
-        defaultValueDeserialized.current = deserializer
-          ? (deserializer(updatedDefaultValue) as any)
-          : updatedDefaultValue;
+        defaultValueDeserialized.current = initDefaultValue(updatedDefaultValue);
       }
 
       Object.entries(fieldsRefs.current).forEach(([path, field]) => {
@@ -374,7 +379,7 @@ export function useForm<T extends FormData = FormData>(
       setSubmitting(false);
       setIsValid(undefined);
     },
-    [getFormData$, deserializer, getFieldDefaultValue]
+    [getFormData$, initDefaultValue, getFieldDefaultValue]
   );
 
   const form = useMemo<FormHook<T>>(() => {
@@ -425,6 +430,25 @@ export function useForm<T extends FormData = FormData>(
     validateFields,
   ]);
 
+  useEffect(() => {
+    if (!isMounted.current) {
+      return;
+    }
+
+    // Whenever the "defaultValue" prop changes, reinitialize our ref
+    defaultValueDeserialized.current = defaultValueMemoized;
+  }, [defaultValueMemoized]);
+
+  useEffect(() => {
+    isMounted.current = true;
+
+    return () => {
+      isMounted.current = false;
+      formUpdateSubscribers.current.forEach((subscription) => subscription.unsubscribe());
+      formUpdateSubscribers.current = [];
+    };
+  }, []);
+
   return {
     form,
   };
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
index 4b203c3927ffd..dc495f6eb56b4 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/types.ts
@@ -38,7 +38,7 @@ export interface FormHook<T extends FormData = FormData> {
   getFieldDefaultValue: (fieldName: string) => unknown;
   /* Returns a list of all errors in the form */
   getErrors: () => string[];
-  reset: (options?: { resetValues?: boolean; defaultValue?: FormData }) => void;
+  reset: (options?: { resetValues?: boolean; defaultValue?: Partial<T> }) => void;
   readonly __options: Required<FormOptions>;
   __getFormData$: () => Subject<T>;
   __addField: (field: FieldHook) => void;
@@ -102,7 +102,6 @@ export interface FieldHook<T = unknown> {
   readonly isValidating: boolean;
   readonly isValidated: boolean;
   readonly isChangingValue: boolean;
-  readonly form: FormHook<any>;
   getErrorsMessages: (args?: {
     validationType?: 'field' | string;
     errorCode?: string;
@@ -117,7 +116,7 @@ export interface FieldHook<T = unknown> {
     validationType?: string;
   }) => FieldValidateResponse | Promise<FieldValidateResponse>;
   reset: (options?: { resetValue?: boolean; defaultValue?: T }) => unknown | undefined;
-  __serializeOutput: (rawValue?: unknown) => unknown;
+  __serializeValue: (rawValue?: unknown) => unknown;
 }
 
 export interface FieldConfig<T extends FormData = any, ValueType = unknown> {
@@ -154,7 +153,10 @@ export interface ValidationError<T = string> {
 export interface ValidationFuncArg<T extends FormData, V = unknown> {
   path: string;
   value: V;
-  form: FormHook<T>;
+  form: {
+    getFormData: FormHook<T>['getFormData'];
+    getFields: FormHook<T>['getFields'];
+  };
   formData: T;
   errors: readonly ValidationError[];
 }
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_form.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_form.helpers.ts
index f92f46d71e7c7..870b8b7ec5509 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_form.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_form.helpers.ts
@@ -85,6 +85,9 @@ export const getFormActions = (testBed: TestBed) => {
           value: type,
         },
       ]);
+    });
+
+    await act(async () => {
       find('createFieldForm.addButton').simulate('click');
     });
 
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/name_parameter.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/name_parameter.tsx
index 0320f2ff51da3..9b27b930b47c4 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/name_parameter.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/name_parameter.tsx
@@ -4,33 +4,42 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useCallback, useMemo } from 'react';
 
 import { TextField, UseField, FieldConfig } from '../../../shared_imports';
 import { validateUniqueName } from '../../../lib';
 import { PARAMETERS_DEFINITION } from '../../../constants';
 import { useMappingsState } from '../../../mappings_state_context';
 
+const { validations, ...rest } = PARAMETERS_DEFINITION.name.fieldConfig as FieldConfig;
+
 export const NameParameter = () => {
   const {
     fields: { rootLevelFields, byId },
     documentFields: { fieldToAddFieldTo, fieldToEdit },
   } = useMappingsState();
-  const { validations, ...rest } = PARAMETERS_DEFINITION.name.fieldConfig as FieldConfig;
 
   const initialName = fieldToEdit ? byId[fieldToEdit].source.name : undefined;
   const parentId = fieldToEdit ? byId[fieldToEdit].parentId : fieldToAddFieldTo;
-  const uniqueNameValidator = validateUniqueName({ rootLevelFields, byId }, initialName, parentId);
+  const uniqueNameValidator = useCallback(
+    (arg: any) => {
+      return validateUniqueName({ rootLevelFields, byId }, initialName, parentId)(arg);
+    },
+    [rootLevelFields, byId, initialName, parentId]
+  );
 
-  const nameConfig: FieldConfig = {
-    ...rest,
-    validations: [
-      ...validations!,
-      {
-        validator: uniqueNameValidator,
-      },
-    ],
-  };
+  const nameConfig: FieldConfig = useMemo(
+    () => ({
+      ...rest,
+      validations: [
+        ...validations!,
+        {
+          validator: uniqueNameValidator,
+        },
+      ],
+    }),
+    [uniqueNameValidator]
+  );
 
   return (
     <UseField
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/path_parameter.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/path_parameter.tsx
index ae5ffaae3552b..6575fe1fac7b8 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/path_parameter.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/path_parameter.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { useMemo } from 'react';
 import { EuiFormRow, EuiComboBox, EuiCallOut, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
@@ -62,14 +62,16 @@ interface Props {
 export const PathParameter = ({ field, allFields }: Props) => {
   const suggestedFields = getSuggestedFields(allFields, field);
 
+  const fieldConfig = useMemo(
+    () => ({
+      ...getFieldConfig('path'),
+      deserializer: getDeserializer(allFields),
+    }),
+    [allFields]
+  );
+
   return (
-    <UseField
-      path="path"
-      config={{
-        ...getFieldConfig('path'),
-        deserializer: getDeserializer(allFields),
-      }}
-    >
+    <UseField path="path" config={fieldConfig}>
       {(pathField) => {
         const error = pathField.getErrorsMessages();
         const isInvalid = error ? Boolean(error.length) : false;
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field.tsx
index 95575124b6abd..6b5a848ce85d3 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field.tsx
@@ -163,7 +163,7 @@ export const EditField = React.memo(({ form, field, allFields, exitEdit, updateF
       </EuiFlyoutBody>
 
       <EuiFlyoutFooter>
-        {form.isSubmitted && !form.isValid && (
+        {form.isSubmitted && form.isValid === false && (
           <>
             <EuiCallOut
               title={i18n.translate(
@@ -193,7 +193,7 @@ export const EditField = React.memo(({ form, field, allFields, exitEdit, updateF
               fill
               onClick={submitForm}
               type="submit"
-              disabled={form.isSubmitted && !form.isValid}
+              disabled={form.isSubmitted && form.isValid === false}
               data-test-subj="editFieldUpdateButton"
             >
               {i18n.translate('xpack.idxMgmt.mappingsEditor.editFieldUpdateButtonLabel', {
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_header_form.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_header_form.tsx
index f2ad37cb45818..3b55c5ac076c2 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_header_form.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/edit_field/edit_field_header_form.tsx
@@ -59,6 +59,9 @@ export const EditFieldHeaderForm = React.memo(
         <FieldDescriptionSection isMultiField={isMultiField}>
           <FormDataProvider pathsToWatch={['type', 'subType']}>
             {({ type, subType }) => {
+              if (!type) {
+                return null;
+              }
               const typeDefinition = TYPE_DEFINITION[type[0].value as MainType];
               const hasSubType = typeDefinition.subTypes !== undefined;
 
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_settings_fields.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_settings_fields.tsx
index 6a70592bc2f70..9adb3957ea9f4 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_settings_fields.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_settings_fields.tsx
@@ -35,7 +35,7 @@ export const ProcessorSettingsFields: FunctionComponent<Props> = ({ processor })
             if (formDescriptor?.FieldsComponent) {
               return (
                 <>
-                  <formDescriptor.FieldsComponent />
+                  <formDescriptor.FieldsComponent key={type} />
                   <EuiHorizontalRule />
                   <CommonProcessorFields />
                 </>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/append.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/append.tsx
index 09d0981adf1c2..23425297f3420 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/append.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processors/append.tsx
@@ -21,6 +21,7 @@ const { emptyField } = fieldValidators;
 
 const fieldsConfig: FieldsConfig = {
   value: {
+    defaultValue: [],
     type: FIELD_TYPES.COMBO_BOX,
     deserializer: to.arrayOfStrings,
     label: i18n.translate('xpack.ingestPipelines.pipelineEditor.appendForm.valueFieldLabel', {
diff --git a/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx b/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
index 9ead8171bfef6..c7810af13eb74 100644
--- a/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
+++ b/x-pack/plugins/security_solution/public/common/mock/test_providers.tsx
@@ -23,7 +23,7 @@ import {
   createKibanaContextProviderMock,
   createStartServicesMock,
 } from '../lib/kibana/kibana_react.mock';
-import { FieldHook, useForm } from '../../shared_imports';
+import { FieldHook } from '../../shared_imports';
 import { SUB_PLUGINS_REDUCER } from './utils';
 import { createSecuritySolutionStorageMock, localStorageMock } from './mock_local_storage';
 
@@ -78,8 +78,6 @@ const TestProvidersComponent: React.FC<Props> = ({
 export const TestProviders = React.memo(TestProvidersComponent);
 
 export const useFormFieldMock = (options?: Partial<FieldHook>): FieldHook => {
-  const { form } = useForm();
-
   return {
     path: 'path',
     type: 'type',
@@ -88,7 +86,6 @@ export const useFormFieldMock = (options?: Partial<FieldHook>): FieldHook => {
     isValidating: false,
     isValidated: false,
     isChangingValue: false,
-    form,
     errors: [],
     isValid: true,
     getErrorsMessages: jest.fn(),
@@ -98,7 +95,7 @@ export const useFormFieldMock = (options?: Partial<FieldHook>): FieldHook => {
     clearErrors: jest.fn(),
     validate: jest.fn(),
     reset: jest.fn(),
-    __serializeOutput: jest.fn(),
+    __serializeValue: jest.fn(),
     ...options,
   };
 };
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx
index a0384ef52a841..cdeca54bfc39b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx
@@ -13,13 +13,13 @@ import {
   EuiFormLabel,
   EuiIcon,
   EuiSpacer,
+  EuiRange,
 } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 import { noop } from 'lodash/fp';
 import * as i18n from './translations';
 import { FieldHook } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
-import { CommonUseField } from '../../../../cases/components/create';
 import { AboutStepRiskScore } from '../../../pages/detection_engine/rules/types';
 import { FieldComponent } from '../../../../common/components/autocomplete/field';
 import { IFieldType } from '../../../../../../../../src/plugins/data/common/index_patterns/fields';
@@ -59,11 +59,12 @@ export const RiskScoreField = ({
   placeholder,
 }: RiskScoreFieldProps) => {
   const fieldTypeFilter = useMemo(() => ['number'], []);
+  const { value: fieldValue, setValue } = field;
 
   const handleFieldChange = useCallback(
     ([newField]: IFieldType[]): void => {
-      const values = field.value as AboutStepRiskScore;
-      field.setValue({
+      const values = fieldValue as AboutStepRiskScore;
+      setValue({
         value: values.value,
         isMappingChecked: values.isMappingChecked,
         mapping: [
@@ -76,25 +77,37 @@ export const RiskScoreField = ({
         ],
       });
     },
-    [field]
+    [setValue, fieldValue]
+  );
+
+  const handleRangeFieldChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement> | React.MouseEvent<HTMLButtonElement>): void => {
+      const range = (e.target as HTMLInputElement).value;
+      setValue({
+        value: range.trim() === '' ? '' : +range,
+        isMappingChecked: (fieldValue as AboutStepRiskScore).isMappingChecked,
+        mapping: (fieldValue as AboutStepRiskScore).mapping,
+      });
+    },
+    [fieldValue, setValue]
   );
 
   const selectedField = useMemo(() => {
-    const existingField = (field.value as AboutStepRiskScore).mapping?.[0]?.field ?? '';
+    const existingField = (fieldValue as AboutStepRiskScore).mapping?.[0]?.field ?? '';
     const [newSelectedField] = indices.fields.filter(
       ({ name }) => existingField != null && existingField === name
     );
     return newSelectedField;
-  }, [field.value, indices]);
+  }, [fieldValue, indices]);
 
   const handleRiskScoreMappingChecked = useCallback(() => {
-    const values = field.value as AboutStepRiskScore;
-    field.setValue({
+    const values = fieldValue as AboutStepRiskScore;
+    setValue({
       value: values.value,
       mapping: [...values.mapping],
       isMappingChecked: !values.isMappingChecked,
     });
-  }, [field]);
+  }, [fieldValue, setValue]);
 
   const riskScoreLabel = useMemo(() => {
     return (
@@ -119,7 +132,7 @@ export const RiskScoreField = ({
           <EuiFlexItem grow={false}>
             <EuiCheckbox
               id={`risk_score-mapping-override`}
-              checked={(field.value as AboutStepRiskScore).isMappingChecked}
+              checked={(fieldValue as AboutStepRiskScore).isMappingChecked}
               disabled={isDisabled}
               onChange={handleRiskScoreMappingChecked}
             />
@@ -132,7 +145,7 @@ export const RiskScoreField = ({
         </NestedContent>
       </div>
     );
-  }, [field.value, handleRiskScoreMappingChecked, isDisabled]);
+  }, [fieldValue, handleRiskScoreMappingChecked, isDisabled]);
 
   return (
     <EuiFlexGroup>
@@ -144,24 +157,20 @@ export const RiskScoreField = ({
           error={'errorMessage'}
           isInvalid={false}
           fullWidth
-          data-test-subj={dataTestSubj}
-          describedByIds={idAria ? [idAria] : undefined}
+          data-test-subj="detectionEngineStepAboutRuleRiskScore"
+          describedByIds={['detectionEngineStepAboutRuleRiskScore']}
         >
-          <CommonUseField
-            path="riskScore.value"
-            componentProps={{
-              idAria: 'detectionEngineStepAboutRuleRiskScore',
-              'data-test-subj': 'detectionEngineStepAboutRuleRiskScore',
-              isDisabled,
-              euiFieldProps: {
-                max: 100,
-                min: 0,
-                fullWidth: false,
-                disabled: false,
-                showTicks: true,
-                tickInterval: 25,
-              },
-            }}
+          <EuiRange
+            value={(fieldValue as AboutStepRiskScore).value}
+            onChange={handleRangeFieldChange}
+            max={100}
+            min={0}
+            showRange
+            showInput
+            fullWidth={false}
+            showTicks
+            tickInterval={25}
+            data-test-subj="range"
           />
         </EuiFormRow>
       </EuiFlexItem>
@@ -170,7 +179,7 @@ export const RiskScoreField = ({
           label={riskScoreMappingLabel}
           labelAppend={field.labelAppend}
           helpText={
-            (field.value as AboutStepRiskScore).isMappingChecked ? (
+            (fieldValue as AboutStepRiskScore).isMappingChecked ? (
               <NestedContent>{i18n.RISK_SCORE_MAPPING_DETAILS}</NestedContent>
             ) : (
               ''
@@ -184,7 +193,7 @@ export const RiskScoreField = ({
         >
           <NestedContent>
             <EuiSpacer size="s" />
-            {(field.value as AboutStepRiskScore).isMappingChecked && (
+            {(fieldValue as AboutStepRiskScore).isMappingChecked && (
               <EuiFlexGroup direction={'column'} gutterSize="s">
                 <EuiFlexItem>
                   <EuiFlexGroup alignItems="center" gutterSize="s">
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx
index a9bde76126b6e..20c3073789b2a 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.test.tsx
@@ -8,6 +8,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 
 import { RuleActionsField } from './index';
+import { useForm, Form } from '../../../../shared_imports';
 import { useKibana } from '../../../../common/lib/kibana';
 import { useFormFieldMock } from '../../../../common/mock';
 jest.mock('../../../../common/lib/kibana');
@@ -32,8 +33,13 @@ describe('RuleActionsField', () => {
     });
     const Component = () => {
       const field = useFormFieldMock();
+      const { form } = useForm();
 
-      return <RuleActionsField euiFieldProps={{ options: [] }} field={field} />;
+      return (
+        <Form form={form}>
+          <RuleActionsField euiFieldProps={{ options: [] }} field={field} />
+        </Form>
+      );
     };
     const wrapper = shallow(<Component />);
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx
index c6ff25f311d9c..b9097949bd20a 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_field/index.tsx
@@ -12,7 +12,7 @@ import ReactMarkdown from 'react-markdown';
 import styled from 'styled-components';
 
 import { NOTIFICATION_SUPPORTED_ACTION_TYPES_IDS } from '../../../../../common/constants';
-import { SelectField } from '../../../../shared_imports';
+import { SelectField, useFormContext } from '../../../../shared_imports';
 import {
   ActionForm,
   ActionType,
@@ -37,6 +37,8 @@ const FieldErrorsContainer = styled.div`
 export const RuleActionsField: ThrottleSelectField = ({ field, messageVariables }) => {
   const [fieldErrors, setFieldErrors] = useState<string | null>(null);
   const [supportedActionTypes, setSupportedActionTypes] = useState<ActionType[] | undefined>();
+  const form = useFormContext();
+  const { isSubmitted, isSubmitting, isValid } = form;
   const {
     http,
     triggers_actions_ui: { actionTypeRegistry },
@@ -88,26 +90,14 @@ export const RuleActionsField: ThrottleSelectField = ({ field, messageVariables
   }, []);
 
   useEffect(() => {
-    if (field.form.isSubmitting || !field.errors.length) {
+    if (isSubmitting || !field.errors.length) {
       return setFieldErrors(null);
     }
-    if (
-      field.form.isSubmitted &&
-      !field.form.isSubmitting &&
-      field.form.isValid === false &&
-      field.errors.length
-    ) {
+    if (isSubmitted && !isSubmitting && isValid === false && field.errors.length) {
       const errorsString = field.errors.map(({ message }) => message).join('\n');
       return setFieldErrors(errorsString);
     }
-  }, [
-    field.form.isSubmitted,
-    field.form.isSubmitting,
-    field.isChangingValue,
-    field.form.isValid,
-    field.errors,
-    setFieldErrors,
-  ]);
+  }, [isSubmitted, isSubmitting, field.isChangingValue, isValid, field.errors, setFieldErrors]);
 
   if (!supportedActionTypes) return <></>;
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx
index 733e701cff204..70e66af25f69e 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx
@@ -13,6 +13,7 @@ import {
   EuiFormLabel,
   EuiIcon,
   EuiSpacer,
+  EuiSuperSelect,
 } from '@elastic/eui';
 import { noop } from 'lodash/fp';
 import React, { useCallback, useMemo } from 'react';
@@ -20,7 +21,6 @@ import styled from 'styled-components';
 import * as i18n from './translations';
 import { FieldHook } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
 import { SeverityOptionItem } from '../step_about_rule/data';
-import { CommonUseField } from '../../../../cases/components/create';
 import { AboutStepSeverity } from '../../../pages/detection_engine/rules/types';
 import {
   IFieldType,
@@ -68,58 +68,61 @@ export const SeverityField = ({
   options,
 }: SeverityFieldProps) => {
   const fieldValueInputWidth = 160;
+  const { setValue } = field;
+  const { value, isMappingChecked, mapping } = field.value as AboutStepSeverity;
 
   const handleFieldValueChange = useCallback(
     (newMappingItems: SeverityMapping, index: number): void => {
-      const values = field.value as AboutStepSeverity;
-      field.setValue({
-        value: values.value,
-        isMappingChecked: values.isMappingChecked,
-        mapping: [
-          ...values.mapping.slice(0, index),
-          ...newMappingItems,
-          ...values.mapping.slice(index + 1),
-        ],
+      setValue({
+        value,
+        isMappingChecked,
+        mapping: [...mapping.slice(0, index), ...newMappingItems, ...mapping.slice(index + 1)],
       });
     },
-    [field]
+    [value, isMappingChecked, mapping, setValue]
   );
 
   const handleFieldChange = useCallback(
     (index: number, severity: Severity, [newField]: IFieldType[]): void => {
-      const values = field.value as AboutStepSeverity;
       const newMappingItems: SeverityMapping = [
         {
-          ...values.mapping[index],
+          ...mapping[index],
           field: newField?.name ?? '',
-          value: newField != null ? values.mapping[index].value : '',
+          value: newField != null ? mapping[index].value : '',
           operator: 'equals',
           severity,
         },
       ];
       handleFieldValueChange(newMappingItems, index);
     },
-    [field, handleFieldValueChange]
+    [mapping, handleFieldValueChange]
+  );
+
+  const handleSecurityLevelChange = useCallback(
+    (newValue: string) => {
+      setValue({
+        value: newValue,
+        isMappingChecked,
+        mapping,
+      });
+    },
+    [isMappingChecked, mapping, setValue]
   );
 
   const handleFieldMatchValueChange = useCallback(
     (index: number, severity: Severity, newMatchValue: string): void => {
-      const values = field.value as AboutStepSeverity;
       const newMappingItems: SeverityMapping = [
         {
-          ...values.mapping[index],
-          field: values.mapping[index].field,
-          value:
-            values.mapping[index].field != null && values.mapping[index].field !== ''
-              ? newMatchValue
-              : '',
+          ...mapping[index],
+          field: mapping[index].field,
+          value: mapping[index].field != null && mapping[index].field !== '' ? newMatchValue : '',
           operator: 'equals',
           severity,
         },
       ];
       handleFieldValueChange(newMappingItems, index);
     },
-    [field, handleFieldValueChange]
+    [mapping, handleFieldValueChange]
   );
 
   const getIFieldTypeFromFieldName = (
@@ -131,13 +134,12 @@ export const SeverityField = ({
   };
 
   const handleSeverityMappingChecked = useCallback(() => {
-    const values = field.value as AboutStepSeverity;
-    field.setValue({
-      value: values.value,
-      mapping: [...values.mapping],
-      isMappingChecked: !values.isMappingChecked,
+    setValue({
+      value,
+      mapping: [...mapping],
+      isMappingChecked: !isMappingChecked,
     });
-  }, [field]);
+  }, [isMappingChecked, mapping, value, setValue]);
 
   const severityLabel = useMemo(() => {
     return (
@@ -162,7 +164,7 @@ export const SeverityField = ({
           <EuiFlexItem grow={false}>
             <EuiCheckbox
               id={`severity-mapping-override`}
-              checked={(field.value as AboutStepSeverity).isMappingChecked}
+              checked={isMappingChecked}
               disabled={isDisabled}
               onChange={handleSeverityMappingChecked}
             />
@@ -175,7 +177,7 @@ export const SeverityField = ({
         </NestedContent>
       </div>
     );
-  }, [field.value, handleSeverityMappingChecked, isDisabled]);
+  }, [handleSeverityMappingChecked, isDisabled, isMappingChecked]);
 
   return (
     <EuiFlexGroup>
@@ -187,21 +189,16 @@ export const SeverityField = ({
           error={'errorMessage'}
           isInvalid={false}
           fullWidth
-          data-test-subj={dataTestSubj}
-          describedByIds={idAria ? [idAria] : undefined}
+          data-test-subj="detectionEngineStepAboutRuleSeverity"
+          describedByIds={['detectionEngineStepAboutRuleSeverity']}
         >
-          <CommonUseField
-            path="severity.value"
-            componentProps={{
-              idAria: 'detectionEngineStepAboutRuleSeverity',
-              'data-test-subj': 'detectionEngineStepAboutRuleSeverity',
-              isDisabled,
-              euiFieldProps: {
-                fullWidth: false,
-                disabled: false,
-                options,
-              },
-            }}
+          <EuiSuperSelect
+            fullWidth={false}
+            disabled={false}
+            valueOfSelected={value}
+            onChange={handleSecurityLevelChange}
+            options={options}
+            data-test-subj="select"
           />
         </EuiFormRow>
       </EuiFlexItem>
@@ -211,11 +208,7 @@ export const SeverityField = ({
           label={severityMappingLabel}
           labelAppend={field.labelAppend}
           helpText={
-            (field.value as AboutStepSeverity).isMappingChecked ? (
-              <NestedContent>{i18n.SEVERITY_MAPPING_DETAILS}</NestedContent>
-            ) : (
-              ''
-            )
+            isMappingChecked ? <NestedContent>{i18n.SEVERITY_MAPPING_DETAILS}</NestedContent> : ''
           }
           error={'errorMessage'}
           isInvalid={false}
@@ -225,7 +218,7 @@ export const SeverityField = ({
         >
           <NestedContent>
             <EuiSpacer size="s" />
-            {(field.value as AboutStepSeverity).isMappingChecked && (
+            {isMappingChecked && (
               <EuiFlexGroup direction={'column'} gutterSize="s">
                 <EuiFlexItem>
                   <EuiFlexGroup alignItems="center" gutterSize="s">
@@ -242,71 +235,69 @@ export const SeverityField = ({
                   </EuiFlexGroup>
                 </EuiFlexItem>
 
-                {(field.value as AboutStepSeverity).mapping.map(
-                  (severityMappingItem: SeverityMappingItem, index) => (
-                    <EuiFlexItem key={`${severityMappingItem.severity}-${index}`}>
-                      <EuiFlexGroup
-                        data-test-subj="severityOverrideRow"
-                        alignItems="center"
-                        gutterSize="s"
-                      >
-                        <EuiFlexItem>
-                          <FieldComponent
-                            placeholder={''}
-                            selectedField={getIFieldTypeFromFieldName(
-                              severityMappingItem.field,
-                              indices
-                            )}
-                            isLoading={false}
-                            isDisabled={isDisabled}
-                            isClearable={false}
-                            indexPattern={indices}
-                            fieldInputWidth={fieldValueInputWidth}
-                            onChange={handleFieldChange.bind(
-                              null,
-                              index,
-                              severityMappingItem.severity
-                            )}
-                            data-test-subj={`detectionEngineStepAboutRuleSeverityMappingField-${severityMappingItem.severity}-${index}`}
-                            aria-label={`detectionEngineStepAboutRuleSeverityMappingField-${severityMappingItem.severity}-${index}`}
-                          />
-                        </EuiFlexItem>
+                {mapping.map((severityMappingItem: SeverityMappingItem, index) => (
+                  <EuiFlexItem key={`${severityMappingItem.severity}-${index}`}>
+                    <EuiFlexGroup
+                      data-test-subj="severityOverrideRow"
+                      alignItems="center"
+                      gutterSize="s"
+                    >
+                      <EuiFlexItem>
+                        <FieldComponent
+                          placeholder={''}
+                          selectedField={getIFieldTypeFromFieldName(
+                            severityMappingItem.field,
+                            indices
+                          )}
+                          isLoading={false}
+                          isDisabled={isDisabled}
+                          isClearable={false}
+                          indexPattern={indices}
+                          fieldInputWidth={fieldValueInputWidth}
+                          onChange={handleFieldChange.bind(
+                            null,
+                            index,
+                            severityMappingItem.severity
+                          )}
+                          data-test-subj={`detectionEngineStepAboutRuleSeverityMappingField-${severityMappingItem.severity}-${index}`}
+                          aria-label={`detectionEngineStepAboutRuleSeverityMappingField-${severityMappingItem.severity}-${index}`}
+                        />
+                      </EuiFlexItem>
 
-                        <EuiFlexItem>
-                          <AutocompleteFieldMatchComponent
-                            placeholder={''}
-                            selectedField={getIFieldTypeFromFieldName(
-                              severityMappingItem.field,
-                              indices
-                            )}
-                            selectedValue={severityMappingItem.value}
-                            isClearable={false}
-                            isDisabled={isDisabled}
-                            isLoading={false}
-                            indexPattern={indices}
-                            fieldInputWidth={fieldValueInputWidth}
-                            onChange={handleFieldMatchValueChange.bind(
-                              null,
-                              index,
-                              severityMappingItem.severity
-                            )}
-                            data-test-subj={`detectionEngineStepAboutRuleSeverityMappingValue-${severityMappingItem.severity}-${index}`}
-                            aria-label={`detectionEngineStepAboutRuleSeverityMappingValue-${severityMappingItem.severity}-${index}`}
-                          />
-                        </EuiFlexItem>
-                        <EuiFlexItemIconColumn grow={false}>
-                          <EuiIcon type={'sortRight'} />
-                        </EuiFlexItemIconColumn>
-                        <EuiFlexItemSeverityColumn grow={false}>
-                          {
-                            options.find((o) => o.value === severityMappingItem.severity)
-                              ?.inputDisplay
-                          }
-                        </EuiFlexItemSeverityColumn>
-                      </EuiFlexGroup>
-                    </EuiFlexItem>
-                  )
-                )}
+                      <EuiFlexItem>
+                        <AutocompleteFieldMatchComponent
+                          placeholder={''}
+                          selectedField={getIFieldTypeFromFieldName(
+                            severityMappingItem.field,
+                            indices
+                          )}
+                          selectedValue={severityMappingItem.value}
+                          isClearable={false}
+                          isDisabled={isDisabled}
+                          isLoading={false}
+                          indexPattern={indices}
+                          fieldInputWidth={fieldValueInputWidth}
+                          onChange={handleFieldMatchValueChange.bind(
+                            null,
+                            index,
+                            severityMappingItem.severity
+                          )}
+                          data-test-subj={`detectionEngineStepAboutRuleSeverityMappingValue-${severityMappingItem.severity}-${index}`}
+                          aria-label={`detectionEngineStepAboutRuleSeverityMappingValue-${severityMappingItem.severity}-${index}`}
+                        />
+                      </EuiFlexItem>
+                      <EuiFlexItemIconColumn grow={false}>
+                        <EuiIcon type={'sortRight'} />
+                      </EuiFlexItemIconColumn>
+                      <EuiFlexItemSeverityColumn grow={false}>
+                        {
+                          options.find((o) => o.value === severityMappingItem.severity)
+                            ?.inputDisplay
+                        }
+                      </EuiFlexItemSeverityColumn>
+                    </EuiFlexGroup>
+                  </EuiFlexItem>
+                ))}
               </EuiFlexGroup>
             )}
           </NestedContent>
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx
index cb3fd5e5bec32..0c834b9fff33a 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/index.test.tsx
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React from 'react';
+import { act } from 'react-dom/test-utils';
 import { mount, shallow } from 'enzyme';
 import { ThemeProvider } from 'styled-components';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_light.json';
@@ -223,32 +224,33 @@ describe('StepAboutRuleComponent', () => {
       .first()
       .simulate('change', { target: { value: '80' } });
 
-    wrapper.find('[data-test-subj="about-continue"]').first().simulate('click').update();
-    await waitFor(() => {
-      const expected: Omit<AboutStepRule, 'isNew'> = {
-        author: [],
-        isAssociatedToEndpointList: false,
-        isBuildingBlock: false,
-        license: '',
-        ruleNameOverride: '',
-        timestampOverride: '',
-        description: 'Test description text',
-        falsePositives: [''],
-        name: 'Test name text',
-        note: '',
-        references: [''],
-        riskScore: { value: 80, mapping: [], isMappingChecked: false },
-        severity: { value: 'low', mapping: fillEmptySeverityMappings([]), isMappingChecked: false },
-        tags: [],
-        threat: [
-          {
-            framework: 'MITRE ATT&CK',
-            tactic: { id: 'none', name: 'none', reference: 'none' },
-            technique: [],
-          },
-        ],
-      };
-      expect(stepDataMock.mock.calls[1][1]).toEqual(expected);
+    await act(async () => {
+      wrapper.find('[data-test-subj="about-continue"]').first().simulate('click').update();
     });
+
+    const expected: Omit<AboutStepRule, 'isNew'> = {
+      author: [],
+      isAssociatedToEndpointList: false,
+      isBuildingBlock: false,
+      license: '',
+      ruleNameOverride: '',
+      timestampOverride: '',
+      description: 'Test description text',
+      falsePositives: [''],
+      name: 'Test name text',
+      note: '',
+      references: [''],
+      riskScore: { value: 80, mapping: [], isMappingChecked: false },
+      severity: { value: 'low', mapping: fillEmptySeverityMappings([]), isMappingChecked: false },
+      tags: [],
+      threat: [
+        {
+          framework: 'MITRE ATT&CK',
+          tactic: { id: 'none', name: 'none', reference: 'none' },
+          technique: [],
+        },
+      ],
+    };
+    expect(stepDataMock.mock.calls[1][1]).toEqual(expected);
   });
 });
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/schema.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/schema.tsx
index a3db8fe659d84..2264a11341eb8 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/schema.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_about_rule/schema.tsx
@@ -102,29 +102,12 @@ export const schema: FormSchema = {
     labelAppend: OptionalFieldLabel,
   },
   severity: {
-    value: {
-      type: FIELD_TYPES.SUPER_SELECT,
-      validations: [
-        {
-          validator: emptyField(
-            i18n.translate(
-              'xpack.securitySolution.detectionEngine.createRule.stepAboutRule.severityFieldRequiredError',
-              {
-                defaultMessage: 'A severity is required.',
-              }
-            )
-          ),
-        },
-      ],
-    },
+    value: {},
     mapping: {},
     isMappingChecked: {},
   },
   riskScore: {
-    value: {
-      type: FIELD_TYPES.RANGE,
-      serializer: (input: string) => Number(input),
-    },
+    value: {},
     mapping: {},
     isMappingChecked: {},
   },
diff --git a/x-pack/plugins/security_solution/public/shared_imports.ts b/x-pack/plugins/security_solution/public/shared_imports.ts
index b2c7319b94576..097166a9c866a 100644
--- a/x-pack/plugins/security_solution/public/shared_imports.ts
+++ b/x-pack/plugins/security_solution/public/shared_imports.ts
@@ -20,6 +20,7 @@ export {
   UseField,
   UseMultiFields,
   useForm,
+  useFormContext,
   ValidationFunc,
   VALIDATION_TYPES,
 } from '../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index d6e611e65154b..c99980fe6205c 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -15631,7 +15631,6 @@
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.guideLabel": "調査ガイド",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.nameFieldRequiredError": "名前が必要です。",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutrule.noteHelpText": "ルール調査ガイドを追加...",
-    "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.severityFieldRequiredError": "深刻度が必要です。",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRuleForm.addFalsePositiveDescription": "誤検出の例を追加します",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRuleForm.addReferenceDescription": "参照URLを追加します",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRuleForm.advancedSettingsButton": "高度な設定",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 54c69d849e3a9..9ffa81a921ba8 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -15637,7 +15637,6 @@
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.guideLabel": "调查指南",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.nameFieldRequiredError": "名称必填。",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutrule.noteHelpText": "添加规则调查指南......",
-    "xpack.securitySolution.detectionEngine.createRule.stepAboutRule.severityFieldRequiredError": "严重性必填。",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRuleForm.addFalsePositiveDescription": "添加误报示例",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRuleForm.addReferenceDescription": "添加引用 URL",
     "xpack.securitySolution.detectionEngine.createRule.stepAboutRuleForm.advancedSettingsButton": "高级设置",

From b802af800268bfa8a008d129b99dfd496b87b276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yulia=20=C4=8Cech?=
 <6585477+yuliacech@users.noreply.github.com>
Date: Thu, 27 Aug 2020 14:15:59 +0200
Subject: [PATCH 090/148] [ILM] Fix json in request flyout (#75971)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../__jest__/components/edit_policy.test.js   | 28 ++++++++++++++++
 .../components/policy_json_flyout.tsx         | 32 +++++++++++--------
 .../sections/edit_policy/edit_policy.tsx      |  3 +-
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js b/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
index 81c30579cd4dd..e4227bac520fe 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/components/edit_policy.test.js
@@ -187,6 +187,34 @@ describe('edit policy', () => {
       save(rendered);
       expectedErrorMessages(rendered, [policyNameStartsWithUnderscoreErrorMessage]);
     });
+    test('should show correct json in policy flyout', () => {
+      const rendered = mountWithIntl(component);
+      findTestSubject(rendered, 'requestButton').simulate('click');
+      const json = rendered.find(`code`).text();
+      const expected = `PUT _ilm/policy/<policyName>\n${JSON.stringify(
+        {
+          policy: {
+            phases: {
+              hot: {
+                min_age: '0ms',
+                actions: {
+                  rollover: {
+                    max_age: '30d',
+                    max_size: '50gb',
+                  },
+                  set_priority: {
+                    priority: 100,
+                  },
+                },
+              },
+            },
+          },
+        },
+        null,
+        2
+      )}`;
+      expect(json).toBe(expected);
+    });
   });
   describe('hot phase', () => {
     test('should show errors when trying to save with no max size and no max age', () => {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/policy_json_flyout.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/policy_json_flyout.tsx
index 66cb4ad9fba32..2f246f21aaf2e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/policy_json_flyout.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/policy_json_flyout.tsx
@@ -18,29 +18,35 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { Policy } from '../../../services/policies/types';
+import { Policy, PolicyFromES } from '../../../services/policies/types';
+import { serializePolicy } from '../../../services/policies/policy_serialization';
 
 interface Props {
   close: () => void;
   policy: Policy;
+  existingPolicy?: PolicyFromES;
   policyName: string;
 }
 
-export const PolicyJsonFlyout: React.FunctionComponent<Props> = ({ close, policy, policyName }) => {
-  const getEsJson = ({ phases }: Policy) => {
-    return JSON.stringify(
-      {
-        policy: {
-          phases,
-        },
+export const PolicyJsonFlyout: React.FunctionComponent<Props> = ({
+  close,
+  policy,
+  policyName,
+  existingPolicy,
+}) => {
+  const { phases } = serializePolicy(policy, existingPolicy?.policy);
+  const json = JSON.stringify(
+    {
+      policy: {
+        phases,
       },
-      null,
-      2
-    );
-  };
+    },
+    null,
+    2
+  );
 
   const endpoint = `PUT _ilm/policy/${policyName || '<policyName>'}`;
-  const request = `${endpoint}\n${getEsJson(policy)}`;
+  const request = `${endpoint}\n${json}`;
 
   return (
     <EuiFlyout maxWidth={480} onClose={close}>
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
index 6cffde577b35e..c99d01b546679 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
@@ -352,7 +352,7 @@ export const EditPolicy: React.FunctionComponent<Props> = ({
               </EuiFlexItem>
 
               <EuiFlexItem grow={false}>
-                <EuiButtonEmpty onClick={togglePolicyJsonFlyout}>
+                <EuiButtonEmpty onClick={togglePolicyJsonFlyout} data-test-subj="requestButton">
                   {isShowingPolicyJsonFlyout ? (
                     <FormattedMessage
                       id="xpack.indexLifecycleMgmt.editPolicy.hidePolicyJsonButto"
@@ -371,6 +371,7 @@ export const EditPolicy: React.FunctionComponent<Props> = ({
             {isShowingPolicyJsonFlyout ? (
               <PolicyJsonFlyout
                 policyName={policy.name || ''}
+                existingPolicy={existingPolicy}
                 policy={policy}
                 close={() => setIsShowingPolicyJsonFlyout(false)}
               />

From f065191a750639179a63b77df0cc95261c920812 Mon Sep 17 00:00:00 2001
From: Jason Stoltzfus <jastoltz24@gmail.com>
Date: Thu, 27 Aug 2020 08:44:41 -0400
Subject: [PATCH 091/148] [Enterprise Search] Added an App Search route for
 listing Credentials (#75487)

In addition to a route for listing Credentials, this also adds a
utility function which helps create API routes which simply proxy
the App Search API.

The reasoning for this is as follows;
1. Creating new routes takes less effort and cognitive load if we
can simply just create proxy routes that use the APIs as is.
2. It keeps the App Search API as the source of truth. All logic is
implemented in the underlying API.
3. It makes unit testing routes much simpler. We do not need to verify
any connectivity to the underlying App Search API, because that is
already tested as part of the utility.
---
 .../server/{routes => }/__mocks__/index.ts    |   0
 .../{routes => }/__mocks__/router.mock.ts     |   0
 .../__mocks__/routerDependencies.mock.ts      |   2 +-
 .../collectors/app_search/telemetry.test.ts   |   2 +-
 .../server/collectors/lib/telemetry.test.ts   |   2 +-
 .../workplace_search/telemetry.test.ts        |   2 +-
 .../enterprise_search_request_handler.test.ts | 133 ++++++++++++++++++
 .../lib/enterprise_search_request_handler.ts  |  69 +++++++++
 .../enterprise_search/server/plugin.ts        |   2 +
 .../routes/app_search/credentials.test.ts     |  93 ++++++++++++
 .../server/routes/app_search/credentials.ts   |  50 +++++++
 .../server/routes/app_search/engines.test.ts  |   2 +-
 .../enterprise_search/config_data.test.ts     |   2 +-
 .../enterprise_search/telemetry.test.ts       |   2 +-
 .../routes/workplace_search/overview.test.ts  |   2 +-
 15 files changed, 355 insertions(+), 8 deletions(-)
 rename x-pack/plugins/enterprise_search/server/{routes => }/__mocks__/index.ts (100%)
 rename x-pack/plugins/enterprise_search/server/{routes => }/__mocks__/router.mock.ts (100%)
 rename x-pack/plugins/enterprise_search/server/{routes => }/__mocks__/routerDependencies.mock.ts (95%)
 create mode 100644 x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
 create mode 100644 x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
 create mode 100644 x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts
 create mode 100644 x-pack/plugins/enterprise_search/server/routes/app_search/credentials.ts

diff --git a/x-pack/plugins/enterprise_search/server/routes/__mocks__/index.ts b/x-pack/plugins/enterprise_search/server/__mocks__/index.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/server/routes/__mocks__/index.ts
rename to x-pack/plugins/enterprise_search/server/__mocks__/index.ts
diff --git a/x-pack/plugins/enterprise_search/server/routes/__mocks__/router.mock.ts b/x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/server/routes/__mocks__/router.mock.ts
rename to x-pack/plugins/enterprise_search/server/__mocks__/router.mock.ts
diff --git a/x-pack/plugins/enterprise_search/server/routes/__mocks__/routerDependencies.mock.ts b/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
similarity index 95%
rename from x-pack/plugins/enterprise_search/server/routes/__mocks__/routerDependencies.mock.ts
rename to x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
index 9b6fa30271d61..7a244be96cfc4 100644
--- a/x-pack/plugins/enterprise_search/server/routes/__mocks__/routerDependencies.mock.ts
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
@@ -5,7 +5,7 @@
  */
 
 import { loggingSystemMock } from 'src/core/server/mocks';
-import { ConfigType } from '../../';
+import { ConfigType } from '../';
 
 export const mockLogger = loggingSystemMock.createLogger().get();
 
diff --git a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.test.ts
index 53c6dee61cd1d..189f8278f1b07 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.test.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { mockLogger } from '../../routes/__mocks__';
+import { mockLogger } from '../../__mocks__';
 
 import { registerTelemetryUsageCollector } from './telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts
index 3ab3b03dd7725..aae162c23ccb4 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/lib/telemetry.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { mockLogger } from '../../routes/__mocks__';
+import { mockLogger } from '../../__mocks__';
 
 jest.mock('../../../../../../src/core/server', () => ({
   SavedObjectsErrorHelpers: {
diff --git a/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.test.ts
index 496b2f254f9a6..8960d6fa9b67b 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.test.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { mockLogger } from '../../routes/__mocks__';
+import { mockLogger } from '../../__mocks__';
 
 import { registerTelemetryUsageCollector } from './telemetry';
 
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
new file mode 100644
index 0000000000000..f0c003936996e
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { mockConfig, mockLogger } from '../__mocks__';
+
+import { createEnterpriseSearchRequestHandler } from './enterprise_search_request_handler';
+
+jest.mock('node-fetch');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fetchMock = require('node-fetch') as jest.Mock;
+const { Response } = jest.requireActual('node-fetch');
+
+const responseMock = {
+  ok: jest.fn(),
+  customError: jest.fn(),
+};
+const KibanaAuthHeader = 'Basic 123';
+
+describe('createEnterpriseSearchRequestHandler', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    fetchMock.mockReset();
+  });
+
+  it('makes an API call and returns the response', async () => {
+    const responseBody = {
+      results: [{ name: 'engine1' }],
+      meta: { page: { total_results: 1 } },
+    };
+
+    EnterpriseSearchAPI.mockReturn(responseBody);
+
+    const requestHandler = createEnterpriseSearchRequestHandler({
+      config: mockConfig,
+      log: mockLogger,
+      path: '/as/credentials/collection',
+    });
+
+    await makeAPICall(requestHandler, {
+      query: {
+        type: 'indexed',
+        pageIndex: 1,
+      },
+    });
+
+    EnterpriseSearchAPI.shouldHaveBeenCalledWith(
+      'http://localhost:3002/as/credentials/collection?type=indexed&pageIndex=1'
+    );
+
+    expect(responseMock.ok).toHaveBeenCalledWith({
+      body: responseBody,
+    });
+  });
+
+  describe('when an API request fails', () => {
+    it('should return 502 with a message', async () => {
+      EnterpriseSearchAPI.mockReturnError();
+
+      const requestHandler = createEnterpriseSearchRequestHandler({
+        config: mockConfig,
+        log: mockLogger,
+        path: '/as/credentials/collection',
+      });
+
+      await makeAPICall(requestHandler);
+
+      EnterpriseSearchAPI.shouldHaveBeenCalledWith(
+        'http://localhost:3002/as/credentials/collection'
+      );
+
+      expect(responseMock.customError).toHaveBeenCalledWith({
+        body: 'Error connecting or fetching data from Enterprise Search',
+        statusCode: 502,
+      });
+    });
+  });
+
+  describe('when `hasValidData` fails', () => {
+    it('should return 502 with a message', async () => {
+      const responseBody = {
+        foo: 'bar',
+      };
+
+      EnterpriseSearchAPI.mockReturn(responseBody);
+
+      const requestHandler = createEnterpriseSearchRequestHandler({
+        config: mockConfig,
+        log: mockLogger,
+        path: '/as/credentials/collection',
+        hasValidData: (body?: any) =>
+          Array.isArray(body?.results) && typeof body?.meta?.page?.total_results === 'number',
+      });
+
+      await makeAPICall(requestHandler);
+
+      EnterpriseSearchAPI.shouldHaveBeenCalledWith(
+        'http://localhost:3002/as/credentials/collection'
+      );
+
+      expect(responseMock.customError).toHaveBeenCalledWith({
+        body: 'Error connecting or fetching data from Enterprise Search',
+        statusCode: 502,
+      });
+    });
+  });
+});
+
+const makeAPICall = (handler: Function, params = {}) => {
+  const request = { headers: { authorization: KibanaAuthHeader }, ...params };
+  return handler(null, request, responseMock);
+};
+
+const EnterpriseSearchAPI = {
+  shouldHaveBeenCalledWith(expectedUrl: string, expectedParams = {}) {
+    expect(fetchMock).toHaveBeenCalledWith(expectedUrl, {
+      headers: { Authorization: KibanaAuthHeader },
+      ...expectedParams,
+    });
+  },
+  mockReturn(response: object) {
+    fetchMock.mockImplementation(() => {
+      return Promise.resolve(new Response(JSON.stringify(response)));
+    });
+  },
+  mockReturnError() {
+    fetchMock.mockImplementation(() => {
+      return Promise.reject('Failed');
+    });
+  },
+};
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
new file mode 100644
index 0000000000000..11152aa651743
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import fetch from 'node-fetch';
+import querystring from 'querystring';
+import {
+  RequestHandlerContext,
+  KibanaRequest,
+  KibanaResponseFactory,
+  Logger,
+} from 'src/core/server';
+import { ConfigType } from '../index';
+
+interface IEnterpriseSearchRequestParams<ResponseBody> {
+  config: ConfigType;
+  log: Logger;
+  path: string;
+  hasValidData?: (body?: ResponseBody) => boolean;
+}
+
+/**
+ * This helper function creates a single standard DRY way of handling
+ * Enterprise Search API requests.
+ *
+ * This handler assumes that it will essentially just proxy the
+ * Enterprise Search API request, so the request body and request
+ * parameters are simply passed through.
+ */
+export function createEnterpriseSearchRequestHandler<ResponseBody>({
+  config,
+  log,
+  path,
+  hasValidData = () => true,
+}: IEnterpriseSearchRequestParams<ResponseBody>) {
+  return async (
+    _context: RequestHandlerContext,
+    request: KibanaRequest<unknown, Readonly<{}>, unknown>,
+    response: KibanaResponseFactory
+  ) => {
+    try {
+      const enterpriseSearchUrl = config.host as string;
+      const params = request.query ? `?${querystring.stringify(request.query)}` : '';
+      const url = `${encodeURI(enterpriseSearchUrl)}${path}${params}`;
+
+      const apiResponse = await fetch(url, {
+        headers: { Authorization: request.headers.authorization as string },
+      });
+
+      const body = await apiResponse.json();
+
+      if (hasValidData(body)) {
+        return response.ok({ body });
+      } else {
+        throw new Error(`Invalid data received: ${JSON.stringify(body)}`);
+      }
+    } catch (e) {
+      log.error(`Cannot connect to Enterprise Search: ${e.toString()}`);
+      if (e instanceof Error) log.debug(e.stack as string);
+
+      return response.customError({
+        statusCode: 502,
+        body: 'Error connecting or fetching data from Enterprise Search',
+      });
+    }
+  };
+}
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
index a0d3a57eabb7a..ef8c72f0cbca5 100644
--- a/x-pack/plugins/enterprise_search/server/plugin.ts
+++ b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -32,6 +32,7 @@ import { registerTelemetryRoute } from './routes/enterprise_search/telemetry';
 import { appSearchTelemetryType } from './saved_objects/app_search/telemetry';
 import { registerTelemetryUsageCollector as registerASTelemetryUsageCollector } from './collectors/app_search/telemetry';
 import { registerEnginesRoute } from './routes/app_search/engines';
+import { registerCredentialsRoutes } from './routes/app_search/credentials';
 
 import { workplaceSearchTelemetryType } from './saved_objects/workplace_search/telemetry';
 import { registerTelemetryUsageCollector as registerWSTelemetryUsageCollector } from './collectors/workplace_search/telemetry';
@@ -108,6 +109,7 @@ export class EnterpriseSearchPlugin implements Plugin {
 
     registerConfigDataRoute(dependencies);
     registerEnginesRoute(dependencies);
+    registerCredentialsRoutes(dependencies);
     registerWSOverviewRoute(dependencies);
 
     /**
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts
new file mode 100644
index 0000000000000..682c17aea6d52
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { MockRouter, mockConfig, mockLogger } from '../../__mocks__';
+
+import { registerCredentialsRoutes } from './credentials';
+
+jest.mock('../../lib/enterprise_search_request_handler', () => ({
+  createEnterpriseSearchRequestHandler: jest.fn(),
+}));
+import { createEnterpriseSearchRequestHandler } from '../../lib/enterprise_search_request_handler';
+
+describe('credentials routes', () => {
+  describe('GET /api/app_search/credentials', () => {
+    let mockRouter: MockRouter;
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+      mockRouter = new MockRouter({ method: 'get', payload: 'query' });
+
+      registerCredentialsRoutes({
+        router: mockRouter.router,
+        log: mockLogger,
+        config: mockConfig,
+      });
+    });
+
+    it('creates a handler with createEnterpriseSearchRequestHandler', () => {
+      expect(createEnterpriseSearchRequestHandler).toHaveBeenCalledWith({
+        config: mockConfig,
+        log: mockLogger,
+        path: '/as/credentials/collection',
+        hasValidData: expect.any(Function),
+      });
+    });
+
+    describe('hasValidData', () => {
+      it('should correctly validate that a response has data', () => {
+        const response = {
+          meta: {
+            page: {
+              current: 1,
+              total_pages: 1,
+              total_results: 1,
+              size: 25,
+            },
+          },
+          results: [
+            {
+              id: 'loco_moco_account_id:5f3575de2b76ff13405f3155|name:asdfasdf',
+              key: 'search-fe49u2z8d5gvf9s4ekda2ad4',
+              name: 'asdfasdf',
+              type: 'search',
+              access_all_engines: true,
+            },
+          ],
+        };
+
+        const {
+          hasValidData,
+        } = (createEnterpriseSearchRequestHandler as jest.Mock).mock.calls[0][0];
+
+        expect(hasValidData(response)).toBe(true);
+      });
+
+      it('should correctly validate that a response does not have data', () => {
+        const response = {
+          foo: 'bar',
+        };
+
+        const hasValidData = (createEnterpriseSearchRequestHandler as jest.Mock).mock.calls[0][0]
+          .hasValidData;
+
+        expect(hasValidData(response)).toBe(false);
+      });
+    });
+
+    describe('validates', () => {
+      it('correctly', () => {
+        const request = { query: { 'page[current]': 1 } };
+        mockRouter.shouldValidate(request);
+      });
+
+      it('missing page[current]', () => {
+        const request = { query: {} };
+        mockRouter.shouldThrow(request);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.ts
new file mode 100644
index 0000000000000..d9539692069f0
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+import { IRouteDependencies } from '../../plugin';
+import { createEnterpriseSearchRequestHandler } from '../../lib/enterprise_search_request_handler';
+
+interface ICredential {
+  id: string;
+  key: string;
+  name: string;
+  type: string;
+  access_all_engines: boolean;
+}
+interface ICredentialsResponse {
+  results: ICredential[];
+  meta?: {
+    page?: {
+      current: number;
+      total_results: number;
+      total_pages: number;
+      size: number;
+    };
+  };
+}
+
+export function registerCredentialsRoutes({ router, config, log }: IRouteDependencies) {
+  router.get(
+    {
+      path: '/api/app_search/credentials',
+      validate: {
+        query: schema.object({
+          'page[current]': schema.number(),
+        }),
+      },
+    },
+    createEnterpriseSearchRequestHandler<ICredentialsResponse>({
+      config,
+      log,
+      path: '/as/credentials/collection',
+      hasValidData: (body?: ICredentialsResponse) => {
+        return Array.isArray(body?.results) && typeof body?.meta?.page?.total_results === 'number';
+      },
+    })
+  );
+}
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts
index 1ea023ecacdbe..03edab89d1b99 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { MockRouter, mockConfig, mockLogger } from '../__mocks__';
+import { MockRouter, mockConfig, mockLogger } from '../../__mocks__';
 
 import { registerEnginesRoute } from './engines';
 
diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/config_data.test.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/config_data.test.ts
index 7484e27594df4..253c9a418d60b 100644
--- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/config_data.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/config_data.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../../common/__mocks__';
-import { MockRouter, mockDependencies } from '../__mocks__';
+import { MockRouter, mockDependencies } from '../../__mocks__';
 
 jest.mock('../../lib/enterprise_search_config_api', () => ({
   callEnterpriseSearchConfigAPI: jest.fn(),
diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
index ebd84d3e0e79a..daf0a1e895a61 100644
--- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { loggingSystemMock, savedObjectsServiceMock } from 'src/core/server/mocks';
-import { MockRouter, mockConfig, mockLogger } from '../__mocks__';
+import { MockRouter, mockConfig, mockLogger } from '../../__mocks__';
 
 jest.mock('../../collectors/lib/telemetry', () => ({
   incrementUICounter: jest.fn(),
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts
index f6534b27b5da0..69e8354e8b2f7 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { MockRouter, mockConfig, mockLogger } from '../__mocks__';
+import { MockRouter, mockConfig, mockLogger } from '../../__mocks__';
 
 import { registerWSOverviewRoute } from './overview';
 

From d457d530017e086064ed174fc74f9a8d738bd6bb Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Thu, 27 Aug 2020 09:02:32 -0400
Subject: [PATCH 092/148] [Uptime] Translate bare strings (#75918)

* Translate a bare string.

* Remove unneeded translation.
---
 .../plugins/uptime/public/state/effects/dynamic_settings.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/uptime/public/state/effects/dynamic_settings.ts b/x-pack/plugins/uptime/public/state/effects/dynamic_settings.ts
index 4b41862649b55..57be818c928dc 100644
--- a/x-pack/plugins/uptime/public/state/effects/dynamic_settings.ts
+++ b/x-pack/plugins/uptime/public/state/effects/dynamic_settings.ts
@@ -47,7 +47,11 @@ export function* setDynamicSettingsEffect() {
       }
       yield call(setDynamicSettingsAPI, { settings: action.payload });
       yield put(setDynamicSettingsSuccess(action.payload));
-      kibanaService.core.notifications.toasts.addSuccess('Settings saved!');
+      kibanaService.core.notifications.toasts.addSuccess(
+        i18n.translate('xpack.uptime.settings.saveSuccess', {
+          defaultMessage: 'Settings saved!',
+        })
+      );
     } catch (err) {
       kibanaService.core.notifications.toasts.addError(err, {
         title: couldNotSaveSettingsText,

From 54bbd6a91097246552c17847864edde6b4b61915 Mon Sep 17 00:00:00 2001
From: Larry Gregory <larry.gregory@elastic.co>
Date: Thu, 27 Aug 2020 10:09:20 -0400
Subject: [PATCH 093/148] Adds `authenticaton_type` as expected property on ES
 authentication response (#75808)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../common/model/authenticated_user.mock.ts   |   1 +
 .../common/model/authenticated_user.ts        |   7 +
 .../apis/security/basic_login.js              |  17 +-
 .../apis/security/kerberos_login.ts           |  14 +-
 .../apis/login_selector.ts                    | 182 ++++++++++++++++--
 .../apis/authorization_code_flow/oidc_auth.ts |  12 +-
 .../apis/implicit_flow/oidc_auth.ts           |   7 +-
 .../apis/security/pki_auth.ts                 |   5 +-
 .../apis/security/saml_login.ts               |   8 +-
 9 files changed, 221 insertions(+), 32 deletions(-)

diff --git a/x-pack/plugins/security/common/model/authenticated_user.mock.ts b/x-pack/plugins/security/common/model/authenticated_user.mock.ts
index f8b0d27efcbf4..0393c94da8d40 100644
--- a/x-pack/plugins/security/common/model/authenticated_user.mock.ts
+++ b/x-pack/plugins/security/common/model/authenticated_user.mock.ts
@@ -16,6 +16,7 @@ export function mockAuthenticatedUser(user: Partial<AuthenticatedUser> = {}) {
     authentication_realm: { name: 'native1', type: 'native' },
     lookup_realm: { name: 'native1', type: 'native' },
     authentication_provider: 'basic1',
+    authentication_type: 'realm',
     ...user,
   };
 }
diff --git a/x-pack/plugins/security/common/model/authenticated_user.ts b/x-pack/plugins/security/common/model/authenticated_user.ts
index 6465b4a23eb48..5ea420af202dc 100644
--- a/x-pack/plugins/security/common/model/authenticated_user.ts
+++ b/x-pack/plugins/security/common/model/authenticated_user.ts
@@ -31,6 +31,13 @@ export interface AuthenticatedUser extends User {
    * Name of the Kibana authentication provider that used to authenticate user.
    */
   authentication_provider: string;
+
+  /**
+   * The AuthenticationType used by ES to authenticate the user.
+   *
+   * @example "realm" | "api_key" | "token" | "anonymous" | "internal"
+   */
+  authentication_type: string;
 }
 
 export function canUserChangePassword(user: AuthenticatedUser) {
diff --git a/x-pack/test/api_integration/apis/security/basic_login.js b/x-pack/test/api_integration/apis/security/basic_login.js
index db58f17582c60..4b39b1bf32d5b 100644
--- a/x-pack/test/api_integration/apis/security/basic_login.js
+++ b/x-pack/test/api_integration/apis/security/basic_login.js
@@ -15,8 +15,7 @@ export default function ({ getService }) {
   const validUsername = kibanaServerConfig.username;
   const validPassword = kibanaServerConfig.password;
 
-  // Failing: See https://github.com/elastic/kibana/issues/75707
-  describe.skip('Basic authentication', () => {
+  describe('Basic authentication', () => {
     it('should redirect non-AJAX requests to the login page if not authenticated', async () => {
       const response = await supertest.get('/abc/xyz').expect(302);
 
@@ -145,8 +144,15 @@ export default function ({ getService }) {
         'authentication_realm',
         'lookup_realm',
         'authentication_provider',
+        'authentication_type',
       ]);
       expect(apiResponse.body.username).to.be(validUsername);
+      expect(apiResponse.body.authentication_provider).to.eql('__http__');
+      expect(apiResponse.body.authentication_realm).to.eql({
+        name: 'reserved',
+        type: 'reserved',
+      });
+      expect(apiResponse.body.authentication_type).to.be('realm');
     });
 
     describe('with session cookie', () => {
@@ -187,8 +193,15 @@ export default function ({ getService }) {
           'authentication_realm',
           'lookup_realm',
           'authentication_provider',
+          'authentication_type',
         ]);
         expect(apiResponse.body.username).to.be(validUsername);
+        expect(apiResponse.body.authentication_provider).to.eql('basic');
+        expect(apiResponse.body.authentication_realm).to.eql({
+          name: 'reserved',
+          type: 'reserved',
+        });
+        expect(apiResponse.body.authentication_type).to.be('realm');
       });
 
       it('should extend cookie on every successful non-system API call', async () => {
diff --git a/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts b/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
index 3c211dca2a783..1f4428e198539 100644
--- a/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
+++ b/x-pack/test/kerberos_api_integration/apis/security/kerberos_login.ts
@@ -37,8 +37,7 @@ export default function ({ getService }: FtrProviderContext) {
     expect(cookie.maxAge).to.be(0);
   }
 
-  // FAILING: https://github.com/elastic/kibana/issues/75707
-  describe.skip('Kerberos authentication', () => {
+  describe('Kerberos authentication', () => {
     before(async () => {
       await getService('esSupertest')
         .post('/_security/role_mapping/krb5')
@@ -82,6 +81,7 @@ export default function ({ getService }: FtrProviderContext) {
       expect(user.username).to.eql(username);
       expect(user.authentication_realm).to.eql({ name: 'reserved', type: 'reserved' });
       expect(user.authentication_provider).to.eql('basic');
+      expect(user.authentication_type).to.eql('realm');
     });
 
     describe('initiating SPNEGO', () => {
@@ -121,7 +121,14 @@ export default function ({ getService }: FtrProviderContext) {
         const sessionCookie = request.cookie(cookies[0])!;
         checkCookieIsSet(sessionCookie);
 
-        const expectedUserRoles = ['kibana_admin'];
+        const isAnonymousAccessEnabled = (config.get(
+          'esTestCluster.serverArgs'
+        ) as string[]).some((setting) => setting.startsWith('xpack.security.authc.anonymous'));
+
+        // `superuser_anonymous` role is derived from the enabled anonymous access.
+        const expectedUserRoles = isAnonymousAccessEnabled
+          ? ['kibana_admin', 'superuser_anonymous']
+          : ['kibana_admin'];
 
         await supertest
           .get('/internal/security/me')
@@ -140,6 +147,7 @@ export default function ({ getService }: FtrProviderContext) {
             authentication_realm: { name: 'kerb1', type: 'kerberos' },
             lookup_realm: { name: 'kerb1', type: 'kerberos' },
             authentication_provider: 'kerberos',
+            authentication_type: 'token',
           });
       });
 
diff --git a/x-pack/test/login_selector_api_integration/apis/login_selector.ts b/x-pack/test/login_selector_api_integration/apis/login_selector.ts
index 63084d3bfc9e9..7eb1f07d67506 100644
--- a/x-pack/test/login_selector_api_integration/apis/login_selector.ts
+++ b/x-pack/test/login_selector_api_integration/apis/login_selector.ts
@@ -32,7 +32,13 @@ export default function ({ getService }: FtrProviderContext) {
     resolve(__dirname, '../../pki_api_integration/fixtures/first_client.p12')
   );
 
-  async function checkSessionCookie(sessionCookie: Cookie, username: string, providerName: string) {
+  async function checkSessionCookie(
+    sessionCookie: Cookie,
+    username: string,
+    providerName: string,
+    authenticationRealm: { name: string; type: string },
+    authenticationType: string
+  ) {
     expect(sessionCookie.key).to.be('sid');
     expect(sessionCookie.value).to.not.be.empty();
     expect(sessionCookie.path).to.be('/');
@@ -56,14 +62,16 @@ export default function ({ getService }: FtrProviderContext) {
       'authentication_realm',
       'lookup_realm',
       'authentication_provider',
+      'authentication_type',
     ]);
 
     expect(apiResponse.body.username).to.be(username);
     expect(apiResponse.body.authentication_provider).to.be(providerName);
+    expect(apiResponse.body.authentication_realm).to.eql(authenticationRealm);
+    expect(apiResponse.body.authentication_type).to.be(authenticationType);
   }
 
-  // FAILING: https://github.com/elastic/kibana/issues/75707
-  describe.skip('Login Selector', () => {
+  describe('Login Selector', () => {
     it('should redirect user to a login selector', async () => {
       const response = await supertest
         .get('/abc/xyz/handshake?one=two three')
@@ -121,7 +129,16 @@ export default function ({ getService }: FtrProviderContext) {
           const cookies = authenticationResponse.headers['set-cookie'];
           expect(cookies).to.have.length(1);
 
-          await checkSessionCookie(request.cookie(cookies[0])!, 'a@b.c', providerName);
+          await checkSessionCookie(
+            request.cookie(cookies[0])!,
+            'a@b.c',
+            providerName,
+            {
+              name: providerName,
+              type: 'saml',
+            },
+            'token'
+          );
         }
       });
 
@@ -148,7 +165,16 @@ export default function ({ getService }: FtrProviderContext) {
           const cookies = authenticationResponse.headers['set-cookie'];
           expect(cookies).to.have.length(1);
 
-          await checkSessionCookie(request.cookie(cookies[0])!, 'a@b.c', providerName);
+          await checkSessionCookie(
+            request.cookie(cookies[0])!,
+            'a@b.c',
+            providerName,
+            {
+              name: providerName,
+              type: 'saml',
+            },
+            'token'
+          );
         }
       });
 
@@ -172,7 +198,16 @@ export default function ({ getService }: FtrProviderContext) {
           const cookies = authenticationResponse.headers['set-cookie'];
           expect(cookies).to.have.length(1);
 
-          await checkSessionCookie(request.cookie(cookies[0])!, 'a@b.c', providerName);
+          await checkSessionCookie(
+            request.cookie(cookies[0])!,
+            'a@b.c',
+            providerName,
+            {
+              name: providerName,
+              type: 'saml',
+            },
+            'token'
+          );
         }
       });
 
@@ -193,7 +228,16 @@ export default function ({ getService }: FtrProviderContext) {
           const basicSessionCookie = request.cookie(
             basicAuthenticationResponse.headers['set-cookie'][0]
           )!;
-          await checkSessionCookie(basicSessionCookie, 'elastic', 'basic1');
+          await checkSessionCookie(
+            basicSessionCookie,
+            'elastic',
+            'basic1',
+            {
+              name: 'reserved',
+              type: 'reserved',
+            },
+            'realm'
+          );
 
           const authenticationResponse = await supertest
             .post('/api/security/saml/callback')
@@ -213,7 +257,16 @@ export default function ({ getService }: FtrProviderContext) {
           const cookies = authenticationResponse.headers['set-cookie'];
           expect(cookies).to.have.length(1);
 
-          await checkSessionCookie(request.cookie(cookies[0])!, 'a@b.c', providerName);
+          await checkSessionCookie(
+            request.cookie(cookies[0])!,
+            'a@b.c',
+            providerName,
+            {
+              name: providerName,
+              type: 'saml',
+            },
+            'token'
+          );
         }
       });
 
@@ -230,7 +283,16 @@ export default function ({ getService }: FtrProviderContext) {
         const saml1SessionCookie = request.cookie(
           saml1AuthenticationResponse.headers['set-cookie'][0]
         )!;
-        await checkSessionCookie(saml1SessionCookie, 'a@b.c', 'saml1');
+        await checkSessionCookie(
+          saml1SessionCookie,
+          'a@b.c',
+          'saml1',
+          {
+            name: 'saml1',
+            type: 'saml',
+          },
+          'token'
+        );
 
         // And now try to login with `saml2`.
         const saml2AuthenticationResponse = await supertest
@@ -249,7 +311,16 @@ export default function ({ getService }: FtrProviderContext) {
         const saml2SessionCookie = request.cookie(
           saml2AuthenticationResponse.headers['set-cookie'][0]
         )!;
-        await checkSessionCookie(saml2SessionCookie, 'a@b.c', 'saml2');
+        await checkSessionCookie(
+          saml2SessionCookie,
+          'a@b.c',
+          'saml2',
+          {
+            name: 'saml2',
+            type: 'saml',
+          },
+          'token'
+        );
       });
 
       it('should redirect to URL from relay state in case of IdP initiated login even if session with other SAML provider exists', async () => {
@@ -265,7 +336,16 @@ export default function ({ getService }: FtrProviderContext) {
         const saml1SessionCookie = request.cookie(
           saml1AuthenticationResponse.headers['set-cookie'][0]
         )!;
-        await checkSessionCookie(saml1SessionCookie, 'a@b.c', 'saml1');
+        await checkSessionCookie(
+          saml1SessionCookie,
+          'a@b.c',
+          'saml1',
+          {
+            name: 'saml1',
+            type: 'saml',
+          },
+          'token'
+        );
 
         // And now try to login with `saml2`.
         const saml2AuthenticationResponse = await supertest
@@ -286,7 +366,16 @@ export default function ({ getService }: FtrProviderContext) {
         const saml2SessionCookie = request.cookie(
           saml2AuthenticationResponse.headers['set-cookie'][0]
         )!;
-        await checkSessionCookie(saml2SessionCookie, 'a@b.c', 'saml2');
+        await checkSessionCookie(
+          saml2SessionCookie,
+          'a@b.c',
+          'saml2',
+          {
+            name: 'saml2',
+            type: 'saml',
+          },
+          'token'
+        );
       });
 
       // Ideally we should be able to abandon intermediate session and let user log in, but for the
@@ -367,7 +456,16 @@ export default function ({ getService }: FtrProviderContext) {
           const cookies = authenticationResponse.headers['set-cookie'];
           expect(cookies).to.have.length(1);
 
-          await checkSessionCookie(request.cookie(cookies[0])!, 'a@b.c', providerName);
+          await checkSessionCookie(
+            request.cookie(cookies[0])!,
+            'a@b.c',
+            providerName,
+            {
+              name: providerName,
+              type: 'saml',
+            },
+            'token'
+          );
         }
       });
 
@@ -429,7 +527,16 @@ export default function ({ getService }: FtrProviderContext) {
         const saml2SessionCookie = request.cookie(
           saml2AuthenticationResponse.headers['set-cookie'][0]
         )!;
-        await checkSessionCookie(saml2SessionCookie, 'a@b.c', 'saml2');
+        await checkSessionCookie(
+          saml2SessionCookie,
+          'a@b.c',
+          'saml2',
+          {
+            name: 'saml2',
+            type: 'saml',
+          },
+          'token'
+        );
       });
     });
 
@@ -472,7 +579,12 @@ export default function ({ getService }: FtrProviderContext) {
         await checkSessionCookie(
           request.cookie(cookies[0])!,
           'tester@TEST.ELASTIC.CO',
-          'kerberos1'
+          'kerberos1',
+          {
+            name: 'kerb1',
+            type: 'kerberos',
+          },
+          'token'
         );
       });
 
@@ -516,7 +628,12 @@ export default function ({ getService }: FtrProviderContext) {
         await checkSessionCookie(
           request.cookie(cookies[0])!,
           'tester@TEST.ELASTIC.CO',
-          'kerberos1'
+          'kerberos1',
+          {
+            name: 'kerb1',
+            type: 'kerberos',
+          },
+          'token'
         );
       });
     });
@@ -550,7 +667,16 @@ export default function ({ getService }: FtrProviderContext) {
         const cookies = authenticationResponse.headers['set-cookie'];
         expect(cookies).to.have.length(1);
 
-        await checkSessionCookie(request.cookie(cookies[0])!, 'user2', 'oidc1');
+        await checkSessionCookie(
+          request.cookie(cookies[0])!,
+          'user2',
+          'oidc1',
+          {
+            name: 'oidc1',
+            type: 'oidc',
+          },
+          'token'
+        );
       });
 
       it('should be able to log in via SP initiated login', async () => {
@@ -601,7 +727,16 @@ export default function ({ getService }: FtrProviderContext) {
         const cookies = authenticationResponse.headers['set-cookie'];
         expect(cookies).to.have.length(1);
 
-        await checkSessionCookie(request.cookie(cookies[0])!, 'user1', 'oidc1');
+        await checkSessionCookie(
+          request.cookie(cookies[0])!,
+          'user1',
+          'oidc1',
+          {
+            name: 'oidc1',
+            type: 'oidc',
+          },
+          'token'
+        );
       });
     });
 
@@ -634,7 +769,16 @@ export default function ({ getService }: FtrProviderContext) {
         const cookies = authenticationResponse.headers['set-cookie'];
         expect(cookies).to.have.length(1);
 
-        await checkSessionCookie(request.cookie(cookies[0])!, 'first_client', 'pki1');
+        await checkSessionCookie(
+          request.cookie(cookies[0])!,
+          'first_client',
+          'pki1',
+          {
+            name: 'pki1',
+            type: 'pki',
+          },
+          'token'
+        );
       });
     });
   });
diff --git a/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.ts b/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.ts
index 1b37d60436ddc..0a230ac84d991 100644
--- a/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.ts
+++ b/x-pack/test/oidc_api_integration/apis/authorization_code_flow/oidc_auth.ts
@@ -15,8 +15,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const config = getService('config');
 
-  // FAILING: https://github.com/elastic/kibana/issues/75707
-  describe.skip('OpenID Connect authentication', () => {
+  describe('OpenID Connect authentication', () => {
     it('should reject API requests if client is not authenticated', async () => {
       await supertest.get('/internal/security/me').set('kbn-xsrf', 'xxx').expect(401);
     });
@@ -46,6 +45,7 @@ export default function ({ getService }: FtrProviderContext) {
       expect(user.username).to.eql(username);
       expect(user.authentication_realm).to.eql({ name: 'reserved', type: 'reserved' });
       expect(user.authentication_provider).to.eql('basic');
+      expect(user.authentication_type).to.be('realm');
     });
 
     describe('initiating handshake', () => {
@@ -230,9 +230,13 @@ export default function ({ getService }: FtrProviderContext) {
           'authentication_realm',
           'lookup_realm',
           'authentication_provider',
+          'authentication_type',
         ]);
 
         expect(apiResponse.body.username).to.be('user1');
+        expect(apiResponse.body.authentication_realm).to.eql({ name: 'oidc1', type: 'oidc' });
+        expect(apiResponse.body.authentication_provider).to.eql('oidc');
+        expect(apiResponse.body.authentication_type).to.be('token');
       });
     });
 
@@ -280,9 +284,13 @@ export default function ({ getService }: FtrProviderContext) {
           'authentication_realm',
           'lookup_realm',
           'authentication_provider',
+          'authentication_type',
         ]);
 
         expect(apiResponse.body.username).to.be('user2');
+        expect(apiResponse.body.authentication_realm).to.eql({ name: 'oidc1', type: 'oidc' });
+        expect(apiResponse.body.authentication_provider).to.eql('oidc');
+        expect(apiResponse.body.authentication_type).to.be('token');
       });
     });
 
diff --git a/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts b/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
index 43d9d680e102a..e4e194a619a95 100644
--- a/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
+++ b/x-pack/test/oidc_api_integration/apis/implicit_flow/oidc_auth.ts
@@ -15,8 +15,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
   const config = getService('config');
 
-  // FAILING: https://github.com/elastic/kibana/issues/75707
-  describe.skip('OpenID Connect Implicit Flow authentication', () => {
+  describe('OpenID Connect Implicit Flow authentication', () => {
     describe('finishing handshake', () => {
       let stateAndNonce: ReturnType<typeof getStateAndNonce>;
       let handshakeCookie: Cookie;
@@ -152,9 +151,13 @@ export default function ({ getService }: FtrProviderContext) {
           'authentication_realm',
           'lookup_realm',
           'authentication_provider',
+          'authentication_type',
         ]);
 
         expect(apiResponse.body.username).to.be('user1');
+        expect(apiResponse.body.authentication_realm).to.eql({ name: 'oidc1', type: 'oidc' });
+        expect(apiResponse.body.authentication_provider).to.eql('oidc');
+        expect(apiResponse.body.authentication_type).to.be('token');
       });
     });
   });
diff --git a/x-pack/test/pki_api_integration/apis/security/pki_auth.ts b/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
index a2090a8c2cc48..2f6b088ab7190 100644
--- a/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
+++ b/x-pack/test/pki_api_integration/apis/security/pki_auth.ts
@@ -41,8 +41,7 @@ export default function ({ getService }: FtrProviderContext) {
     expect(cookie.maxAge).to.be(0);
   }
 
-  // FAILING: https://github.com/elastic/kibana/issues/75707
-  describe.skip('PKI authentication', () => {
+  describe('PKI authentication', () => {
     before(async () => {
       await getService('esSupertest')
         .post('/_security/role_mapping/first_client_pki')
@@ -125,6 +124,7 @@ export default function ({ getService }: FtrProviderContext) {
         authentication_realm: { name: 'pki1', type: 'pki' },
         lookup_realm: { name: 'pki1', type: 'pki' },
         authentication_provider: 'pki',
+        authentication_type: 'token',
       });
 
       // Cookie should be accepted.
@@ -169,6 +169,7 @@ export default function ({ getService }: FtrProviderContext) {
           authentication_realm: { name: 'pki1', type: 'pki' },
           lookup_realm: { name: 'pki1', type: 'pki' },
           authentication_provider: 'pki',
+          authentication_type: 'token',
         });
 
       checkCookieIsSet(request.cookie(response.headers['set-cookie'][0])!);
diff --git a/x-pack/test/saml_api_integration/apis/security/saml_login.ts b/x-pack/test/saml_api_integration/apis/security/saml_login.ts
index 13b541f75e5bd..501e1e5f2c203 100644
--- a/x-pack/test/saml_api_integration/apis/security/saml_login.ts
+++ b/x-pack/test/saml_api_integration/apis/security/saml_login.ts
@@ -56,13 +56,16 @@ export default function ({ getService }: FtrProviderContext) {
       'authentication_realm',
       'lookup_realm',
       'authentication_provider',
+      'authentication_type',
     ]);
 
     expect(apiResponse.body.username).to.be(username);
+    expect(apiResponse.body.authentication_realm).to.eql({ name: 'saml1', type: 'saml' });
+    expect(apiResponse.body.authentication_provider).to.eql('saml');
+    expect(apiResponse.body.authentication_type).to.be('token');
   }
 
-  // FAILING: https://github.com/elastic/kibana/issues/75707
-  describe.skip('SAML authentication', () => {
+  describe('SAML authentication', () => {
     it('should reject API requests if client is not authenticated', async () => {
       await supertest.get('/internal/security/me').set('kbn-xsrf', 'xxx').expect(401);
     });
@@ -92,6 +95,7 @@ export default function ({ getService }: FtrProviderContext) {
       expect(user.username).to.eql(username);
       expect(user.authentication_realm).to.eql({ name: 'reserved', type: 'reserved' });
       expect(user.authentication_provider).to.eql('basic');
+      expect(user.authentication_type).to.be('realm');
     });
 
     describe('initiating handshake', () => {

From b2939618f499914a1abd151fa0fcb0eb928cb139 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Thu, 27 Aug 2020 08:15:37 -0600
Subject: [PATCH 094/148] do not advance beneathMbLayerId if bottomMbLayer
 could not be found for a layer (#76007)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../map/mb/sort_layers.test.ts                | 19 +++++++++++++++++++
 .../map/mb/sort_layers.ts                     |  6 ++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.test.ts b/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.test.ts
index 273611e94ee40..e26a1e43509c8 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.test.ts
+++ b/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.test.ts
@@ -200,6 +200,25 @@ describe('sortLayer', () => {
     ]);
   });
 
+  // Hidden map layers on map load may not add mbLayers to mbStyle.
+  test('Should sort with missing mblayers to expected order', () => {
+    // Notice there are no bravo mbLayers in initial style.
+    const initialMbStyle = {
+      version: 0,
+      layers: [
+        { id: `${CHARLIE_LAYER_ID}_fill`, type: 'fill' } as MbLayer,
+        { id: `${ALPHA_LAYER_ID}_circle`, type: 'circle' } as MbLayer,
+      ],
+    };
+    const mbMap = new MockMbMap(initialMbStyle);
+    syncLayerOrder((mbMap as unknown) as MbMap, spatialFilterLayer, mapLayers);
+    const sortedMbStyle = mbMap.getStyle();
+    const sortedMbLayerIds = sortedMbStyle.layers!.map((mbLayer) => {
+      return mbLayer.id;
+    });
+    expect(sortedMbLayerIds).toEqual(['charlie_fill', 'alpha_circle']);
+  });
+
   test('Should not call move layers when layers are in expected order', () => {
     const initialMbStyle = {
       version: 0,
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.ts b/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.ts
index 4752eeba2376a..0c970fe663557 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.ts
+++ b/x-pack/plugins/maps/public/connected_components/map/mb/sort_layers.ts
@@ -128,7 +128,8 @@ export function syncLayerOrder(mbMap: MbMap, spatialFiltersLayer: ILayer, layerL
       if (!isLayerInOrder(mbMap, mapLayer, LAYER_CLASS.LABEL, beneathMbLayerId)) {
         moveMapLayer(mbMap, mbLayers, mapLayer, LAYER_CLASS.LABEL, beneathMbLayerId);
       }
-      beneathMbLayerId = getBottomMbLayerId(mbLayers, mapLayer, LAYER_CLASS.LABEL);
+      const bottomMbLayerId = getBottomMbLayerId(mbLayers, mapLayer, LAYER_CLASS.LABEL);
+      if (bottomMbLayerId) beneathMbLayerId = bottomMbLayerId;
     });
 
   // Sort map layers
@@ -137,6 +138,7 @@ export function syncLayerOrder(mbMap: MbMap, spatialFiltersLayer: ILayer, layerL
     if (!isLayerInOrder(mbMap, mapLayer, layerClass, beneathMbLayerId)) {
       moveMapLayer(mbMap, mbLayers, mapLayer, layerClass, beneathMbLayerId);
     }
-    beneathMbLayerId = getBottomMbLayerId(mbLayers, mapLayer, layerClass);
+    const bottomMbLayerId = getBottomMbLayerId(mbLayers, mapLayer, layerClass);
+    if (bottomMbLayerId) beneathMbLayerId = bottomMbLayerId;
   });
 }

From 8671db155937c39821091af99ae5cc91f0146a95 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Thu, 27 Aug 2020 10:44:59 -0400
Subject: [PATCH 095/148] [Docs] Add `server.xsrf.disableProtection` to
 settings docs (#76022)

---
 docs/api/using-api.asciidoc  | 6 ++----
 docs/apm/api.asciidoc        | 4 ++--
 docs/setup/settings.asciidoc | 5 ++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/docs/api/using-api.asciidoc b/docs/api/using-api.asciidoc
index c61edfb62b079..c796aac3d6b27 100644
--- a/docs/api/using-api.asciidoc
+++ b/docs/api/using-api.asciidoc
@@ -61,10 +61,8 @@ 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, `server.xsrf.whitelist`>> setting
-
-* XSRF protections are disabled using the `server.xsrf.disableProtection` setting
+* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
+* XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
 
 `Content-Type: application/json`::
   Applicable only when you send a payload in the API request. {kib} API requests and responses use JSON. 
diff --git a/docs/apm/api.asciidoc b/docs/apm/api.asciidoc
index 97fdcd3e13de9..01ba084b9e9e7 100644
--- a/docs/apm/api.asciidoc
+++ b/docs/apm/api.asciidoc
@@ -40,8 +40,8 @@ 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, `server.xsrf.whitelist`>> setting
-* XSRF protections are disabled using the `server.xsrf.disableProtection` setting
+* The path is whitelisted using the <<settings-xsrf-whitelist, `server.xsrf.whitelist`>> setting
+* XSRF protections are disabled using the <<settings-xsrf-disableProtection, `server.xsrf.disableProtection`>> setting
 
 `Content-Type: application/json`::
   Applicable only when you send a payload in the API request.
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index 018cc656362b8..e1fb1802b2a21 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -577,7 +577,7 @@ all http requests to https over the port configured as `server.port`.
  | An array of supported protocols with versions.
 Valid protocols: `TLSv1`, `TLSv1.1`, `TLSv1.2`. *Default: TLSv1.1, TLSv1.2*
 
-| `server.xsrf.whitelist:`
+| [[settings-xsrf-whitelist]] `server.xsrf.whitelist:`
  | It is not recommended to disable protections for
 arbitrary API endpoints. Instead, supply the `kbn-xsrf` header.
 The `server.xsrf.whitelist` setting requires the following format:
@@ -592,6 +592,9 @@ The `server.xsrf.whitelist` setting requires the following format:
 [cols="2*<"]
 |===
 
+| [[settings-xsrf-disableProtection]] `status.xsrf.disableProtection:`
+ | Setting this to `true` will completely disable Cross-site request forgery protection in Kibana. This is not recommended. *Default: `false`*
+
 | `status.allowAnonymous:`
  | If authentication is enabled,
 setting this to `true` enables unauthenticated users to access the {kib}

From b98e2e4f3ddf70f5a55b7a5aa66c4177486b680d Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Date: Thu, 27 Aug 2020 10:06:55 -0500
Subject: [PATCH 096/148] [Metrics UI] Replace uses of `any` introduced by
 Lodash 4 (#75507)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Felix Stürmer <weltenwort@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../inventory/components/expression.tsx       |  4 ++--
 .../components/expression.test.tsx            |  1 +
 .../components/expression.tsx                 |  2 +-
 .../components/expression_chart.tsx           | 22 ++++++++++---------
 .../lib/transform_metrics_explorer_data.ts    |  6 ++---
 .../public/alerting/metric_threshold/types.ts |  2 +-
 .../components/waffle/legend_controls.tsx     |  4 ++--
 .../inventory_view/lib/color_from_value.ts    | 15 ++++++-------
 .../inventory_view/lib/nodes_to_wafflemap.ts  |  5 +++--
 .../metrics_explorer/components/chart.tsx     | 17 ++++++--------
 .../evaluate_condition.ts                     |  6 ++---
 .../inventory_metric_threshold_executor.ts    |  4 +++-
 ...review_inventory_metric_threshold_alert.ts |  4 +++-
 .../metric_threshold_executor.ts              | 20 ++++++++++-------
 .../preview_metric_threshold_alert.ts         | 15 ++++++++-----
 .../server/lib/snapshot/response_helpers.ts   |  3 ++-
 .../infra/server/lib/snapshot/snapshot.ts     |  7 ++++--
 .../infra/server/routes/ip_to_hostname.ts     |  2 +-
 .../server/utils/create_afterkey_handler.ts   |  7 ++++--
 19 files changed, 82 insertions(+), 64 deletions(-)

diff --git a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
index 78cabcf354437..5ac2f407839e4 100644
--- a/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/inventory/components/expression.tsx
@@ -85,7 +85,7 @@ interface Props {
     nodeType: InventoryItemType;
     filterQuery?: string;
     filterQueryText?: string;
-    sourceId?: string;
+    sourceId: string;
     alertOnNoData?: boolean;
   };
   alertInterval: string;
@@ -379,7 +379,7 @@ export const Expressions: React.FC<Props> = (props) => {
       <AlertPreview
         alertInterval={alertInterval}
         alertType={METRIC_INVENTORY_THRESHOLD_ALERT_TYPE_ID}
-        alertParams={pick(alertParams as any, 'criteria', 'nodeType', 'sourceId', 'filterQuery')}
+        alertParams={pick(alertParams, 'criteria', 'nodeType', 'sourceId', 'filterQuery')}
         validate={validateMetricThreshold}
         fetch={alertsContext.http.fetch}
         groupByDisplayName={alertParams.nodeType}
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx
index f6119107ac133..af51db6571753 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.test.tsx
@@ -34,6 +34,7 @@ describe('Expression', () => {
       criteria: [],
       groupBy: undefined,
       filterQueryText: '',
+      sourceId: 'default',
     };
 
     const mocks = coreMock.createSetup();
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
index 8031f7a03731a..6b102045fa516 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression.tsx
@@ -400,7 +400,7 @@ export const Expressions: React.FC<Props> = (props) => {
       <AlertPreview
         alertInterval={alertInterval}
         alertType={METRIC_THRESHOLD_ALERT_TYPE_ID}
-        alertParams={pick(alertParams as any, 'criteria', 'groupBy', 'filterQuery', 'sourceId')}
+        alertParams={pick(alertParams, 'criteria', 'groupBy', 'filterQuery', 'sourceId')}
         showNoDataResults={alertParams.alertOnNoData}
         validate={validateMetricThreshold}
         fetch={alertsContext.http.fetch}
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx
index 94ad074b72e9c..065314d31b008 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/components/expression_chart.tsx
@@ -84,14 +84,16 @@ export const ExpressionChart: React.FC<Props> = ({
   };
   const isDarkMode = context.uiSettings?.get('theme:darkMode') || false;
   const dateFormatter = useMemo(() => {
-    const firstSeries = data ? first(data.series) : null;
-    return firstSeries && firstSeries.rows.length > 0
-      ? niceTimeFormatter([
-          (first(firstSeries.rows) as any).timestamp,
-          (last(firstSeries.rows) as any).timestamp,
-        ])
-      : (value: number) => `${value}`;
-  }, [data]);
+    const firstSeries = first(data?.series);
+    const firstTimestamp = first(firstSeries?.rows)?.timestamp;
+    const lastTimestamp = last(firstSeries?.rows)?.timestamp;
+
+    if (firstTimestamp == null || lastTimestamp == null) {
+      return (value: number) => `${value}`;
+    }
+
+    return niceTimeFormatter([firstTimestamp, lastTimestamp]);
+  }, [data?.series]);
 
   /* eslint-disable-next-line react-hooks/exhaustive-deps */
   const yAxisFormater = useCallback(createFormatterForMetric(metric), [expression]);
@@ -138,8 +140,8 @@ export const ExpressionChart: React.FC<Props> = ({
     }),
   };
 
-  const firstTimestamp = (first(firstSeries.rows) as any).timestamp;
-  const lastTimestamp = (last(firstSeries.rows) as any).timestamp;
+  const firstTimestamp = first(firstSeries.rows)!.timestamp;
+  const lastTimestamp = last(firstSeries.rows)!.timestamp;
   const dataDomain = calculateDomain(series, [metric], false);
   const domain = {
     max: Math.max(dataDomain.max, last(thresholds) || dataDomain.max) * 1.1, // add 10% headroom.
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/lib/transform_metrics_explorer_data.ts b/x-pack/plugins/infra/public/alerting/metric_threshold/lib/transform_metrics_explorer_data.ts
index f46a7f3e5a5e4..d65a33d68a1fd 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/lib/transform_metrics_explorer_data.ts
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/lib/transform_metrics_explorer_data.ts
@@ -13,9 +13,9 @@ export const transformMetricsExplorerData = (
   data: MetricsExplorerResponse | null
 ) => {
   const { criteria } = params;
-  if (criteria && data) {
-    const firstSeries = first(data.series) as any;
-    const series = firstSeries.rows.reduce((acc: any, row: any) => {
+  const firstSeries = first(data?.series);
+  if (criteria && firstSeries) {
+    const series = firstSeries.rows.reduce((acc, row) => {
       const { timestamp } = row;
       criteria.forEach((item, index) => {
         if (!acc[index]) {
diff --git a/x-pack/plugins/infra/public/alerting/metric_threshold/types.ts b/x-pack/plugins/infra/public/alerting/metric_threshold/types.ts
index b2317c558be44..b898f58e69565 100644
--- a/x-pack/plugins/infra/public/alerting/metric_threshold/types.ts
+++ b/x-pack/plugins/infra/public/alerting/metric_threshold/types.ts
@@ -55,7 +55,7 @@ export interface AlertParams {
   criteria: MetricExpression[];
   groupBy?: string[];
   filterQuery?: string;
-  sourceId?: string;
+  sourceId: string;
   filterQueryText?: string;
   alertOnNoData?: boolean;
 }
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend_controls.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend_controls.tsx
index 3997a7eab44e8..ba56d8b82feeb 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend_controls.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/waffle/legend_controls.tsx
@@ -266,7 +266,7 @@ export const LegendControls = ({
             fullWidth
             label={
               <SwatchLabel
-                color={first(paletteColors) as any}
+                color={first(paletteColors)!}
                 label={i18n.translate('xpack.infra.legendControls.minLabel', {
                   defaultMessage: 'Minimum',
                 })}
@@ -294,7 +294,7 @@ export const LegendControls = ({
             display="columnCompressed"
             label={
               <SwatchLabel
-                color={last(paletteColors) as any}
+                color={last(paletteColors)!}
                 label={i18n.translate('xpack.infra.legendControls.maxLabel', {
                   defaultMessage: 'Maxium',
                 })}
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/color_from_value.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/color_from_value.ts
index 70416c0d20ffc..c0adc60a18a76 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/color_from_value.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/color_from_value.ts
@@ -68,8 +68,9 @@ export const calculateSteppedGradientColor = (
 
   // Since the stepped legend matches a range we need to ensure anything outside
   // the max bounds get's the maximum color.
-  if (gte(normalizedValue, (last(rules) as any).value)) {
-    return (last(rules) as any).color;
+  const lastRule = last(rules);
+  if (lastRule && gte(normalizedValue, lastRule.value)) {
+    return lastRule.color;
   }
 
   return rules.reduce((color: string, rule) => {
@@ -79,7 +80,7 @@ export const calculateSteppedGradientColor = (
       return rule.color;
     }
     return color;
-  }, (first(rules) as any).color || defaultColor);
+  }, first(rules)?.color ?? defaultColor);
 };
 
 export const calculateStepColor = (
@@ -106,7 +107,7 @@ export const calculateGradientColor = (
     return defaultColor;
   }
   if (rules.length === 1) {
-    return (last(rules) as any).color;
+    return last(rules)!.color;
   }
   const { min, max } = bounds;
   const sortedRules = sortBy(rules, 'value');
@@ -116,10 +117,8 @@ export const calculateGradientColor = (
       return rule;
     }
     return acc;
-  }, first(sortedRules)) as any;
-  const endRule = sortedRules
-    .filter((r) => r !== startRule)
-    .find((r) => r.value >= normValue) as any;
+  }, first(sortedRules))!;
+  const endRule = sortedRules.filter((r) => r !== startRule).find((r) => r.value >= normValue);
   if (!endRule) {
     return startRule.color;
   }
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/nodes_to_wafflemap.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/nodes_to_wafflemap.ts
index b56b409717cc6..95da994c24616 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/nodes_to_wafflemap.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/lib/nodes_to_wafflemap.ts
@@ -29,8 +29,9 @@ function findOrCreateGroupWithNodes(
    * look for the full id. Otherwise we need to find the parent group and
    * then look for the group in it's sub groups.
    */
-  if (path.length === 2) {
-    const parentId = (first(path) as any).value;
+  const firstPath = first(path);
+  if (path.length === 2 && firstPath) {
+    const parentId = firstPath.value;
     const existingParentGroup = groups.find((g) => g.id === parentId);
     if (isWaffleMapGroupWithGroups(existingParentGroup)) {
       const existingSubGroup = existingParentGroup.groups.find((g) => g.id === id);
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
index 3802366fe2ac5..41d8014b4a5c1 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/chart.tsx
@@ -74,16 +74,13 @@ export const MetricsExplorerChart = ({
     const [from, to] = x;
     onTimeChange(moment(from).toISOString(), moment(to).toISOString());
   };
-  const dateFormatter = useMemo(
-    () =>
-      series.rows.length > 0
-        ? niceTimeFormatter([
-            (first(series.rows) as any).timestamp,
-            (last(series.rows) as any).timestamp,
-          ])
-        : (value: number) => `${value}`,
-    [series.rows]
-  );
+  const dateFormatter = useMemo(() => {
+    const firstRow = first(series.rows);
+    const lastRow = last(series.rows);
+    return firstRow && lastRow
+      ? niceTimeFormatter([firstRow.timestamp, lastRow.timestamp])
+      : (value: number) => `${value}`;
+  }, [series.rows]);
   const tooltipProps = {
     headerFormatter: useCallback(
       (data: TooltipValue) => moment(data.value).format(dateFormat || 'Y-MM-DD HH:mm:ss.SSS'),
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts
index 9be6a4b52157c..2f3593a11f664 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/evaluate_condition.ts
@@ -122,14 +122,14 @@ const getData = async (
     if (!nodes.length) return { [UNGROUPED_FACTORY_KEY]: null }; // No Data state
 
     return nodes.reduce((acc, n) => {
-      const nodePathItem = last(n.path) as any;
+      const { name: nodeName } = n;
       const m = first(n.metrics);
       if (m && m.value && m.timeseries) {
         const { timeseries } = m;
         const values = timeseries.rows.map((row) => row.metric_0) as Array<number | null>;
-        acc[nodePathItem.label] = values;
+        acc[nodeName] = values;
       } else {
-        acc[nodePathItem.label] = m && m.value;
+        acc[nodeName] = m && m.value;
       }
       return acc;
     }, {} as Record<string, number | Array<number | string | null | undefined> | undefined | null>);
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
index db1ff26ee1810..bdac9dcd1dee8 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.ts
@@ -42,6 +42,8 @@ export const createInventoryMetricThresholdExecutor = (libs: InfraBackendLibs) =
     alertOnNoData,
   } = params as InventoryMetricThresholdParams;
 
+  if (criteria.length === 0) throw new Error('Cannot execute an alert with 0 conditions');
+
   const source = await libs.sources.getSourceConfiguration(
     services.savedObjectsClient,
     sourceId || 'default'
@@ -53,7 +55,7 @@ export const createInventoryMetricThresholdExecutor = (libs: InfraBackendLibs) =
     )
   );
 
-  const inventoryItems = Object.keys(first(results) as any);
+  const inventoryItems = Object.keys(first(results)!);
   for (const item of inventoryItems) {
     const alertInstance = services.alertInstanceFactory(`${item}`);
     // AND logic; all criteria must be across the threshold
diff --git a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts
index 562f344dbd060..755c395818f5a 100644
--- a/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/preview_inventory_metric_threshold_alert.ts
@@ -40,6 +40,8 @@ export const previewInventoryMetricThresholdAlert = async ({
 }: PreviewInventoryMetricThresholdAlertParams) => {
   const { criteria, filterQuery, nodeType } = params as InventoryMetricThresholdParams;
 
+  if (criteria.length === 0) throw new Error('Cannot execute an alert with 0 conditions');
+
   const { timeSize, timeUnit } = criteria[0];
   const bucketInterval = `${timeSize}${timeUnit}`;
   const bucketIntervalInSeconds = getIntervalInSeconds(bucketInterval);
@@ -57,7 +59,7 @@ export const previewInventoryMetricThresholdAlert = async ({
       )
     );
 
-    const inventoryItems = Object.keys(first(results) as any);
+    const inventoryItems = Object.keys(first(results)!);
     const previewResults = inventoryItems.map((item) => {
       const numberOfResultBuckets = lookbackSize;
       const numberOfExecutionBuckets = Math.floor(numberOfResultBuckets / alertResultsPerExecution);
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
index 9265e8089e915..c85685b4cdca8 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.ts
@@ -22,6 +22,8 @@ export const createMetricThresholdExecutor = (libs: InfraBackendLibs) =>
   async function (options: AlertExecutorOptions) {
     const { services, params } = options;
     const { criteria } = params;
+    if (criteria.length === 0) throw new Error('Cannot execute an alert with 0 conditions');
+
     const { sourceId, alertOnNoData } = params as {
       sourceId?: string;
       alertOnNoData: boolean;
@@ -34,8 +36,8 @@ export const createMetricThresholdExecutor = (libs: InfraBackendLibs) =>
     const config = source.configuration;
     const alertResults = await evaluateAlert(services.callCluster, params, config);
 
-    // Because each alert result has the same group definitions, just grap the groups from the first one.
-    const groups = Object.keys(first(alertResults) as any);
+    // Because each alert result has the same group definitions, just grab the groups from the first one.
+    const groups = Object.keys(first(alertResults)!);
     for (const group of groups) {
       const alertInstance = services.alertInstanceFactory(`${group}`);
 
@@ -60,7 +62,7 @@ export const createMetricThresholdExecutor = (libs: InfraBackendLibs) =>
       let reason;
       if (nextState === AlertStates.ALERT) {
         reason = alertResults
-          .map((result) => buildFiredAlertReason(formatAlertResult(result[group]) as any))
+          .map((result) => buildFiredAlertReason(formatAlertResult(result[group])))
           .join('\n');
       }
       if (alertOnNoData) {
@@ -121,11 +123,13 @@ const mapToConditionsLookup = (
       {}
     );
 
-const formatAlertResult = (alertResult: {
-  metric: string;
-  currentValue: number;
-  threshold: number[];
-}) => {
+const formatAlertResult = <AlertResult>(
+  alertResult: {
+    metric: string;
+    currentValue: number;
+    threshold: number[];
+  } & AlertResult
+) => {
   const { metric, currentValue, threshold } = alertResult;
   if (!metric.endsWith('.pct')) return alertResult;
   const formatter = createFormatter('percent');
diff --git a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts
index 5aca7f0890940..0f2afda663da8 100644
--- a/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/metric_threshold/preview_metric_threshold_alert.ts
@@ -49,6 +49,8 @@ export const previewMetricThresholdAlert: (
   iterations = 0,
   precalculatedNumberOfGroups
 ) => {
+  if (params.criteria.length === 0) throw new Error('Cannot execute an alert with 0 conditions');
+
   // There are three different "intervals" we're dealing with here, so to disambiguate:
   // - The lookback interval, which is how long of a period of time we want to examine to count
   //   how many times the alert fired
@@ -70,7 +72,7 @@ export const previewMetricThresholdAlert: (
   // Get a date histogram using the bucket interval and the lookback interval
   try {
     const alertResults = await evaluateAlert(callCluster, params, config, timeframe);
-    const groups = Object.keys(first(alertResults) as any);
+    const groups = Object.keys(first(alertResults)!);
 
     // Now determine how to interpolate this histogram based on the alert interval
     const alertIntervalInSeconds = getIntervalInSeconds(alertInterval);
@@ -81,7 +83,7 @@ export const previewMetricThresholdAlert: (
         // buckets would have fired the alert. If the alert interval and bucket interval are the same,
         // this will be a 1:1 evaluation of the alert results. If these are different, the interpolation
         // will skip some buckets or read some buckets more than once, depending on the differential
-        const numberOfResultBuckets = (first(alertResults) as any)[group].shouldFire.length;
+        const numberOfResultBuckets = first(alertResults)![group].shouldFire.length;
         const numberOfExecutionBuckets = Math.floor(
           numberOfResultBuckets / alertResultsPerExecution
         );
@@ -120,8 +122,7 @@ export const previewMetricThresholdAlert: (
         ? await evaluateAlert(callCluster, params, config)
         : [];
       const numberOfGroups =
-        precalculatedNumberOfGroups ??
-        Math.max(Object.keys(first(currentAlertResults) as any).length, 1);
+        precalculatedNumberOfGroups ?? Math.max(Object.keys(first(currentAlertResults)!).length, 1);
       const estimatedTotalBuckets =
         (lookbackIntervalInSeconds / bucketIntervalInSeconds) * numberOfGroups;
       // The minimum number of slices is 2. In case we underestimate the total number of buckets
@@ -152,14 +153,16 @@ export const previewMetricThresholdAlert: (
           // `undefined` values occur if there is no data at all in a certain slice, and that slice
           // returns an empty array. This is different from an error or no data state,
           // so filter these results out entirely and only regard the resultA portion
-          .filter((value) => typeof value !== 'undefined')
+          .filter(
+            <Value>(value: Value): value is NonNullable<Value> => typeof value !== 'undefined'
+          )
           .reduce((a, b) => {
             if (!a) return b;
             if (!b) return a;
             return [a[0] + b[0], a[1] + b[1], a[2] + b[2]];
           })
       );
-      return zippedResult as any;
+      return zippedResult;
     } else throw e;
   }
 };
diff --git a/x-pack/plugins/infra/server/lib/snapshot/response_helpers.ts b/x-pack/plugins/infra/server/lib/snapshot/response_helpers.ts
index 646ce9f2409af..2652e362b7eff 100644
--- a/x-pack/plugins/infra/server/lib/snapshot/response_helpers.ts
+++ b/x-pack/plugins/infra/server/lib/snapshot/response_helpers.ts
@@ -127,7 +127,8 @@ export const getNodeMetrics = (
       avg: null,
     }));
   }
-  const lastBucket = findLastFullBucket(nodeBuckets, options) as any;
+  const lastBucket = findLastFullBucket(nodeBuckets, options);
+  if (!lastBucket) return [];
   return options.metrics.map((metric, index) => {
     const metricResult: SnapshotNodeMetric = {
       name: metric.type,
diff --git a/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts b/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts
index 5f359b0523d9f..33d8e738a717e 100644
--- a/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts
+++ b/x-pack/plugins/infra/server/lib/snapshot/snapshot.ts
@@ -27,6 +27,8 @@ import { InfraSnapshotRequestOptions } from './types';
 import { createTimeRangeWithInterval } from './create_timerange_with_interval';
 import { SnapshotNode } from '../../../common/http_api/snapshot_api';
 
+type NamedSnapshotNode = SnapshotNode & { name: string };
+
 export type ESSearchClient = <Hit = {}, Aggregation = undefined>(
   options: CallWithRequestParams
 ) => Promise<InfraDatabaseSearchResponse<Hit, Aggregation>>;
@@ -34,7 +36,7 @@ export class InfraSnapshot {
   public async getNodes(
     client: ESSearchClient,
     options: InfraSnapshotRequestOptions
-  ): Promise<{ nodes: SnapshotNode[]; interval: string }> {
+  ): Promise<{ nodes: NamedSnapshotNode[]; interval: string }> {
     // Both requestGroupedNodes and requestNodeMetrics may send several requests to elasticsearch
     // in order to page through the results of their respective composite aggregations.
     // Both chains of requests are supposed to run in parallel, and their results be merged
@@ -184,11 +186,12 @@ const mergeNodeBuckets = (
   nodeGroupByBuckets: InfraSnapshotNodeGroupByBucket[],
   nodeMetricsBuckets: InfraSnapshotNodeMetricsBucket[],
   options: InfraSnapshotRequestOptions
-): SnapshotNode[] => {
+): NamedSnapshotNode[] => {
   const nodeMetricsForLookup = getNodeMetricsForLookup(nodeMetricsBuckets);
 
   return nodeGroupByBuckets.map((node) => {
     return {
+      name: node.key.name || node.key.id, // For type safety; name can be derived from getNodePath but not in a TS-friendly way
       path: getNodePath(node, options),
       metrics: getNodeMetrics(nodeMetricsForLookup[node.key.id], options),
     };
diff --git a/x-pack/plugins/infra/server/routes/ip_to_hostname.ts b/x-pack/plugins/infra/server/routes/ip_to_hostname.ts
index 08ad266a22f9b..e699de5819331 100644
--- a/x-pack/plugins/infra/server/routes/ip_to_hostname.ts
+++ b/x-pack/plugins/infra/server/routes/ip_to_hostname.ts
@@ -48,7 +48,7 @@ export const initIpToHostName = ({ framework }: InfraBackendLibs) => {
             body: { message: 'Host with matching IP address not found.' },
           });
         }
-        const hostDoc = first(hits.hits) as any;
+        const hostDoc = first(hits.hits)!;
         return response.ok({ body: { host: hostDoc._source.host.name } });
       } catch ({ statusCode = 500, message = 'Unknown error occurred' }) {
         return response.customError({
diff --git a/x-pack/plugins/infra/server/utils/create_afterkey_handler.ts b/x-pack/plugins/infra/server/utils/create_afterkey_handler.ts
index cdfb9d7cc99f3..d6378c2dea272 100644
--- a/x-pack/plugins/infra/server/utils/create_afterkey_handler.ts
+++ b/x-pack/plugins/infra/server/utils/create_afterkey_handler.ts
@@ -10,11 +10,14 @@ import { InfraDatabaseSearchResponse } from '../lib/adapters/framework';
 export const createAfterKeyHandler = (
   optionsAfterKeyPath: string | string[],
   afterKeySelector: (input: InfraDatabaseSearchResponse<any, any>) => any
-) => <Options>(options: Options, response: InfraDatabaseSearchResponse<any, any>): Options => {
+) => <Options extends object>(
+  options: Options,
+  response: InfraDatabaseSearchResponse<any, any>
+): Options => {
   if (!response.aggregations) {
     return options;
   }
-  const newOptions = { ...options } as any;
+  const newOptions = { ...options };
   const afterKey = afterKeySelector(response);
   set(newOptions, optionsAfterKeyPath, afterKey);
   return newOptions;

From bf25e16a8bb19351c93f5c47a4c927ee15f99f2b Mon Sep 17 00:00:00 2001
From: Brandon Kobel <brandon.kobel@elastic.co>
Date: Thu, 27 Aug 2020 08:23:07 -0700
Subject: [PATCH 097/148] Skip creating SpacesClient when not needed in auth
 interceptor (#75706)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../lib/request_interceptors/on_post_auth_interceptor.ts      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts
index 772914bb53211..3d6084d37a384 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.ts
@@ -38,13 +38,12 @@ export function initSpacesOnPostAuthRequestInterceptor({
     const isRequestingSpaceRoot = path === '/' && spaceId !== DEFAULT_SPACE_ID;
     const isRequestingApplication = path.startsWith('/app');
 
-    const spacesClient = await spacesService.scopedClient(request);
-
     // if requesting the application root, then show the Space Selector UI to allow the user to choose which space
     // they wish to visit. This is done "onPostAuth" to allow the Saved Objects Client to use the request's auth credentials,
     // which is not available at the time of "onRequest".
     if (isRequestingKibanaRoot) {
       try {
+        const spacesClient = await spacesService.scopedClient(request);
         const spaces = await spacesClient.getAll();
 
         if (spaces.length === 1) {
@@ -77,6 +76,7 @@ export function initSpacesOnPostAuthRequestInterceptor({
       try {
         log.debug(`Verifying access to space "${spaceId}"`);
 
+        const spacesClient = await spacesService.scopedClient(request);
         space = await spacesClient.get(spaceId);
       } catch (error) {
         const wrappedError = wrapError(error);

From 69a8d061299c10075d34d26bb0359a77778a8f70 Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Thu, 27 Aug 2020 08:40:56 -0700
Subject: [PATCH 098/148] [Reporting/Download CSV] Get the file name from
 savedSearch data (#76031)

* [Reporting/Download CSV] provide title even if panel \titles are hidden in the dashboard

* add functional test

* Update embeddable_panel.tsx

* Update download_csv.ts
---
 .../public/lib/panel/embeddable_panel.tsx     |   1 +
 .../panel_actions/get_csv_panel_action.tsx    |   2 +-
 .../apps/dashboard/reporting/download_csv.ts  |  46 +++++++++++++-----
 .../reporting/ecommerce_kibana/data.json.gz   | Bin 4138 -> 4219 bytes
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
index d8659680dceb9..ca5cb5ca4f0d5 100644
--- a/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
+++ b/src/plugins/embeddable/public/lib/panel/embeddable_panel.tsx
@@ -211,6 +211,7 @@ export class EmbeddablePanel extends React.Component<Props, State> {
       <EuiPanel
         className={classes}
         data-test-subj="embeddablePanel"
+        data-test-embeddable-id={this.props.embeddable.id}
         paddingSize="none"
         role="figure"
         aria-labelledby={headerId}
diff --git a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
index 30025dce18c0b..7782576bb5a00 100644
--- a/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
+++ b/x-pack/plugins/reporting/public/panel_actions/get_csv_panel_action.tsx
@@ -105,7 +105,7 @@ export class GetCsvReportPanelAction implements ActionDefinition<ActionContext>
     const kibanaTimezone = this.core.uiSettings.get('dateFormat:tz');
 
     const id = `search:${embeddable.getSavedSearch().id}`;
-    const filename = embeddable.getTitle();
+    const filename = embeddable.getSavedSearch().title;
     const timezone = kibanaTimezone === 'Browser' ? moment.tz.guess() : kibanaTimezone;
     const fromTime = dateMath.parse(from);
     const toTime = dateMath.parse(to);
diff --git a/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts b/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts
index b39613b3dbd1b..5c41945cb88d8 100644
--- a/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts
+++ b/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts
@@ -14,15 +14,27 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const csvPath = path.resolve(REPO_ROOT, 'target/functional-tests/downloads/Ecommerce Data.csv');
 
+// checks every 100ms for the file to exist in the download dir
+// just wait up to 5 seconds
+const getDownload$ = (filePath: string) => {
+  return Rx.interval(100).pipe(
+    map(() => fs.existsSync(filePath)),
+    filter((value) => value === true),
+    first(),
+    timeout(5000)
+  );
+};
+
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const browser = getService('browser');
   const dashboardPanelActions = getService('dashboardPanelActions');
   const log = getService('log');
   const testSubjects = getService('testSubjects');
+  const find = getService('find');
   const PageObjects = getPageObjects(['reporting', 'common', 'dashboard']);
 
-  describe('Reporting Download CSV', () => {
+  describe('Download CSV', () => {
     before('initialize tests', async () => {
       log.debug('ReportingPage:initTests');
       await esArchiver.loadIfNeeded('reporting/ecommerce');
@@ -33,10 +45,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     after('clean up archives and previous file download', async () => {
       await esArchiver.unload('reporting/ecommerce');
       await esArchiver.unload('reporting/ecommerce_kibana');
+    });
+
+    afterEach('remove download', () => {
       try {
         fs.unlinkSync(csvPath);
       } catch (e) {
-        // nothing to worry
+        // it might not have been there to begin with
       }
     });
 
@@ -50,19 +65,26 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await testSubjects.click('embeddablePanelAction-downloadCsvReport');
       await testSubjects.existOrFail('csvDownloadStarted'); // validate toast panel
 
-      // check every 100ms for the file to exist in the download dir
-      // just wait up to 5 seconds
-      const success$ = Rx.interval(100).pipe(
-        map(() => fs.existsSync(csvPath)),
-        filter((value) => value === true),
-        first(),
-        timeout(5000)
-      );
-
-      const fileExists = await success$.toPromise();
+      const fileExists = await getDownload$(csvPath).toPromise();
       expect(fileExists).to.be(true);
 
       // no need to validate download contents, API Integration tests do that some different variations
     });
+
+    it('Gets the correct filename if panel titles are hidden', async () => {
+      await PageObjects.common.navigateToApp('dashboard');
+      await PageObjects.dashboard.loadSavedDashboard('Ecom Dashboard Hidden Panel Titles');
+      const savedSearchPanel = await find.byCssSelector(
+        '[data-test-embeddable-id="94eab06f-60ac-4a85-b771-3a8ed475c9bb"]'
+      ); // panel title is hidden
+      await dashboardPanelActions.toggleContextMenu(savedSearchPanel);
+
+      await testSubjects.existOrFail('embeddablePanelAction-downloadCsvReport');
+      await testSubjects.click('embeddablePanelAction-downloadCsvReport');
+      await testSubjects.existOrFail('csvDownloadStarted');
+
+      const fileExists = await getDownload$(csvPath).toPromise(); // file exists with proper name
+      expect(fileExists).to.be(true);
+    });
   });
 }
diff --git a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana/data.json.gz b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana/data.json.gz
index 454d260a518cd39001004d026afd8dc00c5e01d6..d4dd21528a882aa45d262280bb0323f2b9b46bf3 100644
GIT binary patch
delta 4208
zcmV-$5RdPwAp0PHABzYGp4~=Y0s~}WbYU)Pb8l_{?OjWc<Hoh#`&SUk=3YP)iWDEB
zcJ|m4JDBcF+<nJ@rzb*@EJ>B7NSQ45BSr)9&B6%c3tTUPAP9_jVi<$mWDqCusv8$s
zwBhymC-gSRkI1Pik|HH)TI#nZ0;apAQ?Kv5>YPIsIUl}%rYH?|I3|s*((og%(d2|Z
z9HgA`A$)<a)aR{U6!z($YqwAfiEg|l^vMBlZ0%APhd8GvQ5t)b8I*i<i2^h?rGdYh
zj)3YQWNVJ2n}%&5$I+UTUOr~zeiV-|>$0Enwf<}SUZdPj`Zx{PJ2@0nbK3omja0v5
zX{x3XN5yS_O;b@Hn?}bo`;OUeWW$g0c^Wb4lbD1aNnno08TCogoQo)9qoAi_4$tpl
z##?oyIVy5g&Dusz7g=3XYXR+jx!lof{O9Pk*FIcY=$*CDUoLb_hefybc30QCn%=UU
z&LxD-NI*t}#fRPE)AF)EkGEpxigwb3#Bbwdi;!@CGh$Rs$>NmEh%V=38sYik(NW83
z>z5FZkbyeJjFC9(E~NRTrB_*_Dxy9mfzO57c>Li`Bg7-J)9CIrdeq-(G<O6Kf{?J7
zh66z($u>|EAV1DJJ^`v1r6B_vg3pN;(=iAQzV>mD5KbaE_J-IE_;g$cK*NJUOa_=$
zsWHKS{{1)_y%~9rxWJNpmZN4BA!lk)kh1Ts;7q(ICRLnaI&w)YXv@IKiBouT^1^_G
zeN+*ZiB-|%4Nq<dtVFnwl4XzE(6I+Q#2|_f7X!-30juKFE{t<Yappi<yX0^`iWl_p
zqVu)OHfu^!cUyu2@FR$fRDK*|hyiR$<VQz;Q#__Ij}(WO;7z+O-lmZzEE<ux=hB!B
zdpyomK^K$?WJ$ddUChDTr*Xo1l72CZM>l5ivzT82<F8Z1tRLi^(jZthW#y1xC0$L_
zFjrLr0*Oj|7nz*{nEETU%?5bocC7;PE93|zHOzH{@h}R>-S-0@ANHbtZ=aCel>*y;
zqjL+A3S1gOmc<)x!EMP1)8Ot)bwDCIZh4d)F0r-T0l-nnXb8T!VyI!!_^?NlsOLrg
z%HR$ns8?tdR`EhxZyZq$XBu*;>DEBQaDcob_A$a?+Q%MC<3;nQTMX}Iu&W=~tD>I{
z>3|mE`NeD78;Uj(<|?GK<2dqDk0q^th0)%krI*33zNJ@1KW*tntBVuT8^_cmi)C3u
z9Q1qrAi}q^+gEX?A!Vxw{<7C#Z{8(dor|$GN|@^$9xTQ0r%fkAcPt(hczv3PrF(cJ
z5v-C^6yV1s_CQ;Buwq`lQfXZ+>Q~6SU!Leqy3ueI1IS8379VC3!FjlYh}+zMT|m4N
zS7B>Wze4_8RmNO@{vgF6qwMe!mke*(%#z*o?q9Mf&@z0mlGz2|?x(>j?)88?AW5={
z&_#W=ib?6^eDa3U{>-FV#PBK^c5crrhg;xXod6^8f(w3-@+&;jC079U!iVT?GamBO
zx_1)glk!<@Mn~j6KQy}uxcRw%*~ta&YBv^$X5vMo5wE^y4{VR<AQrcU9+5bKKh=}D
z(}#8&cFSs^3m^NgPPf?cW}~aMTkXzej@(P}cP->-AYP<up5^m%%~-`6LTbnCIIipX
zwr9D^pKE@(0OitBa>l}vQ%X}5Tr6=cI~x~f)*)Hg!h6L3q5Bi!u?@n1a7#kl5)A!d
z>xY{y$#Z3fdc_qzj%GAn@LQ6B7X|4ktn$an*>$?=iuuXOX=-uSr`nL;GO1E4rwr-_
zOnC~>YpxAeJ3#6%Vf;zu!3pW{QumFr0}d(UY@-sXRu>g{6;hn2hR+MT)Q}E_0sOGn
zgJ7~{>`A+u5Fjq_tDn4o;>thnG{goL;Bb(N>u*5Wm2F2r@6&+seXskNZ)QT-?~?vz
zz9}waKQLj*K1z%yQOu@Hp!|8hYBCWwN~9;XiYT_bxAN^yc@y^6vO@L>AJyhQf03E+
zqPvscX_*GP#O~zdWavgX_Pds+TWx}_c!MhDuX^RpnQh4)>kP1eSvAusdz@oUkpP}l
zoWmy%aY%w~ZU#vy`a(?K!0~{FMKCQhJLY4GiTDF36NlPqh{v=9#z9PdZcdVsgDlt|
zW`FnLuWrDHA+Hlm?nPp}=4ra8_jR>{JY6+>(^Fkr*HzPWbwe`|vWO;m7C7FKF0}AK
zo|HhU=leX1xF;Tes^a*H`O01_2tCACTY^c!)cIT*uHz6*we60n8ivsa!}UzHZ#sI%
zX}cPBtT|jRGH`h=wI#XCRVjGlTpFF6%TB?iV-V~jtFKxJd#Zr}v1{9!+QuE?8@B0z
zlh$&%*udqv)Gx?oyFJb2gh^BPG{?1E)z&myHFN-sZG)(Po{4NwO}pRsP%V>-4P2hd
z_63<Vw2Vnj%T<XAF0n>B9mfZs>L8*TPTN+oX<MpeJN>rdYaP?6SLI>@m*>)0l1sr<
zg-vsoOMr)5)HYS$HZ9fgz_A>xbyN-a9b(zO)o<5tK8p=po=X!}s}wSj{l+92z5{h>
z48d_apo}qp?A_V(l9gmE52UCzIEeBHim1s0yq2n4+sNwbh{tPWS?^DmQ|}VUFyq<9
zMB{ceJ(b<n?XC%--)_I(n3sb<`jLm;1#^&>7Zc@34)sL)a`gnlhGpn&q=M<9EZZP<
zU)9>4>089m5JvU&L>5WvONBj}q&T2I6>QW7?;0$BI>a;Nco)W^T_Khw%EVeMdOemb
zty~a<f!h}L0ECUbwgll?j;DHk<l9c$^nA;H8Hn~33WPw_Y1$HtegQ1T6=KoaI(CJj
zTud(Ja#-eG$?#`9d!|m%k%|meL)!>-+cw17mSO2vQYUzj`NA&c!D?!PN8^CNAIQwr
zNTlX}YEcfatAz8bgsf;@7YXYkVO=Dwi-dKNur3mAsYp=XroK-?MZ_mX2B>x6ur3_d
zg~PgVxJ=<t!Ps5Gd#~&+XjMvL53>IaZidzy$vJvQo$SUEGFy(VO#;V^6c;PguBaxv
zLw6D<#~Re)Mjws|R=gpOS(*2gZZQyX!O_uwoN(H#n5r0)NuW3e!WR&n<H10j0D(q+
z<eAqeGRp~hhT~5v%3`Qj9FI%9AsJ!$z#?HW^#pZ{V?0VkRwUB9Y+C)CX}R(Ah7>Xq
zaJ|v={0SM1NVe=`fgSm-wc3Xwd42<0&5rH%AvKaP=Hy0lP&Cu0ob*VWfb?vWzjzRT
zOqcj?C3zlKIxp<ufNThXRF6V8<&mYVH^@Ha3j)=Tqj3+|VidZSdh=uduo?EsC-%qz
z<8L(adoB?DOwLD7rsOiKXr52Yw)~{R0~(f(X-^tnKOj>!aj$5hiK<mk6jh!Q8%GIc
zc{1-tj76C$htYmXLhMkS5)yf{5Z4rc>HwhOSjs!VE(tQWs?!wSncGsFhMq70s0h%J
zumYAXBqSu_$t-t|B)MR%I6n1&^jRItVxC!k1L%GkZn?(A6Zrhhn=rBSBoIeT@{7vi
z$j#>^^2i?o;JTH@B_))Qn3CjSZb^@4R-84g0&>Ezw@c(He!r;P1o-ko&GJrvb0n-E
z?+aUegRp%<!iW4J{nE88E}r+O&v>P$XVSe#W3O_-OE}gz3M9J~neOH4omIBr8T<Zr
z6a|cqOUK!K{{i8z4l2PA-yfD09`n;H#deeAae_|>-#2i)Th+&q7k*LTb8ai@%zI>p
zB@5d9jAyN6L!jj}2(s5422m`3NZ)(Qwk+e`w6PqOHNI0HUP@8v=!!D3C2E*;Ms}MS
znV~}_j@B93LK)eZl50)KVE%PJ_HU4n6?(pcphJ^4qcCNq-m{59C9;%*Dt}{GK=w#5
zH-DNNJ_=vBhUl@xMV58+xP|DEUB_v64Ws2CXT_q&CF8|HcWI00@sGcMe)7-HzW(R4
zpIuYP7~php6G3C{URDCI*lq?J7EQ(hK70?yp?D0X*q^ew`21i*gK(5TTFW=(5!jT(
zC3o9AkYv+N-o&sWYmv&N+d16VV>ySQZWRgj{XC&|p?s+!M^F*L<i-9AN&+;vl!R|h
zMELy}3K)e&%DY)1Bo@1W$9rw$b<%@um(GVLIXjOhff41=&qN|<XJoUW+h&<=n>n3t
z+%hxbIK{%{2sXczoRkx80D_SIQmR&~y^DGBi6_J3fs6k`LuOOc^rohpP1Mr=Q%+Y{
z4p>_DU{X;W!@7gK%0n%uRR73tBb@A()^i6NRRV8+0}Ez_l-$98eHsKWLnJ!g%W#*T
z_09`p>F-g<wji?riiM7*Vq)Rp*ANJoxWc~<gtr$64IT(>gw}y@ejt4D#f#(be)i(4
z?|%K_|G)d_yH8#mzxe8!Vqz(T-E2@iF9H_VfNGHDAH_>0=EX87b3~k&*>qnPedNs5
z@Uxk}2KfBo1HmMJ3nz2p#?kypQ`y*yt@wK|;ndDs2~E?)<@Vz`L%W8pd5N3ScVlb5
znyt?2YOti)UfnB3=WSHm^z7v4sltZo;o0%uuj^9J2*<mAv>#S>sp<WsWak>c=pBto
z_<)AH$vfdD+26))CH2WCgxRNfP=eFXmC@PBZy1oEMG2yRv*V{!+56__p>mL(eoYnc
z^l!@W+piSw?D)&H3EfV=4hPByDOSSa>F+~j@9g+FYbwL&^z)E+`XU@QmE`Q?FUlUQ
z^|7aX^C_QrJmgKv>C<qixMwGS@Dvtf_<V5sg#s)8hAJ`qhM9x2li$LufGY(0pMe4^
zd>M*qK7s`uPM%@KOQEmFSNRm$y(m<|!M9(XoqR@{iYqxB@{_R*6l&7E%W-;KGJK?a
zcKjFU8V-P8_zh6XQei_96#!xU$+HaL!Rb@U@-M?-YiB2ff7@{courgKXdVi1fN^&S
z-<o`y<L6;MC}Z&r63{T&rCnubhi_uDY6I?{1BGS-`0&pt=aCN(n0}$elP?Y>f8w*_
zXJIZm=z08n%nycf{hWRt30(*!KMylN1;d%4$Qd~h_;~s!;B+W{gGGG~f4IiSLyi)H
z5^$SO6Q2I9rEJweI6L_r$M^d~_{|mjg$KN1S`3%#?MizcP%Mp#a|&V--@^fX`M8)6
zBzXMykmLS?RN=GCc7aW>iI0See~tm5_w7^Z4mm`@pHS^%?MbF}_y=EptZbZ}d?_UR
zM`haiBtmY?pN5KNq5?_D+yLSKfQ>v5Zn-%~4^RIOyy(BdJ}Li{aDNS($|eXAOjD@W
z6`uCZ|B4}Eyz(QyhR3;9-iD5w+~JxE4Z+)_NP%ZX7rxHTN?OyeDEHJ~e<=wlxuv|_
zQgnpcEoB@0cA&I%tCf{)MSz{+?@D6p2#*tW@;};Dzg{4WR>xOj5|jclbyG%?ha}#>
z<LQ{g?^?=;lZcy@Q|)|)y+QRMfo#o#Iw}n-$2BWK2inOfc?7{PiXY%Z2q1MURtE&U
zpLl1-f_<-vi`pP6H1tpwT3g9`lnuX6BJom>978!YawTo^7r*3<<;N}(!Waz)$xKE7
zc_%3CQ90)j(twU46wW;udk>HK8y5Zg3z?mk(YD^da4J=6unSy2Eiaq<&A$K(o8ofr
GbN~RTtxO#N

delta 4126
zcmV+(5aI9pAgUmLABzYGwZV^G0s~}WbYU)Pb8l_{?Oj`s<HnVK_pcz7mt8;<iWD!R
z-t4g_b}-$UxO>Ndrzb*@EK#*hkuq8AON<8M%|j3*3#=c4AP9_jVi<#LGFWHhr*16r
z(1xGKKcQb2`4Kr)MN*_hO-p^(WB^aMbn5n<Tb*-?#rDU4ZzxKO9ZpEAueAKwYqdFH
z4~H42d<<XUEA@G+7e_-H^z9DnAkmGtL_Rs-jh$WU;s_V?G|m!lI)hS-u26vHW;FCS
zvoTN|glx@mbknd6<TzS;+RMj`+>etnW_|V(zSh5O-)mLd$q;8Dd#`|EYEF09vytle
zEKSuk;;6WPt7$44V$<k(=Fl;_t$g@VF;6QYLz0llBPq=BIHx`-n+p-;Y?SnD!r}P?
z%y_GgG)F~_s#)8}=_9LeY8{|`D3?2Wga12v<BgA37JBcs&|fZeO@~Fd^=@C+`<mXd
zoZcmb&PYhcge8al^3&?FKaaO^=9+f0lqB!sbc>LGXftM1Ov#dr%!#hxWESE1;?YsZ
z>FSpdkC1^n!Hkh4>My1Fm8Dl(qb{N$C85uS+Isx)PAkG=veWACv<B4QX|;C*4}y@g
zghqj&k#rlVDUcuM9iITzi?fIU4Z-KsOXviI249CbObI6uoOmPbhI~4%1EAp`NJxNL
zothAT?B7q~@!PTYhzl$&W;trt5pt%M1u6U93eMDv6H><+Wn-5lg0>2rf;fYxATJF_
z*hd{vl~@;D(eUJUz)FNmDOvWo4IO*1Lj-YhxExSM4p<$hc43?=in9RP*(Hbjak8Y3
zmz}R&ws}*Ux!V#HfFDC-r1IkgLkwUuB0oBRn&B}^c%(SI1aI1P@ivPzW$~CK1D7Uj
zG~jWj4!We&AWQ0v=wbohAx%;?ko1dLJi0N9pU3<P7=M!@=KY}Pl!f8CDXW0|D(Pyf
zhJ~sM2qY@WU1W9vVCt{YHXGu#+qFu_uaF~D)UePICZjkaci#_ud^m`QgMC7F*9z=^
zfG#XZYH(=;Sr%`&1-B(*OvAe`)quow((x!eTw!au1Aya*(FlBV%}~Rl$>D&e@xY7y
zwZR?6P_NK9s^f*W!6c>}&Mf3g)2)Gq;Q)C}>|>0hY=}LUCClbdw;0~5VAnse*F`@Y
z(g7{R^NZKEHxz9o%ymd-CrRvQ9!ooaOQXF-ORs`me@m~6e%8{<Ru`vaFiEIKmdmn6
zI2;a!VT^BQx3A;QBFfeg{AJHzZ{8(dox|7$B`kCf50>K3(`J*QI~EU0ygp6E(gQq}
z2-e9dO7Ihsc%UsDteID@Ra)1G`W5o-mnVADZZulQ0J4^l#fP~>a1rh><~DbK7Z9(-
zDQqL^SID31%2?>nA7waVlpS8;$nd7kEZxoS{*gtAmf?f7%q{@;FbmgluLtBINz-+N
zF6y&&OiC~3lQ)$1=O)c!hS$lk3wvHW+yd|V1Q>}IT=1iepYTYRTm#rkU!uFsc*t+-
z-bs{Cs&};+9h3X~((ESS=J#fQrw82iZY&hd#EZvcUVYDB*dEg$5s!r)ktBs*^_#h~
zmv&or$LgR9U;D04x7_t+qpx*4-QH!c+)MHIE#zn*UZiTC<@0;ZSj8GbYR~LBuIu==
zXSu82Yks)^<<e4e#?q2gDpQnPtZ*$m9~b4;Az9eMd&K{t`|reK8-(G1j)b-)82Z81
z4>voK=h_U-iYt2@&1t&iw;}^C4zqDo=Z}-~bGrJ9#m&iCYI)bE-cUR;sZ(pW44MYa
zcnZ)P&IaopAa$5B{-pNeg!Fi+`&QKfN0f24QH9i~i<-PjDNa?x=Y?HrM1xTX|Ja*h
zINdV#q}@#k5EuCAC$G4FijO-jv4Mp+3Nms229#adb_Dbx4H@6}`j7c$CY1d?8EzJv
z;wtt76ISe_!gv}dY{mqtpBJkp7jdgXdeW$fa=Uw{*zT0KVSlYEWUus5ZQ=VDxd|`3
zJL$cSX`oB&PCiaYZj2MZZ+W`aCFqJbsB-?gSKgf2R_w9K0NZtcGo7)=1=bV`;Azb{
zeDV-SB;4j^kXE8E#PkiE1T-pxX_eUtA5%`mUqG2U)J{vhrX?^23H7--Nk$IxV1JnZ
z-iP110Ut)ZPB6I_iSe4J>7G8+)gJP6)$mPEb!}Z&P1Ds4%|yr|n&esFcu%^}(gS%?
z0;!(w^DN??c&Uni<16Q@da)o35MONtCIwUHb7{DaLp0U4d!}j_#t;nGGu5H#=sl<F
zYS^(BaJkID)w$GG<g!qu;E8i-^a?I}C6|stu#2prY9Z{Y1_s2gZEI>5_lR%UrUy>i
z$mMbaSLaf{AeY_lESFOzP2JNR*K$=`(`?ny0Wh`=qIxEOvOzW7;m|{kOfENYbtbzP
zWYW-bCN-^4B`UeZ8tL^MAAG8Zh-x@pTg9ersgCUoyN0jzOs83u%MDzeOJhYY1yeOP
z&3P^X9&%CFRDIjDRKo+ua<JA@H9T~PW&75!+r0TKH*j?>O<1i~$Uyd+kaYAO)TIdo
z$Ju}~!LWCK=kH6_lCdI?qQ>AL$|ESErZ4bXs%~u~tFI#-uaRYaI9pD=Pawlg<`)x<
z+wtsFc3-#qCWL;w`(bNQ4g%>%5qg)*L0(==R3kam6Wz<z69^lYp?8rAri=1ygV;k=
z>w2bd5ko^5HP;h)Bxx=c_Gp^nkp4ul(HOiNu;>tf&yeF?7>jm=SXL+#8?orkSn{-T
zNe~9^TG#^+Huky_gljpT>J5=^J6+TBE&F94x>qO=0#&DJODy^Yuozc}MeFL=6^3##
zxtObAS$LA+&w2J-ouDHX8LEc15$bnsh_xNVy39-3HH`fgy!XluGwM<jdyxH4aHi30
zB<JXV9rg115Sbmv)}}#XPKwLbWLH#x-Jt`4>FK0e*6TPSSn)<UVO8EUy2U`mB}YdK
z!fCr^s$xtof$}t$FCaL_K_Cutp^@KQ;I)X%Xd<4?_|wyra;R56<x0H~8Dn|xn6QL;
zf;zzo9;YG$5~*B1t$xn5+;|2f3fTv^-gtI@{*(k`k}o@5U`PJRgvPtgJeL8j=1<>;
zkOoN@3-Ta2D4y$6O>m@5Kq|J$|9%LVF7e+<i=3_U*x$n;*$@J$-)LydCl7gVkbTA%
z1gf9JlL4^BD0Hjz=C^lXGaOVOypaROUrh7|E)e}(&PPvX<T9^lo;%C7;=u6%jjFeQ
zEv5}`9*`NExL3B&RMqMa25Of*Cvi$yk+{1tV{xv^QM_M~5IYoy{US#e;+jDn0yLaR
zd572~Va`^4n$kN9TS~IX69xd;KROat!19HJghV`<=kAdtm#mdfK^~AHYhqc<GtX}b
z-7mu}*SL6*hCjLzCU%|#l9)+;QB@p&h55Wh9>rZAu3KqbQbH+7C`lg{mh^aT#d*Uj
zA*T#`yF^~b@yjYrfUhppuI@BP!us*Pu*J6s+b1M?$ltZ8T%+OQ`GES2S9N+W-Fr0g
z!s=Zc;aHP6l<d}Ix>u-oUfF_Y?EBks95OnoJeBhO2ZX-?T!A6JKddS|;fK(F<#v-6
zae_|>-#2iwTi3^k7kP2$b8c(uEPCXIC5zYnoM)|KL!jj>4D-KM62^%jeeWIHvW$DP
z#&T5E_)c?psYIotE6T`Ls9|1bWVe}-89HR*=ygW6R7N(T<XRIlnE!P?_D_(Hm3qE{
zphMHQ<0xa5-t&n<EwWUDDu3~RKO}o3T$n#C3?HR0TtoC&;gIEZ^tgrSk)Pvq`-ahR
zkh5md<C5`WsYkM9^!We({ng(;`}*(CetJzIBfwd36G3C)URD9H+-?RN7ELE1KKuYD
zk+@A(?oat#e10&ZAQ~4p<oTvN2Ah(&<ZfF8l6>0f3soDk7O73TUBG>RGm&!$>Q<Rh
z-!Bqs7s{6gatsv_OkVE4pd>(pD@pj)RD|D8pny?Wth}EWLSnIdyw^riCq2k_>0)?V
zu=98t7*P@ZOeBJKPBu%rZC2^FS<v~$Ei)sIQ!HGKV2ex1X*uDBAPDI%m1?!#yPT((
zcse`@T>LK@GTWM_w>8~=Y@?3;uX4K5a=_B^`-Nq34C@9(m4`Y`rT&rM#yH)rtmg(B
zbpmgH3kzn2l-%Gx4a1iq5}oelxGS%06os+$_c&r(kXZo5LPs+(vGnk32!tz~@V^d(
zw-*Qv9tdrOUI)U(f$+r_FOI+a>5H$v`^}60`|gwPe)Zz`#aGvV6cZ~U>}G@Fc@eNY
z18P88d=&47EsAAO=7=~kx9Pqt`pB8<;b*h>YhLFE9|$ISI9U)kjuuCn+QwdP#ovPo
zXLjCNXqqLiwjVbc+BIy=D?F6G8(Z_$Y;{&&gC))G`kok_w^41=vy-1?3L9mIXUBiL
zuA`nYPImoxKdSA2QnUL>#m+T;=p9c;^ngaY>3h*8+26))E%hlTgxP0!P{PyCmGRlh
zZyAuFMG51x<EK>F`{rkna*&;VO%?C-ugd7#uN3d>_{*#f-A=!b0_CF&E79om50SEW
zcKn>Rl~H{9dBi(?5slhPdUo;`We?W+xu<;dDW7;U;!Vm->C<SWxMwGS^c0q0_<V5s
zg#s)8mMRJSgqg#$li$ItfGYy}{{RJ6_%agHd;$xcJj05YL0^xr@+q`?aim1Sw_lx|
zd`8=fD>)qTlK~DCYSz5Vae7=be58AJ{1@mN1;8)-1SnOhun~z%fH3~#Sq|{v^r>X|
zm(i%RvlGF8+er+aq?A2q9tm)Oad!mY+I*Vh=TR{zXYnl((kR`fePw5dZ({Rm1MZ&#
zh2{hJ@Xsjckq;1<exW3je-0&olC$GyQ6V|#dHj6BFM)CWoPHh)T?i#Vk8(gI!?~fz
z895O6c=~7HbR>R)MSTvxxW*?VjuL_ra9d0ho&L3>Y&AeQJNZ4w_lHCH$rbyB2fSih
z4wvigN_!0`mPW-n1u=>5Q2<|lUQP%SJpNn6asN@O@L6uVz$VzlCqhMk#{kg#_NjD-
z0;1qgsP?h;B-c9p2VZ`yY@D5ZDJ1(RW!Cv5LT=2TMv7*l5=q6}0O5avjXV%;xfx`K
zr~eIJ^dDfKlz&ROzea6k6NCt+Db(u<Py6P-#1JuF`4L~k<6JB6LdQ++aBYP~;B8W*
zz_X$YU*~2et?Ad4d+M)$l@yfRQQqw+Izru!vJHM4C|%v^<YikKU}yNdlGr-NlT@Al
zk16V3FAzrS<7+VqN`ZvB86)XKl5F6~Y|P<LEoH<>#ly;(c0R*iP=6yJU-O`eN~7A<
z%v#Wab}~*MLGX){2lx;INYje-0U_@vUcFng?=^AJ7(|7J9?D`_EB%17(f3I#-pwm8
zR6`?I(l&p8vuLcoW04ZZXcVM#83E*-ptMKToI^+hI*L%Z@Dl7jJmG&R#cw{y>~)N;
c_2Gq6sYZic;{3F_Y~eTm06Ls^>9uG80ER^n&j0`b


From 3541e779c62a9f4f0d398a7e41316cc1f33018bb Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Thu, 27 Aug 2020 10:57:37 -0500
Subject: [PATCH 099/148] Index pattern class cleanup - remove _.apply and
 `any` instance  (#76004)

Index pattern class cleanup - remove _.apply and `any` instance
---
 ...ins-data-public.fieldlist._constructor_.md |  4 +-
 ...s-data-public.indexpattern.intervalname.md | 11 ++++
 ...plugin-plugins-data-public.indexpattern.md |  3 +
 ...ugins-data-public.indexpattern.prepbody.md | 18 +++++-
 ...-data-public.indexpattern.sourcefilters.md | 11 ++++
 ...n-plugins-data-public.indexpattern.type.md | 11 ++++
 .../index_patterns/fields/field_list.ts       |  2 +-
 .../index_patterns/index_pattern.test.ts      | 13 ++++
 .../index_patterns/index_pattern.ts           | 63 +++++++++++--------
 src/plugins/data/public/public.api.md         | 23 +++++--
 10 files changed, 122 insertions(+), 37 deletions(-)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.intervalname.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.type.md

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md
index 3b60ac0f48edd..9f9613a5a68f7 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md
@@ -9,7 +9,7 @@ Constructs a new instance of the `FieldList` class
 <b>Signature:</b>
 
 ```typescript
-constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: () => void);
+constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: OnNotification);
 ```
 
 ## Parameters
@@ -19,5 +19,5 @@ constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: b
 |  indexPattern | <code>IndexPattern</code> |  |
 |  specs | <code>FieldSpec[]</code> |  |
 |  shortDotsEnable | <code>boolean</code> |  |
-|  onNotification | <code>() =&gt; void</code> |  |
+|  onNotification | <code>OnNotification</code> |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.intervalname.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.intervalname.md
new file mode 100644
index 0000000000000..762b4a37bfd28
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.intervalname.md
@@ -0,0 +1,11 @@
+<!-- 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; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md)
+
+## IndexPattern.intervalName property
+
+<b>Signature:</b>
+
+```typescript
+intervalName: string | undefined;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index 649f8ef077e3f..c15cb3358f689 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -27,9 +27,12 @@ export declare class IndexPattern implements IIndexPattern
 |  [formatField](./kibana-plugin-plugins-data-public.indexpattern.formatfield.md) |  | <code>any</code> |  |
 |  [formatHit](./kibana-plugin-plugins-data-public.indexpattern.formathit.md) |  | <code>any</code> |  |
 |  [id](./kibana-plugin-plugins-data-public.indexpattern.id.md) |  | <code>string</code> |  |
+|  [intervalName](./kibana-plugin-plugins-data-public.indexpattern.intervalname.md) |  | <code>string &#124; undefined</code> |  |
 |  [metaFields](./kibana-plugin-plugins-data-public.indexpattern.metafields.md) |  | <code>string[]</code> |  |
+|  [sourceFilters](./kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md) |  | <code>SourceFilter[]</code> |  |
 |  [timeFieldName](./kibana-plugin-plugins-data-public.indexpattern.timefieldname.md) |  | <code>string &#124; undefined</code> |  |
 |  [title](./kibana-plugin-plugins-data-public.indexpattern.title.md) |  | <code>string</code> |  |
+|  [type](./kibana-plugin-plugins-data-public.indexpattern.type.md) |  | <code>string &#124; undefined</code> |  |
 |  [typeMeta](./kibana-plugin-plugins-data-public.indexpattern.typemeta.md) |  | <code>TypeMeta</code> |  |
 
 ## Methods
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.prepbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.prepbody.md
index 5c9f017b571da..1d77b2a55860e 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.prepbody.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.prepbody.md
@@ -8,12 +8,26 @@
 
 ```typescript
 prepBody(): {
-        [key: string]: any;
+        title: string;
+        timeFieldName: string | undefined;
+        intervalName: string | undefined;
+        sourceFilters: string | undefined;
+        fields: string | undefined;
+        fieldFormatMap: string | undefined;
+        type: string | undefined;
+        typeMeta: string | undefined;
     };
 ```
 <b>Returns:</b>
 
 `{
-        [key: string]: any;
+        title: string;
+        timeFieldName: string | undefined;
+        intervalName: string | undefined;
+        sourceFilters: string | undefined;
+        fields: string | undefined;
+        fieldFormatMap: string | undefined;
+        type: string | undefined;
+        typeMeta: string | undefined;
     }`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md
new file mode 100644
index 0000000000000..10ccf8e137627
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md
@@ -0,0 +1,11 @@
+<!-- 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; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [sourceFilters](./kibana-plugin-plugins-data-public.indexpattern.sourcefilters.md)
+
+## IndexPattern.sourceFilters property
+
+<b>Signature:</b>
+
+```typescript
+sourceFilters?: SourceFilter[];
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.type.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.type.md
new file mode 100644
index 0000000000000..7a10d058b9c65
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.type.md
@@ -0,0 +1,11 @@
+<!-- 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; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [type](./kibana-plugin-plugins-data-public.indexpattern.type.md)
+
+## IndexPattern.type property
+
+<b>Signature:</b>
+
+```typescript
+type: string | undefined;
+```
diff --git a/src/plugins/data/common/index_patterns/fields/field_list.ts b/src/plugins/data/common/index_patterns/fields/field_list.ts
index 34bd69230a2e4..d2489a5d1f7e3 100644
--- a/src/plugins/data/common/index_patterns/fields/field_list.ts
+++ b/src/plugins/data/common/index_patterns/fields/field_list.ts
@@ -64,7 +64,7 @@ export class FieldList extends Array<IndexPatternField> implements IIndexPattern
     indexPattern: IndexPattern,
     specs: FieldSpec[] = [],
     shortDotsEnable = false,
-    onNotification = () => {}
+    onNotification: OnNotification = () => {}
   ) {
     super();
     this.indexPattern = indexPattern;
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
index 09b79cae4aac2..f7e1156170f03 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.test.ts
@@ -43,8 +43,21 @@ jest.mock('../../field_mapping', () => {
       id: true,
       title: true,
       fieldFormatMap: {
+        _serialize: jest.fn().mockImplementation(() => {}),
         _deserialize: jest.fn().mockImplementation(() => []),
       },
+      fields: {
+        _serialize: jest.fn().mockImplementation(() => {}),
+        _deserialize: jest.fn().mockImplementation((fields) => fields),
+      },
+      sourceFilters: {
+        _serialize: jest.fn().mockImplementation(() => {}),
+        _deserialize: jest.fn().mockImplementation(() => undefined),
+      },
+      typeMeta: {
+        _serialize: jest.fn().mockImplementation(() => {}),
+        _deserialize: jest.fn().mockImplementation(() => undefined),
+      },
     })),
   };
 });
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index e81ef1d6b2482..5d6ae61a77e00 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -56,14 +56,14 @@ interface IndexPatternDeps {
 }
 
 export class IndexPattern implements IIndexPattern {
-  [key: string]: any;
-
   public id?: string;
   public title: string = '';
   public fieldFormatMap: any;
   public typeMeta?: TypeMeta;
   public fields: IIndexPatternFieldList & { toSpec: () => FieldSpec[] };
   public timeFieldName: string | undefined;
+  public intervalName: string | undefined;
+  public type: string | undefined;
   public formatHit: any;
   public formatField: any;
   public flattenHit: any;
@@ -72,7 +72,7 @@ export class IndexPattern implements IIndexPattern {
   private version: string | undefined;
   private savedObjectsClient: SavedObjectsClientCommon;
   private patternCache: PatternCache;
-  private sourceFilters?: SourceFilter[];
+  public sourceFilters?: SourceFilter[];
   private originalBody: { [key: string]: any } = {};
   public fieldsFetcher: any; // probably want to factor out any direct usage and change to private
   private shortDotsEnable: boolean = false;
@@ -126,7 +126,7 @@ export class IndexPattern implements IIndexPattern {
     this.shortDotsEnable = shortDotsEnable;
     this.metaFields = metaFields;
 
-    this.fields = new FieldList(this, [], this.shortDotsEnable, this.onUnknownType);
+    this.fields = new FieldList(this, [], this.shortDotsEnable, this.onNotification);
 
     this.apiClient = apiClient;
     this.fieldsFetcher = createFieldsFetcher(this, apiClient, metaFields);
@@ -226,10 +226,13 @@ export class IndexPattern implements IIndexPattern {
       response[name] = fieldMapping._deserialize(response[name]);
     });
 
-    // give index pattern all of the values
-    const fieldList = this.fields;
-    _.assign(this, response);
-    this.fields = fieldList;
+    this.title = response.title;
+    this.timeFieldName = response.timeFieldName;
+    this.intervalName = response.intervalName;
+    this.sourceFilters = response.sourceFilters;
+    this.fieldFormatMap = response.fieldFormatMap;
+    this.type = response.type;
+    this.typeMeta = response.typeMeta;
 
     if (!this.title && this.id) {
       this.title = this.id;
@@ -430,18 +433,16 @@ export class IndexPattern implements IIndexPattern {
   }
 
   prepBody() {
-    const body: { [key: string]: any } = {};
-
-    // serialize json fields
-    _.forOwn(this.mapping, (fieldMapping, fieldName) => {
-      if (!fieldName || this[fieldName] == null) return;
-
-      body[fieldName] = fieldMapping._serialize
-        ? fieldMapping._serialize(this[fieldName])
-        : this[fieldName];
-    });
-
-    return body;
+    return {
+      title: this.title,
+      timeFieldName: this.timeFieldName,
+      intervalName: this.intervalName,
+      sourceFilters: this.mapping.sourceFilters._serialize!(this.sourceFilters),
+      fields: this.mapping.fields._serialize!(this.fields),
+      fieldFormatMap: this.mapping.fieldFormatMap._serialize!(this.fieldFormatMap),
+      type: this.type,
+      typeMeta: this.mapping.typeMeta._serialize!(this.mapping),
+    };
   }
 
   getFormatterForField(field: IndexPatternField | IndexPatternField['spec']): FieldFormat {
@@ -485,10 +486,14 @@ export class IndexPattern implements IIndexPattern {
   async save(saveAttempts: number = 0): Promise<void | Error> {
     if (!this.id) return;
     const body = this.prepBody();
-    // What keys changed since they last pulled the index pattern
-    const originalChangedKeys = Object.keys(body).filter(
-      (key) => body[key] !== this.originalBody[key]
-    );
+
+    const originalChangedKeys: string[] = [];
+    Object.entries(body).forEach(([key, value]) => {
+      if (value !== this.originalBody[key]) {
+        originalChangedKeys.push(key);
+      }
+    });
+
     return this.savedObjectsClient
       .update(savedObjectType, this.id, body, { version: this.version })
       .then((resp) => {
@@ -519,8 +524,12 @@ export class IndexPattern implements IIndexPattern {
             // and ensure we ignore the key if the server response
             // is the same as the original response (since that is expected
             // if we made a change in that key)
-            const serverChangedKeys = Object.keys(updatedBody).filter((key) => {
-              return updatedBody[key] !== body[key] && this.originalBody[key] !== updatedBody[key];
+
+            const serverChangedKeys: string[] = [];
+            Object.entries(updatedBody).forEach(([key, value]) => {
+              if (value !== (body as any)[key] && value !== this.originalBody[key]) {
+                serverChangedKeys.push(key);
+              }
             });
 
             let unresolvedCollision = false;
@@ -545,7 +554,7 @@ export class IndexPattern implements IIndexPattern {
 
             // Set the updated response on this object
             serverChangedKeys.forEach((key) => {
-              this[key] = samePattern[key];
+              (this as any)[key] = (samePattern as any)[key];
             });
             this.version = samePattern.version;
 
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 261f16229460a..9a2a82e8ed206 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -604,7 +604,8 @@ export type FieldFormatsGetConfigFn = GetConfigFn;
 // @public (undocumented)
 export class FieldList extends Array<IndexPatternField> implements IIndexPatternFieldList {
     // Warning: (ae-forgotten-export) The symbol "FieldSpec" needs to be exported by the entry point index.d.ts
-    constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: () => void);
+    // Warning: (ae-forgotten-export) The symbol "OnNotification" needs to be exported by the entry point index.d.ts
+    constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: OnNotification);
     // (undocumented)
     readonly add: (field: FieldSpec) => void;
     // (undocumented)
@@ -946,8 +947,6 @@ export class IndexPattern implements IIndexPattern {
     // Warning: (ae-forgotten-export) The symbol "IndexPatternDeps" needs to be exported by the entry point index.d.ts
     constructor(id: string | undefined, { savedObjectsClient, apiClient, patternCache, fieldFormats, onNotification, onError, shortDotsEnable, metaFields, }: IndexPatternDeps);
     // (undocumented)
-    [key: string]: any;
-    // (undocumented)
     addScriptedField(name: string, script: string, fieldType: string | undefined, lang: string): Promise<void>;
     // (undocumented)
     create(allowOverride?: boolean): Promise<string | false>;
@@ -1008,6 +1007,8 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     initFromSpec(spec: IndexPatternSpec): this;
     // (undocumented)
+    intervalName: string | undefined;
+    // (undocumented)
     isTimeBased(): boolean;
     // (undocumented)
     isTimeBasedWildcard(): boolean;
@@ -1021,7 +1022,14 @@ export class IndexPattern implements IIndexPattern {
     popularizeField(fieldName: string, unit?: number): Promise<void>;
     // (undocumented)
     prepBody(): {
-        [key: string]: any;
+        title: string;
+        timeFieldName: string | undefined;
+        intervalName: string | undefined;
+        sourceFilters: string | undefined;
+        fields: string | undefined;
+        fieldFormatMap: string | undefined;
+        type: string | undefined;
+        typeMeta: string | undefined;
     };
     // (undocumented)
     refreshFields(): Promise<void | Error | never[] | undefined>;
@@ -1029,6 +1037,10 @@ export class IndexPattern implements IIndexPattern {
     removeScriptedField(fieldName: string): Promise<void | Error>;
     // (undocumented)
     save(saveAttempts?: number): Promise<void | Error>;
+    // Warning: (ae-forgotten-export) The symbol "SourceFilter" needs to be exported by the entry point index.d.ts
+    //
+    // (undocumented)
+    sourceFilters?: SourceFilter[];
     // (undocumented)
     timeFieldName: string | undefined;
     // (undocumented)
@@ -1040,6 +1052,8 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     toString(): string;
     // (undocumented)
+    type: string | undefined;
+    // (undocumented)
     typeMeta?: IndexPatternTypeMeta;
     }
 
@@ -1081,7 +1095,6 @@ export interface IndexPatternAttributes {
 //
 // @public (undocumented)
 export class IndexPatternField implements IFieldType {
-    // Warning: (ae-forgotten-export) The symbol "OnNotification" needs to be exported by the entry point index.d.ts
     constructor(indexPattern: IndexPattern, spec: FieldSpec, displayName: string, onNotification: OnNotification);
     // (undocumented)
     get aggregatable(): boolean;

From d556c79481e7fa19b3644f8e925ea0236e237a44 Mon Sep 17 00:00:00 2001
From: Bhavya RM <bhavya@elastic.co>
Date: Thu, 27 Aug 2020 12:03:53 -0400
Subject: [PATCH 100/148] Test user assignment to maps tests - 2 (#75890)

and removing unused data from fullscreen maps.js
---
 x-pack/test/functional/apps/maps/add_layer_panel.js    |  6 ++++++
 .../test/functional/apps/maps/blended_vector_layer.js  | 10 ++++++++++
 x-pack/test/functional/apps/maps/full_screen_mode.js   |  7 +++++--
 x-pack/test/functional/apps/maps/layer_visibility.js   |  3 +++
 .../functional/apps/maps/saved_object_management.js    |  9 +++++++++
 x-pack/test/functional/apps/maps/vector_styling.js     |  7 ++++++-
 6 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/x-pack/test/functional/apps/maps/add_layer_panel.js b/x-pack/test/functional/apps/maps/add_layer_panel.js
index 3902b616cf1ee..9eb560ed42c31 100644
--- a/x-pack/test/functional/apps/maps/add_layer_panel.js
+++ b/x-pack/test/functional/apps/maps/add_layer_panel.js
@@ -9,17 +9,23 @@ import expect from '@kbn/expect';
 export default function ({ getService, getPageObjects }) {
   const testSubjects = getService('testSubjects');
   const PageObjects = getPageObjects(['maps']);
+  const security = getService('security');
 
   describe('Add layer panel', () => {
     const LAYER_NAME = 'World Countries';
 
     before(async () => {
+      await security.testUser.setRoles(['global_maps_all']);
       await PageObjects.maps.openNewMap();
       await PageObjects.maps.clickAddLayer();
       await PageObjects.maps.selectEMSBoundariesSource();
       await PageObjects.maps.selectVectorLayer(LAYER_NAME);
     });
 
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
+
     it('should show unsaved layer in layer TOC', async () => {
       const vectorLayerExists = await PageObjects.maps.doesLayerExist(LAYER_NAME);
       expect(vectorLayerExists).to.be(true);
diff --git a/x-pack/test/functional/apps/maps/blended_vector_layer.js b/x-pack/test/functional/apps/maps/blended_vector_layer.js
index 9658cb3729134..9793d4b8f03d3 100644
--- a/x-pack/test/functional/apps/maps/blended_vector_layer.js
+++ b/x-pack/test/functional/apps/maps/blended_vector_layer.js
@@ -9,12 +9,22 @@ import expect from '@kbn/expect';
 export default function ({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['maps']);
   const inspector = getService('inspector');
+  const security = getService('security');
 
   describe('blended vector layer', () => {
     before(async () => {
+      await security.testUser.setRoles(['test_logstash_reader', 'global_maps_all']);
       await PageObjects.maps.loadSavedMap('blended document example');
     });
 
+    afterEach(async () => {
+      await inspector.close();
+    });
+
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
+
     it('should request documents when zoomed to smaller regions showing less data', async () => {
       const hits = await PageObjects.maps.getHits();
       expect(hits).to.equal('33');
diff --git a/x-pack/test/functional/apps/maps/full_screen_mode.js b/x-pack/test/functional/apps/maps/full_screen_mode.js
index b4ea2b0baf255..a114826f564bb 100644
--- a/x-pack/test/functional/apps/maps/full_screen_mode.js
+++ b/x-pack/test/functional/apps/maps/full_screen_mode.js
@@ -9,13 +9,16 @@ import expect from '@kbn/expect';
 export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['maps', 'common']);
   const retry = getService('retry');
-  const esArchiver = getService('esArchiver');
+  const security = getService('security');
 
   describe('maps full screen mode', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('maps/data');
+      await security.testUser.setRoles(['global_maps_all']);
       await PageObjects.maps.openNewMap();
     });
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
 
     it('full screen button should exist', async () => {
       const exists = await PageObjects.maps.fullScreenModeMenuItemExists();
diff --git a/x-pack/test/functional/apps/maps/layer_visibility.js b/x-pack/test/functional/apps/maps/layer_visibility.js
index 22cff6de416c1..dd9b93c995695 100644
--- a/x-pack/test/functional/apps/maps/layer_visibility.js
+++ b/x-pack/test/functional/apps/maps/layer_visibility.js
@@ -9,14 +9,17 @@ import expect from '@kbn/expect';
 export default function ({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['maps']);
   const inspector = getService('inspector');
+  const security = getService('security');
 
   describe('layer visibility', () => {
     before(async () => {
+      await security.testUser.setRoles(['test_logstash_reader', 'global_maps_all']);
       await PageObjects.maps.loadSavedMap('document example hidden');
     });
 
     afterEach(async () => {
       await inspector.close();
+      await security.testUser.restoreDefaults();
     });
 
     it('should not make any requests when layer is hidden', async () => {
diff --git a/x-pack/test/functional/apps/maps/saved_object_management.js b/x-pack/test/functional/apps/maps/saved_object_management.js
index 810df8e995064..277a8a5651453 100644
--- a/x-pack/test/functional/apps/maps/saved_object_management.js
+++ b/x-pack/test/functional/apps/maps/saved_object_management.js
@@ -12,6 +12,7 @@ export default function ({ getPageObjects, getService }) {
   const filterBar = getService('filterBar');
   const browser = getService('browser');
   const inspector = getService('inspector');
+  const security = getService('security');
 
   describe('map saved object management', () => {
     const MAP_NAME_PREFIX = 'saved_object_management_test_';
@@ -20,8 +21,16 @@ export default function ({ getPageObjects, getService }) {
 
     describe('read', () => {
       before(async () => {
+        await security.testUser.setRoles([
+          'global_maps_all',
+          'geoshape_data_reader',
+          'test_logstash_reader',
+        ]);
         await PageObjects.maps.loadSavedMap('join example');
       });
+      after(async () => {
+        await security.testUser.restoreDefaults();
+      });
 
       it('should update global Kibana time to value stored with map', async () => {
         const timeConfig = await PageObjects.timePicker.getTimeConfig();
diff --git a/x-pack/test/functional/apps/maps/vector_styling.js b/x-pack/test/functional/apps/maps/vector_styling.js
index 29c01918165cf..1def542982dd8 100644
--- a/x-pack/test/functional/apps/maps/vector_styling.js
+++ b/x-pack/test/functional/apps/maps/vector_styling.js
@@ -6,13 +6,18 @@
 
 import expect from '@kbn/expect';
 
-export default function ({ getPageObjects }) {
+export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['maps']);
+  const security = getService('security');
 
   describe('vector styling', () => {
     before(async () => {
+      await security.testUser.setRoles(['test_logstash_reader', 'global_maps_all']);
       await PageObjects.maps.loadSavedMap('document example');
     });
+    after(async () => {
+      await security.testUser.restoreDefaults();
+    });
 
     describe('categorical styling', () => {
       before(async () => {

From 51fd423689faa64fc08de43c379e4afdd1c4b711 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Thu, 27 Aug 2020 12:42:24 -0400
Subject: [PATCH 101/148] [Docs] Fix typo in docs for
 `server.xsrf.disableProtection` (#76102)

---
 docs/setup/settings.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index e1fb1802b2a21..4a931aabd3646 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -592,7 +592,7 @@ The `server.xsrf.whitelist` setting requires the following format:
 [cols="2*<"]
 |===
 
-| [[settings-xsrf-disableProtection]] `status.xsrf.disableProtection:`
+| [[settings-xsrf-disableProtection]] `server.xsrf.disableProtection:`
  | Setting this to `true` will completely disable Cross-site request forgery protection in Kibana. This is not recommended. *Default: `false`*
 
 | `status.allowAnonymous:`

From 12f4f6d74ac8986bf59ab6721fa06ab8c4c671e8 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Thu, 27 Aug 2020 10:53:16 -0600
Subject: [PATCH 102/148] [Maps] fix read only badge is no longer shown in nav
 for users with read-only permission (#76091)

---
 .../maps/public/routing/maps_router.js        | 21 ++++++++++++++++++-
 .../maps/feature_controls/maps_security.ts    |  3 +--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/maps/public/routing/maps_router.js b/x-pack/plugins/maps/public/routing/maps_router.js
index 9b7900d032f5a..f0f5234e3f989 100644
--- a/x-pack/plugins/maps/public/routing/maps_router.js
+++ b/x-pack/plugins/maps/public/routing/maps_router.js
@@ -7,7 +7,14 @@
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Router, Switch, Route, Redirect } from 'react-router-dom';
-import { getCoreI18n, getToasts, getEmbeddableService } from '../kibana_services';
+import { i18n } from '@kbn/i18n';
+import {
+  getCoreChrome,
+  getCoreI18n,
+  getMapsCapabilities,
+  getToasts,
+  getEmbeddableService,
+} from '../kibana_services';
 import {
   createKbnUrlStateStorage,
   withNotifyOnErrors,
@@ -44,6 +51,18 @@ const App = ({ history, appBasePath, onAppLeave }) => {
   const { originatingApp } =
     stateTransfer?.getIncomingEditorState({ keysToRemoveAfterFetch: ['originatingApp'] }) || {};
 
+  if (!getMapsCapabilities().save) {
+    getCoreChrome().setBadge({
+      text: i18n.translate('xpack.maps.badge.readOnly.text', {
+        defaultMessage: 'Read only',
+      }),
+      tooltip: i18n.translate('xpack.maps.badge.readOnly.tooltip', {
+        defaultMessage: 'Unable to save maps',
+      }),
+      iconType: 'glasses',
+    });
+  }
+
   return (
     <I18nContext>
       <Provider store={store}>
diff --git a/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts b/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts
index f480f1f0ae24a..ae9b0f095fc44 100644
--- a/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts
+++ b/x-pack/test/functional/apps/maps/feature_controls/maps_security.ts
@@ -181,8 +181,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await testSubjects.missingOrFail('checkboxSelectAll');
       });
 
-      // This behavior was removed when the Maps app was migrated to NP
-      it.skip(`shows read-only badge`, async () => {
+      it(`shows read-only badge`, async () => {
         await globalNav.badgeExistsOrFail('Read only');
       });
 

From 2010ec6ac4ba518fd032afb044f6ea0b47e3f587 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Thu, 27 Aug 2020 18:22:53 +0100
Subject: [PATCH 103/148] fix(NA): keystore read path on serve (#75659)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/cli/serve/serve.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index 345156b2491a1..c08f3aec64335 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -149,7 +149,7 @@ function applyConfigOverrides(rawConfig, opts, extraCliOptions) {
   );
 
   merge(extraCliOptions);
-  merge(readKeystore(get('path.data')));
+  merge(readKeystore());
 
   return rawConfig;
 }

From ebfba81ba54b4b25f07a98fc3eefe7a7927a3e02 Mon Sep 17 00:00:00 2001
From: Brent Kimmel <bkimmel@users.noreply.github.com>
Date: Thu, 27 Aug 2020 13:25:01 -0400
Subject: [PATCH 104/148] [Security Solution][Resolver] break/wrap for process
 detail (#76095)

* [Security Solution][Resolver]break/wrap for process detail

* add an enzyme test to check for the breakers
---
 .../public/resolver/mocks/resolver_tree.ts    |  2 +-
 .../public/resolver/view/panel.test.tsx       | 17 ++++++++--
 .../view/panels/panel_content_utilities.tsx   | 32 +++++++++++++++++++
 .../resolver/view/panels/process_details.tsx  | 16 +++++++---
 .../view/panels/related_event_detail.tsx      | 30 +----------------
 5 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts b/x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts
index 7edf4f8071ed8..8bd5953e9cb41 100644
--- a/x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts
+++ b/x-pack/plugins/security_solution/public/resolver/mocks/resolver_tree.ts
@@ -177,7 +177,7 @@ export function mockTreeWithNoAncestorsAnd2Children({
   const origin: ResolverEvent = mockEndpointEvent({
     pid: 0,
     entityID: originID,
-    name: 'c',
+    name: 'c.ext',
     parentEntityId: 'none',
     timestamp: 0,
   });
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx
index 037337fb2f868..1add907ae933d 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panel.test.tsx
@@ -81,7 +81,7 @@ describe(`Resolver: when analyzing a tree with no ancestors and two children, an
           };
         })
       ).toYieldEqualTo({
-        title: 'c',
+        title: 'c.ext',
         titleIcon: 'Running Process',
         detailEntries: [
           ['process.executable', 'executable'],
@@ -94,6 +94,19 @@ describe(`Resolver: when analyzing a tree with no ancestors and two children, an
         ],
       });
     });
+    it('should have breaking opportunities (<wbr>s) in node titles to allow wrapping', async () => {
+      await expect(
+        simulator().map(() => {
+          const titleWrapper = simulator().testSubject('resolver:node-detail:title');
+          return {
+            wordBreaks: titleWrapper.find('wbr').length,
+          };
+        })
+      ).toYieldEqualTo({
+        // The GeneratedText component adds 1 <wbr> after the period and one at the end
+        wordBreaks: 2,
+      });
+    });
   });
 
   const queryStringWithFirstChildSelected = urlSearch(resolverComponentInstanceID, {
@@ -174,7 +187,7 @@ describe(`Resolver: when analyzing a tree with no ancestors and two children, an
               .testSubject('resolver:node-list:node-link:title')
               .map((node) => node.text());
           })
-        ).toYieldEqualTo(['c', 'd', 'e']);
+        ).toYieldEqualTo(['c.ext', 'd', 'e']);
       });
     });
   });
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_utilities.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_utilities.tsx
index 5c7a4a476efba..19f0aa3fe1d67 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_utilities.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_utilities.tsx
@@ -43,6 +43,38 @@ const betaBadgeLabel = i18n.translate(
   }
 );
 
+/**
+ * A component that renders an element with breaking opportunities (`<wbr>`s)
+ * spliced into text children at word boundaries.
+ */
+export const GeneratedText = React.memo(function ({ children }) {
+  return <>{processedValue()}</>;
+
+  function processedValue() {
+    return React.Children.map(children, (child) => {
+      if (typeof child === 'string') {
+        const valueSplitByWordBoundaries = child.split(/\b/);
+
+        if (valueSplitByWordBoundaries.length < 2) {
+          return valueSplitByWordBoundaries[0];
+        }
+
+        return [
+          valueSplitByWordBoundaries[0],
+          ...valueSplitByWordBoundaries
+            .splice(1)
+            .reduce(function (generatedTextMemo: Array<string | JSX.Element>, value, index) {
+              return [...generatedTextMemo, value, <wbr />];
+            }, []),
+        ];
+      } else {
+        return child;
+      }
+    });
+  }
+});
+GeneratedText.displayName = 'GeneratedText';
+
 /**
  * A component to keep time representations in blocks so they don't wrap
  * and look bad.
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
index 15711909c4c9b..e86e3e6baf4a4 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
@@ -19,7 +19,7 @@ import { FormattedMessage } from 'react-intl';
 import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 import * as selectors from '../../store/selectors';
 import * as event from '../../../../common/endpoint/models/event';
-import { formatDate, StyledBreadcrumbs } from './panel_content_utilities';
+import { formatDate, StyledBreadcrumbs, GeneratedText } from './panel_content_utilities';
 import {
   processPath,
   processPid,
@@ -39,6 +39,10 @@ const StyledDescriptionList = styled(EuiDescriptionList)`
   }
 `;
 
+const StyledTitle = styled('h4')`
+  overflow-wrap: break-word;
+`;
+
 /**
  * A description list view of all the Metadata that goes with a particular process event, like:
  * Created, PID, User/Domain, etc.
@@ -114,7 +118,7 @@ export const ProcessDetails = memo(function ProcessDetails({
       .map((entry) => {
         return {
           ...entry,
-          description: String(entry.description),
+          description: <GeneratedText>{String(entry.description)}</GeneratedText>,
         };
       });
 
@@ -163,13 +167,15 @@ export const ProcessDetails = memo(function ProcessDetails({
       <StyledBreadcrumbs breadcrumbs={crumbs} />
       <EuiSpacer size="l" />
       <EuiTitle size="xs">
-        <h4 aria-describedby={titleID}>
+        <StyledTitle aria-describedby={titleID}>
           <CubeForProcess
             data-test-subj="resolver:node-detail:title-icon"
             running={!isProcessTerminated}
           />
-          <span data-test-subj="resolver:node-detail:title">{processName}</span>
-        </h4>
+          <span data-test-subj="resolver:node-detail:title">
+            <GeneratedText>{processName}</GeneratedText>
+          </span>
+        </StyledTitle>
       </EuiTitle>
       <EuiText>
         <EuiTextColor color="subdued">
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
index da4cd3c9dacad..6aacf91c56178 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
@@ -10,7 +10,7 @@ import { EuiSpacer, EuiText, EuiDescriptionList, EuiTextColor, EuiTitle } from '
 import styled from 'styled-components';
 import { useSelector } from 'react-redux';
 import { FormattedMessage } from 'react-intl';
-import { StyledBreadcrumbs, BoldCode, StyledTime } from './panel_content_utilities';
+import { StyledBreadcrumbs, BoldCode, StyledTime, GeneratedText } from './panel_content_utilities';
 import * as event from '../../../../common/endpoint/models/event';
 import { ResolverEvent } from '../../../../common/endpoint/types';
 import * as selectors from '../../store/selectors';
@@ -57,34 +57,6 @@ const TitleHr = memo(() => {
 });
 TitleHr.displayName = 'TitleHR';
 
-const GeneratedText = React.memo(function ({ children }) {
-  return <>{processedValue()}</>;
-
-  function processedValue() {
-    return React.Children.map(children, (child) => {
-      if (typeof child === 'string') {
-        const valueSplitByWordBoundaries = child.split(/\b/);
-
-        if (valueSplitByWordBoundaries.length < 2) {
-          return valueSplitByWordBoundaries[0];
-        }
-
-        return [
-          valueSplitByWordBoundaries[0],
-          ...valueSplitByWordBoundaries
-            .splice(1)
-            .reduce(function (generatedTextMemo: Array<string | JSX.Element>, value, index) {
-              return [...generatedTextMemo, value, <wbr />];
-            }, []),
-        ];
-      } else {
-        return child;
-      }
-    });
-  }
-});
-GeneratedText.displayName = 'GeneratedText';
-
 /**
  * Take description list entries and prepare them for display by
  * seeding with `<wbr />` tags.

From 165752b05f2e2e847c3204a762a44c430f58ebac Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Thu, 27 Aug 2020 10:39:44 -0700
Subject: [PATCH 105/148] [DOCS] Add monitoring.ui.logs.index (#75830)

---
 docs/settings/monitoring-settings.asciidoc | 43 ++++++++++++----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/docs/settings/monitoring-settings.asciidoc b/docs/settings/monitoring-settings.asciidoc
index 5b8fa0725d96b..d538519eefcc4 100644
--- a/docs/settings/monitoring-settings.asciidoc
+++ b/docs/settings/monitoring-settings.asciidoc
@@ -5,12 +5,12 @@
 <titleabbrev>Monitoring settings</titleabbrev>
 ++++
 
-By default, the Monitoring application is enabled, but data collection
-is disabled.  When you first start {kib} monitoring, you are prompted to
-enable data collection. If you are using {stack-security-features}, you must be
-signed in as a user with the `cluster:manage` privilege to enable
-data collection. The built-in `superuser` role has this privilege and the
-built-in `elastic` user has this role.
+By default, *{stack-monitor-app}* is enabled, but data collection is disabled.
+When you first start {kib} monitoring, you are prompted to enable data
+collection. If you are using {stack-security-features}, you must be signed in as
+a user with the `cluster:manage` privilege to enable data collection. The
+built-in `superuser` role has this privilege and the built-in `elastic` user has
+this role.
 
 You can adjust how monitoring data is
 collected from {kib} and displayed in {kib} by configuring settings in the
@@ -49,7 +49,7 @@ For more information, see
   in {kib}  to the {es} monitoring cluster and to verify licensing status on the {es}
   monitoring cluster. +
   +
-  Every other request performed by the Stack Monitoring UI to the monitoring {es}
+  Every other request performed by *{stack-monitor-app}* to the monitoring {es}
   cluster uses the authenticated user's credentials, which must be the same on
   both the {es} monitoring cluster and the {es} production cluster. +
   +
@@ -60,7 +60,7 @@ For more information, see
   in {kib}  to the {es} monitoring cluster and to verify licensing status on the {es}
   monitoring cluster. +
   +
-  Every other request performed by the Stack Monitoring UI to the monitoring {es}
+  Every other request performed by *{stack-monitor-app}* to the monitoring {es}
   cluster uses the authenticated user's credentials, which must be the same on
   both the {es} monitoring cluster and the {es} production cluster. +
   +
@@ -83,7 +83,7 @@ These settings control how data is collected from {kib}.
 |===
 | `monitoring.kibana.collection.enabled`
   | Set to `true` (default) to enable data collection from the {kib} NodeJS server
-  for {kib} Dashboards to be featured in the Monitoring.
+  for {kib} dashboards to be featured in *{stack-monitor-app}*.
 
 | `monitoring.kibana.collection.interval`
   | Specifies the number of milliseconds to wait in between data sampling on the
@@ -96,16 +96,26 @@ These settings control how data is collected from {kib}.
 [[monitoring-ui-settings]]
 ==== Monitoring UI settings
 
-These settings adjust how the {kib} Monitoring page displays monitoring data.
+These settings adjust how *{stack-monitor-app}* displays monitoring data.
 However, the defaults work best in most circumstances. For more information
 about configuring {kib}, see
-{kibana-ref}/settings.html[Setting Kibana Server Properties].
+{kibana-ref}/settings.html[Setting {kib} server properties].
 
 [cols="2*<"]
 |===
 | `monitoring.ui.elasticsearch.logFetchCount`
-  | Specifies the number of log entries to display in the Monitoring UI. Defaults to
-  `10`. The maximum value is `50`.
+  | Specifies the number of log entries to display in *{stack-monitor-app}*.
+  Defaults to `10`. The maximum value is `50`.
+
+| `monitoring.ui.enabled`
+  | Set to `false` to hide *{stack-monitor-app}*. The monitoring back-end
+    continues to run as an agent for sending {kib} stats to the monitoring
+    cluster. Defaults to `true`.
+  
+| `monitoring.ui.logs.index`
+  | Specifies the name of the indices that are shown on the
+  <<logs-monitor-page,*Logs*>> page in *{stack-monitor-app}*. The default value
+  is `filebeat-*`.
 
 | `monitoring.ui.max_bucket_size`
   | Specifies the number of term buckets to return out of the overall terms list when
@@ -120,18 +130,13 @@ about configuring {kib}, see
   `monitoring.ui.collection.interval` in `elasticsearch.yml`, use the same
   value in this setting.
 
-| `monitoring.ui.enabled`
-  | Set to `false` to hide the Monitoring UI in {kib}. The monitoring back-end
-  continues to run as an agent for sending {kib} stats to the monitoring
-  cluster. Defaults to `true`.
-
 |===
 
 [float]
 [[monitoring-ui-cgroup-settings]]
 ===== Monitoring UI container settings
 
-The Monitoring UI exposes the Cgroup statistics that we collect for you to make
+*{stack-monitor-app}* exposes the Cgroup statistics that we collect for you to make
 better decisions about your container performance, rather than guessing based on
 the overall machine performance. If you are not running your applications in a
 container, then Cgroup statistics are not useful.

From c31acce6499932fd39babcb4a984f58260df4239 Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Thu, 27 Aug 2020 13:54:09 -0400
Subject: [PATCH 106/148] Fix more broken usages of `bulkCreate` (#76005)

---
 .../tutorial/saved_objects_installer.js       |  9 +++++---
 .../tutorial/saved_objects_installer.test.js  | 21 +++++++++++++++++++
 .../models/data_recognizer/data_recognizer.ts |  7 ++++---
 3 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/plugins/home/public/application/components/tutorial/saved_objects_installer.js b/src/plugins/home/public/application/components/tutorial/saved_objects_installer.js
index 790c6d9c2574e..dd63827c38c5d 100644
--- a/src/plugins/home/public/application/components/tutorial/saved_objects_installer.js
+++ b/src/plugins/home/public/application/components/tutorial/saved_objects_installer.js
@@ -62,9 +62,12 @@ class SavedObjectsInstallerUi extends React.Component {
 
     let resp;
     try {
-      resp = await this.props.bulkCreate(this.props.savedObjects, {
-        overwrite: this.state.overwrite,
-      });
+      // Filter out the saved object version field, if present, to avoid inadvertently triggering optimistic concurrency control.
+      const objectsToCreate = this.props.savedObjects.map(
+        // eslint-disable-next-line no-unused-vars
+        ({ version, ...savedObject }) => savedObject
+      );
+      resp = await this.props.bulkCreate(objectsToCreate, { overwrite: this.state.overwrite });
     } catch (error) {
       if (!this._isMounted) {
         return;
diff --git a/src/plugins/home/public/application/components/tutorial/saved_objects_installer.test.js b/src/plugins/home/public/application/components/tutorial/saved_objects_installer.test.js
index 6cc02184fbc16..e7b7d8ed1d7fd 100644
--- a/src/plugins/home/public/application/components/tutorial/saved_objects_installer.test.js
+++ b/src/plugins/home/public/application/components/tutorial/saved_objects_installer.test.js
@@ -79,4 +79,25 @@ describe('bulkCreate', () => {
 
     expect(component).toMatchSnapshot();
   });
+
+  test('should filter out saved object version before calling bulkCreate', async () => {
+    const bulkCreateMock = jest.fn().mockResolvedValue({
+      savedObjects: [savedObject],
+    });
+    const component = mountWithIntl(
+      <SavedObjectsInstaller.WrappedComponent
+        bulkCreate={bulkCreateMock}
+        savedObjects={[{ ...savedObject, version: 'foo' }]}
+      />
+    );
+
+    findTestSubject(component, 'loadSavedObjects').simulate('click');
+
+    // Ensure all promises resolve
+    await new Promise((resolve) => process.nextTick(resolve));
+    // Ensure the state changes are reflected
+    component.update();
+
+    expect(bulkCreateMock).toHaveBeenCalledWith([savedObject], expect.any(Object));
+  });
 });
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
index cc42a545c11e2..206baacd98322 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts
@@ -20,6 +20,7 @@ import { getAuthorizationHeader } from '../../lib/request_authorization';
 import { MlInfoResponse } from '../../../common/types/ml_server_info';
 import {
   KibanaObjects,
+  KibanaObjectConfig,
   ModuleDataFeed,
   ModuleJob,
   Module,
@@ -100,7 +101,7 @@ interface ObjectExistResponse {
   id: string;
   type: string;
   exists: boolean;
-  savedObject?: any;
+  savedObject?: { id: string; type: string; attributes: KibanaObjectConfig };
 }
 
 interface SaveResults {
@@ -678,14 +679,14 @@ export class DataRecognizer {
     let results = { saved_objects: [] as any[] };
     const filteredSavedObjects = objectExistResults
       .filter((o) => o.exists === false)
-      .map((o) => o.savedObject);
+      .map((o) => o.savedObject!);
     if (filteredSavedObjects.length) {
       results = await this.savedObjectsClient.bulkCreate(
         // Add an empty migrationVersion attribute to each saved object to ensure
         // it is automatically migrated to the 7.0+ format with a references attribute.
         filteredSavedObjects.map((doc) => ({
           ...doc,
-          migrationVersion: doc.migrationVersion || {},
+          migrationVersion: {},
         }))
       );
     }

From 1bd8f4127531a5b0426416b4ee264f1af6166a1f Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <43350163+qn895@users.noreply.github.com>
Date: Thu, 27 Aug 2020 13:50:15 -0500
Subject: [PATCH 107/148] [ML] Add indicator if there are stopped partitions in
 categorization job wizard (#75709)

---
 .../common/results_loader/results_loader.ts   |   4 +
 .../category_stopped_partitions.tsx           | 137 ++++++++++++++++++
 .../metric_selection_summary.tsx              |   2 +
 3 files changed, 143 insertions(+)
 create mode 100644 x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/category_stopped_partitions.tsx

diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
index 110b031cd1dc0..2b250b9622286 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
@@ -126,6 +126,10 @@ export class ResultsLoader {
     this._results$.next(this._results);
   }
 
+  public get results$() {
+    return this._results$;
+  }
+
   public subscribeToResults(func: ResultsSubscriber) {
     return this._results$.subscribe(func);
   }
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/category_stopped_partitions.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/category_stopped_partitions.tsx
new file mode 100644
index 0000000000000..5e28a2f7c6975
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/category_stopped_partitions.tsx
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { FC, useContext, useEffect, useState, useMemo, useCallback } from 'react';
+import { EuiBasicTable, EuiCallOut, EuiSpacer, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { from } from 'rxjs';
+import { switchMap, takeWhile, tap } from 'rxjs/operators';
+import { JobCreatorContext } from '../../../job_creator_context';
+import { CategorizationJobCreator } from '../../../../../common/job_creator';
+import { ml } from '../../../../../../../services/ml_api_service';
+import { extractErrorProperties } from '../../../../../../../../../common/util/errors';
+
+const NUMBER_OF_PREVIEW = 5;
+export const CategoryStoppedPartitions: FC = () => {
+  const { jobCreator: jc, resultsLoader } = useContext(JobCreatorContext);
+  const jobCreator = jc as CategorizationJobCreator;
+  const [tableRow, setTableRow] = useState<Array<{ partitionName: string }>>([]);
+  const [stoppedPartitionsError, setStoppedPartitionsError] = useState<string | undefined>();
+
+  const columns = useMemo(
+    () => [
+      {
+        field: 'partitionName',
+        name: i18n.translate(
+          'xpack.ml.newJob.wizard.pickFieldsStep.stoppedPartitionsPreviewColumnName',
+          {
+            defaultMessage: 'Stopped partition names',
+          }
+        ),
+        render: (partition: any) => (
+          <EuiText size="s">
+            <code>{partition}</code>
+          </EuiText>
+        ),
+      },
+    ],
+    []
+  );
+
+  const loadCategoryStoppedPartitions = useCallback(async () => {
+    try {
+      const { jobs } = await ml.results.getCategoryStoppedPartitions([jobCreator.jobId]);
+
+      if (
+        !Array.isArray(jobs) && // if jobs is object of jobId: [partitions]
+        Array.isArray(jobs[jobCreator.jobId]) &&
+        jobs[jobCreator.jobId].length > 0
+      ) {
+        return jobs[jobCreator.jobId];
+      }
+    } catch (e) {
+      const error = extractErrorProperties(e);
+      // might get 404 because job has not been created yet and that's ok
+      if (error.statusCode !== 404) {
+        setStoppedPartitionsError(error.message);
+      }
+    }
+  }, [jobCreator.jobId]);
+
+  useEffect(() => {
+    // only need to run this check if jobCreator.perPartitionStopOnWarn is turned on
+    if (jobCreator.perPartitionCategorization && jobCreator.perPartitionStopOnWarn) {
+      // subscribe to result updates
+      const resultsSubscription = resultsLoader.results$
+        .pipe(
+          switchMap(() => {
+            return from(loadCategoryStoppedPartitions());
+          }),
+          tap((results) => {
+            if (Array.isArray(results)) {
+              setTableRow(
+                results.slice(0, NUMBER_OF_PREVIEW).map((partitionName) => ({
+                  partitionName,
+                }))
+              );
+            }
+          }),
+          takeWhile((results) => {
+            return !results || (Array.isArray(results) && results.length <= NUMBER_OF_PREVIEW);
+          })
+        )
+        .subscribe();
+      return () => resultsSubscription.unsubscribe();
+    }
+  }, []);
+
+  return (
+    <>
+      {stoppedPartitionsError && (
+        <>
+          <EuiSpacer />
+          <EuiCallOut
+            color={'danger'}
+            size={'s'}
+            title={
+              <FormattedMessage
+                id="xpack.ml.newJob.wizard.pickFieldsStep.stoppedPartitionsErrorCallout"
+                defaultMessage="An error occurred while fetching list of stopped partitions."
+              />
+            }
+          />
+        </>
+      )}
+      {Array.isArray(tableRow) && tableRow.length > 0 && (
+        <>
+          <EuiSpacer />
+          <div>
+            <FormattedMessage
+              id="xpack.ml.newJob.wizard.pickFieldsStep.categorizationStoppedPartitionsTitle"
+              defaultMessage="Stopped partitions"
+            />
+          </div>
+          <EuiSpacer size={'s'} />
+          <EuiCallOut
+            color={'warning'}
+            size={'s'}
+            title={
+              <FormattedMessage
+                id="xpack.ml.newJob.wizard.pickFieldsStep.stoppedPartitionsExistCallout"
+                defaultMessage="Per-partition categorization and stop_on_warn settings are enabled. Some partitions in job '{jobId}' are unsuitable for categorization and have been excluded from further categorization or anomaly detection analysis."
+                values={{
+                  jobId: jobCreator.jobId,
+                }}
+              />
+            }
+          />
+          <EuiBasicTable columns={columns} items={tableRow} />
+        </>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
index 768d8c394fb8f..9f66fb95b53a8 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
@@ -11,6 +11,7 @@ import { Results, Anomaly } from '../../../../../common/results_loader';
 import { LineChartPoint } from '../../../../../common/chart_loader';
 import { EventRateChart } from '../../../charts/event_rate_chart';
 import { TopCategories } from './top_categories';
+import { CategoryStoppedPartitions } from './category_stopped_partitions';
 
 const DTR_IDX = 0;
 
@@ -73,6 +74,7 @@ export const CategorizationDetectorsSummary: FC = () => {
         fadeChart={jobIsRunning}
       />
       <TopCategories />
+      <CategoryStoppedPartitions />
     </>
   );
 };

From a7b0f7a102f4785d6c9cefbbdc07c1049087dfe0 Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Thu, 27 Aug 2020 12:03:20 -0700
Subject: [PATCH 108/148] [Enterprise Search] Add reusable FlashMessages helper
 (#75901)

* Set up basic shared FlashMessages & FlashMessagesLogic

* Add top-level FlashMessagesProvider and history listener

- This ensures that:
  - Our FlashMessagesLogic is a global state that persists throughout the entire app and only unmounts when the app itself does (allowing for persistent messages if needed)
  - history.listen enables the same behavior as previously, where flash messages would be cleared between page views

* Set up queued messages that appear on page nav/load

* [AS] Add FlashMessages component to Engines Overview

+ add Kea/Redux context/state to mountWithContext (in order for tests to pass)

* Fix missing type exports, replace previous IFlashMessagesProps

* [WS] Remove flashMessages state in OverviewLogic

- in favor of either connecting it or using FlashMessagesLogic directly in the future

* PR feedback: DRY out EUI callout color type def

* PR Feedback: make flashMessages method names more explicit

* PR Feedback: Shorter FlashMessagesLogic type names

* PR feedback: Typing

Co-authored-by: Byron Hulcher <byronhulcher@gmail.com>

Co-authored-by: Byron Hulcher <byronhulcher@gmail.com>
---
 .../__mocks__/mount_with_context.mock.tsx     |   9 +-
 .../engine_overview/engine_overview.tsx       |   2 +
 .../public/applications/index.tsx             |   2 +
 .../flash_messages/flash_messages.test.tsx    |  64 +++++++++
 .../shared/flash_messages/flash_messages.tsx  |  43 ++++++
 .../flash_messages_logic.test.ts              | 136 ++++++++++++++++++
 .../flash_messages/flash_messages_logic.ts    |  87 +++++++++++
 .../flash_messages_provider.test.tsx          |  46 ++++++
 .../flash_messages_provider.tsx               |  30 ++++
 .../shared/flash_messages/index.ts            |  14 ++
 .../public/applications/shared/types.ts       |   9 +-
 .../overview/__mocks__/overview_logic.mock.ts |   1 -
 .../views/overview/overview_logic.test.ts     |   9 --
 .../views/overview/overview_logic.ts          |  11 +-
 14 files changed, 434 insertions(+), 29 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.test.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/index.ts

diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/mount_with_context.mock.tsx b/x-pack/plugins/enterprise_search/public/applications/__mocks__/mount_with_context.mock.tsx
index 9f8fda856eed6..826e0482acef7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/mount_with_context.mock.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/mount_with_context.mock.tsx
@@ -8,6 +8,10 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { mount, ReactWrapper } from 'enzyme';
 
+import { Provider } from 'react-redux';
+import { Store } from 'redux';
+import { getContext, resetContext } from 'kea';
+
 import { I18nProvider } from '@kbn/i18n/react';
 import { KibanaContext } from '../';
 import { mockKibanaContext } from './kibana_context.mock';
@@ -24,11 +28,14 @@ import { mockLicenseContext } from './license_context.mock';
  * const wrapper = mountWithContext(<Component />, { config: { host: 'someOverride' } });
  */
 export const mountWithContext = (children: React.ReactNode, context?: object) => {
+  resetContext({ createStore: true });
+  const store = getContext().store as Store;
+
   return mount(
     <I18nProvider>
       <KibanaContext.Provider value={{ ...mockKibanaContext, ...context }}>
         <LicenseContext.Provider value={{ ...mockLicenseContext, ...context }}>
-          {children}
+          <Provider store={store}>{children}</Provider>
         </LicenseContext.Provider>
       </KibanaContext.Provider>
     </I18nProvider>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
index 74bcd9aeafb28..c3b47b2b585bd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.tsx
@@ -16,6 +16,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SendAppSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
+import { FlashMessages } from '../../../shared/flash_messages';
 import { LicenseContext, ILicenseContext, hasPlatinumLicense } from '../../../shared/licensing';
 import { KibanaContext, IKibanaContext } from '../../../index';
 
@@ -88,6 +89,7 @@ export const EngineOverview: React.FC = () => {
 
       <EngineOverviewHeader />
       <EuiPageContent panelPaddingSize="s" className="engineOverview">
+        <FlashMessages />
         <EuiPageContentHeader>
           <EuiTitle size="s">
             <h2>
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.tsx b/x-pack/plugins/enterprise_search/public/applications/index.tsx
index 60e4cedf413f2..a54295548004a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.tsx
@@ -22,6 +22,7 @@ import {
 } from 'src/core/public';
 import { ClientConfigType, ClientData, PluginsSetup } from '../plugin';
 import { LicenseProvider } from './shared/licensing';
+import { FlashMessagesProvider } from './shared/flash_messages';
 import { HttpProvider } from './shared/http';
 import { IExternalUrl } from './shared/enterprise_search_url';
 import { IInitialAppData } from '../../common/types';
@@ -69,6 +70,7 @@ export const renderApp = (
         <LicenseProvider license$={plugins.licensing.license$}>
           <Provider store={store}>
             <HttpProvider http={core.http} errorConnecting={errorConnecting} />
+            <FlashMessagesProvider history={params.history} />
             <Router history={params.history}>
               <App {...initialData} />
             </Router>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.test.tsx
new file mode 100644
index 0000000000000..59bb7ee5b9625
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.test.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import '../../__mocks__/kea.mock';
+
+import { useValues } from 'kea';
+import React from 'react';
+import { shallow } from 'enzyme';
+import { EuiCallOut } from '@elastic/eui';
+
+import { FlashMessages } from './';
+
+describe('FlashMessages', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('does not render if no messages exist', () => {
+    (useValues as jest.Mock).mockImplementationOnce(() => ({ messages: [] }));
+
+    const wrapper = shallow(<FlashMessages />);
+
+    expect(wrapper.isEmptyRender()).toBe(true);
+  });
+
+  it('renders an array of flash messages & types', () => {
+    const mockMessages = [
+      { type: 'success', message: 'Hello world!!' },
+      {
+        type: 'error',
+        message: 'Whoa nelly!',
+        description: <div data-test-subj="error">Something went wrong</div>,
+      },
+      { type: 'info', message: 'Everything is fine, nothing is ruined' },
+      { type: 'warning', message: 'Uh oh' },
+      { type: 'info', message: 'Testing multiples of same type' },
+    ];
+    (useValues as jest.Mock).mockImplementationOnce(() => ({ messages: mockMessages }));
+
+    const wrapper = shallow(<FlashMessages />);
+
+    expect(wrapper.find(EuiCallOut)).toHaveLength(5);
+    expect(wrapper.find(EuiCallOut).first().prop('color')).toEqual('success');
+    expect(wrapper.find('[data-test-subj="error"]')).toHaveLength(1);
+    expect(wrapper.find(EuiCallOut).last().prop('iconType')).toEqual('iInCircle');
+  });
+
+  it('renders any children', () => {
+    (useValues as jest.Mock).mockImplementationOnce(() => ({ messages: [{ type: 'success' }] }));
+
+    const wrapper = shallow(
+      <FlashMessages>
+        <button data-test-subj="testing">
+          Some action - you could even clear flash messages here
+        </button>
+      </FlashMessages>
+    );
+
+    expect(wrapper.find('[data-test-subj="testing"]').text()).toContain('Some action');
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.tsx
new file mode 100644
index 0000000000000..5a909a287795c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Fragment } from 'react';
+import { useValues } from 'kea';
+import { EuiCallOut, EuiCallOutProps, EuiSpacer } from '@elastic/eui';
+
+import { FlashMessagesLogic, IFlashMessagesValues } from './flash_messages_logic';
+
+const FLASH_MESSAGE_TYPES = {
+  success: { color: 'success' as EuiCallOutProps['color'], icon: 'check' },
+  info: { color: 'primary' as EuiCallOutProps['color'], icon: 'iInCircle' },
+  warning: { color: 'warning' as EuiCallOutProps['color'], icon: 'alert' },
+  error: { color: 'danger' as EuiCallOutProps['color'], icon: 'cross' },
+};
+
+export const FlashMessages: React.FC = ({ children }) => {
+  const { messages } = useValues(FlashMessagesLogic) as IFlashMessagesValues;
+
+  // If we have no messages to display, do not render the element at all
+  if (!messages.length) return null;
+
+  return (
+    <div data-test-subj="FlashMessages">
+      {messages.map(({ type, message, description }, index) => (
+        <Fragment key={index}>
+          <EuiCallOut
+            color={FLASH_MESSAGE_TYPES[type].color}
+            iconType={FLASH_MESSAGE_TYPES[type].icon}
+            title={message}
+          >
+            {description}
+          </EuiCallOut>
+          <EuiSpacer />
+        </Fragment>
+      ))}
+      {children}
+    </div>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.test.ts
new file mode 100644
index 0000000000000..136912847baa9
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.test.ts
@@ -0,0 +1,136 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { resetContext } from 'kea';
+
+import { FlashMessagesLogic, IFlashMessage } from './flash_messages_logic';
+
+describe('FlashMessagesLogic', () => {
+  const DEFAULT_VALUES = {
+    messages: [],
+    queuedMessages: [],
+    historyListener: null,
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    resetContext({});
+  });
+
+  it('has expected default values', () => {
+    FlashMessagesLogic.mount();
+    expect(FlashMessagesLogic.values).toEqual(DEFAULT_VALUES);
+  });
+
+  describe('setFlashMessages()', () => {
+    it('sets an array of messages', () => {
+      const messages: IFlashMessage[] = [
+        { type: 'success', message: 'Hello world!!' },
+        { type: 'error', message: 'Whoa nelly!', description: 'Uh oh' },
+        { type: 'info', message: 'Everything is fine, nothing is ruined' },
+      ];
+
+      FlashMessagesLogic.mount();
+      FlashMessagesLogic.actions.setFlashMessages(messages);
+
+      expect(FlashMessagesLogic.values.messages).toEqual(messages);
+    });
+
+    it('automatically converts to an array if a single message obj is passed in', () => {
+      const message = { type: 'success', message: 'I turn into an array!' } as IFlashMessage;
+
+      FlashMessagesLogic.mount();
+      FlashMessagesLogic.actions.setFlashMessages(message);
+
+      expect(FlashMessagesLogic.values.messages).toEqual([message]);
+    });
+  });
+
+  describe('clearFlashMessages()', () => {
+    it('sets messages back to an empty array', () => {
+      FlashMessagesLogic.mount();
+      FlashMessagesLogic.actions.setFlashMessages('test' as any);
+      FlashMessagesLogic.actions.clearFlashMessages();
+
+      expect(FlashMessagesLogic.values.messages).toEqual([]);
+    });
+  });
+
+  describe('setQueuedMessages()', () => {
+    it('sets an array of messages', () => {
+      const queuedMessage: IFlashMessage = { type: 'error', message: 'You deleted a thing' };
+
+      FlashMessagesLogic.mount();
+      FlashMessagesLogic.actions.setQueuedMessages(queuedMessage);
+
+      expect(FlashMessagesLogic.values.queuedMessages).toEqual([queuedMessage]);
+    });
+  });
+
+  describe('clearQueuedMessages()', () => {
+    it('sets queued messages back to an empty array', () => {
+      FlashMessagesLogic.mount();
+      FlashMessagesLogic.actions.setQueuedMessages('test' as any);
+      FlashMessagesLogic.actions.clearQueuedMessages();
+
+      expect(FlashMessagesLogic.values.queuedMessages).toEqual([]);
+    });
+  });
+
+  describe('history listener logic', () => {
+    describe('setHistoryListener()', () => {
+      it('sets the historyListener value', () => {
+        FlashMessagesLogic.mount();
+        FlashMessagesLogic.actions.setHistoryListener('test' as any);
+
+        expect(FlashMessagesLogic.values.historyListener).toEqual('test');
+      });
+    });
+
+    describe('listenToHistory()', () => {
+      it('listens for history changes and clears messages on change', () => {
+        FlashMessagesLogic.mount();
+        FlashMessagesLogic.actions.setQueuedMessages(['queuedMessages'] as any);
+        jest.spyOn(FlashMessagesLogic.actions, 'clearFlashMessages');
+        jest.spyOn(FlashMessagesLogic.actions, 'setFlashMessages');
+        jest.spyOn(FlashMessagesLogic.actions, 'clearQueuedMessages');
+        jest.spyOn(FlashMessagesLogic.actions, 'setHistoryListener');
+
+        const mockListener = jest.fn(() => jest.fn());
+        const history = { listen: mockListener } as any;
+        FlashMessagesLogic.actions.listenToHistory(history);
+
+        expect(mockListener).toHaveBeenCalled();
+        expect(FlashMessagesLogic.actions.setHistoryListener).toHaveBeenCalled();
+
+        const mockHistoryChange = (mockListener.mock.calls[0] as any)[0];
+        mockHistoryChange();
+        expect(FlashMessagesLogic.actions.clearFlashMessages).toHaveBeenCalled();
+        expect(FlashMessagesLogic.actions.setFlashMessages).toHaveBeenCalledWith([
+          'queuedMessages',
+        ]);
+        expect(FlashMessagesLogic.actions.clearQueuedMessages).toHaveBeenCalled();
+      });
+    });
+
+    describe('beforeUnmount', () => {
+      it('removes history listener on unmount', () => {
+        const mockUnlistener = jest.fn();
+        const unmount = FlashMessagesLogic.mount();
+
+        FlashMessagesLogic.actions.setHistoryListener(mockUnlistener);
+        unmount();
+
+        expect(mockUnlistener).toHaveBeenCalled();
+      });
+
+      it('does not crash if no listener exists', () => {
+        const unmount = FlashMessagesLogic.mount();
+        unmount();
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.ts
new file mode 100644
index 0000000000000..96c7817832c52
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.ts
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { kea } from 'kea';
+import { ReactNode } from 'react';
+import { History } from 'history';
+
+import { IKeaLogic, TKeaReducers, IKeaParams } from '../types';
+
+export interface IFlashMessage {
+  type: 'success' | 'info' | 'warning' | 'error';
+  message: ReactNode;
+  description?: ReactNode;
+}
+
+export interface IFlashMessagesValues {
+  messages: IFlashMessage[];
+  queuedMessages: IFlashMessage[];
+  historyListener: Function | null;
+}
+export interface IFlashMessagesActions {
+  setFlashMessages(messages: IFlashMessage | IFlashMessage[]): void;
+  clearFlashMessages(): void;
+  setQueuedMessages(messages: IFlashMessage | IFlashMessage[]): void;
+  clearQueuedMessages(): void;
+  listenToHistory(history: History): void;
+  setHistoryListener(historyListener: Function): void;
+}
+
+const convertToArray = (messages: IFlashMessage | IFlashMessage[]) =>
+  !Array.isArray(messages) ? [messages] : messages;
+
+export const FlashMessagesLogic = kea({
+  actions: (): IFlashMessagesActions => ({
+    setFlashMessages: (messages) => ({ messages: convertToArray(messages) }),
+    clearFlashMessages: () => null,
+    setQueuedMessages: (messages) => ({ messages: convertToArray(messages) }),
+    clearQueuedMessages: () => null,
+    listenToHistory: (history) => history,
+    setHistoryListener: (historyListener) => ({ historyListener }),
+  }),
+  reducers: (): TKeaReducers<IFlashMessagesValues, IFlashMessagesActions> => ({
+    messages: [
+      [],
+      {
+        setFlashMessages: (_, { messages }) => messages,
+        clearFlashMessages: () => [],
+      },
+    ],
+    queuedMessages: [
+      [],
+      {
+        setQueuedMessages: (_, { messages }) => messages,
+        clearQueuedMessages: () => [],
+      },
+    ],
+    historyListener: [
+      null,
+      {
+        setHistoryListener: (_, { historyListener }) => historyListener,
+      },
+    ],
+  }),
+  listeners: ({ values, actions }): Partial<IFlashMessagesActions> => ({
+    listenToHistory: (history) => {
+      // On React Router navigation, clear previous flash messages and load any queued messages
+      const unlisten = history.listen(() => {
+        actions.clearFlashMessages();
+        actions.setFlashMessages(values.queuedMessages);
+        actions.clearQueuedMessages();
+      });
+      actions.setHistoryListener(unlisten);
+    },
+  }),
+  events: ({ values }) => ({
+    beforeUnmount: () => {
+      const { historyListener: removeHistoryListener } = values;
+      if (removeHistoryListener) removeHistoryListener();
+    },
+  }),
+} as IKeaParams<IFlashMessagesValues, IFlashMessagesActions>) as IKeaLogic<
+  IFlashMessagesValues,
+  IFlashMessagesActions
+>;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.test.tsx
new file mode 100644
index 0000000000000..bcd7abd6d7ce2
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.test.tsx
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import '../../__mocks__/shallow_usecontext.mock';
+import '../../__mocks__/kea.mock';
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { useValues, useActions } from 'kea';
+
+import { mockHistory } from '../../__mocks__';
+
+import { FlashMessagesProvider } from './';
+
+describe('FlashMessagesProvider', () => {
+  const props = { history: mockHistory as any };
+  const listenToHistory = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useActions as jest.Mock).mockImplementationOnce(() => ({ listenToHistory }));
+  });
+
+  it('does not render', () => {
+    const wrapper = shallow(<FlashMessagesProvider {...props} />);
+
+    expect(wrapper.isEmptyRender()).toBe(true);
+  });
+
+  it('listens to history on mount', () => {
+    shallow(<FlashMessagesProvider {...props} />);
+
+    expect(listenToHistory).toHaveBeenCalledWith(mockHistory);
+  });
+
+  it('does not add another history listener if one already exists', () => {
+    (useValues as jest.Mock).mockImplementationOnce(() => ({ historyListener: 'exists' as any }));
+
+    shallow(<FlashMessagesProvider {...props} />);
+
+    expect(listenToHistory).not.toHaveBeenCalledWith(props);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.tsx
new file mode 100644
index 0000000000000..584124468a91f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect } from 'react';
+import { useValues, useActions } from 'kea';
+import { History } from 'history';
+
+import {
+  FlashMessagesLogic,
+  IFlashMessagesValues,
+  IFlashMessagesActions,
+} from './flash_messages_logic';
+
+interface IFlashMessagesProviderProps {
+  history: History;
+}
+
+export const FlashMessagesProvider: React.FC<IFlashMessagesProviderProps> = ({ history }) => {
+  const { historyListener } = useValues(FlashMessagesLogic) as IFlashMessagesValues;
+  const { listenToHistory } = useActions(FlashMessagesLogic) as IFlashMessagesActions;
+
+  useEffect(() => {
+    if (!historyListener) listenToHistory(history);
+  }, []);
+
+  return null;
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/index.ts
new file mode 100644
index 0000000000000..74e233ad6b320
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { FlashMessages } from './flash_messages';
+export {
+  FlashMessagesLogic,
+  IFlashMessage,
+  IFlashMessagesValues,
+  IFlashMessagesActions,
+} from './flash_messages_logic';
+export { FlashMessagesProvider } from './flash_messages_provider';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
index a8e08323c5e3b..561016d36921d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
@@ -4,14 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export interface IFlashMessagesProps {
-  info?: string[];
-  warning?: string[];
-  error?: string[];
-  success?: string[];
-  isWrapped?: boolean;
-  children?: React.ReactNode;
-}
+export { IFlashMessage } from './flash_messages';
 
 export interface IKeaLogic<IKeaValues, IKeaActions> {
   mount(): Function;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
index 5588c4fc53b67..05715c648e5dc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
@@ -22,7 +22,6 @@ export const mockLogicValues = {
   personalSourcesCount: 0,
   sourcesCount: 0,
   dataLoading: true,
-  flashMessages: {},
 } as IOverviewValues;
 
 export const mockLogicActions = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
index 3fbf0e60b5b49..61108d7cb1f2f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
@@ -76,15 +76,6 @@ describe('OverviewLogic', () => {
     });
   });
 
-  describe('setFlashMessages', () => {
-    it('will set `flashMessages`', () => {
-      const flashMessages = { error: ['error'] };
-      OverviewLogic.actions.setFlashMessages(flashMessages);
-
-      expect(OverviewLogic.values.flashMessages).toEqual(flashMessages);
-    });
-  });
-
   describe('initializeOverview', () => {
     it('calls API and sets values', async () => {
       const setServerDataSpy = jest.spyOn(OverviewLogic.actions, 'setServerData');
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.ts
index 057bce1b4056c..6606e5b55cb33 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.ts
@@ -8,7 +8,7 @@ import { kea } from 'kea';
 import { HttpLogic } from '../../../shared/http';
 
 import { IAccount, IOrganization } from '../../types';
-import { IFlashMessagesProps, IKeaLogic, TKeaReducers, IKeaParams } from '../../../shared/types';
+import { IKeaLogic, TKeaReducers, IKeaParams } from '../../../shared/types';
 
 import { IFeedActivity } from './recent_activity';
 
@@ -30,19 +30,16 @@ export interface IOverviewServerData {
 
 export interface IOverviewActions {
   setServerData(serverData: IOverviewServerData): void;
-  setFlashMessages(flashMessages: IFlashMessagesProps): void;
   initializeOverview(): void;
 }
 
 export interface IOverviewValues extends IOverviewServerData {
   dataLoading: boolean;
-  flashMessages: IFlashMessagesProps;
 }
 
 export const OverviewLogic = kea({
   actions: (): IOverviewActions => ({
     setServerData: (serverData) => serverData,
-    setFlashMessages: (flashMessages) => ({ flashMessages }),
     initializeOverview: () => null,
   }),
   reducers: (): TKeaReducers<IOverviewValues, IOverviewActions> => ({
@@ -70,12 +67,6 @@ export const OverviewLogic = kea({
         setServerData: (_, { canCreateInvitations }) => canCreateInvitations,
       },
     ],
-    flashMessages: [
-      {},
-      {
-        setFlashMessages: (_, { flashMessages }) => flashMessages,
-      },
-    ],
     hasUsers: [
       false,
       {

From e2e9d96df674e7cdbcaa94f33f9ca4098c0c9cc8 Mon Sep 17 00:00:00 2001
From: Rashmi Kulkarni <rashmi.kulkarni@elastic.co>
Date: Thu, 27 Aug 2020 12:15:47 -0700
Subject: [PATCH 109/148] accessibility test for Painless lab (#75688)

* accessibility test for painless lab

* skipped a test due to aria-violation

* skipped tests due to aria-violation and added datatestsubj

* removed the unwanted import

* incorporate review comments

* feedback incorporated

* review comments incorporated

* removed unwanted expect
---
 .../components/output_pane/output_pane.tsx    |  1 +
 .../public/application/constants.tsx          |  3 +
 .../test/accessibility/apps/painless_lab.ts   | 65 +++++++++++++++++++
 x-pack/test/accessibility/config.ts           |  1 +
 x-pack/test/functional/config.js              |  4 ++
 5 files changed, 74 insertions(+)
 create mode 100644 x-pack/test/accessibility/apps/painless_lab.ts

diff --git a/x-pack/plugins/painless_lab/public/application/components/output_pane/output_pane.tsx b/x-pack/plugins/painless_lab/public/application/components/output_pane/output_pane.tsx
index e6a97bb02f738..ce597b27cc2a3 100644
--- a/x-pack/plugins/painless_lab/public/application/components/output_pane/output_pane.tsx
+++ b/x-pack/plugins/painless_lab/public/application/components/output_pane/output_pane.tsx
@@ -50,6 +50,7 @@ export const OutputPane: FunctionComponent<Props> = ({ isLoading, response }) =>
     <EuiPanel className="painlessLabRightPane">
       <EuiTabbedContent
         className="painlessLabRightPane__tabs"
+        data-test-subj="painlessTabs"
         size="s"
         tabs={[
           {
diff --git a/x-pack/plugins/painless_lab/public/application/constants.tsx b/x-pack/plugins/painless_lab/public/application/constants.tsx
index d8430dbfc7d9d..b2c284aa97420 100644
--- a/x-pack/plugins/painless_lab/public/application/constants.tsx
+++ b/x-pack/plugins/painless_lab/public/application/constants.tsx
@@ -25,6 +25,7 @@ export const painlessContextOptions = [
   {
     value: 'painless_test',
     inputDisplay: defaultLabel,
+    'data-test-subj': 'basicButtonDropdown',
     dropdownDisplay: (
       <>
         <strong>{defaultLabel}</strong>
@@ -41,6 +42,7 @@ export const painlessContextOptions = [
   {
     value: 'filter',
     inputDisplay: filterLabel,
+    'data-test-subj': 'filterButtonDropdown',
     dropdownDisplay: (
       <>
         <strong>{filterLabel}</strong>
@@ -57,6 +59,7 @@ export const painlessContextOptions = [
   {
     value: 'score',
     inputDisplay: scoreLabel,
+    'data-test-subj': 'scoreButtonDropdown',
     dropdownDisplay: (
       <>
         <strong>{scoreLabel}</strong>
diff --git a/x-pack/test/accessibility/apps/painless_lab.ts b/x-pack/test/accessibility/apps/painless_lab.ts
new file mode 100644
index 0000000000000..0ec8285f50ec8
--- /dev/null
+++ b/x-pack/test/accessibility/apps/painless_lab.ts
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['common', 'security']);
+  const testSubjects = getService('testSubjects');
+  const find = getService('find');
+  const a11y = getService('a11y');
+
+  describe('Accessibility Painless Lab Editor', () => {
+    before(async () => {
+      await PageObjects.common.navigateToApp('painlessLab');
+    });
+
+    it('renders the page without a11y errors', async () => {
+      await PageObjects.common.navigateToApp('painlessLab');
+      await a11y.testAppSnapshot();
+    });
+
+    it('click on the output button', async () => {
+      const painlessTabsOutput = await find.byCssSelector(
+        '[data-test-subj="painlessTabs"] #output'
+      );
+      await painlessTabsOutput.click();
+      await a11y.testAppSnapshot();
+    });
+
+    it('click on the parameters button', async () => {
+      const painlessTabsParameters = await find.byCssSelector(
+        '[data-test-subj="painlessTabs"] #parameters'
+      );
+      await painlessTabsParameters.click();
+      await a11y.testAppSnapshot();
+    });
+
+    // github.com/elastic/kibana/issues/75876
+    it.skip('click on the context button', async () => {
+      const painlessTabsContext = await find.byCssSelector(
+        '[data-test-subj="painlessTabs"] #context'
+      );
+      await painlessTabsContext.click();
+      await a11y.testAppSnapshot();
+    });
+
+    it.skip('click on the Basic button', async () => {
+      await testSubjects.click('basicButtonDropdown');
+      await a11y.testAppSnapshot();
+    });
+
+    it.skip('click on the Filter button', async () => {
+      await testSubjects.click('filterButtonDropdown');
+      await a11y.testAppSnapshot();
+    });
+
+    it.skip('click on the Score button', async () => {
+      await testSubjects.click('scoreButtonDropdown');
+      await a11y.testAppSnapshot();
+    });
+  });
+}
diff --git a/x-pack/test/accessibility/config.ts b/x-pack/test/accessibility/config.ts
index 7f4543d014def..0a95805754314 100644
--- a/x-pack/test/accessibility/config.ts
+++ b/x-pack/test/accessibility/config.ts
@@ -20,6 +20,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('./apps/grok_debugger'),
       require.resolve('./apps/search_profiler'),
       require.resolve('./apps/uptime'),
+      require.resolve('./apps/painless_lab'),
     ],
     pageObjects,
     services,
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index cdc6292ba808a..16e2cd1559fce 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -128,6 +128,10 @@ export default async function ({ readConfigFile }) {
         pathname: '/app/dev_tools',
         hash: '/searchprofiler',
       },
+      painlessLab: {
+        pathname: '/app/dev_tools',
+        hash: '/painless_lab',
+      },
       spaceSelector: {
         pathname: '/',
       },

From ca94923900f9ce424f08f4d32bea53b40bc0e552 Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Thu, 27 Aug 2020 14:34:28 -0500
Subject: [PATCH 110/148] [Enterprise Search] Migrate util and components from
 ent-search (#76051)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Migrate useDidUpdateEffect hook

Migrates https://github.com/elastic/ent-search/blob/master/app/javascript/shared/utils/useDidUpdateEffect.ts with test added.

* Migrate TruncateContent component

* Migrate TableHeader component

* Remove unused deps

* Fix test name

* Remove custom type in favor of DependencyList

* Add stylesheet for truncated content

* Actually import stylesheet

🤦🏼‍♂️

* Replace legacy mixin

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../applications/shared/table_header/index.ts |  7 +++
 .../shared/table_header/table_header.test.tsx | 29 ++++++++++++
 .../shared/table_header/table_header.tsx      | 23 +++++++++
 .../applications/shared/truncate/index.ts     |  8 ++++
 .../shared/truncate/truncate.test.tsx         | 47 +++++++++++++++++++
 .../applications/shared/truncate/truncate.ts  | 13 +++++
 .../shared/truncate/truncated_content.scss    | 35 ++++++++++++++
 .../shared/truncate/truncated_content.tsx     | 35 ++++++++++++++
 .../shared/use_did_update_effect/index.ts     |  7 +++
 .../use_did_update_effect.test.tsx            | 33 +++++++++++++
 .../use_did_update_effect.tsx                 | 23 +++++++++
 11 files changed, 260 insertions(+)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/table_header/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/table_header/table_header.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/table_header/table_header.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/truncate/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.scss
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/use_did_update_effect.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/use_did_update_effect.tsx

diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/table_header/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/table_header/index.ts
new file mode 100644
index 0000000000000..34ce070fcde46
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/table_header/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { TableHeader } from './table_header';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/table_header/table_header.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/table_header/table_header.test.tsx
new file mode 100644
index 0000000000000..70e2ac7ac6f0d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/table_header/table_header.test.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+import { EuiTableHeader, EuiTableHeaderCell } from '@elastic/eui';
+
+import { TableHeader } from './table_header';
+
+const headerItems = ['foo', 'bar', 'baz'];
+
+describe('TableHeader', () => {
+  it('renders', () => {
+    const wrapper = shallow(<TableHeader headerItems={headerItems} />);
+
+    expect(wrapper.find(EuiTableHeader)).toHaveLength(1);
+    expect(wrapper.find(EuiTableHeaderCell)).toHaveLength(3);
+  });
+
+  it('renders extra cell', () => {
+    const wrapper = shallow(<TableHeader headerItems={headerItems} extraCell />);
+
+    expect(wrapper.find(EuiTableHeader)).toHaveLength(1);
+    expect(wrapper.find(EuiTableHeaderCell)).toHaveLength(4);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/table_header/table_header.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/table_header/table_header.tsx
new file mode 100644
index 0000000000000..e7f9617fdcd91
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/table_header/table_header.tsx
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { EuiTableHeader, EuiTableHeaderCell } from '@elastic/eui';
+
+interface ITableHeaderProps {
+  headerItems: string[];
+  extraCell?: boolean;
+}
+
+export const TableHeader: React.FC<ITableHeaderProps> = ({ headerItems, extraCell }) => (
+  <EuiTableHeader>
+    {headerItems.map((item, i) => (
+      <EuiTableHeaderCell key={i}>{item}</EuiTableHeaderCell>
+    ))}
+    {extraCell && <EuiTableHeaderCell />}
+  </EuiTableHeader>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/index.ts
new file mode 100644
index 0000000000000..d3ee618e92b5b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { truncate, truncateBeginning } from './truncate';
+export { TruncatedContent } from './truncated_content';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx
new file mode 100644
index 0000000000000..aa8427cd822be
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.test.tsx
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { TruncatedContent } from './';
+
+const content = 'foobarbaz';
+
+describe('TruncatedContent', () => {
+  it('renders with no truncation', () => {
+    const wrapper = shallow(<TruncatedContent length={4} content="foo" />);
+
+    expect(wrapper.find('span.truncated-content')).toHaveLength(0);
+    expect(wrapper.text()).toEqual('foo');
+  });
+
+  it('renders with truncation at the end', () => {
+    const wrapper = shallow(<TruncatedContent tooltipType="title" length={4} content={content} />);
+    const element = wrapper.find('span.truncated-content');
+
+    expect(element).toHaveLength(1);
+    expect(element.prop('title')).toEqual(content);
+    expect(wrapper.text()).toEqual('foob…');
+    expect(wrapper.find('span.truncated-content__tooltip')).toHaveLength(0);
+  });
+
+  it('renders with truncation at the beginning', () => {
+    const wrapper = shallow(
+      <TruncatedContent tooltipType="title" beginning length={4} content={content} />
+    );
+
+    expect(wrapper.find('span.truncated-content')).toHaveLength(1);
+    expect(wrapper.text()).toEqual('…rbaz');
+  });
+
+  it('renders with inline tooltip', () => {
+    const wrapper = shallow(<TruncatedContent beginning length={4} content={content} />);
+
+    expect(wrapper.find('span.truncated-content').prop('title')).toEqual('');
+    expect(wrapper.find('span.truncated-content__tooltip')).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.ts b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.ts
new file mode 100644
index 0000000000000..36094e3abe258
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncate.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export function truncate(text: string, length: number) {
+  return `${text.substring(0, length)}…`;
+}
+
+export function truncateBeginning(text: string, length: number) {
+  return `…${text.substring(text.length - length)}`;
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.scss b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.scss
new file mode 100644
index 0000000000000..701834acfed9d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.scss
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+.truncated-content {
+  position: relative;
+  z-index: 2;
+  display: inline-block;
+  white-space: nowrap;
+
+  &__tooltip {
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    left: -3px;
+    margin-top: -1px;
+    background: $euiColorEmptyShade;
+    border-radius: 2px;
+    width: calc(100% + 4px);
+    height: calc(100% + 4px);
+    padding: 0 2px;
+    display: none;
+    align-items: center;
+    box-shadow: 0 1px 3px rgba(black, 0.1);
+    border: 1px solid $euiBorderColor;
+    width: auto;
+    white-space: nowrap;
+
+    .truncated-content:hover & {
+      display: flex;
+    }
+  }
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx
new file mode 100644
index 0000000000000..7785f75b71d34
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/truncate/truncated_content.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+
+import { truncate, truncateBeginning } from './';
+
+import './truncated_content.scss';
+
+interface ITruncatedContentProps {
+  content: string;
+  length: number;
+  beginning?: boolean;
+  tooltipType?: 'inline' | 'title';
+}
+
+export const TruncatedContent: React.FC<ITruncatedContentProps> = ({
+  content,
+  length,
+  beginning = false,
+  tooltipType = 'inline',
+}) => {
+  if (content.length <= length) return <>{content}</>;
+
+  const inline = tooltipType === 'inline';
+  return (
+    <span className="truncated-content" title={!inline ? content : ''}>
+      {beginning ? truncateBeginning(content, length) : truncate(content, length)}
+      {inline && <span className="truncated-content__tooltip">{content}</span>}
+    </span>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/index.ts
new file mode 100644
index 0000000000000..05c60ebced088
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { useDidUpdateEffect } from './use_did_update_effect';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/use_did_update_effect.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/use_did_update_effect.test.tsx
new file mode 100644
index 0000000000000..e3d2ffb44f01e
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/use_did_update_effect.test.tsx
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useState } from 'react';
+import { mount } from 'enzyme';
+
+import { EuiLink } from '@elastic/eui';
+
+import { useDidUpdateEffect } from './use_did_update_effect';
+
+const fn = jest.fn();
+
+const TestHook = ({ value }: { value: number }) => {
+  const [inputValue, setValue] = useState(value);
+  useDidUpdateEffect(fn, [inputValue]);
+  return <EuiLink onClick={() => setValue(2)} />;
+};
+
+const wrapper = mount(<TestHook value={1} />);
+
+describe('useDidUpdateEffect', () => {
+  it('should not fire function when value unchanged', () => {
+    expect(fn).not.toHaveBeenCalled();
+  });
+
+  it('should fire function when value changed', () => {
+    wrapper.find(EuiLink).simulate('click');
+    expect(fn).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/use_did_update_effect.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/use_did_update_effect.tsx
new file mode 100644
index 0000000000000..4c3e10fc84b84
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/use_did_update_effect/use_did_update_effect.tsx
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/*
+ * Sometimes we don't want to fire the initial useEffect call.
+ * This custom Hook only fires after the intial render has completed.
+ */
+import { useEffect, useRef, DependencyList } from 'react';
+
+export const useDidUpdateEffect = (fn: Function, inputs: DependencyList) => {
+  const didMountRef = useRef(false);
+
+  useEffect(() => {
+    if (didMountRef.current) {
+      fn();
+    } else {
+      didMountRef.current = true;
+    }
+  }, inputs);
+};

From 31507f82b6b4e6751fc694ec61b3b0cab3cbd83c Mon Sep 17 00:00:00 2001
From: Robert Austin <robert.austin@elastic.co>
Date: Thu, 27 Aug 2020 15:43:52 -0400
Subject: [PATCH 111/148] [Resolver] Fix useSelector usage (#76129)

In some cases we have selectors returning thunks. The thunks need to be
called inside `useSelector` in order for a rerender to be reliably
triggered.

`useSelector` triggers a re-render if its return value changes. By calling the thunk inside of the selector passed to `useSelector`, we will trigger re-renders when needed.
---
 .../resolver/view/panels/process_details.tsx   |  6 ++++--
 .../view/panels/related_event_detail.tsx       |  7 +++----
 .../public/resolver/view/process_event_dot.tsx | 18 +++++++++++-------
 .../view/resolver_without_providers.tsx        | 11 +++++++----
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
index e86e3e6baf4a4..1ec56b8aa169a 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
@@ -31,7 +31,7 @@ import {
 import { CubeForProcess } from './cube_for_process';
 import { ResolverEvent } from '../../../../common/endpoint/types';
 import { useResolverTheme } from '../assets';
-import { CrumbInfo } from '../../types';
+import { CrumbInfo, ResolverState } from '../../types';
 
 const StyledDescriptionList = styled(EuiDescriptionList)`
   &.euiDescriptionList.euiDescriptionList--column dt.euiDescriptionList__title.desc-title {
@@ -56,7 +56,9 @@ export const ProcessDetails = memo(function ProcessDetails({
 }) {
   const processName = event.eventName(processEvent);
   const entityId = event.entityId(processEvent);
-  const isProcessTerminated = useSelector(selectors.isProcessTerminated)(entityId);
+  const isProcessTerminated = useSelector((state: ResolverState) =>
+    selectors.isProcessTerminated(state)(entityId)
+  );
   const processInfoEntry: EuiDescriptionListProps['listItems'] = useMemo(() => {
     const eventTime = event.eventTimestamp(processEvent);
     const dateTime = eventTime === undefined ? null : formatDate(eventTime);
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
index 6aacf91c56178..dfafbae9c9a16 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
@@ -16,7 +16,7 @@ import { ResolverEvent } from '../../../../common/endpoint/types';
 import * as selectors from '../../store/selectors';
 import { useResolverDispatch } from '../use_resolver_dispatch';
 import { PanelContentError } from './panel_content_error';
-import { CrumbInfo } from '../../types';
+import { CrumbInfo, ResolverState } from '../../types';
 
 // Adding some styles to prevent horizontal scrollbars, per request from UX review
 const StyledDescriptionList = memo(styled(EuiDescriptionList)`
@@ -126,9 +126,8 @@ export const RelatedEventDetail = memo(function RelatedEventDetail({
     relatedEventCategory = naString,
     sections,
     formattedDate,
-  ] = useSelector(selectors.relatedEventDisplayInfoByEntityAndSelfId)(
-    processEntityId,
-    relatedEventId
+  ] = useSelector((state: ResolverState) =>
+    selectors.relatedEventDisplayInfoByEntityAndSelfId(state)(processEntityId, relatedEventId)
   );
 
   const waitCrumbs = useMemo(() => {
diff --git a/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx b/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
index 2bb104801866f..baa8ce1fcdd86 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
@@ -12,7 +12,7 @@ import { htmlIdGenerator, EuiButton, EuiI18nNumber, EuiFlexGroup, EuiFlexItem }
 import { useSelector } from 'react-redux';
 import { NodeSubMenu, subMenuAssets } from './submenu';
 import { applyMatrix3 } from '../models/vector2';
-import { Vector2, Matrix3 } from '../types';
+import { Vector2, Matrix3, ResolverState } from '../types';
 import { SymbolIds, useResolverTheme, calculateResolverFontSize } from './assets';
 import { ResolverEvent, SafeResolverEvent } from '../../../common/endpoint/types';
 import { useResolverDispatch } from './use_resolver_dispatch';
@@ -118,7 +118,9 @@ const UnstyledProcessEventDot = React.memo(
       // NB: this component should be taking nodeID as a `string` instead of handling this logic here
       throw new Error('Tried to render a node with no ID');
     }
-    const relatedEventStats = useSelector(selectors.relatedEventsStats)(nodeID);
+    const relatedEventStats = useSelector((state: ResolverState) =>
+      selectors.relatedEventsStats(state)(nodeID)
+    );
 
     // define a standard way of giving HTML IDs to nodes based on their entity_id/nodeID.
     // this is used to link nodes via aria attributes
@@ -126,11 +128,13 @@ const UnstyledProcessEventDot = React.memo(
       htmlIDPrefix,
     ]);
 
-    const ariaLevel: number | null = useSelector(selectors.ariaLevel)(nodeID);
+    const ariaLevel: number | null = useSelector((state: ResolverState) =>
+      selectors.ariaLevel(state)(nodeID)
+    );
 
     // the node ID to 'flowto'
-    const ariaFlowtoNodeID: string | null = useSelector(selectors.ariaFlowtoNodeID)(timeAtRender)(
-      nodeID
+    const ariaFlowtoNodeID: string | null = useSelector((state: ResolverState) =>
+      selectors.ariaFlowtoNodeID(state)(timeAtRender)(nodeID)
     );
 
     const isShowingEventActions = xScale > 0.8;
@@ -290,8 +294,8 @@ const UnstyledProcessEventDot = React.memo(
       ? subMenuAssets.initialMenuStatus
       : relatedEventOptions;
 
-    const grandTotal: number | null = useSelector(selectors.relatedEventTotalForProcess)(
-      event as ResolverEvent
+    const grandTotal: number | null = useSelector((state: ResolverState) =>
+      selectors.relatedEventTotalForProcess(state)(event as ResolverEvent)
     );
 
     /* eslint-disable jsx-a11y/click-events-have-key-events */
diff --git a/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx b/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx
index 32faeec043f2d..aa845e7283ebe 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/resolver_without_providers.tsx
@@ -21,7 +21,7 @@ import { useStateSyncingActions } from './use_state_syncing_actions';
 import { StyledMapContainer, StyledPanel, GraphContainer } from './styles';
 import { entityIDSafeVersion } from '../../../common/endpoint/models/event';
 import { SideEffectContext } from './side_effect_context';
-import { ResolverProps } from '../types';
+import { ResolverProps, ResolverState } from '../types';
 
 /**
  * The highest level connected Resolver component. Needs a `Provider` in its ancestry to work.
@@ -46,9 +46,12 @@ export const ResolverWithoutProviders = React.memo(
     // use this for the entire render in order to keep things in sync
     const timeAtRender = timestamp();
 
-    const { processNodePositions, connectingEdgeLineSegments } = useSelector(
-      selectors.visibleNodesAndEdgeLines
-    )(timeAtRender);
+    const {
+      processNodePositions,
+      connectingEdgeLineSegments,
+    } = useSelector((state: ResolverState) =>
+      selectors.visibleNodesAndEdgeLines(state)(timeAtRender)
+    );
     const terminatedProcesses = useSelector(selectors.terminatedProcesses);
     const { projectionMatrix, ref: cameraRef, onMouseDown } = useCamera();
 

From 50193eaabb3993fa662efc83caa5712ef11ae64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20C=C3=B4t=C3=A9?= <mikecote@users.noreply.github.com>
Date: Thu, 27 Aug 2020 16:00:03 -0400
Subject: [PATCH 112/148] Fix alerts unable to create / update when the name
 has trailing whitepace(s) (#76079)

* Trim alert name in API key name

* Add API integration tests
---
 .../alerts/server/alerts_client.test.ts       | 128 +++++++++++++++++-
 x-pack/plugins/alerts/server/alerts_client.ts |   4 +-
 .../tests/alerting/create.ts                  |  39 ++++++
 .../tests/alerting/update.ts                  |  51 +++++++
 4 files changed, 219 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/alerts/server/alerts_client.test.ts b/x-pack/plugins/alerts/server/alerts_client.test.ts
index d994269366ae6..f4aef62657abc 100644
--- a/x-pack/plugins/alerts/server/alerts_client.test.ts
+++ b/x-pack/plugins/alerts/server/alerts_client.test.ts
@@ -652,6 +652,70 @@ describe('create()', () => {
     expect(taskManager.schedule).toHaveBeenCalledTimes(0);
   });
 
+  test('should trim alert name when creating API key', async () => {
+    const data = getMockData({ name: ' my alert name ' });
+    unsecuredSavedObjectsClient.bulkGet.mockResolvedValueOnce({
+      saved_objects: [
+        {
+          id: '1',
+          type: 'action',
+          attributes: {
+            actions: [],
+            actionTypeId: 'test',
+          },
+          references: [],
+        },
+      ],
+    });
+    unsecuredSavedObjectsClient.create.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        enabled: false,
+        name: ' my alert name ',
+        alertTypeId: '123',
+        schedule: { interval: 10000 },
+        params: {
+          bar: true,
+        },
+        createdAt: new Date().toISOString(),
+        actions: [
+          {
+            group: 'default',
+            actionRef: 'action_0',
+            actionTypeId: 'test',
+            params: {
+              foo: true,
+            },
+          },
+        ],
+      },
+      references: [
+        {
+          name: 'action_0',
+          type: 'action',
+          id: '1',
+        },
+      ],
+    });
+    taskManager.schedule.mockResolvedValueOnce({
+      id: 'task-123',
+      taskType: 'alerting:123',
+      scheduledAt: new Date(),
+      attempts: 1,
+      status: TaskStatus.Idle,
+      runAt: new Date(),
+      startedAt: null,
+      retryAt: null,
+      state: {},
+      params: {},
+      ownerId: null,
+    });
+
+    await alertsClient.create({ data });
+    expect(alertsClientParams.createAPIKey).toHaveBeenCalledWith('Alerting: 123/my alert name');
+  });
+
   test('should validate params', async () => {
     const data = getMockData();
     alertTypeRegistry.get.mockReturnValue({
@@ -2896,9 +2960,13 @@ describe('update()', () => {
     type: 'alert',
     attributes: {
       enabled: true,
+      tags: ['foo'],
       alertTypeId: 'myType',
+      schedule: { interval: '10s' },
       consumer: 'myApp',
       scheduledTaskId: 'task-123',
+      params: {},
+      throttle: null,
       actions: [
         {
           group: 'default',
@@ -2927,7 +2995,7 @@ describe('update()', () => {
     unsecuredSavedObjectsClient.get.mockResolvedValue(existingAlert);
     encryptedSavedObjects.getDecryptedAsInternalUser.mockResolvedValue(existingDecryptedAlert);
     alertTypeRegistry.get.mockReturnValue({
-      id: '123',
+      id: 'myType',
       name: 'Test',
       actionGroups: [{ id: 'default', name: 'Default' }],
       defaultActionGroupId: 'default',
@@ -3489,6 +3557,64 @@ describe('update()', () => {
     );
   });
 
+  it('should trim alert name in the API key name', async () => {
+    unsecuredSavedObjectsClient.bulkGet.mockResolvedValueOnce({
+      saved_objects: [
+        {
+          id: '1',
+          type: 'action',
+          attributes: {
+            actions: [],
+            actionTypeId: 'test',
+          },
+          references: [],
+        },
+      ],
+    });
+    unsecuredSavedObjectsClient.update.mockResolvedValueOnce({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        enabled: false,
+        name: ' my alert name ',
+        schedule: { interval: '10s' },
+        params: {
+          bar: true,
+        },
+        createdAt: new Date().toISOString(),
+        actions: [
+          {
+            group: 'default',
+            actionRef: 'action_0',
+            actionTypeId: 'test',
+            params: {
+              foo: true,
+            },
+          },
+        ],
+        scheduledTaskId: 'task-123',
+        apiKey: null,
+      },
+      updated_at: new Date().toISOString(),
+      references: [
+        {
+          name: 'action_0',
+          type: 'action',
+          id: '1',
+        },
+      ],
+    });
+    await alertsClient.update({
+      id: '1',
+      data: {
+        ...existingAlert.attributes,
+        name: ' my alert name ',
+      },
+    });
+
+    expect(alertsClientParams.createAPIKey).toHaveBeenCalledWith('Alerting: myType/my alert name');
+  });
+
   it('swallows error when invalidate API key throws', async () => {
     alertsClientParams.invalidateAPIKey.mockRejectedValueOnce(new Error('Fail'));
     unsecuredSavedObjectsClient.bulkGet.mockResolvedValueOnce({
diff --git a/x-pack/plugins/alerts/server/alerts_client.ts b/x-pack/plugins/alerts/server/alerts_client.ts
index 80e021fc5cb6e..74aef644d58ca 100644
--- a/x-pack/plugins/alerts/server/alerts_client.ts
+++ b/x-pack/plugins/alerts/server/alerts_client.ts
@@ -5,7 +5,7 @@
  */
 
 import Boom from 'boom';
-import { omit, isEqual, map, uniq, pick, truncate } from 'lodash';
+import { omit, isEqual, map, uniq, pick, truncate, trim } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import {
   Logger,
@@ -940,7 +940,7 @@ export class AlertsClient {
   }
 
   private generateAPIKeyName(alertTypeId: string, alertName: string) {
-    return truncate(`Alerting: ${alertTypeId}/${alertName}`, { length: 256 });
+    return truncate(`Alerting: ${alertTypeId}/${trim(alertName)}`, { length: 256 });
   }
 }
 
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts
index 8d7b9dec58cf1..983f87405a1a6 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/create.ts
@@ -347,6 +347,45 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
           }
         });
 
+        it('should handle create alert request appropriately when alert name has leading and trailing whitespaces', async () => {
+          const response = await supertestWithoutAuth
+            .post(`${getUrlPrefix(space.id)}/api/alerts/alert`)
+            .set('kbn-xsrf', 'foo')
+            .auth(user.username, user.password)
+            .send(
+              getTestAlertData({
+                name: ' leading and trailing whitespace ',
+              })
+            );
+
+          switch (scenario.id) {
+            case 'no_kibana_privileges at space1':
+            case 'global_read at space1':
+            case 'space_1_all at space2':
+              expect(response.statusCode).to.eql(403);
+              expect(response.body).to.eql({
+                error: 'Forbidden',
+                message: getConsumerUnauthorizedErrorMessage(
+                  'create',
+                  'test.noop',
+                  'alertsFixture'
+                ),
+                statusCode: 403,
+              });
+              break;
+            case 'superuser at space1':
+            case 'space_1_all at space1':
+            case 'space_1_all_alerts_none_actions at space1':
+            case 'space_1_all_with_restricted_fixture at space1':
+              expect(response.statusCode).to.eql(200);
+              expect(response.body.name).to.eql(' leading and trailing whitespace ');
+              objectRemover.add(space.id, response.body.id, 'alert', 'alerts');
+              break;
+            default:
+              throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
+          }
+        });
+
         it('should handle create alert request appropriately when alert type is unregistered', async () => {
           const response = await supertestWithoutAuth
             .post(`${getUrlPrefix(space.id)}/api/alerts/alert`)
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts
index ab3a92d0b3f70..48269cc1c4498 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/update.ts
@@ -505,6 +505,57 @@ export default function createUpdateTests({ getService }: FtrProviderContext) {
           }
         });
 
+        it('should handle update alert request appropriately when alert name has leading and trailing whitespaces', async () => {
+          const { body: createdAlert } = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/alerts/alert`)
+            .set('kbn-xsrf', 'foo')
+            .send(getTestAlertData())
+            .expect(200);
+          objectRemover.add(space.id, createdAlert.id, 'alert', 'alerts');
+
+          const updatedData = {
+            name: ' leading and trailing whitespace ',
+            tags: ['bar'],
+            params: {
+              foo: true,
+            },
+            schedule: { interval: '12s' },
+            actions: [],
+            throttle: '1m',
+          };
+          const response = await supertestWithoutAuth
+            .put(`${getUrlPrefix(space.id)}/api/alerts/alert/${createdAlert.id}`)
+            .set('kbn-xsrf', 'foo')
+            .auth(user.username, user.password)
+            .send(updatedData);
+
+          switch (scenario.id) {
+            case 'no_kibana_privileges at space1':
+            case 'space_1_all at space2':
+            case 'global_read at space1':
+              expect(response.statusCode).to.eql(403);
+              expect(response.body).to.eql({
+                error: 'Forbidden',
+                message: getConsumerUnauthorizedErrorMessage(
+                  'update',
+                  'test.noop',
+                  'alertsFixture'
+                ),
+                statusCode: 403,
+              });
+              break;
+            case 'superuser at space1':
+            case 'space_1_all at space1':
+            case 'space_1_all_alerts_none_actions at space1':
+            case 'space_1_all_with_restricted_fixture at space1':
+              expect(response.statusCode).to.eql(200);
+              expect(response.body.name).to.eql(' leading and trailing whitespace ');
+              break;
+            default:
+              throw new Error(`Scenario untested: ${JSON.stringify(scenario)}`);
+          }
+        });
+
         it(`shouldn't update alert from another space`, async () => {
           const { body: createdAlert } = await supertest
             .post(`${getUrlPrefix(space.id)}/api/alerts/alert`)

From 905c76242d650dce2f9288c43ba91c8cbd5184e0 Mon Sep 17 00:00:00 2001
From: Chris Cressman <chris@chriscressman.com>
Date: Thu, 27 Aug 2020 16:11:18 -0400
Subject: [PATCH 113/148] Fixes App Search documentation links (#76133)

Two links to App Search docs are pointing to outdated versions.

Update the URLs.
---
 .../app_search/components/setup_guide/setup_guide.tsx         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx
index fa55289e73e0b..204f355c7a31a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/setup_guide.tsx
@@ -19,8 +19,8 @@ export const SetupGuide: React.FC = () => (
   <SetupGuideLayout
     productName={APP_SEARCH_PLUGIN.NAME}
     productEuiIcon="logoAppSearch"
-    standardAuthLink="https://swiftype.com/documentation/app-search/self-managed/security#standard"
-    elasticsearchNativeAuthLink="https://swiftype.com/documentation/app-search/self-managed/security#elasticsearch-native-realm"
+    standardAuthLink="https://www.elastic.co/guide/en/app-search/current/security-and-users.html#app-search-self-managed-security-and-user-management-standard"
+    elasticsearchNativeAuthLink="https://www.elastic.co/guide/en/app-search/current/security-and-users.html#app-search-self-managed-security-and-user-management-elasticsearch-native-realm"
   >
     <SetPageChrome
       text={i18n.translate('xpack.enterpriseSearch.setupGuide.title', {

From 280fb8b3ed61538c54e206c45b30afae61279618 Mon Sep 17 00:00:00 2001
From: Michael Olorunnisola <michael.olorunnisola@elastic.co>
Date: Thu, 27 Aug 2020 14:42:21 -0600
Subject: [PATCH 114/148] [Security_Solution][Resolver] Resolver loading and
 error state (#75600)

---
 .../data_access_layer/mocks/emptify_mock.ts   |  88 +++++++++
 .../data_access_layer/mocks/pausify_mock.ts   | 124 +++++++++++++
 .../resolver/test_utilities/extend_jest.ts    |  12 +-
 .../resolver/view/clickthrough.test.tsx       |   1 +
 .../view/resolver_loading_state.test.tsx      | 167 ++++++++++++++++++
 5 files changed, 387 insertions(+), 5 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/emptify_mock.ts
 create mode 100644 x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts
 create mode 100644 x-pack/plugins/security_solution/public/resolver/view/resolver_loading_state.test.tsx

diff --git a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/emptify_mock.ts b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/emptify_mock.ts
new file mode 100644
index 0000000000000..43282848dcf9a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/emptify_mock.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  ResolverRelatedEvents,
+  ResolverTree,
+  ResolverEntityIndex,
+} from '../../../../common/endpoint/types';
+import { mockTreeWithNoProcessEvents } from '../../mocks/resolver_tree';
+import { DataAccessLayer } from '../../types';
+
+type EmptiableRequests = 'relatedEvents' | 'resolverTree' | 'entities' | 'indexPatterns';
+
+interface Metadata<T> {
+  /**
+   * The `_id` of the document being analyzed.
+   */
+  databaseDocumentID: string;
+  /**
+   * A record of entityIDs to be used in tests assertions.
+   */
+  entityIDs: T;
+}
+
+/**
+ * A simple mock dataAccessLayer that allows you to control whether a request comes back with data or empty.
+ */
+export function emptifyMock<T>(
+  {
+    metadata,
+    dataAccessLayer,
+  }: {
+    dataAccessLayer: DataAccessLayer;
+    metadata: Metadata<T>;
+  },
+  dataShouldBeEmpty: EmptiableRequests[]
+): {
+  dataAccessLayer: DataAccessLayer;
+  metadata: Metadata<T>;
+} {
+  return {
+    metadata,
+    dataAccessLayer: {
+      /**
+       * Fetch related events for an entity ID
+       */
+      async relatedEvents(...args): Promise<ResolverRelatedEvents> {
+        return dataShouldBeEmpty.includes('relatedEvents')
+          ? Promise.resolve({
+              entityID: args[0],
+              events: [],
+              nextEvent: null,
+            })
+          : dataAccessLayer.relatedEvents(...args);
+      },
+
+      /**
+       * Fetch a ResolverTree for a entityID
+       */
+      async resolverTree(...args): Promise<ResolverTree> {
+        return dataShouldBeEmpty.includes('resolverTree')
+          ? Promise.resolve(mockTreeWithNoProcessEvents())
+          : dataAccessLayer.resolverTree(...args);
+      },
+
+      /**
+       * Get an array of index patterns that contain events.
+       */
+      indexPatterns(...args): string[] {
+        return dataShouldBeEmpty.includes('indexPatterns')
+          ? []
+          : dataAccessLayer.indexPatterns(...args);
+      },
+
+      /**
+       * Get entities matching a document.
+       */
+      async entities(...args): Promise<ResolverEntityIndex> {
+        return dataShouldBeEmpty.includes('entities')
+          ? Promise.resolve([])
+          : dataAccessLayer.entities(...args);
+      },
+    },
+  };
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts
new file mode 100644
index 0000000000000..baddcdfd0cd84
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/data_access_layer/mocks/pausify_mock.ts
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  ResolverRelatedEvents,
+  ResolverTree,
+  ResolverEntityIndex,
+} from '../../../../common/endpoint/types';
+import { DataAccessLayer } from '../../types';
+
+type PausableRequests = 'relatedEvents' | 'resolverTree' | 'entities';
+
+interface Metadata<T> {
+  /**
+   * The `_id` of the document being analyzed.
+   */
+  databaseDocumentID: string;
+  /**
+   * A record of entityIDs to be used in tests assertions.
+   */
+  entityIDs: T;
+}
+
+/**
+ * A simple mock dataAccessLayer that allows you to manually pause and resume a request.
+ */
+export function pausifyMock<T>({
+  metadata,
+  dataAccessLayer,
+}: {
+  dataAccessLayer: DataAccessLayer;
+  metadata: Metadata<T>;
+}): {
+  dataAccessLayer: DataAccessLayer;
+  metadata: Metadata<T>;
+  pause: (pausableRequests: PausableRequests[]) => void;
+  resume: (pausableRequests: PausableRequests[]) => void;
+} {
+  let relatedEventsPromise = Promise.resolve();
+  let resolverTreePromise = Promise.resolve();
+  let entitiesPromise = Promise.resolve();
+
+  let relatedEventsResolver: (() => void) | null;
+  let resolverTreeResolver: (() => void) | null;
+  let entitiesResolver: (() => void) | null;
+
+  return {
+    metadata,
+    pause: (pausableRequests: PausableRequests[]) => {
+      const pauseRelatedEventsRequest = pausableRequests.includes('relatedEvents');
+      const pauseResolverTreeRequest = pausableRequests.includes('resolverTree');
+      const pauseEntitiesRequest = pausableRequests.includes('entities');
+
+      if (pauseRelatedEventsRequest && !relatedEventsResolver) {
+        relatedEventsPromise = new Promise((resolve) => {
+          relatedEventsResolver = resolve;
+        });
+      }
+      if (pauseResolverTreeRequest && !resolverTreeResolver) {
+        resolverTreePromise = new Promise((resolve) => {
+          resolverTreeResolver = resolve;
+        });
+      }
+      if (pauseEntitiesRequest && !entitiesResolver) {
+        entitiesPromise = new Promise((resolve) => {
+          entitiesResolver = resolve;
+        });
+      }
+    },
+    resume: (pausableRequests: PausableRequests[]) => {
+      const resumeEntitiesRequest = pausableRequests.includes('entities');
+      const resumeResolverTreeRequest = pausableRequests.includes('resolverTree');
+      const resumeRelatedEventsRequest = pausableRequests.includes('relatedEvents');
+
+      if (resumeEntitiesRequest && entitiesResolver) {
+        entitiesResolver();
+        entitiesResolver = null;
+      }
+      if (resumeResolverTreeRequest && resolverTreeResolver) {
+        resolverTreeResolver();
+        resolverTreeResolver = null;
+      }
+      if (resumeRelatedEventsRequest && relatedEventsResolver) {
+        relatedEventsResolver();
+        relatedEventsResolver = null;
+      }
+    },
+    dataAccessLayer: {
+      /**
+       * Fetch related events for an entity ID
+       */
+      async relatedEvents(...args): Promise<ResolverRelatedEvents> {
+        await relatedEventsPromise;
+        return dataAccessLayer.relatedEvents(...args);
+      },
+
+      /**
+       * Fetch a ResolverTree for a entityID
+       */
+      async resolverTree(...args): Promise<ResolverTree> {
+        await resolverTreePromise;
+        return dataAccessLayer.resolverTree(...args);
+      },
+
+      /**
+       * Get an array of index patterns that contain events.
+       */
+      indexPatterns(...args): string[] {
+        return dataAccessLayer.indexPatterns(...args);
+      },
+
+      /**
+       * Get entities matching a document.
+       */
+      async entities(...args): Promise<ResolverEntityIndex> {
+        await entitiesPromise;
+        return dataAccessLayer.entities(...args);
+      },
+    },
+  };
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/test_utilities/extend_jest.ts b/x-pack/plugins/security_solution/public/resolver/test_utilities/extend_jest.ts
index df8f32d15a7ab..aa04221361de0 100644
--- a/x-pack/plugins/security_solution/public/resolver/test_utilities/extend_jest.ts
+++ b/x-pack/plugins/security_solution/public/resolver/test_utilities/extend_jest.ts
@@ -44,7 +44,7 @@ expect.extend({
     const received: T[] = [];
 
     // Set to true if the test passes.
-    let pass: boolean = false;
+    let lastCheckPassed: boolean = false;
 
     // Async iterate over the iterable
     for await (const next of receivedIterable) {
@@ -52,15 +52,17 @@ expect.extend({
       received.push(next);
       // Use deep equals to compare the value to the expected value
       if (this.equals(next, expected)) {
-        // If the value is equal, break
-        pass = true;
+        lastCheckPassed = true;
+      } else if (lastCheckPassed) {
+        // the previous check passed but this one didn't
+        lastCheckPassed = false;
         break;
       }
     }
 
     // Use `pass` as set in the above loop (or initialized to `false`)
     // See https://jestjs.io/docs/en/expect#custom-matchers-api and https://jestjs.io/docs/en/expect#thisutils
-    const message = pass
+    const message = lastCheckPassed
       ? () =>
           `${this.utils.matcherHint(matcherName, undefined, undefined, options)}\n\n` +
           `Expected: not ${this.utils.printExpected(expected)}\n${
@@ -84,7 +86,7 @@ expect.extend({
             )
             .join(`\n\n`)}`;
 
-    return { message, pass };
+    return { message, pass: lastCheckPassed };
   },
   /**
    * A custom matcher that takes an async generator and compares each value it yields to an expected value.
diff --git a/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx
index 358fcd17b998a..1e5ac093cac77 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/clickthrough.test.tsx
@@ -242,6 +242,7 @@ describe('Resolver, when analyzing a tree that has two related events for the or
         );
         if (button) {
           button.simulate('click');
+          button.simulate('click'); // The first click opened the menu, this second click closes it
         }
       });
       it('should close the submenu', async () => {
diff --git a/x-pack/plugins/security_solution/public/resolver/view/resolver_loading_state.test.tsx b/x-pack/plugins/security_solution/public/resolver/view/resolver_loading_state.test.tsx
new file mode 100644
index 0000000000000..c357ee18acfeb
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/view/resolver_loading_state.test.tsx
@@ -0,0 +1,167 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Simulator } from '../test_utilities/simulator';
+import { pausifyMock } from '../data_access_layer/mocks/pausify_mock';
+import { emptifyMock } from '../data_access_layer/mocks/emptify_mock';
+import { noAncestorsTwoChildren } from '../data_access_layer/mocks/no_ancestors_two_children';
+import '../test_utilities/extend_jest';
+
+describe('Resolver: data loading and resolution states', () => {
+  let simulator: Simulator;
+  const resolverComponentInstanceID = 'resolver-loading-resolution-states';
+
+  describe('When entities data is being requested', () => {
+    beforeEach(() => {
+      const {
+        metadata: { databaseDocumentID },
+        dataAccessLayer,
+        pause,
+      } = pausifyMock(noAncestorsTwoChildren());
+      pause(['entities']);
+      simulator = new Simulator({
+        dataAccessLayer,
+        databaseDocumentID,
+        resolverComponentInstanceID,
+      });
+    });
+
+    it('should display a loading state', async () => {
+      await expect(
+        simulator.map(() => ({
+          resolverGraphLoading: simulator.testSubject('resolver:graph:loading').length,
+          resolverGraphError: simulator.testSubject('resolver:graph:error').length,
+          resolverGraph: simulator.testSubject('resolver:graph').length,
+        }))
+      ).toYieldEqualTo({
+        resolverGraphLoading: 1,
+        resolverGraphError: 0,
+        resolverGraph: 0,
+      });
+    });
+  });
+
+  describe('When resolver tree data is being requested', () => {
+    beforeEach(() => {
+      const {
+        metadata: { databaseDocumentID },
+        dataAccessLayer,
+        pause,
+      } = pausifyMock(noAncestorsTwoChildren());
+      pause(['resolverTree']);
+      simulator = new Simulator({
+        dataAccessLayer,
+        databaseDocumentID,
+        resolverComponentInstanceID,
+      });
+    });
+
+    it('should display a loading state', async () => {
+      await expect(
+        simulator.map(() => ({
+          resolverGraphLoading: simulator.testSubject('resolver:graph:loading').length,
+          resolverGraphError: simulator.testSubject('resolver:graph:error').length,
+          resolverGraph: simulator.testSubject('resolver:graph').length,
+        }))
+      ).toYieldEqualTo({
+        resolverGraphLoading: 1,
+        resolverGraphError: 0,
+        resolverGraph: 0,
+      });
+    });
+  });
+
+  describe("When the entities request doesn't return any data", () => {
+    beforeEach(() => {
+      const {
+        metadata: { databaseDocumentID },
+        dataAccessLayer,
+      } = emptifyMock(noAncestorsTwoChildren(), ['entities']);
+
+      simulator = new Simulator({
+        dataAccessLayer,
+        databaseDocumentID,
+        resolverComponentInstanceID,
+      });
+    });
+
+    it('should display an error', async () => {
+      await expect(
+        simulator.map(() => ({
+          resolverGraphLoading: simulator.testSubject('resolver:graph:loading').length,
+          resolverGraphError: simulator.testSubject('resolver:graph:error').length,
+          resolverGraph: simulator.testSubject('resolver:graph').length,
+        }))
+      ).toYieldEqualTo({
+        resolverGraphLoading: 0,
+        resolverGraphError: 1,
+        resolverGraph: 0,
+      });
+    });
+  });
+
+  describe("When the resolver tree request doesn't return any data", () => {
+    beforeEach(() => {
+      const {
+        metadata: { databaseDocumentID },
+        dataAccessLayer,
+      } = emptifyMock(noAncestorsTwoChildren(), ['resolverTree']);
+
+      simulator = new Simulator({
+        dataAccessLayer,
+        databaseDocumentID,
+        resolverComponentInstanceID,
+      });
+    });
+
+    it('should display a resolver graph with 0 nodes', async () => {
+      await expect(
+        simulator.map(() => ({
+          resolverGraphLoading: simulator.testSubject('resolver:graph:loading').length,
+          resolverGraphError: simulator.testSubject('resolver:graph:error').length,
+          resolverGraph: simulator.testSubject('resolver:graph').length,
+          resolverGraphNodes: simulator.testSubject('resolver:node').length,
+        }))
+      ).toYieldEqualTo({
+        resolverGraphLoading: 0,
+        resolverGraphError: 0,
+        resolverGraph: 1,
+        resolverGraphNodes: 0,
+      });
+    });
+  });
+
+  describe('When all resolver data requests successfully resolve', () => {
+    beforeEach(async () => {
+      const {
+        metadata: { databaseDocumentID },
+        dataAccessLayer,
+      } = noAncestorsTwoChildren();
+
+      simulator = new Simulator({
+        dataAccessLayer,
+        databaseDocumentID,
+        resolverComponentInstanceID,
+      });
+    });
+
+    it('should display the resolver graph with 3 nodes', async () => {
+      await expect(
+        simulator.map(() => ({
+          resolverGraphLoading: simulator.testSubject('resolver:graph:loading').length,
+          resolverGraphError: simulator.testSubject('resolver:graph:error').length,
+          resolverGraph: simulator.testSubject('resolver:graph').length,
+          resolverGraphNodes: simulator.testSubject('resolver:node').length,
+        }))
+      ).toYieldEqualTo({
+        resolverGraphLoading: 0,
+        resolverGraphError: 0,
+        resolverGraph: 1,
+        resolverGraphNodes: 3,
+      });
+    });
+  });
+});

From 89ae03221b99c2cf06aa007b3f055e6f0cd43537 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Thu, 27 Aug 2020 14:19:41 -0700
Subject: [PATCH 115/148] [docs/getting-started] link to yarn v1 specifically
 (#76169)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 docs/developer/getting-started/index.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developer/getting-started/index.asciidoc b/docs/developer/getting-started/index.asciidoc
index 10e603a8da8bb..9b334a55c4203 100644
--- a/docs/developer/getting-started/index.asciidoc
+++ b/docs/developer/getting-started/index.asciidoc
@@ -30,7 +30,7 @@ you can switch to the correct version when using nvm by running:
 nvm use
 ----
 
-Install the latest version of https://yarnpkg.com[yarn].
+Install the latest version of https://classic.yarnpkg.com/en/docs/install[yarn v1].
 
 Bootstrap {kib} and install all the dependencies:
 

From 64311d306f88f649677a26b1f9a50c2f39b1a2aa Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Thu, 27 Aug 2020 14:56:48 -0700
Subject: [PATCH 116/148] [plugin-helpers] improve 3rd party KP plugin support
 (#75019)

Co-authored-by: Tyler Smalley <tylersmalley@me.com>
Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 .../external-plugin-functional-tests.asciidoc |   4 +-
 packages/kbn-dev-utils/package.json           |  18 +-
 packages/kbn-dev-utils/src/babel.ts           |  59 +++++
 packages/kbn-dev-utils/src/index.ts           |   3 +
 .../src/parse_kibana_platform_plugin.ts       |  59 +++++
 packages/kbn-dev-utils/src/run/flags.ts       |   4 +-
 .../kbn-dev-utils/src/serializers/index.ts    |   1 +
 .../src/serializers/replace_serializer.ts     |  36 +++
 ...simple_kibana_platform_plugin_discovery.ts |  54 +----
 .../src/streams.ts                            |  53 ++--
 .../src/optimizer/kibana_platform_plugins.ts  |   2 +-
 .../kbn-plugin-generator/src/plugin_types.ts  |  60 +++++
 .../src/render_template.ts                    |  25 +-
 .../template/README.md.ejs                    |  11 +
 .../template/package.json.ejs                 |   2 +
 packages/kbn-plugin-helpers/package.json      |  35 +--
 .../build_context.ts}                         |  20 +-
 packages/kbn-plugin-helpers/src/cli.ts        | 123 ++++++----
 packages/kbn-plugin-helpers/src/config.ts     |  83 +++++++
 .../src/{lib/run.ts => find_kibana_json.ts}   |  26 +-
 .../src/{tasks/start => }/index.ts            |   2 +-
 .../src/integration_tests/build.test.ts       | 123 ++++++++++
 .../commander_action.test.js.snap             |  43 ----
 .../src/lib/commander_action.test.js          |  87 -------
 .../src/lib/commander_action.ts               |  36 ---
 .../kbn-plugin-helpers/src/lib/config_file.ts |  69 ------
 .../lib/enable_collecting_unknown_options.ts  |  30 ---
 .../kbn-plugin-helpers/src/lib/pipeline.ts    |  23 --
 .../src/lib/plugin_config.ts                  |  74 ------
 packages/kbn-plugin-helpers/src/lib/utils.ts  |  42 ----
 .../kbn-plugin-helpers/src/lib/win_cmd.ts     |  24 --
 ...task.ts => load_kibana_platform_plugin.ts} |  41 ++--
 .../tasks.ts => resolve_kibana_version.ts}    |  33 +--
 .../src/tasks/build/README.md                 |  19 --
 .../src/tasks/build/build_task.ts             |  63 -----
 .../src/tasks/build/create_build.ts           | 179 --------------
 .../src/tasks/build/git_info.ts               |  46 ----
 .../src/tasks/build/index.ts                  |  20 --
 .../build_action_test_plugin/package.json     |  16 --
 .../translations/es.json                      |   4 -
 .../create_build_test_plugin/index.js         |  20 --
 .../create_build_test_plugin/package.json     |  16 --
 .../translations/es.json                      |   4 -
 .../create_package_test_plugin/index.js       |  20 --
 .../create_package_test_plugin/package.json   |  16 --
 .../translations/es.json                      |   4 -
 .../__snapshots__/build_action.test.js.snap   |   3 -
 .../integration_tests/build_action.test.js    | 117 ---------
 .../integration_tests/create_build.test.js    |  87 -------
 .../integration_tests/create_package.test.js  |  48 ----
 .../src/tasks/build/rewrite_package_json.ts   |  54 -----
 .../src/{lib/docs.ts => tasks/clean.ts}       |  26 +-
 .../create_package.ts => create_archive.ts}   |  48 ++--
 .../src/{lib => tasks}/index.ts               |  10 +-
 .../kbn-plugin-helpers/src/tasks/optimize.ts  |  53 ++++
 .../src/tasks/start/README.md                 |   6 -
 .../src/tasks/start/start_task.ts             |  51 ----
 .../src/tasks/test/mocha/README.md            |  45 ----
 .../src/tasks/test/mocha/index.ts             |  20 --
 .../src/tasks/write_server_files.ts           | 101 ++++++++
 .../src/tasks/yarn_install.ts                 |  40 ++++
 packages/kbn-plugin-helpers/tsconfig.json     |   5 +-
 .../index.js => scripts/plugin_helpers.js     |   3 +-
 src/setup_node_env/prebuilt_dev_only_entry.js |   1 +
 .../plugins/kbn_tp_run_pipeline/package.json  |   2 +-
 .../kbn_tp_custom_visualizations/package.json |   2 +-
 x-pack/.kibana-plugin-helpers.json            |  35 ---
 x-pack/gulpfile.js                            |   2 -
 x-pack/package.json                           |   4 +-
 x-pack/scripts/api_debug.js                   |   2 +-
 x-pack/scripts/functional_test_runner.js      |   2 +-
 x-pack/scripts/functional_tests.js            |   2 +-
 x-pack/scripts/functional_tests_server.js     |   2 +-
 x-pack/scripts/jest.js                        |   2 +-
 x-pack/tasks/build.ts                         |  68 +++++-
 x-pack/tasks/dev.ts                           |  14 --
 .../common/config.ts                          |   8 +-
 .../spaces_api_integration/common/config.ts   |   6 +-
 yarn.lock                                     | 226 +++++++++++++-----
 79 files changed, 1146 insertions(+), 1681 deletions(-)
 create mode 100644 packages/kbn-dev-utils/src/babel.ts
 create mode 100644 packages/kbn-dev-utils/src/parse_kibana_platform_plugin.ts
 create mode 100644 packages/kbn-dev-utils/src/serializers/replace_serializer.ts
 rename packages/{kbn-plugin-generator => kbn-dev-utils}/src/streams.ts (62%)
 create mode 100644 packages/kbn-plugin-generator/src/plugin_types.ts
 rename packages/kbn-plugin-helpers/{bin/plugin-helpers.js => src/build_context.ts} (73%)
 mode change 100755 => 100644
 create mode 100644 packages/kbn-plugin-helpers/src/config.ts
 rename packages/kbn-plugin-helpers/src/{lib/run.ts => find_kibana_json.ts} (65%)
 rename packages/kbn-plugin-helpers/src/{tasks/start => }/index.ts (96%)
 create mode 100644 packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/lib/__snapshots__/commander_action.test.js.snap
 delete mode 100644 packages/kbn-plugin-helpers/src/lib/commander_action.test.js
 delete mode 100644 packages/kbn-plugin-helpers/src/lib/commander_action.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/lib/config_file.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/lib/enable_collecting_unknown_options.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/lib/pipeline.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/lib/plugin_config.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/lib/utils.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/lib/win_cmd.ts
 rename packages/kbn-plugin-helpers/src/{tasks/test/mocha/test_mocha_task.ts => load_kibana_platform_plugin.ts} (52%)
 rename packages/kbn-plugin-helpers/src/{lib/tasks.ts => resolve_kibana_version.ts} (58%)
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/README.md
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/build_task.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/create_build.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/git_info.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/index.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/package.json
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/translations/es.json
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/index.js
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/package.json
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/translations/es.json
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/index.js
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/package.json
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/translations/es.json
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__snapshots__/build_action.test.js.snap
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/build_action.test.js
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/create_build.test.js
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/integration_tests/create_package.test.js
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/build/rewrite_package_json.ts
 rename packages/kbn-plugin-helpers/src/{lib/docs.ts => tasks/clean.ts} (62%)
 rename packages/kbn-plugin-helpers/src/tasks/{build/create_package.ts => create_archive.ts} (53%)
 rename packages/kbn-plugin-helpers/src/{lib => tasks}/index.ts (83%)
 create mode 100644 packages/kbn-plugin-helpers/src/tasks/optimize.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/start/README.md
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/start/start_task.ts
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/test/mocha/README.md
 delete mode 100644 packages/kbn-plugin-helpers/src/tasks/test/mocha/index.ts
 create mode 100644 packages/kbn-plugin-helpers/src/tasks/write_server_files.ts
 create mode 100644 packages/kbn-plugin-helpers/src/tasks/yarn_install.ts
 rename packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/index.js => scripts/plugin_helpers.js (88%)
 delete mode 100644 x-pack/.kibana-plugin-helpers.json
 delete mode 100644 x-pack/tasks/dev.ts

diff --git a/docs/developer/plugin/external-plugin-functional-tests.asciidoc b/docs/developer/plugin/external-plugin-functional-tests.asciidoc
index 706bf6af8ed9b..7e5b5b79d06e9 100644
--- a/docs/developer/plugin/external-plugin-functional-tests.asciidoc
+++ b/docs/developer/plugin/external-plugin-functional-tests.asciidoc
@@ -13,7 +13,7 @@ To get started copy and paste this example to `test/functional/config.js`:
 ["source","js"]
 -----------
 import { resolve } from 'path';
-import { resolveKibanaPath } from '@kbn/plugin-helpers';
+import { REPO_ROOT } from '@kbn/dev-utils';
 
 import { MyServiceProvider } from './services/my_service';
 import { MyAppPageProvider } from './services/my_app_page';
@@ -24,7 +24,7 @@ export default async function ({ readConfigFile }) {
 
   // read the {kib} config file so that we can utilize some of
   // its services and PageObjects
-  const kibanaConfig = await readConfigFile(resolveKibanaPath('test/functional/config.js'));
+  const kibanaConfig = await readConfigFile(resolve(REPO_ROOT, 'test/functional/config.js'));
 
   return {
     // list paths to the files that contain your plugins tests
diff --git a/packages/kbn-dev-utils/package.json b/packages/kbn-dev-utils/package.json
index 768a67794517f..4f6f995f38f31 100644
--- a/packages/kbn-dev-utils/package.json
+++ b/packages/kbn-dev-utils/package.json
@@ -1,32 +1,38 @@
 {
   "name": "@kbn/dev-utils",
-  "main": "./target/index.js",
   "version": "1.0.0",
-  "license": "Apache-2.0",
   "private": true,
+  "license": "Apache-2.0",
+  "main": "./target/index.js",
   "scripts": {
     "build": "tsc",
     "kbn:bootstrap": "yarn build",
     "kbn:watch": "yarn build --watch"
   },
   "dependencies": {
+    "@babel/core": "^7.11.1",
     "axios": "^0.19.0",
     "chalk": "^4.1.0",
+    "cheerio": "0.22.0",
     "dedent": "^0.7.0",
     "execa": "^4.0.2",
     "exit-hook": "^2.2.0",
     "getopts": "^2.2.5",
+    "globby": "^8.0.1",
     "load-json-file": "^6.2.0",
-    "normalize-path": "^3.0.0",
+    "markdown-it": "^10.0.0",
     "moment": "^2.24.0",
+    "normalize-path": "^3.0.0",
     "rxjs": "^6.5.5",
     "strip-ansi": "^6.0.0",
     "tree-kill": "^1.2.2",
-    "tslib": "^2.0.0"
+    "vinyl": "^2.2.0"
   },
   "devDependencies": {
-    "typescript": "4.0.2",
+    "@kbn/babel-preset": "1.0.0",
     "@kbn/expect": "1.0.0",
-    "chance": "1.0.18"
+    "@types/vinyl": "^2.0.4",
+    "chance": "1.0.18",
+    "typescript": "4.0.2"
   }
 }
diff --git a/packages/kbn-dev-utils/src/babel.ts b/packages/kbn-dev-utils/src/babel.ts
new file mode 100644
index 0000000000000..e48fe81d0232c
--- /dev/null
+++ b/packages/kbn-dev-utils/src/babel.ts
@@ -0,0 +1,59 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import File from 'vinyl';
+import * as Babel from '@babel/core';
+
+const transformedFiles = new WeakSet<File>();
+
+/**
+ * Returns a promise that resolves when the file has been
+ * mutated so the contents of the file are tranformed with
+ * babel, include inline sourcemaps, and the filename has
+ * been updated to use .js.
+ *
+ * If the file was previously transformed with this function
+ * the promise will just resolve immediately.
+ */
+export async function transformFileWithBabel(file: File) {
+  if (!(file.contents instanceof Buffer)) {
+    throw new Error('file must be buffered');
+  }
+
+  if (transformedFiles.has(file)) {
+    return;
+  }
+
+  const source = file.contents.toString('utf8');
+  const result = await Babel.transformAsync(source, {
+    babelrc: false,
+    configFile: false,
+    sourceMaps: 'inline',
+    filename: file.path,
+    presets: [require.resolve('@kbn/babel-preset/node_preset')],
+  });
+
+  if (!result || typeof result.code !== 'string') {
+    throw new Error('babel transformation failed without an error...');
+  }
+
+  file.contents = Buffer.from(result.code);
+  file.extname = '.js';
+  transformedFiles.add(file);
+}
diff --git a/packages/kbn-dev-utils/src/index.ts b/packages/kbn-dev-utils/src/index.ts
index 798746d159f60..2871fe2ffcf4a 100644
--- a/packages/kbn-dev-utils/src/index.ts
+++ b/packages/kbn-dev-utils/src/index.ts
@@ -41,3 +41,6 @@ export * from './stdio';
 export * from './ci_stats_reporter';
 export * from './plugin_list';
 export * from './simple_kibana_platform_plugin_discovery';
+export * from './streams';
+export * from './babel';
+export * from './parse_kibana_platform_plugin';
diff --git a/packages/kbn-dev-utils/src/parse_kibana_platform_plugin.ts b/packages/kbn-dev-utils/src/parse_kibana_platform_plugin.ts
new file mode 100644
index 0000000000000..83d8c2684d7ca
--- /dev/null
+++ b/packages/kbn-dev-utils/src/parse_kibana_platform_plugin.ts
@@ -0,0 +1,59 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Path from 'path';
+import loadJsonFile from 'load-json-file';
+
+export interface KibanaPlatformPlugin {
+  readonly directory: string;
+  readonly manifestPath: string;
+  readonly manifest: {
+    id: string;
+    ui: boolean;
+    server: boolean;
+    [key: string]: unknown;
+  };
+}
+
+export function parseKibanaPlatformPlugin(manifestPath: string): KibanaPlatformPlugin {
+  if (!Path.isAbsolute(manifestPath)) {
+    throw new TypeError('expected new platform manifest path to be absolute');
+  }
+
+  const manifest = loadJsonFile.sync(manifestPath);
+  if (!manifest || typeof manifest !== 'object' || Array.isArray(manifest)) {
+    throw new TypeError('expected new platform plugin manifest to be a JSON encoded object');
+  }
+
+  if (typeof manifest.id !== 'string') {
+    throw new TypeError('expected new platform plugin manifest to have a string id');
+  }
+
+  return {
+    directory: Path.dirname(manifestPath),
+    manifestPath,
+    manifest: {
+      ...manifest,
+
+      ui: !!manifest.ui,
+      server: !!manifest.server,
+      id: manifest.id,
+    },
+  };
+}
diff --git a/packages/kbn-dev-utils/src/run/flags.ts b/packages/kbn-dev-utils/src/run/flags.ts
index 12642bceca15a..54758b4a7dbf8 100644
--- a/packages/kbn-dev-utils/src/run/flags.ts
+++ b/packages/kbn-dev-utils/src/run/flags.ts
@@ -52,8 +52,8 @@ export function mergeFlagOptions(global: FlagOptions = {}, local: FlagOptions =
     boolean: [...(global.boolean || []), ...(local.boolean || [])],
     string: [...(global.string || []), ...(local.string || [])],
     default: {
-      ...global.alias,
-      ...local.alias,
+      ...global.default,
+      ...local.default,
     },
 
     help: local.help,
diff --git a/packages/kbn-dev-utils/src/serializers/index.ts b/packages/kbn-dev-utils/src/serializers/index.ts
index e645a3be3fe5d..6e0ac0b8be029 100644
--- a/packages/kbn-dev-utils/src/serializers/index.ts
+++ b/packages/kbn-dev-utils/src/serializers/index.ts
@@ -21,3 +21,4 @@ export * from './absolute_path_serializer';
 export * from './strip_ansi_serializer';
 export * from './recursive_serializer';
 export * from './any_instance_serizlizer';
+export * from './replace_serializer';
diff --git a/packages/kbn-dev-utils/src/serializers/replace_serializer.ts b/packages/kbn-dev-utils/src/serializers/replace_serializer.ts
new file mode 100644
index 0000000000000..06096c4bee3a2
--- /dev/null
+++ b/packages/kbn-dev-utils/src/serializers/replace_serializer.ts
@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createRecursiveSerializer } from './recursive_serializer';
+
+type Replacer = (substring: string, ...args: any[]) => string;
+
+export function createReplaceSerializer(
+  toReplace: string | RegExp,
+  replaceWith: string | Replacer
+) {
+  return createRecursiveSerializer(
+    typeof toReplace === 'string'
+      ? (v: any) => typeof v === 'string' && v.includes(toReplace)
+      : (v: any) => typeof v === 'string' && toReplace.test(v),
+    typeof replaceWith === 'string'
+      ? (v: string) => v.replace(toReplace, replaceWith)
+      : (v: string) => v.replace(toReplace, replaceWith)
+  );
+}
diff --git a/packages/kbn-dev-utils/src/simple_kibana_platform_plugin_discovery.ts b/packages/kbn-dev-utils/src/simple_kibana_platform_plugin_discovery.ts
index c7155b2b3c51b..c56d63edb9ac4 100644
--- a/packages/kbn-dev-utils/src/simple_kibana_platform_plugin_discovery.ts
+++ b/packages/kbn-dev-utils/src/simple_kibana_platform_plugin_discovery.ts
@@ -20,67 +20,37 @@
 import Path from 'path';
 
 import globby from 'globby';
-import loadJsonFile from 'load-json-file';
 
-export interface KibanaPlatformPlugin {
-  readonly directory: string;
-  readonly manifestPath: string;
-  readonly manifest: {
-    id: string;
-    [key: string]: unknown;
-  };
-}
+import { parseKibanaPlatformPlugin } from './parse_kibana_platform_plugin';
 
 /**
  * Helper to find the new platform plugins.
  */
-export function simpleKibanaPlatformPluginDiscovery(scanDirs: string[], paths: string[]) {
+export function simpleKibanaPlatformPluginDiscovery(scanDirs: string[], pluginPaths: string[]) {
   const patterns = Array.from(
     new Set([
       // find kibana.json files up to 5 levels within the scan dir
       ...scanDirs.reduce(
         (acc: string[], dir) => [
           ...acc,
-          `${dir}/*/kibana.json`,
-          `${dir}/*/*/kibana.json`,
-          `${dir}/*/*/*/kibana.json`,
-          `${dir}/*/*/*/*/kibana.json`,
-          `${dir}/*/*/*/*/*/kibana.json`,
+          Path.resolve(dir, '*/kibana.json'),
+          Path.resolve(dir, '*/*/kibana.json'),
+          Path.resolve(dir, '*/*/*/kibana.json'),
+          Path.resolve(dir, '*/*/*/*/kibana.json'),
+          Path.resolve(dir, '*/*/*/*/*/kibana.json'),
         ],
         []
       ),
-      ...paths.map((path) => `${path}/kibana.json`),
+      ...pluginPaths.map((path) => Path.resolve(path, `kibana.json`)),
     ])
   );
 
   const manifestPaths = globby.sync(patterns, { absolute: true }).map((path) =>
-    // absolute paths returned from globby are using normalize or something so the path separators are `/` even on windows, Path.resolve solves this
+    // absolute paths returned from globby are using normalize or
+    // something so the path separators are `/` even on windows,
+    // Path.resolve solves this
     Path.resolve(path)
   );
 
-  return manifestPaths.map(
-    (manifestPath): KibanaPlatformPlugin => {
-      if (!Path.isAbsolute(manifestPath)) {
-        throw new TypeError('expected new platform manifest path to be absolute');
-      }
-
-      const manifest = loadJsonFile.sync(manifestPath);
-      if (!manifest || typeof manifest !== 'object' || Array.isArray(manifest)) {
-        throw new TypeError('expected new platform plugin manifest to be a JSON encoded object');
-      }
-
-      if (typeof manifest.id !== 'string') {
-        throw new TypeError('expected new platform plugin manifest to have a string id');
-      }
-
-      return {
-        directory: Path.dirname(manifestPath),
-        manifestPath,
-        manifest: {
-          ...manifest,
-          id: manifest.id,
-        },
-      };
-    }
-  );
+  return manifestPaths.map(parseKibanaPlatformPlugin);
 }
diff --git a/packages/kbn-plugin-generator/src/streams.ts b/packages/kbn-dev-utils/src/streams.ts
similarity index 62%
rename from packages/kbn-plugin-generator/src/streams.ts
rename to packages/kbn-dev-utils/src/streams.ts
index 976008e879dd3..6a868f648e78d 100644
--- a/packages/kbn-plugin-generator/src/streams.ts
+++ b/packages/kbn-dev-utils/src/streams.ts
@@ -20,7 +20,6 @@
 import { Transform } from 'stream';
 
 import File from 'vinyl';
-import { Minimatch } from 'minimatch';
 
 interface BufferedFile extends File {
   contents: Buffer;
@@ -33,41 +32,31 @@ interface BufferedFile extends File {
  * mutate the file, replace it with another file (return a new File
  * object), or drop it from the stream (return null)
  */
-export const tapFileStream = (
+export const transformFileStream = (
   fn: (file: BufferedFile) => File | void | null | Promise<File | void | null>
 ) =>
   new Transform({
     objectMode: true,
-    transform(file: BufferedFile, _, cb) {
-      Promise.resolve(file)
-        .then(fn)
-        .then(
-          (result) => {
-            // drop the file when null is returned
-            if (result === null) {
-              cb();
-            } else {
-              cb(undefined, result || file);
-            }
-          },
-          (error) => cb(error)
-        );
-    },
-  });
+    transform(file: File, _, cb) {
+      Promise.resolve()
+        .then(async () => {
+          if (file.isDirectory()) {
+            return cb(undefined, file);
+          }
 
-export const excludeFiles = (globs: string[]) => {
-  const patterns = globs.map(
-    (g) =>
-      new Minimatch(g, {
-        matchBase: true,
-      })
-  );
+          if (!(file.contents instanceof Buffer)) {
+            throw new Error('files must be buffered to use transformFileStream()');
+          }
 
-  return tapFileStream((file) => {
-    const path = file.relative.replace(/\.ejs$/, '');
-    const exclude = patterns.some((p) => p.match(path));
-    if (exclude) {
-      return null;
-    }
+          const result = await fn(file as BufferedFile);
+
+          if (result === null) {
+            // explicitly drop file if null is returned
+            cb();
+          } else {
+            cb(undefined, result || file);
+          }
+        })
+        .catch(cb);
+    },
   });
-};
diff --git a/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.ts b/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.ts
index a848d779dc9a2..8a3379211927b 100644
--- a/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.ts
+++ b/packages/kbn-optimizer/src/optimizer/kibana_platform_plugins.ts
@@ -50,7 +50,7 @@ export function findKibanaPlatformPlugins(scanDirs: string[], paths: string[]) {
         directory,
         manifestPath,
         id: manifest.id,
-        isUiPlugin: !!manifest.ui,
+        isUiPlugin: manifest.ui,
         extraPublicDirs: extraPublicDirs || [],
       };
     }
diff --git a/packages/kbn-plugin-generator/src/plugin_types.ts b/packages/kbn-plugin-generator/src/plugin_types.ts
new file mode 100644
index 0000000000000..ae5201f4e8dbb
--- /dev/null
+++ b/packages/kbn-plugin-generator/src/plugin_types.ts
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Path from 'path';
+
+import { REPO_ROOT } from '@kbn/dev-utils';
+
+export interface PluginType {
+  thirdParty: boolean;
+  installDir: string;
+}
+
+export const PLUGIN_TYPE_OPTIONS: Array<{ name: string; value: PluginType }> = [
+  {
+    name: 'Installable plugin',
+    value: { thirdParty: true, installDir: Path.resolve(REPO_ROOT, 'plugins') },
+  },
+  {
+    name: 'Kibana Example',
+    value: { thirdParty: false, installDir: Path.resolve(REPO_ROOT, 'examples') },
+  },
+  {
+    name: 'Kibana OSS',
+    value: { thirdParty: false, installDir: Path.resolve(REPO_ROOT, 'src/plugins') },
+  },
+  {
+    name: 'Kibana OSS Functional Testing',
+    value: {
+      thirdParty: false,
+      installDir: Path.resolve(REPO_ROOT, 'test/plugin_functional/plugins'),
+    },
+  },
+  {
+    name: 'X-Pack',
+    value: { thirdParty: false, installDir: Path.resolve(REPO_ROOT, 'x-pack/plugins') },
+  },
+  {
+    name: 'X-Pack Functional Testing',
+    value: {
+      thirdParty: false,
+      installDir: Path.resolve(REPO_ROOT, 'x-pack/test/plugin_functional/plugins'),
+    },
+  },
+];
diff --git a/packages/kbn-plugin-generator/src/render_template.ts b/packages/kbn-plugin-generator/src/render_template.ts
index 18bdcf1be1a6b..894088c119651 100644
--- a/packages/kbn-plugin-generator/src/render_template.ts
+++ b/packages/kbn-plugin-generator/src/render_template.ts
@@ -23,15 +23,32 @@ import { promisify } from 'util';
 
 import vfs from 'vinyl-fs';
 import prettier from 'prettier';
-import { REPO_ROOT } from '@kbn/dev-utils';
+import { REPO_ROOT, transformFileStream } from '@kbn/dev-utils';
 import ejs from 'ejs';
+import { Minimatch } from 'minimatch';
 
 import { snakeCase, camelCase, upperCamelCase } from './casing';
-import { excludeFiles, tapFileStream } from './streams';
 import { Answers } from './ask_questions';
 
 const asyncPipeline = promisify(pipeline);
 
+const excludeFiles = (globs: string[]) => {
+  const patterns = globs.map(
+    (g) =>
+      new Minimatch(g, {
+        matchBase: true,
+      })
+  );
+
+  return transformFileStream((file) => {
+    const path = file.relative.replace(/\.ejs$/, '');
+    const exclude = patterns.some((p) => p.match(path));
+    if (exclude) {
+      return null;
+    }
+  });
+};
+
 /**
  * Stream all the files from the template directory, ignoring
  * certain files based on the answers, process the .ejs templates
@@ -82,7 +99,7 @@ export async function renderTemplates({
     ),
 
     // render .ejs templates and rename to not use .ejs extension
-    tapFileStream((file) => {
+    transformFileStream((file) => {
       if (file.extname !== '.ejs') {
         return;
       }
@@ -108,7 +125,7 @@ export async function renderTemplates({
     }),
 
     // format each file with prettier
-    tapFileStream((file) => {
+    transformFileStream((file) => {
       if (!file.extname) {
         return;
       }
diff --git a/packages/kbn-plugin-generator/template/README.md.ejs b/packages/kbn-plugin-generator/template/README.md.ejs
index 5f30bf0463305..2cd19c904263e 100755
--- a/packages/kbn-plugin-generator/template/README.md.ejs
+++ b/packages/kbn-plugin-generator/template/README.md.ejs
@@ -7,3 +7,14 @@ A Kibana plugin
 ## Development
 
 See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions setting up your development environment.
+
+<% if (thirdPartyPlugin) { %>
+## Scripts
+<dl>
+  <dt><code>yarn kbn bootstrap</code></dt>
+  <dd>Execute this to install node_modules and setup the dependencies in your plugin and in Kibana</dd>
+
+  <dt><code>yarn plugin-helpers build</code></dt>
+  <dd>Execute this to create a distributable version of this plugin that can be installed in Kibana</dd>
+</dl>
+<% } %>
diff --git a/packages/kbn-plugin-generator/template/package.json.ejs b/packages/kbn-plugin-generator/template/package.json.ejs
index cbd59894ca47c..ab234b1df2bc5 100644
--- a/packages/kbn-plugin-generator/template/package.json.ejs
+++ b/packages/kbn-plugin-generator/template/package.json.ejs
@@ -3,6 +3,8 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
+    "build": "yarn plugin-helpers build",
+    "plugin-helpers": "node ../../scripts/plugin_helpers",
     "kbn": "node ../../scripts/kbn"
   }
 }
diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
index ba39528a1f809..129c58a4b4174 100644
--- a/packages/kbn-plugin-helpers/package.json
+++ b/packages/kbn-plugin-helpers/package.json
@@ -1,43 +1,32 @@
 {
   "name": "@kbn/plugin-helpers",
-  "version": "9.0.2",
+  "version": "1.0.0",
   "private": true,
   "description": "Just some helpers for kibana plugin devs.",
   "license": "Apache-2.0",
-  "main": "target/lib/index.js",
-  "scripts": {
-    "kbn:bootstrap": "tsc"
-  },
+  "main": "target/index.js",
   "bin": {
     "plugin-helpers": "bin/plugin-helpers.js"
   },
+  "scripts": {
+    "kbn:bootstrap": "rm -rf target && tsc",
+    "kbn:watch": "tsc --watch"
+  },
   "dependencies": {
-    "@babel/core": "^7.11.1",
-    "argv-split": "^2.0.1",
-    "commander": "^3.0.0",
+    "@kbn/dev-utils": "1.0.0",
+    "@kbn/optimizer": "1.0.0",
     "del": "^5.1.0",
     "execa": "^4.0.2",
-    "globby": "^8.0.1",
-    "gulp-babel": "^8.0.0",
-    "gulp-rename": "1.4.0",
-    "gulp-zip": "5.0.1",
+    "gulp-zip": "^5.0.2",
     "inquirer": "^1.2.2",
-    "minimatch": "^3.0.4",
-    "through2": "^2.0.3",
-    "through2-map": "^3.0.0",
-    "vinyl": "^2.2.0",
+    "load-json-file": "^6.2.0",
     "vinyl-fs": "^3.0.3"
   },
   "devDependencies": {
-    "@types/gulp-rename": "^0.0.33",
+    "@types/decompress": "^4.2.3",
     "@types/gulp-zip": "^4.0.1",
     "@types/inquirer": "^6.5.0",
-    "@types/through2": "^2.0.35",
-    "@types/through2-map": "^3.0.0",
-    "@types/vinyl": "^2.0.4",
+    "decompress": "^4.2.1",
     "typescript": "4.0.2"
-  },
-  "peerDependencies": {
-    "@kbn/babel-preset": "1.0.0"
   }
 }
diff --git a/packages/kbn-plugin-helpers/bin/plugin-helpers.js b/packages/kbn-plugin-helpers/src/build_context.ts
old mode 100755
new mode 100644
similarity index 73%
rename from packages/kbn-plugin-helpers/bin/plugin-helpers.js
rename to packages/kbn-plugin-helpers/src/build_context.ts
index 175ff1019fa2d..62300d5a34e49
--- a/packages/kbn-plugin-helpers/bin/plugin-helpers.js
+++ b/packages/kbn-plugin-helpers/src/build_context.ts
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 /*
  * Licensed to Elasticsearch B.V. under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19,10 +17,16 @@
  * under the License.
  */
 
-const nodeMajorVersion = parseFloat(process.version.replace(/^v(\d+)\..+/, '$1'));
-if (nodeMajorVersion < 6) {
-  console.error('FATAL: kibana-plugin-helpers requires node 6+');
-  process.exit(1);
-}
+import { ToolingLog } from '@kbn/dev-utils';
 
-require('../target/cli');
+import { Plugin } from './load_kibana_platform_plugin';
+import { Config } from './config';
+
+export interface BuildContext {
+  log: ToolingLog;
+  plugin: Plugin;
+  config: Config;
+  sourceDir: string;
+  buildDir: string;
+  kibanaVersion: string;
+}
diff --git a/packages/kbn-plugin-helpers/src/cli.ts b/packages/kbn-plugin-helpers/src/cli.ts
index 18ddc62cba8a6..21b6559f63650 100644
--- a/packages/kbn-plugin-helpers/src/cli.ts
+++ b/packages/kbn-plugin-helpers/src/cli.ts
@@ -17,59 +17,86 @@
  * under the License.
  */
 
-import Fs from 'fs';
 import Path from 'path';
 
-import program from 'commander';
+import { RunWithCommands, createFlagError, createFailError } from '@kbn/dev-utils';
 
-import { createCommanderAction } from './lib/commander_action';
-import { docs } from './lib/docs';
-import { enableCollectingUnknownOptions } from './lib/enable_collecting_unknown_options';
+import { findKibanaJson } from './find_kibana_json';
+import { loadKibanaPlatformPlugin } from './load_kibana_platform_plugin';
+import * as Tasks from './tasks';
+import { BuildContext } from './build_context';
+import { resolveKibanaVersion } from './resolve_kibana_version';
+import { loadConfig } from './config';
 
-const pkg = JSON.parse(Fs.readFileSync(Path.resolve(__dirname, '../package.json'), 'utf8'));
-program.version(pkg.version);
+export function runCli() {
+  new RunWithCommands({
+    description: 'Some helper tasks for plugin-authors',
+  })
+    .command({
+      name: 'build',
+      description: `
+        Copies files from the source into a zip archive that can be distributed for
+        installation into production Kibana installs. The archive includes the non-
+        development npm dependencies and builds itself using raw files in the source
+        directory so make sure they are clean/up to date. The resulting archive can
+        be found at:
 
-enableCollectingUnknownOptions(
-  program
-    .command('start')
-    .description('Start kibana and have it include this plugin')
-    .on('--help', docs('start'))
-    .action(
-      createCommanderAction('start', (command) => ({
-        flags: command.unknownOptions,
-      }))
-    )
-);
+          build/{plugin.id}-{kibanaVersion}.zip
 
-program
-  .command('build [files...]')
-  .description('Build a distributable archive')
-  .on('--help', docs('build'))
-  .option('--skip-archive', "Don't create the zip file, leave the build path alone")
-  .option(
-    '-d, --build-destination <path>',
-    'Target path for the build output, absolute or relative to the plugin root'
-  )
-  .option('-b, --build-version <version>', 'Version for the build output')
-  .option('-k, --kibana-version <version>', 'Kibana version for the build output')
-  .action(
-    createCommanderAction('build', (command, files) => ({
-      buildDestination: command.buildDestination,
-      buildVersion: command.buildVersion,
-      kibanaVersion: command.kibanaVersion,
-      skipArchive: Boolean(command.skipArchive),
-      files,
-    }))
-  );
+      `,
+      flags: {
+        boolean: ['skip-archive'],
+        string: ['kibana-version'],
+        alias: {
+          k: 'kibana-version',
+        },
+        help: `
+          --skip-archive        Don't create the zip file, just create the build/kibana directory
+          --kibana-version, -v  Kibana version that the
+        `,
+      },
+      async run({ log, flags }) {
+        const versionFlag = flags['kibana-version'];
+        if (versionFlag !== undefined && typeof versionFlag !== 'string') {
+          throw createFlagError('expected a single --kibana-version flag');
+        }
 
-program
-  .command('test:mocha [files...]')
-  .description('Run the server tests using mocha')
-  .on('--help', docs('test/mocha'))
-  .action(
-    createCommanderAction('testMocha', (command, files) => ({
-      files,
-    }))
-  );
+        const skipArchive = flags['skip-archive'];
+        if (skipArchive !== undefined && typeof skipArchive !== 'boolean') {
+          throw createFlagError('expected a single --skip-archive flag');
+        }
 
-program.parse(process.argv);
+        const pluginDir = await findKibanaJson(process.cwd());
+        if (!pluginDir) {
+          throw createFailError(
+            `Unable to find Kibana Platform plugin in [${process.cwd()}] or any of its parent directories. Has it been migrated properly? Does it have a kibana.json file?`
+          );
+        }
+
+        const plugin = loadKibanaPlatformPlugin(pluginDir);
+        const config = await loadConfig(log, plugin);
+        const kibanaVersion = await resolveKibanaVersion(versionFlag, plugin);
+        const sourceDir = plugin.directory;
+        const buildDir = Path.resolve(plugin.directory, 'build/kibana', plugin.manifest.id);
+
+        const context: BuildContext = {
+          log,
+          plugin,
+          config,
+          sourceDir,
+          buildDir,
+          kibanaVersion,
+        };
+
+        await Tasks.initTargets(context);
+        await Tasks.optimize(context);
+        await Tasks.writeServerFiles(context);
+        await Tasks.yarnInstall(context);
+
+        if (skipArchive !== true) {
+          await Tasks.createArchive(context);
+        }
+      },
+    })
+    .execute();
+}
diff --git a/packages/kbn-plugin-helpers/src/config.ts b/packages/kbn-plugin-helpers/src/config.ts
new file mode 100644
index 0000000000000..bd5ad8ab6acc7
--- /dev/null
+++ b/packages/kbn-plugin-helpers/src/config.ts
@@ -0,0 +1,83 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Path from 'path';
+
+import loadJsonFile from 'load-json-file';
+
+import { ToolingLog } from '@kbn/dev-utils';
+import { Plugin } from './load_kibana_platform_plugin';
+
+export interface Config {
+  skipInstallDependencies: boolean;
+  serverSourcePatterns?: string[];
+}
+
+const isArrayOfStrings = (v: any): v is string[] =>
+  Array.isArray(v) && v.every((p) => typeof p === 'string');
+
+export async function loadConfig(log: ToolingLog, plugin: Plugin): Promise<Config> {
+  try {
+    const path = Path.resolve(plugin.directory, '.kibana-plugin-helpers.json');
+    const file = await loadJsonFile(path);
+
+    if (!(typeof file === 'object' && file && !Array.isArray(file))) {
+      throw new TypeError(`expected config at [${path}] to be an object`);
+    }
+
+    const {
+      skipInstallDependencies = false,
+      buildSourcePatterns,
+      serverSourcePatterns,
+      ...rest
+    } = file;
+
+    if (typeof skipInstallDependencies !== 'boolean') {
+      throw new TypeError(`expected [skipInstallDependencies] at [${path}] to be a boolean`);
+    }
+
+    if (buildSourcePatterns) {
+      log.warning(
+        `DEPRECATED: rename [buildSourcePatterns] to [serverSourcePatterns] in [${path}]`
+      );
+    }
+    const ssp = buildSourcePatterns || serverSourcePatterns;
+    if (ssp !== undefined && !isArrayOfStrings(ssp)) {
+      throw new TypeError(`expected [serverSourcePatterns] at [${path}] to be an array of strings`);
+    }
+
+    if (Object.keys(rest).length) {
+      throw new TypeError(`unexpected key in [${path}]: ${Object.keys(rest).join(', ')}`);
+    }
+
+    log.info(`Loaded config file from [${path}]`);
+    return {
+      skipInstallDependencies,
+      serverSourcePatterns: ssp,
+    };
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      return {
+        skipInstallDependencies: false,
+      };
+    }
+
+    throw error;
+  }
+}
diff --git a/packages/kbn-plugin-helpers/src/lib/run.ts b/packages/kbn-plugin-helpers/src/find_kibana_json.ts
similarity index 65%
rename from packages/kbn-plugin-helpers/src/lib/run.ts
rename to packages/kbn-plugin-helpers/src/find_kibana_json.ts
index 2b1a2a63c1074..9340309056830 100644
--- a/packages/kbn-plugin-helpers/src/lib/run.ts
+++ b/packages/kbn-plugin-helpers/src/find_kibana_json.ts
@@ -17,21 +17,21 @@
  * under the License.
  */
 
-import { pluginConfig, PluginConfig } from './plugin_config';
-import { tasks, Tasks } from './tasks';
+import Path from 'path';
+import Fs from 'fs';
+import { promisify } from 'util';
 
-export interface TaskContext {
-  plugin: PluginConfig;
-  run: typeof run;
-  options?: any;
-}
+const existsAsync = promisify(Fs.exists);
+
+export async function findKibanaJson(directory: string): Promise<string | undefined> {
+  if (await existsAsync(Path.resolve(directory, 'kibana.json'))) {
+    return directory;
+  }
 
-export function run(name: keyof Tasks, options?: any) {
-  const action = tasks[name];
-  if (!action) {
-    throw new Error('Invalid task: "' + name + '"');
+  const parent = Path.dirname(directory);
+  if (parent === directory) {
+    return undefined;
   }
 
-  const plugin = pluginConfig();
-  return action({ plugin, run, options });
+  return findKibanaJson(parent);
 }
diff --git a/packages/kbn-plugin-helpers/src/tasks/start/index.ts b/packages/kbn-plugin-helpers/src/index.ts
similarity index 96%
rename from packages/kbn-plugin-helpers/src/tasks/start/index.ts
rename to packages/kbn-plugin-helpers/src/index.ts
index cf34bdbadf416..a05bc698bde17 100644
--- a/packages/kbn-plugin-helpers/src/tasks/start/index.ts
+++ b/packages/kbn-plugin-helpers/src/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export * from './start_task';
+export * from './cli';
diff --git a/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts b/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
new file mode 100644
index 0000000000000..62f83cd672f3d
--- /dev/null
+++ b/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
@@ -0,0 +1,123 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Path from 'path';
+import Fs from 'fs';
+
+import execa from 'execa';
+import { createStripAnsiSerializer, REPO_ROOT, createReplaceSerializer } from '@kbn/dev-utils';
+import decompress from 'decompress';
+import del from 'del';
+import globby from 'globby';
+import loadJsonFile from 'load-json-file';
+
+const PLUGIN_DIR = Path.resolve(REPO_ROOT, 'plugins/foo_test_plugin');
+const PLUGIN_BUILD_DIR = Path.resolve(PLUGIN_DIR, 'build');
+const PLUGIN_ARCHIVE = Path.resolve(PLUGIN_BUILD_DIR, `fooTestPlugin-7.5.0.zip`);
+const TMP_DIR = Path.resolve(__dirname, '__tmp__');
+
+expect.addSnapshotSerializer(createReplaceSerializer(/[\d\.]+ sec/g, '<time>'));
+expect.addSnapshotSerializer(createReplaceSerializer(/\d+(\.\d+)?[sm]/g, '<time>'));
+expect.addSnapshotSerializer(createReplaceSerializer(/yarn (\w+) v[\d\.]+/g, 'yarn $1 <version>'));
+expect.addSnapshotSerializer(createStripAnsiSerializer());
+
+beforeEach(async () => {
+  await del([PLUGIN_DIR, TMP_DIR]);
+  Fs.mkdirSync(TMP_DIR);
+});
+
+afterEach(async () => await del([PLUGIN_DIR, TMP_DIR]));
+
+it('builds a generated plugin into a viable archive', async () => {
+  const generateProc = await execa(
+    process.execPath,
+    ['scripts/generate_plugin', '-y', '--name', 'fooTestPlugin'],
+    {
+      cwd: REPO_ROOT,
+      all: true,
+    }
+  );
+
+  expect(generateProc.all).toMatchInlineSnapshot(`
+    " succ 🎉
+
+          Your plugin has been created in plugins/foo_test_plugin
+    "
+  `);
+
+  const buildProc = await execa(
+    process.execPath,
+    ['../../scripts/plugin_helpers', 'build', '--kibana-version', '7.5.0'],
+    {
+      cwd: PLUGIN_DIR,
+      all: true,
+    }
+  );
+
+  expect(buildProc.all).toMatchInlineSnapshot(`
+    " info deleting the build and target directories
+     info running @kbn/optimizer
+     │ info initialized, 0 bundles cached
+     │ info starting worker [1 bundle]
+     │ succ 1 bundles compiled successfully after <time>
+     info copying source into the build and converting with babel
+     info running yarn to install dependencies
+     info compressing plugin into [fooTestPlugin-7.5.0.zip]"
+  `);
+
+  await decompress(PLUGIN_ARCHIVE, TMP_DIR);
+
+  const files = await globby(['**/*'], { cwd: TMP_DIR });
+  files.sort((a, b) => a.localeCompare(b));
+
+  expect(files).toMatchInlineSnapshot(`
+    Array [
+      "kibana/fooTestPlugin/common/index.js",
+      "kibana/fooTestPlugin/kibana.json",
+      "kibana/fooTestPlugin/package.json",
+      "kibana/fooTestPlugin/server/index.js",
+      "kibana/fooTestPlugin/server/plugin.js",
+      "kibana/fooTestPlugin/server/routes/index.js",
+      "kibana/fooTestPlugin/server/types.js",
+      "kibana/fooTestPlugin/target/public/fooTestPlugin.chunk.1.js",
+      "kibana/fooTestPlugin/target/public/fooTestPlugin.chunk.1.js.br",
+      "kibana/fooTestPlugin/target/public/fooTestPlugin.chunk.1.js.gz",
+      "kibana/fooTestPlugin/target/public/fooTestPlugin.plugin.js",
+      "kibana/fooTestPlugin/target/public/fooTestPlugin.plugin.js.br",
+      "kibana/fooTestPlugin/target/public/fooTestPlugin.plugin.js.gz",
+      "kibana/fooTestPlugin/translations/ja-JP.json",
+      "kibana/fooTestPlugin/tsconfig.json",
+    ]
+  `);
+
+  expect(loadJsonFile.sync(Path.resolve(TMP_DIR, 'kibana', 'fooTestPlugin', 'kibana.json')))
+    .toMatchInlineSnapshot(`
+    Object {
+      "id": "fooTestPlugin",
+      "kibanaVersion": "7.5.0",
+      "optionalPlugins": Array [],
+      "requiredPlugins": Array [
+        "navigation",
+      ],
+      "server": true,
+      "ui": true,
+      "version": "1.0.0",
+    }
+  `);
+});
diff --git a/packages/kbn-plugin-helpers/src/lib/__snapshots__/commander_action.test.js.snap b/packages/kbn-plugin-helpers/src/lib/__snapshots__/commander_action.test.js.snap
deleted file mode 100644
index ff384fbd83794..0000000000000
--- a/packages/kbn-plugin-helpers/src/lib/__snapshots__/commander_action.test.js.snap
+++ /dev/null
@@ -1,43 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`commander action exits with status 1 when task throws error asynchronously 1`] = `
-Array [
-  Array [
-    "Task \\"mockTask\\" failed:
-
-Error: async error thrown
-  ...stack trace...
-",
-  ],
-]
-`;
-
-exports[`commander action exits with status 1 when task throws synchronously 1`] = `
-Array [
-  Array [
-    "Task \\"mockTask\\" failed:
-
-Error: sync error thrown
-  ...stack trace...
-",
-  ],
-]
-`;
-
-exports[`commander action passes args to getOptions, calls run() with taskName and options 1`] = `
-Array [
-  Array [
-    "taskName",
-    Object {
-      "args": Array [
-        "f",
-        "a",
-        "b",
-        "c",
-        "d",
-        "e",
-      ],
-    },
-  ],
-]
-`;
diff --git a/packages/kbn-plugin-helpers/src/lib/commander_action.test.js b/packages/kbn-plugin-helpers/src/lib/commander_action.test.js
deleted file mode 100644
index 501c0bd061913..0000000000000
--- a/packages/kbn-plugin-helpers/src/lib/commander_action.test.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { createCommanderAction } from './commander_action';
-import { run } from './run';
-
-jest.mock('./run');
-
-const STACK_TRACE_RE = /\n(?:\s+at .+(?:\n|$))+/g;
-expect.addSnapshotSerializer({
-  print(val, serialize) {
-    return serialize(val.replace(STACK_TRACE_RE, '\n  ...stack trace...\n'));
-  },
-
-  test(val) {
-    return typeof val === 'string' && STACK_TRACE_RE.test(val);
-  },
-});
-
-beforeAll(() => {
-  jest.spyOn(process.stderr, 'write').mockImplementation(() => {});
-  jest.spyOn(process, 'exit').mockImplementation(() => {});
-});
-
-beforeEach(() => {
-  run.mockReset();
-  jest.clearAllMocks();
-});
-
-afterAll(() => {
-  jest.restoreAllMocks();
-});
-
-describe('commander action', () => {
-  it('creates a function', async () => {
-    expect(typeof createCommanderAction()).toBe('function');
-  });
-
-  it('passes args to getOptions, calls run() with taskName and options', async () => {
-    const action = createCommanderAction('taskName', (...args) => ({ args }));
-    await action('a', 'b', 'c', 'd', 'e', 'f');
-    expect(run).toHaveBeenCalledTimes(1);
-    expect(run.mock.calls).toMatchSnapshot();
-  });
-
-  it('exits with status 1 when task throws synchronously', async () => {
-    run.mockImplementation(() => {
-      throw new Error('sync error thrown');
-    });
-
-    await createCommanderAction('mockTask')();
-
-    expect(process.stderr.write).toHaveBeenCalledTimes(1);
-    expect(process.stderr.write.mock.calls).toMatchSnapshot();
-    expect(process.exit).toHaveBeenCalledTimes(1);
-    expect(process.exit).toHaveBeenCalledWith(1);
-  });
-
-  it('exits with status 1 when task throws error asynchronously', async () => {
-    run.mockImplementation(async () => {
-      throw new Error('async error thrown');
-    });
-
-    await createCommanderAction('mockTask')();
-
-    expect(process.stderr.write).toHaveBeenCalledTimes(1);
-    expect(process.stderr.write.mock.calls).toMatchSnapshot();
-    expect(process.exit).toHaveBeenCalledTimes(1);
-    expect(process.exit).toHaveBeenCalledWith(1);
-  });
-});
diff --git a/packages/kbn-plugin-helpers/src/lib/commander_action.ts b/packages/kbn-plugin-helpers/src/lib/commander_action.ts
deleted file mode 100644
index ce585dd0a02c8..0000000000000
--- a/packages/kbn-plugin-helpers/src/lib/commander_action.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { run } from './run';
-import { Tasks } from './tasks';
-
-type GetOptions = (command: any, ...args: string[]) => any;
-
-export function createCommanderAction(taskName: keyof Tasks, getOptions: GetOptions = () => {}) {
-  return async (...args: string[]) => {
-    try {
-      // command is the last arg passed by commander, but we move it to the front of the list
-      const command = args.pop();
-      await run(taskName, getOptions(command, ...args));
-    } catch (error) {
-      process.stderr.write(`Task "${taskName}" failed:\n\n${error.stack || error.message}\n`);
-      process.exit(1);
-    }
-  };
-}
diff --git a/packages/kbn-plugin-helpers/src/lib/config_file.ts b/packages/kbn-plugin-helpers/src/lib/config_file.ts
deleted file mode 100644
index 1566932b65872..0000000000000
--- a/packages/kbn-plugin-helpers/src/lib/config_file.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import { readFileSync } from 'fs';
-
-const configFileNames = ['.kibana-plugin-helpers.json', '.kibana-plugin-helpers.dev.json'];
-
-interface Config {
-  [key: string]: unknown;
-}
-
-const configCache = new Map<string, Config>();
-
-export function configFile(root: string = process.cwd()) {
-  if (configCache.has(root)) {
-    return configCache.get(root)!;
-  }
-
-  // config files to read from, in the order they are merged together
-  let config: Config = {};
-  for (const name of configFileNames) {
-    try {
-      config = JSON.parse(readFileSync(resolve(root, name), 'utf8'));
-    } catch (e) {
-      // rethrow error unless it's complaining about file not existing
-      if (e.code !== 'ENOENT') {
-        throw e;
-      }
-    }
-  }
-
-  const deprecationMsg =
-    'has been removed from `@kbn/plugin-helpers`. ' +
-    'During development your plugin must live in `./plugins/{pluginName}` ' +
-    'inside the Kibana folder or `../kibana-extra/{pluginName}` ' +
-    'relative to the Kibana folder to work with this package.\n';
-
-  if (config.kibanaRoot) {
-    throw new Error('The `kibanaRoot` config option ' + deprecationMsg);
-  }
-  if (process.env.KIBANA_ROOT) {
-    throw new Error('The `KIBANA_ROOT` environment variable ' + deprecationMsg);
-  }
-
-  // use resolve to ensure correct resolution of paths
-  if (Array.isArray(config.includePlugins)) {
-    config.includePlugins = config.includePlugins.map((path: string) => resolve(root, path));
-  }
-
-  configCache.set(root, config);
-  return config;
-}
diff --git a/packages/kbn-plugin-helpers/src/lib/enable_collecting_unknown_options.ts b/packages/kbn-plugin-helpers/src/lib/enable_collecting_unknown_options.ts
deleted file mode 100644
index 0d692aed06305..0000000000000
--- a/packages/kbn-plugin-helpers/src/lib/enable_collecting_unknown_options.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { Command } from 'commander';
-
-export function enableCollectingUnknownOptions(command: Command) {
-  const origParse = command.parseOptions;
-  command.allowUnknownOption();
-  command.parseOptions = function (argv: string[]) {
-    const opts = origParse.call(this, argv);
-    this.unknownOptions = opts.unknown;
-    return opts;
-  };
-}
diff --git a/packages/kbn-plugin-helpers/src/lib/pipeline.ts b/packages/kbn-plugin-helpers/src/lib/pipeline.ts
deleted file mode 100644
index d66e18f5239a9..0000000000000
--- a/packages/kbn-plugin-helpers/src/lib/pipeline.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Stream from 'stream';
-import Util from 'util';
-
-export const pipeline = Util.promisify(Stream.pipeline);
diff --git a/packages/kbn-plugin-helpers/src/lib/plugin_config.ts b/packages/kbn-plugin-helpers/src/lib/plugin_config.ts
deleted file mode 100644
index c186bc3275a05..0000000000000
--- a/packages/kbn-plugin-helpers/src/lib/plugin_config.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import { readFileSync } from 'fs';
-
-import { configFile } from './config_file';
-
-export interface PluginConfig {
-  root: string;
-  kibanaRoot: string;
-  serverTestPatterns: string[];
-  buildSourcePatterns: string[];
-  skipInstallDependencies: boolean;
-  id: string;
-  version: string;
-  pkg: any;
-  [k: string]: unknown;
-}
-
-export function pluginConfig(root: string = process.cwd()): PluginConfig {
-  const pluginPackageJsonPath = resolve(root, 'package.json');
-  const pkg = JSON.parse(readFileSync(pluginPackageJsonPath, 'utf8'));
-
-  const buildSourcePatterns = [
-    'yarn.lock',
-    'tsconfig.json',
-    'package.json',
-    'index.{js,ts}',
-    '{lib,public,server,translations}/**/*',
-  ];
-
-  const kibanaExtraDir = resolve(root, '../../kibana');
-  const kibanaPluginsDir = resolve(root, '../../');
-  const isPluginOnKibanaExtra = pluginPackageJsonPath.includes(kibanaExtraDir);
-  const isPluginXpack = pkg.name === 'x-pack';
-
-  if (isPluginOnKibanaExtra && !isPluginXpack) {
-    // eslint-disable-next-line no-console
-    console.warn(
-      `In the future we will disable ../kibana-extra/{pluginName}. You should move your plugin ${pkg.name} as soon as possible to ./plugins/{pluginName}`
-    );
-  }
-
-  const kibanaRootWhenNotXpackPlugin = isPluginOnKibanaExtra ? kibanaExtraDir : kibanaPluginsDir;
-
-  return {
-    root,
-    kibanaRoot: isPluginXpack ? resolve(root, '..') : kibanaRootWhenNotXpackPlugin,
-    serverTestPatterns: ['server/**/__tests__/**/*.js'],
-    buildSourcePatterns,
-    skipInstallDependencies: false,
-    id: pkg.name as string,
-    version: pkg.version as string,
-    pkg,
-    ...configFile(root),
-  };
-}
diff --git a/packages/kbn-plugin-helpers/src/lib/utils.ts b/packages/kbn-plugin-helpers/src/lib/utils.ts
deleted file mode 100644
index be7fa65cc2939..0000000000000
--- a/packages/kbn-plugin-helpers/src/lib/utils.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-
-import { pluginConfig } from './plugin_config';
-
-export function babelRegister() {
-  const plugin = pluginConfig();
-
-  try {
-    // add support for moved @babel/register source: https://github.com/elastic/kibana/pull/13973
-    require(resolve(plugin.kibanaRoot, 'src/setup_node_env/babel_register'));
-  } catch (error) {
-    if (error.code === 'MODULE_NOT_FOUND') {
-      require(resolve(plugin.kibanaRoot, 'src/optimize/babel/register'));
-    } else {
-      throw error;
-    }
-  }
-}
-
-export function resolveKibanaPath(path: string) {
-  const plugin = pluginConfig();
-  return resolve(plugin.kibanaRoot, path);
-}
diff --git a/packages/kbn-plugin-helpers/src/lib/win_cmd.ts b/packages/kbn-plugin-helpers/src/lib/win_cmd.ts
deleted file mode 100644
index a3f5d144602ed..0000000000000
--- a/packages/kbn-plugin-helpers/src/lib/win_cmd.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Os from 'os';
-
-export function winCmd(cmd: string) {
-  return /^win/.test(Os.platform()) ? cmd + '.cmd' : cmd;
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/test/mocha/test_mocha_task.ts b/packages/kbn-plugin-helpers/src/load_kibana_platform_plugin.ts
similarity index 52%
rename from packages/kbn-plugin-helpers/src/tasks/test/mocha/test_mocha_task.ts
rename to packages/kbn-plugin-helpers/src/load_kibana_platform_plugin.ts
index a79ef0a59d19a..8f48670e49de4 100644
--- a/packages/kbn-plugin-helpers/src/tasks/test/mocha/test_mocha_task.ts
+++ b/packages/kbn-plugin-helpers/src/load_kibana_platform_plugin.ts
@@ -17,32 +17,29 @@
  * under the License.
  */
 
-import { execFileSync } from 'child_process';
-import globby from 'globby';
+import Path from 'path';
 
-import { TaskContext } from '../../../lib';
+import {
+  REPO_ROOT,
+  parseKibanaPlatformPlugin,
+  KibanaPlatformPlugin,
+  createFailError,
+} from '@kbn/dev-utils';
 
-export function testMochaTask({ plugin, options }: TaskContext) {
-  options = options || {};
-  let testPatterns = plugin.serverTestPatterns;
+export type Plugin = KibanaPlatformPlugin;
 
-  // allow server test files to be overridden
-  if (options.files && options.files.length) {
-    testPatterns = options.files;
+export function loadKibanaPlatformPlugin(pluginDir: string) {
+  const parentDir = Path.resolve(pluginDir, '..');
+
+  const isFixture = pluginDir.includes('__fixtures__');
+  const isExample = Path.basename(parentDir) === 'examples';
+  const isRootPlugin = parentDir === Path.resolve(REPO_ROOT, 'plugins');
+
+  if (isFixture || isExample || isRootPlugin) {
+    return parseKibanaPlatformPlugin(Path.resolve(pluginDir, 'kibana.json'));
   }
 
-  execFileSync(
-    process.execPath,
-    [
-      'scripts/mocha',
-      ...globby.sync(testPatterns, {
-        cwd: plugin.root,
-        absolute: true,
-      }),
-    ],
-    {
-      cwd: plugin.kibanaRoot,
-      stdio: ['ignore', 1, 2],
-    }
+  throw createFailError(
+    `Plugin located at [${pluginDir}] must be moved to the plugins directory at the root of the Kibana repo`
   );
 }
diff --git a/packages/kbn-plugin-helpers/src/lib/tasks.ts b/packages/kbn-plugin-helpers/src/resolve_kibana_version.ts
similarity index 58%
rename from packages/kbn-plugin-helpers/src/lib/tasks.ts
rename to packages/kbn-plugin-helpers/src/resolve_kibana_version.ts
index bd86bb670ff39..85029d5ffb25e 100644
--- a/packages/kbn-plugin-helpers/src/lib/tasks.ts
+++ b/packages/kbn-plugin-helpers/src/resolve_kibana_version.ts
@@ -17,19 +17,24 @@
  * under the License.
  */
 
-import { buildTask } from '../tasks/build';
-import { startTask } from '../tasks/start';
-import { testMochaTask } from '../tasks/test/mocha';
+import inquirer from 'inquirer';
 
-// define a tasks interface that we can extend in the tests
-export interface Tasks {
-  build: typeof buildTask;
-  start: typeof startTask;
-  testMocha: typeof testMochaTask;
-}
+import { Plugin } from './load_kibana_platform_plugin';
+
+export async function resolveKibanaVersion(option: string | undefined, plugin: Plugin) {
+  const preselectedVersion = option || plugin.manifest.kibanaVersion || plugin.manifest.version;
+
+  if (preselectedVersion && preselectedVersion !== 'kibana') {
+    return preselectedVersion;
+  }
 
-export const tasks: Tasks = {
-  build: buildTask,
-  start: startTask,
-  testMocha: testMochaTask,
-};
+  const answers = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'kibanaVersion',
+      message: 'What version of Kibana are you building for?',
+    },
+  ]);
+
+  return answers.kibanaVersion;
+}
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/README.md b/packages/kbn-plugin-helpers/src/tasks/build/README.md
deleted file mode 100644
index 2906525c872be..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Copies files from the source into a zip archive that can be distributed for
-installation into production kibana installs. The archive includes the non-
-development npm dependencies and builds itself using raw files in the source
-directory so make sure they are clean/up to date. The resulting archive can
-be found at:
-
-```
-build/{pkg.name}-{pkg.version}.zip
-```
-
-If you use the `--build-destination` flag, the resulting build will be found
-in that directory.
-
-```
-plugin-helpers build --build-destination build/some/child/path
-
-# This will place the resulting build at:
-build/some/child/path/{pkg.name}-{pkg.version}.zip
-```
\ No newline at end of file
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/build_task.ts b/packages/kbn-plugin-helpers/src/tasks/build/build_task.ts
deleted file mode 100644
index 16207f323ff71..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/build_task.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { join, resolve } from 'path';
-import inquirer from 'inquirer';
-
-import { TaskContext } from '../../lib';
-import { createBuild } from './create_build';
-import { createPackage } from './create_package';
-
-export async function buildTask({ plugin, options = {} }: TaskContext) {
-  let buildVersion = plugin.version;
-  let kibanaVersion = (plugin.pkg.kibana && plugin.pkg.kibana.version) || plugin.pkg.version;
-  let buildFiles = plugin.buildSourcePatterns;
-  let buildTarget = join(plugin.root, 'build');
-
-  // allow source files to be overridden
-  if (options.files && options.files.length) {
-    buildFiles = options.files;
-  }
-
-  // allow options to override plugin info
-  if (options.buildDestination) buildTarget = resolve(plugin.root, options.buildDestination);
-  if (options.buildVersion) buildVersion = options.buildVersion;
-  if (options.kibanaVersion) kibanaVersion = options.kibanaVersion;
-
-  const chosenKibanaVersion =
-    kibanaVersion === 'kibana' ? await askForKibanaVersion() : kibanaVersion;
-
-  await createBuild(plugin, buildTarget, buildVersion, chosenKibanaVersion, buildFiles);
-
-  if (!options.skipArchive) {
-    await createPackage(plugin, buildTarget, buildVersion);
-  }
-}
-
-async function askForKibanaVersion() {
-  const answers = await inquirer.prompt([
-    {
-      type: 'input',
-      name: 'kibanaVersion',
-      message: 'What version of Kibana are you building for?',
-    },
-  ]);
-
-  return answers.kibanaVersion;
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/create_build.ts b/packages/kbn-plugin-helpers/src/tasks/build/create_build.ts
deleted file mode 100644
index 1681c7cfdcf90..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/create_build.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { relative } from 'path';
-import path from 'path';
-
-import { readFileSync, writeFileSync, unlinkSync, existsSync } from 'fs';
-import execa from 'execa';
-import del from 'del';
-import File from 'vinyl';
-import vfs from 'vinyl-fs';
-import rename from 'gulp-rename';
-import through from 'through2';
-import minimatch from 'minimatch';
-// @ts-ignore
-import gulpBabel from 'gulp-babel';
-
-import { PluginConfig, winCmd, pipeline } from '../../lib';
-import { rewritePackageJson } from './rewrite_package_json';
-
-// `link:` dependencies create symlinks, but we don't want to include symlinks
-// in the built zip file. Therefore we remove all symlinked dependencies, so we
-// can re-create them when installing the plugin.
-function removeSymlinkDependencies(root: string) {
-  const nodeModulesPattern = path.join(root, '**', 'node_modules', '**');
-
-  return through.obj((file: File, _, cb) => {
-    const isSymlink = file.symlink != null;
-    const isDependency = minimatch(file.path, nodeModulesPattern);
-
-    if (isSymlink && isDependency) {
-      unlinkSync(file.path);
-    }
-
-    cb();
-  });
-}
-
-// parse a ts config file
-function parseTsconfig(pluginSourcePath: string, configPath: string) {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const ts = require(path.join(pluginSourcePath, 'node_modules', 'typescript'));
-
-  const { error, config } = ts.parseConfigFileTextToJson(
-    configPath,
-    readFileSync(configPath, 'utf8')
-  );
-
-  if (error) {
-    throw error;
-  }
-
-  return config;
-}
-
-// transpile with babel
-async function transpileWithBabel(srcGlobs: string[], buildRoot: string, presets: string[]) {
-  await pipeline(
-    vfs.src(
-      srcGlobs.concat([
-        '!**/*.d.ts',
-        '!**/*.{test,test.mocks,mock,mocks}.{ts,tsx}',
-        '!**/node_modules/**',
-        '!**/bower_components/**',
-        '!**/__tests__/**',
-      ]),
-      {
-        cwd: buildRoot,
-      }
-    ),
-
-    gulpBabel({
-      babelrc: false,
-      presets,
-    }),
-
-    vfs.dest(buildRoot)
-  );
-}
-
-export async function createBuild(
-  plugin: PluginConfig,
-  buildTarget: string,
-  buildVersion: string,
-  kibanaVersion: string,
-  files: string[]
-) {
-  const buildSource = plugin.root;
-  const buildRoot = path.join(buildTarget, 'kibana', plugin.id);
-
-  await del(buildTarget);
-
-  // copy source files and apply some transformations in the process
-  await pipeline(
-    vfs.src(files, {
-      cwd: buildSource,
-      base: buildSource,
-      allowEmpty: true,
-    }),
-
-    // modify the package.json file
-    rewritePackageJson(buildSource, buildVersion, kibanaVersion),
-
-    // put all files inside the correct directories
-    rename(function nestFileInDir(filePath) {
-      const nonRelativeDirname = filePath.dirname!.replace(/^(\.\.\/?)+/g, '');
-      filePath.dirname = path.join(relative(buildTarget, buildRoot), nonRelativeDirname);
-    }),
-
-    // write files back to disk
-    vfs.dest(buildTarget)
-  );
-
-  // install packages in build
-  if (!plugin.skipInstallDependencies) {
-    execa.sync(winCmd('yarn'), ['install', '--production', '--pure-lockfile'], {
-      cwd: buildRoot,
-    });
-  }
-
-  // transform typescript to js and clean out typescript
-  const tsConfigPath = path.join(buildRoot, 'tsconfig.json');
-  if (existsSync(tsConfigPath)) {
-    // attempt to patch the extends path in the tsconfig file
-    const buildConfig = parseTsconfig(buildSource, tsConfigPath);
-
-    if (buildConfig.extends) {
-      buildConfig.extends = path.join(relative(buildRoot, buildSource), buildConfig.extends);
-
-      writeFileSync(tsConfigPath, JSON.stringify(buildConfig));
-    }
-
-    // Transpile ts server code
-    //
-    // Include everything except content from public folders
-    await transpileWithBabel(['**/*.{ts,tsx}', '!**/public/**'], buildRoot, [
-      require.resolve('@kbn/babel-preset/node_preset'),
-    ]);
-
-    // Transpile ts client code
-    //
-    // Include everything inside a public directory
-    await transpileWithBabel(['**/public/**/*.{ts,tsx}'], buildRoot, [
-      require.resolve('@kbn/babel-preset/webpack_preset'),
-    ]);
-
-    del.sync([
-      path.join(buildRoot, '**', '*.{ts,tsx,d.ts}'),
-      path.join(buildRoot, 'tsconfig.json'),
-    ]);
-  }
-
-  // remove symlinked dependencies
-  await pipeline(
-    vfs.src([relative(buildTarget, buildRoot) + '/**/*'], {
-      cwd: buildTarget,
-      base: buildTarget,
-      resolveSymlinks: false,
-    }),
-
-    removeSymlinkDependencies(buildRoot)
-  );
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/git_info.ts b/packages/kbn-plugin-helpers/src/tasks/build/git_info.ts
deleted file mode 100644
index e3a68f82e48b2..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/git_info.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { execFileSync } from 'child_process';
-
-export function gitInfo(rootPath: string) {
-  try {
-    const LOG_SEPARATOR = '||';
-
-    const commitCount = execFileSync('git', ['rev-list', '--count', 'HEAD'], {
-      cwd: rootPath,
-      stdio: ['ignore', 'pipe', 'ignore'],
-      encoding: 'utf8',
-    });
-
-    const logLine = execFileSync('git', ['log', '--pretty=%h' + LOG_SEPARATOR + '%cD', '-n', '1'], {
-      cwd: rootPath,
-      stdio: ['ignore', 'pipe', 'ignore'],
-      encoding: 'utf8',
-    }).split(LOG_SEPARATOR);
-
-    return {
-      count: commitCount.trim(),
-      sha: logLine[0].trim(),
-      date: logLine[1].trim(),
-    };
-  } catch (e) {
-    return {};
-  }
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/index.ts b/packages/kbn-plugin-helpers/src/tasks/build/index.ts
deleted file mode 100644
index d22d544a95491..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export * from './build_task';
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/package.json b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/package.json
deleted file mode 100644
index b36fc5bc961ac..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "build_action_test_plugin",
-  "version": "0.0.1",
-  "kibana": {
-    "version": "6.0.0"
-  },
-  "dependencies": {
-
-  },
-  "devDependencies": {
-
-  },
-  "scripts": {
-    "start": "node index.js"
-  }
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/translations/es.json b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/translations/es.json
deleted file mode 100644
index b553d7b7d5fe8..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/translations/es.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "common.ui.welcomeMessage": "Cargando Kibana",
-  "common.ui.welcomeError": "Kibana no se cargó correctamente. Heck la salida del servidor para obtener más información."
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/index.js b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/index.js
deleted file mode 100644
index e6a975e75ed2d..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = (kibana) => new kibana.Plugin({});
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/package.json b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/package.json
deleted file mode 100644
index c4ed8f69c8eab..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "create_build_test_plugin",
-  "version": "0.0.1",
-  "kibana": {
-    "version": "6.0.0"
-  },
-  "dependencies": {
-    "noop3": "999.999.999"
-  },
-  "devDependencies": {
-
-  },
-  "scripts": {
-    "start": "node index.js"
-  }
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/translations/es.json b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/translations/es.json
deleted file mode 100644
index b553d7b7d5fe8..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_build_test_plugin/translations/es.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "common.ui.welcomeMessage": "Cargando Kibana",
-  "common.ui.welcomeError": "Kibana no se cargó correctamente. Heck la salida del servidor para obtener más información."
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/index.js b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/index.js
deleted file mode 100644
index e6a975e75ed2d..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = (kibana) => new kibana.Plugin({});
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/package.json b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/package.json
deleted file mode 100644
index 9be527e742953..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "create_package_test_plugin",
-  "version": "0.0.1",
-  "kibana": {
-    "version": "6.0.0"
-  },
-  "dependencies": {
-
-  },
-  "devDependencies": {
-
-  },
-  "scripts": {
-    "start": "node index.js"
-  }
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/translations/es.json b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/translations/es.json
deleted file mode 100644
index b553d7b7d5fe8..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/create_package_test_plugin/translations/es.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "common.ui.welcomeMessage": "Cargando Kibana",
-  "common.ui.welcomeError": "Kibana no se cargó correctamente. Heck la salida del servidor para obtener más información."
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__snapshots__/build_action.test.js.snap b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__snapshots__/build_action.test.js.snap
deleted file mode 100644
index 798967e96583d..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__snapshots__/build_action.test.js.snap
+++ /dev/null
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`calling create_build rejects returned promise when build fails 1`] = `"foo bar"`;
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/build_action.test.js b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/build_action.test.js
deleted file mode 100644
index d9f20129e85f9..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/build_action.test.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import fs from 'fs';
-import del from 'del';
-import { pluginConfig } from '../../../lib';
-
-const PLUGIN_FIXTURE = resolve(__dirname, '__fixtures__/build_action_test_plugin');
-const PLUGIN_BUILD_DIR = resolve(PLUGIN_FIXTURE, 'build');
-const plugin = pluginConfig(PLUGIN_FIXTURE);
-
-describe('creating build zip', () => {
-  const { buildTask } = require('../build_task');
-
-  beforeEach(() => del(PLUGIN_BUILD_DIR));
-  afterEach(() => del(PLUGIN_BUILD_DIR));
-
-  it('creates a zip in the build directory', async () => {
-    await buildTask({ plugin });
-
-    const buildFile = resolve(PLUGIN_BUILD_DIR, plugin.id + '-' + plugin.version + '.zip');
-    if (!fs.existsSync(buildFile)) {
-      throw new Error('Build file not found: ' + buildFile);
-    }
-  });
-
-  it('skips zip creation based on flag', async () => {
-    await buildTask({ plugin, options: { skipArchive: true } });
-
-    const buildFile = resolve(PLUGIN_BUILD_DIR, plugin.id + '-' + plugin.version + '.zip');
-    if (fs.existsSync(buildFile)) {
-      throw new Error('Build file not found: ' + buildFile);
-    }
-  });
-});
-
-describe('calling create_build', () => {
-  let mockBuild;
-  let buildTask;
-
-  beforeEach(() => {
-    jest.resetModules();
-    jest.mock('../create_build');
-    ({ createBuild: mockBuild } = require('../create_build'));
-    ({ buildTask } = require('../build_task'));
-  });
-
-  const nameArgs = ([plugin, buildTarget, buildVersion, kibanaVersion, files]) => ({
-    plugin,
-    buildTarget,
-    buildVersion,
-    kibanaVersion,
-    files,
-  });
-
-  it('takes optional build version', async () => {
-    const options = {
-      buildVersion: '1.2.3',
-      kibanaVersion: '4.5.6',
-    };
-
-    await buildTask({ plugin, options });
-
-    expect(mockBuild.mock.calls).toHaveLength(1);
-
-    const { buildVersion, kibanaVersion } = nameArgs(mockBuild.mock.calls[0]);
-    expect(buildVersion).toBe('1.2.3');
-    expect(kibanaVersion).toBe('4.5.6');
-  });
-
-  it('uses default file list without files option', async () => {
-    await buildTask({ plugin });
-
-    expect(mockBuild.mock.calls).toHaveLength(1);
-
-    const { files } = nameArgs(mockBuild.mock.calls[0]);
-    plugin.buildSourcePatterns.forEach((file) => expect(files).toContain(file));
-  });
-
-  it('uses only files passed in', async () => {
-    const options = {
-      files: ['index.js', 'LICENSE.txt', 'plugins/**/*', '{server,public}/**/*'],
-    };
-
-    await buildTask({ plugin, options });
-
-    expect(mockBuild.mock.calls).toHaveLength(1);
-
-    const { files } = nameArgs(mockBuild.mock.calls[0]);
-    options.files.forEach((file) => expect(files).toContain(file));
-  });
-
-  it('rejects returned promise when build fails', async () => {
-    mockBuild.mockImplementation(async () => {
-      throw new Error('foo bar');
-    });
-
-    await expect(buildTask({ plugin })).rejects.toThrowErrorMatchingSnapshot();
-  });
-});
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/create_build.test.js b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/create_build.test.js
deleted file mode 100644
index 6662de24a3e03..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/create_build.test.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import { readdirSync } from 'fs';
-import del from 'del';
-import { createBuild } from '../create_build';
-import { pluginConfig } from '../../../lib';
-
-const PLUGIN_FIXTURE = resolve(__dirname, '__fixtures__/create_build_test_plugin');
-const PLUGIN = pluginConfig(PLUGIN_FIXTURE);
-const PLUGIN_BUILD_DIR = resolve(PLUGIN_FIXTURE, 'build');
-const PLUGIN_BUILD_TARGET = resolve(PLUGIN_BUILD_DIR, 'kibana', PLUGIN.id);
-
-beforeEach(() => del(PLUGIN_BUILD_DIR));
-afterEach(() => del(PLUGIN_BUILD_DIR));
-
-describe('creating the build', () => {
-  const buildTarget = resolve(PLUGIN.root, 'build');
-  const buildVersion = PLUGIN.version;
-  const kibanaVersion = PLUGIN.version;
-  const buildFiles = PLUGIN.buildSourcePatterns;
-
-  it('removes development properties from package.json', async () => {
-    expect(PLUGIN.pkg.scripts).not.toBeUndefined();
-    expect(PLUGIN.pkg.devDependencies).not.toBeUndefined();
-
-    await createBuild(PLUGIN, buildTarget, buildVersion, kibanaVersion, buildFiles);
-
-    const pkg = require(resolve(PLUGIN_BUILD_TARGET, 'package.json')); // eslint-disable-line import/no-dynamic-require
-    expect(pkg).not.toHaveProperty('scripts');
-    expect(pkg).not.toHaveProperty('devDependencies');
-  });
-
-  it('adds build metadata to package.json', async () => {
-    expect(PLUGIN.pkg.build).toBeUndefined();
-
-    await createBuild(PLUGIN, buildTarget, buildVersion, kibanaVersion, buildFiles);
-
-    const pkg = require(resolve(PLUGIN_BUILD_TARGET, 'package.json')); // eslint-disable-line import/no-dynamic-require
-    expect(pkg).toHaveProperty('build');
-    expect(pkg.build.git).not.toBeUndefined();
-    expect(pkg.build.date).not.toBeUndefined();
-  });
-
-  describe('skipInstallDependencies = false', () => {
-    it('installs node_modules as a part of build', async () => {
-      expect(PLUGIN.skipInstallDependencies).toBe(false);
-
-      await createBuild(PLUGIN, buildTarget, buildVersion, kibanaVersion, buildFiles);
-
-      expect(readdirSync(resolve(PLUGIN_BUILD_TARGET))).toContain('node_modules');
-      expect(readdirSync(resolve(PLUGIN_BUILD_TARGET, 'node_modules'))).toContain('noop3');
-    });
-  });
-
-  describe('skipInstallDependencies = true', () => {
-    // set skipInstallDependencies to true for these tests
-    beforeEach(() => (PLUGIN.skipInstallDependencies = true));
-    // set it back to false after
-    afterEach(() => (PLUGIN.skipInstallDependencies = false));
-
-    it('does not install node_modules as a part of build', async () => {
-      expect(PLUGIN.skipInstallDependencies).toBe(true);
-
-      await createBuild(PLUGIN, buildTarget, buildVersion, kibanaVersion, buildFiles);
-
-      expect(readdirSync(resolve(PLUGIN_BUILD_TARGET))).not.toContain('node_modules');
-    });
-  });
-});
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/create_package.test.js b/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/create_package.test.js
deleted file mode 100644
index 13de8fa165c29..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/create_package.test.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import { statSync } from 'fs';
-import del from 'del';
-import { createBuild } from '../create_build';
-import { createPackage } from '../create_package';
-import { pluginConfig } from '../../../lib';
-
-const PLUGIN_FIXTURE = resolve(__dirname, '__fixtures__/create_package_test_plugin');
-const PLUGIN = pluginConfig(PLUGIN_FIXTURE);
-const PLUGIN_BUILD_DIR = resolve(PLUGIN_FIXTURE, 'build-custom');
-
-const buildVersion = PLUGIN.version;
-const kibanaVersion = PLUGIN.version;
-const buildFiles = PLUGIN.buildSourcePatterns;
-const packageFile = `${PLUGIN.id}-${buildVersion}.zip`;
-
-beforeAll(() => del(PLUGIN_BUILD_DIR));
-afterAll(() => del(PLUGIN_BUILD_DIR));
-
-describe('creating the package', () => {
-  it('creates zip file in build target path', async () => {
-    await createBuild(PLUGIN, PLUGIN_BUILD_DIR, buildVersion, kibanaVersion, buildFiles);
-    await createPackage(PLUGIN, PLUGIN_BUILD_DIR, buildVersion);
-
-    const zipFile = resolve(PLUGIN_BUILD_DIR, packageFile);
-    const stats = statSync(zipFile);
-    expect(stats.isFile()).toBe(true);
-  });
-});
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/rewrite_package_json.ts b/packages/kbn-plugin-helpers/src/tasks/build/rewrite_package_json.ts
deleted file mode 100644
index aaecd11ad82af..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/build/rewrite_package_json.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Through2Map from 'through2-map';
-import File from 'vinyl';
-import { gitInfo } from './git_info';
-
-export function rewritePackageJson(
-  buildSource: string,
-  buildVersion: string,
-  kibanaVersion: string
-) {
-  return Through2Map.obj(function (file: File) {
-    if (file.basename === 'package.json' && file.dirname === buildSource) {
-      const pkg = JSON.parse(file.contents!.toString('utf8'));
-
-      // rewrite the target kibana version while the
-      // file is on it's way to the archive
-      if (!pkg.kibana) pkg.kibana = {};
-      pkg.kibana.version = kibanaVersion;
-      pkg.version = buildVersion;
-
-      // append build info
-      pkg.build = {
-        git: gitInfo(buildSource),
-        date: new Date().toString(),
-      };
-
-      // remove development properties from the package file
-      delete pkg.scripts;
-      delete pkg.devDependencies;
-
-      file.contents = Buffer.from(JSON.stringify(pkg, null, 2));
-    }
-
-    return file;
-  });
-}
diff --git a/packages/kbn-plugin-helpers/src/lib/docs.ts b/packages/kbn-plugin-helpers/src/tasks/clean.ts
similarity index 62%
rename from packages/kbn-plugin-helpers/src/lib/docs.ts
rename to packages/kbn-plugin-helpers/src/tasks/clean.ts
index fb05fd0c5c2ce..e77cbc3efe611 100644
--- a/packages/kbn-plugin-helpers/src/lib/docs.ts
+++ b/packages/kbn-plugin-helpers/src/tasks/clean.ts
@@ -17,19 +17,21 @@
  * under the License.
  */
 
-import { resolve } from 'path';
-import { readFileSync } from 'fs';
+import Fs from 'fs';
+import { promisify } from 'util';
 
-function indent(txt: string, n: number) {
-  const space = new Array(n + 1).join(' ');
-  return space + txt.split('\n').join('\n' + space);
-}
+import del from 'del';
+
+import { BuildContext } from '../build_context';
+
+const asyncMkdir = promisify(Fs.mkdir);
 
-export function docs(name: string) {
-  const md = readFileSync(resolve(__dirname, '../../src/tasks', name, 'README.md'), 'utf8');
+export async function initTargets({ log, sourceDir, buildDir }: BuildContext) {
+  log.info('deleting the build and target directories');
+  await del(['build', 'target'], {
+    cwd: sourceDir,
+  });
 
-  return function () {
-    /* eslint-disable-next-line no-console */
-    console.log(`\n  Docs:\n\n${indent(md, 4)}\n\n`);
-  };
+  log.debug(`creating build output dir [${buildDir}]`);
+  await asyncMkdir(buildDir, { recursive: true });
 }
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/create_package.ts b/packages/kbn-plugin-helpers/src/tasks/create_archive.ts
similarity index 53%
rename from packages/kbn-plugin-helpers/src/tasks/build/create_package.ts
rename to packages/kbn-plugin-helpers/src/tasks/create_archive.ts
index 02c2004900347..7656b6119c85d 100644
--- a/packages/kbn-plugin-helpers/src/tasks/build/create_package.ts
+++ b/packages/kbn-plugin-helpers/src/tasks/create_archive.ts
@@ -17,30 +17,40 @@
  * under the License.
  */
 
-import { relative, join } from 'path';
+import Path from 'path';
+import { pipeline } from 'stream';
+import { promisify } from 'util';
 
 import del from 'del';
 import vfs from 'vinyl-fs';
 import zip from 'gulp-zip';
 
-import { pipeline, PluginConfig } from '../../lib';
-
-export async function createPackage(
-  plugin: PluginConfig,
-  buildTarget: string,
-  buildVersion: string
-) {
-  const buildId = `${plugin.id}-${buildVersion}`;
-  const buildRoot = join(buildTarget, 'kibana', plugin.id);
-  const buildFiles = [relative(buildTarget, buildRoot) + '/**/*'];
-
-  // zip up the package
-  await pipeline(
-    vfs.src(buildFiles, { cwd: buildTarget, base: buildTarget, dot: true }),
-    zip(`${buildId}.zip`),
-    vfs.dest(buildTarget)
+import { BuildContext } from '../build_context';
+
+const asyncPipeline = promisify(pipeline);
+
+export async function createArchive({ kibanaVersion, plugin, log }: BuildContext) {
+  const {
+    manifest: { id },
+    directory,
+  } = plugin;
+
+  const zipName = `${id}-${kibanaVersion}.zip`;
+  log.info(`compressing plugin into [${zipName}]`);
+
+  const buildDir = Path.resolve(directory, 'build');
+
+  // zip up the build files
+  await asyncPipeline(
+    vfs.src([`kibana/${id}/**/*`], {
+      cwd: buildDir,
+      base: buildDir,
+      dot: true,
+    }),
+    zip(zipName),
+    vfs.dest(buildDir)
   );
 
-  // clean up the build path
-  await del(join(buildTarget, 'kibana'));
+  // delete the files that were zipped
+  await del(Path.resolve(buildDir, 'kibana'));
 }
diff --git a/packages/kbn-plugin-helpers/src/lib/index.ts b/packages/kbn-plugin-helpers/src/tasks/index.ts
similarity index 83%
rename from packages/kbn-plugin-helpers/src/lib/index.ts
rename to packages/kbn-plugin-helpers/src/tasks/index.ts
index acc7134308bec..92bb5b1510ad3 100644
--- a/packages/kbn-plugin-helpers/src/lib/index.ts
+++ b/packages/kbn-plugin-helpers/src/tasks/index.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-export * from './run';
-export * from './utils';
-export * from './win_cmd';
-export * from './plugin_config';
-export * from './pipeline';
+export * from './clean';
+export * from './create_archive';
+export * from './optimize';
+export * from './write_server_files';
+export * from './yarn_install';
diff --git a/packages/kbn-plugin-helpers/src/tasks/optimize.ts b/packages/kbn-plugin-helpers/src/tasks/optimize.ts
new file mode 100644
index 0000000000000..6cfeda8b2d81b
--- /dev/null
+++ b/packages/kbn-plugin-helpers/src/tasks/optimize.ts
@@ -0,0 +1,53 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Fs from 'fs';
+import Path from 'path';
+import { promisify } from 'util';
+
+import { REPO_ROOT } from '@kbn/dev-utils';
+import { OptimizerConfig, runOptimizer, logOptimizerState } from '@kbn/optimizer';
+
+import { BuildContext } from '../build_context';
+
+const asyncRename = promisify(Fs.rename);
+
+export async function optimize({ log, plugin, sourceDir, buildDir }: BuildContext) {
+  if (!plugin.manifest.ui) {
+    return;
+  }
+
+  log.info('running @kbn/optimizer');
+  log.indent(2);
+
+  // build bundles into target
+  const config = OptimizerConfig.create({
+    repoRoot: REPO_ROOT,
+    pluginPaths: [sourceDir],
+    cache: false,
+    dist: true,
+    pluginScanDirs: [],
+  });
+
+  await runOptimizer(config).pipe(logOptimizerState(log, config)).toPromise();
+
+  // move target into buildDir
+  await asyncRename(Path.resolve(sourceDir, 'target'), Path.resolve(buildDir, 'target'));
+  log.indent(-2);
+}
diff --git a/packages/kbn-plugin-helpers/src/tasks/start/README.md b/packages/kbn-plugin-helpers/src/tasks/start/README.md
deleted file mode 100644
index 6bddfc5c86696..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/start/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Starts the kibana server with this plugin included. In essence this is the same as running the
-following from the root of the kibana install:
-
-```sh
-./bin/kibana --dev --plugin-path=../path/to/plugin
-```
diff --git a/packages/kbn-plugin-helpers/src/tasks/start/start_task.ts b/packages/kbn-plugin-helpers/src/tasks/start/start_task.ts
deleted file mode 100644
index 5018fd7598180..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/start/start_task.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { execFileSync } from 'child_process';
-import { join } from 'path';
-
-// @ts-ignore
-import split from 'argv-split';
-
-import { TaskContext } from '../../lib';
-
-export function startTask({ plugin, options }: TaskContext) {
-  options = options || {};
-
-  const cmd = 'node';
-  const script = join('scripts', 'kibana.js');
-  const nodeOptions = split(process.env.NODE_OPTIONS || '');
-
-  let args = nodeOptions.concat([script, '--dev', '--plugin-path', plugin.root]);
-
-  if (Array.isArray(plugin.includePlugins)) {
-    plugin.includePlugins.forEach((path) => {
-      args = args.concat(['--plugin-path', path]);
-    });
-  }
-
-  if (options.flags) {
-    args = args.concat(options.flags);
-  }
-
-  execFileSync(cmd, args, {
-    cwd: plugin.kibanaRoot,
-    stdio: ['ignore', 1, 2],
-  });
-}
diff --git a/packages/kbn-plugin-helpers/src/tasks/test/mocha/README.md b/packages/kbn-plugin-helpers/src/tasks/test/mocha/README.md
deleted file mode 100644
index 6f5997a40a23b..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/test/mocha/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-writing tests
-=============
-
-Server tests are written just like browser tests, they are just executed differently.
-
-  - place tests near the code they test, in `__tests__` directories throughout
-    the server directory
-  - Use the same bdd-style `describe()` and `it()` api to define the suites
-    and cases of your tests.
-
-    ```js
-    describe('some portion of your code', function () {
-      it('should do this thing', function () {
-        expect(true).to.be(false);
-      });
-    });
-    ```
-
-
-running the tests
-=================
-
-Running the server tests is simple, just execute `yarn test:mocha` in your terminal
-and all of the tests in your server will be run.
-
-By default, the runner will look for tests in `server/**/__tests__/**/*.js`. If you'd prefer to
-use a different collection of globs and files, you can specify them after the `yarn test:mocha`
-task, like so:
-
-`yarn test:mocha 'plugins/myplugins/server/__tests__/**/*.js'`
-
-NOTE: quoting the glob pattern is not required, but helps to avoid issues with globbing expansion
-in your shell.
-
-
-focus on the task at hand
-=========================
-
-To limit the tests that run add `.only` to your `describe()` or `it()` calls:
-
-```js
-describe.only('suite name', function () {
-  // ...
-});
-```
diff --git a/packages/kbn-plugin-helpers/src/tasks/test/mocha/index.ts b/packages/kbn-plugin-helpers/src/tasks/test/mocha/index.ts
deleted file mode 100644
index 74e53062d4f01..0000000000000
--- a/packages/kbn-plugin-helpers/src/tasks/test/mocha/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export * from './test_mocha_task';
diff --git a/packages/kbn-plugin-helpers/src/tasks/write_server_files.ts b/packages/kbn-plugin-helpers/src/tasks/write_server_files.ts
new file mode 100644
index 0000000000000..64e309822b673
--- /dev/null
+++ b/packages/kbn-plugin-helpers/src/tasks/write_server_files.ts
@@ -0,0 +1,101 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { pipeline } from 'stream';
+import { promisify } from 'util';
+
+import vfs from 'vinyl-fs';
+import { transformFileWithBabel, transformFileStream } from '@kbn/dev-utils';
+
+import { BuildContext } from '../build_context';
+
+const asyncPipeline = promisify(pipeline);
+
+export async function writeServerFiles({
+  log,
+  config,
+  plugin,
+  sourceDir,
+  buildDir,
+  kibanaVersion,
+}: BuildContext) {
+  log.info('copying source into the build and converting with babel');
+
+  // copy source files and apply some babel transformations in the process
+  await asyncPipeline(
+    vfs.src(
+      [
+        'kibana.json',
+        ...(plugin.manifest.server
+          ? config.serverSourcePatterns || [
+              'yarn.lock',
+              'tsconfig.json',
+              'package.json',
+              'index.{js,ts}',
+              '{lib,server,common,translations}/**/*',
+            ]
+          : []),
+      ],
+      {
+        cwd: sourceDir,
+        base: sourceDir,
+        buffer: true,
+        ignore: [
+          '**/*.d.ts',
+          '**/public/**',
+          '**/__tests__/**',
+          '**/*.{test,test.mocks,mock,mocks}.*',
+        ],
+        allowEmpty: true,
+      }
+    ),
+
+    // add kibanaVersion to kibana.json files
+    transformFileStream((file) => {
+      if (file.relative !== 'kibana.json') {
+        return;
+      }
+
+      const json = file.contents.toString('utf8');
+      const manifest = JSON.parse(json);
+      file.contents = Buffer.from(
+        JSON.stringify(
+          {
+            ...manifest,
+            kibanaVersion,
+          },
+          null,
+          2
+        )
+      );
+    }),
+
+    transformFileStream(async (file) => {
+      if (file.path.includes('node_modules')) {
+        return;
+      }
+
+      if (['.js', '.ts', '.tsx'].includes(file.extname)) {
+        await transformFileWithBabel(file);
+      }
+    }),
+
+    vfs.dest(buildDir)
+  );
+}
diff --git a/packages/kbn-plugin-helpers/src/tasks/yarn_install.ts b/packages/kbn-plugin-helpers/src/tasks/yarn_install.ts
new file mode 100644
index 0000000000000..1528e14133444
--- /dev/null
+++ b/packages/kbn-plugin-helpers/src/tasks/yarn_install.ts
@@ -0,0 +1,40 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import Fs from 'fs';
+import Path from 'path';
+
+import execa from 'execa';
+
+import { BuildContext } from '../build_context';
+
+const winVersion = (path: string) => (process.platform === 'win32' ? `${path}.cmd` : path);
+
+export async function yarnInstall({ log, buildDir, config }: BuildContext) {
+  const pkgJson = Path.resolve(buildDir, 'package.json');
+
+  if (config?.skipInstallDependencies || !Fs.existsSync(pkgJson)) {
+    return;
+  }
+
+  log.info('running yarn to install dependencies');
+  await execa(winVersion('yarn'), ['install', '--production', '--pure-lockfile'], {
+    cwd: buildDir,
+  });
+}
diff --git a/packages/kbn-plugin-helpers/tsconfig.json b/packages/kbn-plugin-helpers/tsconfig.json
index d0dbe1e44f0fa..e794b11b14afa 100644
--- a/packages/kbn-plugin-helpers/tsconfig.json
+++ b/packages/kbn-plugin-helpers/tsconfig.json
@@ -3,9 +3,10 @@
   "compilerOptions": {
     "outDir": "target",
     "declaration": true,
-    "sourceMap": true
+    "sourceMap": true,
+    "target": "ES2018"
   },
   "include": [
-    "src/**/*.ts"
+    "src/**/*"
   ]
 }
diff --git a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/index.js b/scripts/plugin_helpers.js
similarity index 88%
rename from packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/index.js
rename to scripts/plugin_helpers.js
index e6a975e75ed2d..a07ba7a9185f8 100644
--- a/packages/kbn-plugin-helpers/src/tasks/build/integration_tests/__fixtures__/build_action_test_plugin/index.js
+++ b/scripts/plugin_helpers.js
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-module.exports = (kibana) => new kibana.Plugin({});
+require('../src/setup_node_env/prebuilt_dev_only_entry');
+require('@kbn/plugin-helpers').runCli();
diff --git a/src/setup_node_env/prebuilt_dev_only_entry.js b/src/setup_node_env/prebuilt_dev_only_entry.js
index 9453b3bd67eb7..71fdfa5ad29ea 100644
--- a/src/setup_node_env/prebuilt_dev_only_entry.js
+++ b/src/setup_node_env/prebuilt_dev_only_entry.js
@@ -23,5 +23,6 @@ require('./harden');
 // The following require statements MUST be executed before any others - END
 
 require('symbol-observable');
+require('source-map-support/register');
 require('./root');
 require('./node_version_validator');
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index f2e4039f8c2bd..37837747a69dd 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@elastic/eui": "27.4.1",
-    "@kbn/plugin-helpers": "9.0.2",
+    "@kbn/plugin-helpers": "1.0.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
     "typescript": "4.0.2"
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index fd1fb0aa1fca9..ebf0e046eca4c 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "@elastic/eui": "27.4.1",
-    "@kbn/plugin-helpers": "9.0.2",
+    "@kbn/plugin-helpers": "1.0.0",
     "react": "^16.12.0",
     "typescript": "4.0.2"
   }
diff --git a/x-pack/.kibana-plugin-helpers.json b/x-pack/.kibana-plugin-helpers.json
deleted file mode 100644
index c73f2ec595a2a..0000000000000
--- a/x-pack/.kibana-plugin-helpers.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "serverTestPatterns": [
-    "legacy/server/**/__tests__/**/*.js",
-    "legacy/plugins/**/__tests__/**/*.js",
-    "!legacy/plugins/**/server/**/__tests__/**/*"
-  ],
-  "buildSourcePatterns": [
-    "LICENSE.txt",
-    "NOTICE.txt",
-    "package.json",
-    "yarn.lock",
-    "tsconfig.json",
-    "index.js",
-    ".i18nrc.json",
-    "plugins/**/*",
-    "plugins/reporting/.phantom/*",
-    "plugins/reporting/.chromium/*",
-    "legacy/common/**/*",
-    "legacy/plugins/**/*",
-    "legacy/server/**/*",
-    "typings/**/*",
-    "!**/README.md",
-    "!__tests__",
-    "!__tests__/**/*",
-    "!**/__tests__",
-    "!**/__tests__/**/*",
-    "!legacy/plugins/**/*.test.{js,ts}",
-    "!legacy/plugins/**/__snapshots__",
-    "!legacy/plugins/**/__snapshots__/*",
-    "!legacy/plugins/**/__mocks__/*",
-    "!plugins/canvas/shareable_runtime/test",
-    "!plugins/canvas/shareable_runtime/test/**/*"
-  ],
-  "skipInstallDependencies": true
-}
diff --git a/x-pack/gulpfile.js b/x-pack/gulpfile.js
index 78ed2bff8cb01..4a11a03f19fc7 100644
--- a/x-pack/gulpfile.js
+++ b/x-pack/gulpfile.js
@@ -7,12 +7,10 @@
 require('../src/setup_node_env');
 
 const { buildTask } = require('./tasks/build');
-const { devTask } = require('./tasks/dev');
 const { downloadChromium } = require('./tasks/download_chromium');
 
 // export the tasks that are runnable from the CLI
 module.exports = {
   build: buildTask,
-  dev: devTask,
   downloadChromium,
 };
diff --git a/x-pack/package.json b/x-pack/package.json
index dd8cb589dc232..c2fc16153290e 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "kbn": "node ../scripts/kbn",
     "kbn:bootstrap": "node plugins/canvas/scripts/storybook --clean",
-    "start": "gulp dev",
+    "start": "node ../scripts/kibana --dev",
     "build": "gulp build",
     "testonly": "echo 'Deprecated, use `yarn test`' && gulp test",
     "test": "gulp test",
@@ -35,7 +35,7 @@
     "@kbn/dev-utils": "1.0.0",
     "@kbn/es": "1.0.0",
     "@kbn/expect": "1.0.0",
-    "@kbn/plugin-helpers": "9.0.2",
+    "@kbn/plugin-helpers": "1.0.0",
     "@kbn/storybook": "1.0.0",
     "@kbn/test": "1.0.0",
     "@kbn/utility-types": "1.0.0",
diff --git a/x-pack/scripts/api_debug.js b/x-pack/scripts/api_debug.js
index 85bfa7d066e65..70b9fd5caedb4 100644
--- a/x-pack/scripts/api_debug.js
+++ b/x-pack/scripts/api_debug.js
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-require('@kbn/plugin-helpers').babelRegister();
+require('../../src/setup_node_env');
 require('../dev-tools/api_debug').apiDebug();
diff --git a/x-pack/scripts/functional_test_runner.js b/x-pack/scripts/functional_test_runner.js
index 8fbfd113428b3..c2169e7440c5b 100644
--- a/x-pack/scripts/functional_test_runner.js
+++ b/x-pack/scripts/functional_test_runner.js
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-require('@kbn/plugin-helpers').babelRegister();
+require('../../src/setup_node_env');
 require('@kbn/test').runFtrCli();
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index f79e2c3b34497..421e709444d0f 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -64,7 +64,7 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/ingest_manager_api_integration/config.ts'),
 ];
 
-require('@kbn/plugin-helpers').babelRegister();
+require('../../src/setup_node_env');
 require('@kbn/test').runTestsCli([
   ...alwaysImportedTests,
   ...(!!process.env.CODE_COVERAGE ? [] : onlyNotInCoverageTests),
diff --git a/x-pack/scripts/functional_tests_server.js b/x-pack/scripts/functional_tests_server.js
index d6a460f985855..8fa23122bfad0 100644
--- a/x-pack/scripts/functional_tests_server.js
+++ b/x-pack/scripts/functional_tests_server.js
@@ -6,5 +6,5 @@
 
 process.env.ALLOW_PERFORMANCE_HOOKS_IN_TASK_MANAGER = true;
 
-require('@kbn/plugin-helpers').babelRegister();
+require('../../src/setup_node_env');
 require('@kbn/test').startServersCli(require.resolve('../test/functional/config.js'));
diff --git a/x-pack/scripts/jest.js b/x-pack/scripts/jest.js
index 76a3aff0eb7f3..f807610fd60de 100644
--- a/x-pack/scripts/jest.js
+++ b/x-pack/scripts/jest.js
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-require('@kbn/plugin-helpers').babelRegister();
+require('../../src/setup_node_env');
 require('../dev-tools/jest').runJest();
diff --git a/x-pack/tasks/build.ts b/x-pack/tasks/build.ts
index ce1c9d7c269b7..085f63206507f 100644
--- a/x-pack/tasks/build.ts
+++ b/x-pack/tasks/build.ts
@@ -7,22 +7,26 @@
 import execa from 'execa';
 import { resolve } from 'path';
 import { writeFileSync } from 'fs';
+import { promisify } from 'util';
+import { pipeline } from 'stream';
 
-import * as pluginHelpers from '@kbn/plugin-helpers';
-import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
+import { ToolingLog, REPO_ROOT, transformFileStream, transformFileWithBabel } from '@kbn/dev-utils';
 import gulp from 'gulp';
 import del from 'del';
 import fancyLog from 'fancy-log';
 import chalk from 'chalk';
+import vfs from 'vinyl-fs';
 
 import { generateNoticeFromSource } from '../../src/dev/notice';
 import { gitInfo } from './helpers/git_info';
 import { PKG_NAME } from './helpers/pkg';
 import { BUILD_VERSION } from './helpers/build_version';
 
+const asyncPipeline = promisify(pipeline);
+
 const XPACK_DIR = resolve(REPO_ROOT, 'x-pack');
 const BUILD_DIR = resolve(XPACK_DIR, 'build');
-const PLUGIN_BUILD_DIR = resolve(BUILD_DIR, 'plugin');
+const PLUGIN_BUILD_DIR = resolve(BUILD_DIR, 'plugin/kibana/x-pack');
 
 async function cleanBuildTask() {
   fancyLog('Deleting', BUILD_DIR);
@@ -41,11 +45,52 @@ async function reportTask() {
   fancyLog('Build SHA', chalk.yellow(info.sha));
 }
 
-async function pluginHelpersBuild() {
-  await pluginHelpers.run('build', {
-    skipArchive: true,
-    buildDestination: PLUGIN_BUILD_DIR,
-  });
+async function copySourceAndBabelify() {
+  // copy source files and apply some babel transformations in the process
+  await asyncPipeline(
+    vfs.src(
+      [
+        'LICENSE.txt',
+        'NOTICE.txt',
+        'package.json',
+        'yarn.lock',
+        'tsconfig.json',
+        'index.js',
+        '.i18nrc.json',
+        'plugins/**/*',
+        'plugins/reporting/.phantom/*',
+        'plugins/reporting/.chromium/*',
+        'legacy/common/**/*',
+        'legacy/plugins/**/*',
+        'legacy/server/**/*',
+        'typings/**/*',
+      ],
+      {
+        cwd: XPACK_DIR,
+        base: XPACK_DIR,
+        buffer: true,
+        nodir: true,
+        ignore: [
+          '**/README.md',
+          '**/*.{test,test.mocks,mock,mocks}.*',
+          '**/*.d.ts',
+          '**/node_modules/**',
+          '**/public/**',
+          '**/{__tests__,__mocks__,__snapshots__}/**',
+          'plugins/canvas/shareable_runtime/test/**',
+        ],
+        allowEmpty: true,
+      }
+    ),
+
+    transformFileStream(async (file) => {
+      if (['.js', '.ts', '.tsx'].includes(file.extname)) {
+        await transformFileWithBabel(file);
+      }
+    }),
+
+    vfs.dest(PLUGIN_BUILD_DIR)
+  );
 }
 
 async function buildCanvasShareableRuntime() {
@@ -58,18 +103,17 @@ async function buildCanvasShareableRuntime() {
 }
 
 async function generateNoticeText() {
-  const buildRoot = resolve(PLUGIN_BUILD_DIR, 'kibana/x-pack');
   const log = new ToolingLog({
     level: 'info',
     writeTo: process.stdout,
   });
 
   writeFileSync(
-    resolve(buildRoot, 'NOTICE.txt'),
+    resolve(PLUGIN_BUILD_DIR, 'NOTICE.txt'),
     await generateNoticeFromSource({
       productName: 'Kibana X-Pack',
       log,
-      directory: buildRoot,
+      directory: PLUGIN_BUILD_DIR,
     })
   );
 }
@@ -78,6 +122,6 @@ export const buildTask = gulp.series(
   cleanBuildTask,
   reportTask,
   buildCanvasShareableRuntime,
-  pluginHelpersBuild,
+  copySourceAndBabelify,
   generateNoticeText
 );
diff --git a/x-pack/tasks/dev.ts b/x-pack/tasks/dev.ts
deleted file mode 100644
index c454817158700..0000000000000
--- a/x-pack/tasks/dev.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import * as pluginHelpers from '@kbn/plugin-helpers';
-import gulp from 'gulp';
-
-export const devTask = gulp.series(async function startKibanaServer() {
-  await pluginHelpers.run('start', {
-    flags: process.argv.slice(3),
-  });
-});
diff --git a/x-pack/test/saved_object_api_integration/common/config.ts b/x-pack/test/saved_object_api_integration/common/config.ts
index 4bae8e48173e4..61884f521cfaf 100644
--- a/x-pack/test/saved_object_api_integration/common/config.ts
+++ b/x-pack/test/saved_object_api_integration/common/config.ts
@@ -4,9 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { resolveKibanaPath } from '@kbn/plugin-helpers';
-import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
 import path from 'path';
+
+import { REPO_ROOT } from '@kbn/dev-utils';
+import { FtrConfigProviderContext } from '@kbn/test/types/ftr';
+
 import { services } from './services';
 
 interface CreateTestConfigOptions {
@@ -20,7 +22,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
   return async ({ readConfigFile }: FtrConfigProviderContext) => {
     const config = {
       kibana: {
-        api: await readConfigFile(resolveKibanaPath('test/api_integration/config.js')),
+        api: await readConfigFile(path.resolve(REPO_ROOT, 'test/api_integration/config.js')),
         functional: await readConfigFile(require.resolve('../../../../test/functional/config.js')),
       },
       xpack: {
diff --git a/x-pack/test/spaces_api_integration/common/config.ts b/x-pack/test/spaces_api_integration/common/config.ts
index d734c5a6ba422..89fa07566ecba 100644
--- a/x-pack/test/spaces_api_integration/common/config.ts
+++ b/x-pack/test/spaces_api_integration/common/config.ts
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { resolveKibanaPath } from '@kbn/plugin-helpers';
 import path from 'path';
+
+import { REPO_ROOT } from '@kbn/dev-utils';
+
 import { TestInvoker } from './lib/types';
 // @ts-ignore
 import { LegacyEsProvider } from './services/legacy_es';
@@ -21,7 +23,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
   return async ({ readConfigFile }: TestInvoker) => {
     const config = {
       kibana: {
-        api: await readConfigFile(resolveKibanaPath('test/api_integration/config.js')),
+        api: await readConfigFile(path.resolve(REPO_ROOT, 'test/api_integration/config.js')),
         functional: await readConfigFile(require.resolve('../../../../test/functional/config.js')),
       },
       xpack: {
diff --git a/yarn.lock b/yarn.lock
index d3994337301cf..496331aba0485 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3643,6 +3643,13 @@
   resolved "https://registry.yarnpkg.com/@types/d3/-/d3-3.5.43.tgz#e9b4992817e0b6c5efaa7d6e5bb2cee4d73eab58"
   integrity sha512-t9ZmXOcpVxywRw86YtIC54g7M9puRh8hFedRvVfHKf5YyOP6pSxA0TvpXpfseXSCInoW4P7bggTrSDiUOs4g5w==
 
+"@types/decompress@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@types/decompress/-/decompress-4.2.3.tgz#98eed48af80001038aa05690b2094915f296fe65"
+  integrity sha512-W24e3Ycz1UZPgr1ZEDHlK4XnvOr+CpJH3qNsFeqXwwlW/9END9gxn3oJSsp7gYdiQxrXUHwUUd3xuzVz37MrZQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/dedent@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@types/dedent/-/dedent-0.7.0.tgz#155f339ca404e6dd90b9ce46a3f78fd69ca9b050"
@@ -3809,13 +3816,6 @@
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.13.4.tgz#55ae9c29f0fd6b85ee536f5c72b4769d5c5e06b1"
   integrity sha512-B4yel4ro2nTb3v0pYO8vO6SjgvFJSrwUY+IO6TUSLdOSB+gQFslylrhRCHxvXMIhxB71mv5PEE9dAX+24S8sew==
 
-"@types/gulp-rename@^0.0.33":
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@types/gulp-rename/-/gulp-rename-0.0.33.tgz#38d146e97786569f74f5391a1b1f9b5198674b6c"
-  integrity sha512-FIZQvbZJj6V1gHPTzO+g/BCWpDur7fJrroae4gwV3LaoHBQ+MrR9sB+2HssK8fHv4WdY6hVNxkcft9bYatuPIA==
-  dependencies:
-    "@types/node" "*"
-
 "@types/gulp-zip@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/gulp-zip/-/gulp-zip-4.0.1.tgz#96cd0b994219f9ae3bbbec7ec3baa043fba9d9ef"
@@ -4787,21 +4787,6 @@
     "@types/react-dom" "*"
     "@types/testing-library__dom" "*"
 
-"@types/through2-map@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/through2-map/-/through2-map-3.0.0.tgz#2fda6049bf0ec16fd75394fc64536d73024d3189"
-  integrity sha512-r2m4v3Lggg30dCt7nG9uDl93LhImYRsAutECYNU7JenHTM3MdwMHudcC3sOqk/rEUEpN9CDNOIuOxRGzJUP1pg==
-  dependencies:
-    "@types/node" "*"
-    "@types/through2" "*"
-
-"@types/through2@*", "@types/through2@^2.0.35":
-  version "2.0.35"
-  resolved "https://registry.yarnpkg.com/@types/through2/-/through2-2.0.35.tgz#9add1643da9f936ecf0622311759b33e881047e8"
-  integrity sha512-5puhsegK8DdiZkVL71+iL67KxKd92l7kzzzeclc+idlp5L6PbjxDDQX9JCIA6jOUS9aNHgcmONyW5CRtZUvKFw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/through@*":
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.30.tgz#e0e42ce77e897bd6aead6f6ea62aeb135b8a3895"
@@ -6167,11 +6152,6 @@ argparse@^1.0.7, argparse@~1.0.9:
   dependencies:
     sprintf-js "~1.0.2"
 
-argv-split@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argv-split/-/argv-split-2.0.1.tgz#be264117790dbd5ccd63ec3f449a1804814ac4c5"
-  integrity sha1-viZBF3kNvVzNY+w/RJoYBIFKxMU=
-
 aria-hidden@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/aria-hidden/-/aria-hidden-1.1.1.tgz#0c356026d3f65e2bd487a3adb73f0c586be2c37e"
@@ -7737,6 +7717,19 @@ btoa-lite@^1.0.0:
   resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
   integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc=
 
+buffer-alloc-unsafe@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
+
+buffer-alloc@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
+  dependencies:
+    buffer-alloc-unsafe "^1.1.0"
+    buffer-fill "^1.0.0"
+
 buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -7757,6 +7750,11 @@ buffer-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
   integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
 
+buffer-fill@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
+
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -7789,6 +7787,14 @@ buffer@^5.1.0, buffer@^5.2.0:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
+buffer@^5.2.1:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
+  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+
 builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
@@ -10328,6 +10334,59 @@ decompress-response@^5.0.0:
   dependencies:
     mimic-response "^2.0.0"
 
+decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1"
+  integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==
+  dependencies:
+    file-type "^5.2.0"
+    is-stream "^1.1.0"
+    tar-stream "^1.5.2"
+
+decompress-tarbz2@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b"
+  integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==
+  dependencies:
+    decompress-tar "^4.1.0"
+    file-type "^6.1.0"
+    is-stream "^1.1.0"
+    seek-bzip "^1.0.5"
+    unbzip2-stream "^1.0.9"
+
+decompress-targz@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee"
+  integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==
+  dependencies:
+    decompress-tar "^4.1.1"
+    file-type "^5.2.0"
+    is-stream "^1.1.0"
+
+decompress-unzip@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69"
+  integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k=
+  dependencies:
+    file-type "^3.8.0"
+    get-stream "^2.2.0"
+    pify "^2.3.0"
+    yauzl "^2.4.2"
+
+decompress@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118"
+  integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==
+  dependencies:
+    decompress-tar "^4.0.0"
+    decompress-tarbz2 "^4.0.0"
+    decompress-targz "^4.0.0"
+    decompress-unzip "^4.0.1"
+    graceful-fs "^4.1.10"
+    make-dir "^1.0.0"
+    pify "^2.3.0"
+    strip-dirs "^2.0.0"
+
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -11095,20 +11154,10 @@ duplexer@^0.1.1:
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
   integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
-duplexify@^3.2.0, duplexify@^3.5.3:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.4.tgz#4bb46c1796eabebeec4ca9a2e66b808cb7a3d8b4"
-  integrity sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-duplexify@^3.4.2, duplexify@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
-  integrity sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==
+duplexify@^3.2.0, duplexify@^3.4.2, duplexify@^3.5.3, duplexify@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -12909,6 +12958,21 @@ file-type@^10.9.0:
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.9.0.tgz#f6c12c7cb9e6b8aeefd6917555fd4f9eadf31891"
   integrity sha512-9C5qtGR/fNibHC5gzuMmmgnjH3QDDLKMa8lYe9CiZVmAnI4aUaoMh40QyUPzzs0RYo837SOBKh7TYwle4G8E4w==
 
+file-type@^3.8.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
+  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=
+
+file-type@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
+  integrity sha1-LdvqfHP/42No365J3DOMBYwritY=
+
+file-type@^6.1.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919"
+  integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==
+
 file-type@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz#a68d5ad07f486414dfb2c8866f73161946714a18"
@@ -13714,6 +13778,14 @@ get-stream@3.0.0, get-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
+get-stream@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
+  integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=
+  dependencies:
+    object-assign "^4.0.1"
+    pinkie-promise "^2.0.0"
+
 get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -14322,7 +14394,7 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
+graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@@ -14749,11 +14821,6 @@ gulp-cli@^2.2.0:
     v8flags "^3.0.1"
     yargs "^7.1.0"
 
-gulp-rename@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz#de1c718e7c4095ae861f7296ef4f3248648240bd"
-  integrity sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==
-
 gulp-sourcemaps@2.6.5:
   version "2.6.5"
   resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz#a3f002d87346d2c0f3aec36af7eb873f23de8ae6"
@@ -14771,10 +14838,10 @@ gulp-sourcemaps@2.6.5:
     strip-bom-string "1.X"
     through2 "2.X"
 
-gulp-zip@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/gulp-zip/-/gulp-zip-5.0.1.tgz#0dba5094901b0d91bcc8b53b3f6ff797c0f2002d"
-  integrity sha512-M/IWLh9RvOpuofDZkgDirtiyz9J3yIqnDOJ3muzk2D/XnZ1ruqPlPLRIpXnl/aZU+xXwKPdOIxjRzkUcVEQyZQ==
+gulp-zip@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/gulp-zip/-/gulp-zip-5.0.2.tgz#2edf797ec842e770f4dfde8bef97d139015b1972"
+  integrity sha512-rZd0Ppuc8Bf7J2/WzcdNaeb+lcEXf1R8mV/PJ9Kdu7PmnInWVeLSmiXIka/2QSe6uhAsGVFAMffWSaMzAPGTBg==
   dependencies:
     get-stream "^5.1.0"
     plugin-error "^1.0.1"
@@ -16416,6 +16483,11 @@ is-native@^1.0.1:
     is-nil "^1.0.0"
     to-source-code "^1.0.0"
 
+is-natural-number@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
+  integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=
+
 is-negated-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
@@ -23992,7 +24064,7 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@1 || 2", readable-stream@^2.3.7, readable-stream@~2.3.3:
+"readable-stream@1 || 2", readable-stream@^2.3.0, readable-stream@^2.3.7, readable-stream@~2.3.3:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -25374,6 +25446,13 @@ seedrandom@^3.0.5:
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7"
   integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==
 
+seek-bzip@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4"
+  integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==
+  dependencies:
+    commander "^2.8.1"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -26745,6 +26824,13 @@ strip-bom@^4.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
+strip-dirs@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5"
+  integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==
+  dependencies:
+    is-natural-number "^4.0.1"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -27220,6 +27306,19 @@ tar-stream@^1.1.2:
     readable-stream "^2.0.0"
     xtend "^4.0.0"
 
+tar-stream@^1.5.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+  dependencies:
+    bl "^1.0.0"
+    buffer-alloc "^1.2.0"
+    end-of-stream "^1.0.0"
+    fs-constants "^1.0.0"
+    readable-stream "^2.3.0"
+    to-buffer "^1.1.1"
+    xtend "^4.0.0"
+
 tar-stream@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"
@@ -27444,14 +27543,6 @@ through2-filter@^2.0.0:
     through2 "~2.0.0"
     xtend "~4.0.0"
 
-through2-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-map/-/through2-map-3.0.0.tgz#a6c3026ce63b4898a997d540506b66ffd970f271"
-  integrity sha1-psMCbOY7SJipl9VAUGtm/9lw8nE=
-  dependencies:
-    through2 "~2.0.0"
-    xtend "^4.0.0"
-
 through2@2.X, through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
@@ -27657,6 +27748,11 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
+to-buffer@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
+
 to-camel-case@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-camel-case/-/to-camel-case-1.0.0.tgz#1a56054b2f9d696298ce66a60897322b6f423e46"
@@ -28205,6 +28301,14 @@ uid-safe@2.1.5:
   dependencies:
     random-bytes "~1.0.0"
 
+unbzip2-stream@^1.0.9:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
+  integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
+  dependencies:
+    buffer "^5.2.1"
+    through "^2.3.8"
+
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
@@ -30494,7 +30598,7 @@ yargs@~3.10.0:
     decamelize "^1.0.0"
     window-size "0.1.0"
 
-yauzl@2.10.0, yauzl@^2.10.0:
+yauzl@2.10.0, yauzl@^2.10.0, yauzl@^2.4.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
   integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=

From 69599e0b49ef44f174247adaa49f74bafc1c8735 Mon Sep 17 00:00:00 2001
From: Yara Tercero <yctercero@users.noreply.github.com>
Date: Thu, 27 Aug 2020 20:00:42 -0400
Subject: [PATCH 117/148] [Security Solution][Exceptions] - Fix bug of alerts
 not updating after closure from exceptions modal (#76145)

## Summary

Fixes bug found in 7.9.

**Current behavior:**
  - Go to alerts page
  - Select action to add exception item
  - Select checkbox to close all alerts matching exception
  - Click `Add exception`
  - Note that the alerts table does not update until after you refresh or toggle between `Closed` and `Open`

**New behavior:**
  - Go to alerts page
  - Select action to add exception item
  - Select checkbox to close all alerts matching exception
  - Click `Add exception`
  - Note that the alerts table updates
---
 .../events_viewer/events_viewer.test.tsx      | 42 ++++++++++++++
 .../events_viewer/events_viewer.tsx           |  6 +-
 .../common/components/events_viewer/index.tsx |  7 ++-
 .../components/alerts_table/index.tsx         | 55 +++++++++++++------
 4 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.test.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.test.tsx
index 833688ae57993..6f77d15913d07 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.test.tsx
@@ -50,6 +50,10 @@ const utilityBar = (refetch: inputsModel.Refetch, totalCount: number) => (
   <div data-test-subj="mock-utility-bar" />
 );
 
+const exceptionsModal = (refetch: inputsModel.Refetch) => (
+  <div data-test-subj="mock-exceptions-modal" />
+);
+
 const eventsViewerDefaultProps = {
   browserFields: {},
   columns: [],
@@ -460,4 +464,42 @@ describe('EventsViewer', () => {
       });
     });
   });
+
+  describe('exceptions modal', () => {
+    test('it renders exception modal if "exceptionsModal" callback exists', async () => {
+      const wrapper = mount(
+        <TestProviders>
+          <MockedProvider mocks={mockEventViewerResponse} addTypename={false}>
+            <EventsViewer
+              {...eventsViewerDefaultProps}
+              exceptionsModal={exceptionsModal}
+              graphEventId=""
+            />
+          </MockedProvider>
+        </TestProviders>
+      );
+
+      await waitFor(() => {
+        wrapper.update();
+
+        expect(wrapper.find(`[data-test-subj="mock-exceptions-modal"]`).exists()).toBeTruthy();
+      });
+    });
+
+    test('it does not render exception modal if "exceptionModal" callback does not exist', async () => {
+      const wrapper = mount(
+        <TestProviders>
+          <MockedProvider mocks={mockEventViewerResponse} addTypename={false}>
+            <EventsViewer {...eventsViewerDefaultProps} graphEventId="" />
+          </MockedProvider>
+        </TestProviders>
+      );
+
+      await waitFor(() => {
+        wrapper.update();
+
+        expect(wrapper.find(`[data-test-subj="mock-exceptions-modal"]`).exists()).toBeFalsy();
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx
index 436386077e725..ebda64efabf65 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/events_viewer.tsx
@@ -109,6 +109,7 @@ interface Props {
   utilityBar?: (refetch: inputsModel.Refetch, totalCount: number) => React.ReactNode;
   // If truthy, the graph viewer (Resolver) is showing
   graphEventId: string | undefined;
+  exceptionsModal?: (refetch: inputsModel.Refetch) => React.ReactNode;
 }
 
 const EventsViewerComponent: React.FC<Props> = ({
@@ -134,6 +135,7 @@ const EventsViewerComponent: React.FC<Props> = ({
   toggleColumn,
   utilityBar,
   graphEventId,
+  exceptionsModal,
 }) => {
   const { globalFullScreen } = useFullScreen();
   const columnsHeader = isEmpty(columns) ? defaultHeaders : columns;
@@ -259,6 +261,7 @@ const EventsViewerComponent: React.FC<Props> = ({
                       </HeaderFilterGroupWrapper>
                     )}
                   </HeaderSection>
+                  {exceptionsModal && exceptionsModal(refetch)}
                   {utilityBar && !resolverIsShowing(graphEventId) && (
                     <UtilityBar>{utilityBar?.(refetch, totalCountMinusDeleted)}</UtilityBar>
                   )}
@@ -335,5 +338,6 @@ export const EventsViewer = React.memo(
     prevProps.start === nextProps.start &&
     prevProps.sort === nextProps.sort &&
     prevProps.utilityBar === nextProps.utilityBar &&
-    prevProps.graphEventId === nextProps.graphEventId
+    prevProps.graphEventId === nextProps.graphEventId &&
+    prevProps.exceptionsModal === nextProps.exceptionsModal
 );
diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
index e4520dab4626a..ec56a3a1bd8d3 100644
--- a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
@@ -43,6 +43,7 @@ export interface OwnProps {
   headerFilterGroup?: React.ReactNode;
   pageFilters?: Filter[];
   utilityBar?: (refetch: inputsModel.Refetch, totalCount: number) => React.ReactNode;
+  exceptionsModal?: (refetch: inputsModel.Refetch) => React.ReactNode;
 }
 
 type Props = OwnProps & PropsFromRedux;
@@ -74,6 +75,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
   utilityBar,
   // If truthy, the graph viewer (Resolver) is showing
   graphEventId,
+  exceptionsModal,
 }) => {
   const [
     { docValueFields, browserFields, indexPatterns, isLoading: isLoadingIndexPattern },
@@ -156,6 +158,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
           toggleColumn={toggleColumn}
           utilityBar={utilityBar}
           graphEventId={graphEventId}
+          exceptionsModal={exceptionsModal}
         />
       </InspectButtonContainer>
     </FullScreenContainer>
@@ -220,6 +223,7 @@ type PropsFromRedux = ConnectedProps<typeof connector>;
 export const StatefulEventsViewer = connector(
   React.memo(
     StatefulEventsViewerComponent,
+    // eslint-disable-next-line complexity
     (prevProps, nextProps) =>
       prevProps.id === nextProps.id &&
       deepEqual(prevProps.columns, nextProps.columns) &&
@@ -240,6 +244,7 @@ export const StatefulEventsViewer = connector(
       prevProps.showCheckboxes === nextProps.showCheckboxes &&
       prevProps.start === nextProps.start &&
       prevProps.utilityBar === nextProps.utilityBar &&
-      prevProps.graphEventId === nextProps.graphEventId
+      prevProps.graphEventId === nextProps.graphEventId &&
+      prevProps.exceptionsModal === nextProps.exceptionsModal
   )
 );
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
index 07e69d850f173..854565ace9b4b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -228,7 +228,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
       exceptionListType,
       alertData,
     }: AddExceptionModalBaseProps) => {
-      if (alertData !== null && alertData !== undefined) {
+      if (alertData != null) {
         setShouldShowAddExceptionModal(true);
         setAddExceptionModalState({
           ruleName,
@@ -441,9 +441,43 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
     closeAddExceptionModal();
   }, [closeAddExceptionModal]);
 
-  const onAddExceptionConfirm = useCallback(() => closeAddExceptionModal(), [
-    closeAddExceptionModal,
-  ]);
+  const onAddExceptionConfirm = useCallback(
+    (refetch: inputsModel.Refetch) => (): void => {
+      refetch();
+      closeAddExceptionModal();
+    },
+    [closeAddExceptionModal]
+  );
+
+  // Callback for creating the AddExceptionModal and allowing it
+  // access to the refetchQuery to update the page
+  const exceptionModalCallback = useCallback(
+    (refetchQuery: inputsModel.Refetch) => {
+      if (shouldShowAddExceptionModal) {
+        return (
+          <AddExceptionModal
+            ruleName={addExceptionModalState.ruleName}
+            ruleId={addExceptionModalState.ruleId}
+            ruleIndices={addExceptionModalState.ruleIndices}
+            exceptionListType={addExceptionModalState.exceptionListType}
+            alertData={addExceptionModalState.alertData}
+            onCancel={onAddExceptionCancel}
+            onConfirm={onAddExceptionConfirm(refetchQuery)}
+            alertStatus={filterGroup}
+          />
+        );
+      } else {
+        return <></>;
+      }
+    },
+    [
+      addExceptionModalState,
+      filterGroup,
+      onAddExceptionCancel,
+      onAddExceptionConfirm,
+      shouldShowAddExceptionModal,
+    ]
+  );
 
   if (loading || indexPatternsLoading || isEmpty(signalsIndex)) {
     return (
@@ -465,19 +499,8 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
         id={timelineId}
         start={from}
         utilityBar={utilityBarCallback}
+        exceptionsModal={exceptionModalCallback}
       />
-      {shouldShowAddExceptionModal === true && addExceptionModalState.alertData !== null && (
-        <AddExceptionModal
-          ruleName={addExceptionModalState.ruleName}
-          ruleId={addExceptionModalState.ruleId}
-          ruleIndices={addExceptionModalState.ruleIndices}
-          exceptionListType={addExceptionModalState.exceptionListType}
-          alertData={addExceptionModalState.alertData}
-          onCancel={onAddExceptionCancel}
-          onConfirm={onAddExceptionConfirm}
-          alertStatus={filterGroup}
-        />
-      )}
     </>
   );
 };

From 1b75690b73c8b23de57575de0cb2bb71d899be16 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Thu, 27 Aug 2020 18:56:31 -0700
Subject: [PATCH 118/148] [Transforms] Avoid using "Are you sure" (#75932)

---
 .../action_delete/delete_action_modal.tsx     | 32 +------------------
 .../action_start/start_action_modal.tsx       |  5 ++-
 .../translations/translations/ja-JP.json      |  5 ---
 .../translations/translations/zh-CN.json      |  5 ---
 4 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx
index 3c06af1eecb59..b7d4413e9455a 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx
@@ -15,8 +15,6 @@ import {
   EuiSpacer,
   EuiSwitch,
 } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { TRANSFORM_STATE } from '../../../../../../common';
 
 import { DeleteAction } from './use_delete_action';
 
@@ -42,26 +40,11 @@ export const DeleteActionModal: FC<DeleteAction> = ({
     }
   );
   const deleteModalTitle = i18n.translate('xpack.transform.transformList.deleteModalTitle', {
-    defaultMessage: 'Delete {transformId}',
+    defaultMessage: 'Delete {transformId}?',
     values: { transformId: items[0] && items[0].config.id },
   });
   const bulkDeleteModalContent = (
     <>
-      <p>
-        {shouldForceDelete ? (
-          <FormattedMessage
-            id="xpack.transform.transformList.bulkForceDeleteModalBody"
-            defaultMessage="Are you sure you want to force delete {count, plural, one {this} other {these}} {count} {count, plural, one {transform} other {transforms}}? The {count, plural, one {transform} other {transforms}} will be deleted regardless of {count, plural, one {its} other {their}} current state."
-            values={{ count: items.length }}
-          />
-        ) : (
-          <FormattedMessage
-            id="xpack.transform.transformList.bulkDeleteModalBody"
-            defaultMessage="Are you sure you want to delete {count, plural, one {this} other {these}} {count} {count, plural, one {transform} other {transforms}}?"
-            values={{ count: items.length }}
-          />
-        )}
-      </p>
       <EuiFlexGroup direction="column" gutterSize="none">
         <EuiFlexItem>
           {
@@ -100,19 +83,6 @@ export const DeleteActionModal: FC<DeleteAction> = ({
 
   const deleteModalContent = (
     <>
-      <p>
-        {items[0] && items[0] && items[0].stats.state === TRANSFORM_STATE.FAILED ? (
-          <FormattedMessage
-            id="xpack.transform.transformList.forceDeleteModalBody"
-            defaultMessage="Are you sure you want to force delete this transform? The transform will be deleted regardless of its current state."
-          />
-        ) : (
-          <FormattedMessage
-            id="xpack.transform.transformList.deleteModalBody"
-            defaultMessage="Are you sure you want to delete this transform?"
-          />
-        )}
-      </p>
       <EuiFlexGroup direction="column" gutterSize="none">
         <EuiFlexItem>
           {userCanDeleteIndex && (
diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_modal.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_modal.tsx
index 9f7dbee10cef0..ebc88918de6d5 100644
--- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_modal.tsx
+++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_start/start_action_modal.tsx
@@ -18,7 +18,7 @@ export const StartActionModal: FC<StartAction> = ({ closeModal, items, startAndC
     values: { count: items && items.length },
   });
   const startModalTitle = i18n.translate('xpack.transform.transformList.startModalTitle', {
-    defaultMessage: 'Start {transformId}',
+    defaultMessage: 'Start {transformId}?',
     values: { transformId: items[0] && items[0].config.id },
   });
 
@@ -40,8 +40,7 @@ export const StartActionModal: FC<StartAction> = ({ closeModal, items, startAndC
         <p>
           {i18n.translate('xpack.transform.transformList.startModalBody', {
             defaultMessage:
-              'A transform will increase search and indexing load in your cluster. Please stop the transform if excessive load is experienced. Are you sure you want to start {count, plural, one {this} other {these}} {count} {count, plural, one {transform} other {transforms}}?',
-            values: { count: items.length },
+              'A transform increases search and indexing load in your cluster. If excessive load is experienced, stop the transform.',
           })}
         </p>
       </EuiConfirmModal>
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index c99980fe6205c..dbbe6072b1fe5 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -18154,17 +18154,14 @@
     "xpack.transform.transformForm.sizeNotationPlaceholder": "例: {example1}、{example2}、{example3}、{example4}",
     "xpack.transform.transformList.bulkDeleteDestIndexPatternSuccessMessage": "{count}個のディスティネーションインデックス{count, plural, one {パターン} other {パターン}}を正常に削除しました。",
     "xpack.transform.transformList.bulkDeleteDestIndexSuccessMessage": "{count}個のディスティネーション{count, plural, one {インデックス} other {インデックス}}を正常に削除しました。",
-    "xpack.transform.transformList.bulkDeleteModalBody": "{count, plural, one {この} other {これらの}} {count} {count, plural, one {変換} other {変換}}を削除しますか?",
     "xpack.transform.transformList.bulkDeleteModalTitle": "{count} 件の{count, plural, one {変換} other {変換}}を削除",
     "xpack.transform.transformList.bulkDeleteTransformSuccessMessage": "{count} {count, plural, one {個の変換} other {個の変換}}を正常に削除しました。",
-    "xpack.transform.transformList.bulkForceDeleteModalBody": "{count, plural, one {この} other {これらの}} {count} {count, plural, one {変換} other {変換}}を強制的に削除しますか?{count, plural, one {} other {}}現在の状態に関係なく、{count, plural, one {個の変換} other {個の変換}}は削除されます。",
     "xpack.transform.transformList.bulkStartModalTitle": "{count} 件の{count, plural, one {変換} other {変換}}を開始",
     "xpack.transform.transformList.completeBatchTransformBulkActionToolTip": "1 つまたは複数の変換が完了済みの一斉変換で、再度開始できません。",
     "xpack.transform.transformList.completeBatchTransformToolTip": "{transformId} は完了済みの一斉変換で、再度開始できません。",
     "xpack.transform.transformList.createTransformButton": "変換の作成",
     "xpack.transform.transformList.deleteActionDisabledToolTipContent": "削除するにはデータフレームジョブを停止してください。",
     "xpack.transform.transformList.deleteBulkActionDisabledToolTipContent": "削除するには、選択された変換のうちの 1 つまたは複数を停止する必要があります。",
-    "xpack.transform.transformList.deleteModalBody": "この変換を削除してよろしいですか？",
     "xpack.transform.transformList.deleteModalCancelButton": "キャンセル",
     "xpack.transform.transformList.deleteModalDeleteButton": "削除",
     "xpack.transform.transformList.deleteModalTitle": "{transformId} 削除",
@@ -18187,14 +18184,12 @@
     "xpack.transform.transformList.editTransformGenericErrorMessage": "変換を削除するためのAPIエンドポイントの呼び出し中にエラーが発生しました。",
     "xpack.transform.transformList.editTransformSuccessMessage": "変換{transformId}が更新されました。",
     "xpack.transform.transformList.errorWithCheckingIfUserCanDeleteIndexNotificationErrorMessage": "ユーザーがディスティネーションインデックスを削除できるかどうかを確認するときにエラーが発生しました。",
-    "xpack.transform.transformList.forceDeleteModalBody": "この変換を強制的に削除しますか?現在の状態に関係なく、変換が削除されます。",
     "xpack.transform.transformList.refreshButtonLabel": "更新",
     "xpack.transform.transformList.rowCollapse": "{transformId} の詳細を非表示",
     "xpack.transform.transformList.rowExpand": "{transformId} の詳細を表示",
     "xpack.transform.transformList.showDetailsColumn.screenReaderDescription": "このカラムには変換ごとの詳細を示すクリック可能なコントロールが含まれます",
     "xpack.transform.transformList.startedTransformBulkToolTip": "1 つまたは複数の変換が既に開始済みです。",
     "xpack.transform.transformList.startedTransformToolTip": "{transformId} は既に開始済みです。",
-    "xpack.transform.transformList.startModalBody": "変換は、クラスターの検索とインデックスによる負荷を増やします。過剰な負荷が生じた場合は変換を停止してください。{count, plural, one {この} other {これら}} {count} 件の{count, plural, one {変換} other {変換}}を開始してよろしいですか？",
     "xpack.transform.transformList.startModalCancelButton": "キャンセル",
     "xpack.transform.transformList.startModalStartButton": "開始",
     "xpack.transform.transformList.startModalTitle": "{transformId} を開始",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 9ffa81a921ba8..ed849c1050497 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -18161,17 +18161,14 @@
     "xpack.transform.transformForm.sizeNotationPlaceholder": "示例：{example1}、{example2}、{example3}、{example4}",
     "xpack.transform.transformList.bulkDeleteDestIndexPatternSuccessMessage": "已成功删除 {count} 个目标索引{count, plural, one {模式} other {模式}}。",
     "xpack.transform.transformList.bulkDeleteDestIndexSuccessMessage": "已成功删除 {count} 个目标{count, plural, one {索引} other {索引}}。",
-    "xpack.transform.transformList.bulkDeleteModalBody": "确定要删除{count, plural, one {这} other {这}} {count} 个{count, plural, one {转换} other {转换}}？",
     "xpack.transform.transformList.bulkDeleteModalTitle": "删除 {count} 个 {count, plural, one {转换} other {转换}}？",
     "xpack.transform.transformList.bulkDeleteTransformSuccessMessage": "已成功删除 {count} 个{count, plural, one {转换} other {转换}}。",
-    "xpack.transform.transformList.bulkForceDeleteModalBody": "确定要强制删除{count, plural, one {这} other {这}} {count} 个{count, plural, one {转换} other {转换}}？无论{count, plural, one {转换} other {转换}}的当前状态如何，都将删除{count, plural, one {} other {}}。",
     "xpack.transform.transformList.bulkStartModalTitle": "启动 {count} 个 {count, plural, one {转换} other {转换}}？",
     "xpack.transform.transformList.completeBatchTransformBulkActionToolTip": "一个或多个转换为已完成批量转换，无法重新启动。",
     "xpack.transform.transformList.completeBatchTransformToolTip": "{transformId} 为已完成批量转换，无法重新启动。",
     "xpack.transform.transformList.createTransformButton": "创建转换",
     "xpack.transform.transformList.deleteActionDisabledToolTipContent": "停止数据帧作业，以便将其删除。",
     "xpack.transform.transformList.deleteBulkActionDisabledToolTipContent": "一个或多个选定数据帧转换必须停止，才能删除。",
-    "xpack.transform.transformList.deleteModalBody": "是否确定要删除此转换？",
     "xpack.transform.transformList.deleteModalCancelButton": "取消",
     "xpack.transform.transformList.deleteModalDeleteButton": "删除",
     "xpack.transform.transformList.deleteModalTitle": "删除 {transformId}",
@@ -18194,14 +18191,12 @@
     "xpack.transform.transformList.editTransformGenericErrorMessage": "调用用于更新转换的 API 终端时发生错误。",
     "xpack.transform.transformList.editTransformSuccessMessage": "转换 {transformId} 已更新。",
     "xpack.transform.transformList.errorWithCheckingIfUserCanDeleteIndexNotificationErrorMessage": "检查用户是否可以删除目标索引时发生错误",
-    "xpack.transform.transformList.forceDeleteModalBody": "确定要强制删除此索引？无论转换的当前状态如何，都将删除。",
     "xpack.transform.transformList.refreshButtonLabel": "刷新",
     "xpack.transform.transformList.rowCollapse": "隐藏 {transformId} 的详情",
     "xpack.transform.transformList.rowExpand": "显示 {transformId} 的详情",
     "xpack.transform.transformList.showDetailsColumn.screenReaderDescription": "此列包含可单击控件，用于显示每个转换的更多详情",
     "xpack.transform.transformList.startedTransformBulkToolTip": "一个或多个选定数据帧转换已启动。",
     "xpack.transform.transformList.startedTransformToolTip": "{transformId} 已启动。",
-    "xpack.transform.transformList.startModalBody": "转换将增加集群的搜索和索引负荷。如果负荷超载，请停止转换。是否确定要启动{count, plural, one {这} other {这}} {count} 个 {count, plural, one {转换} other {转换}}？",
     "xpack.transform.transformList.startModalCancelButton": "取消",
     "xpack.transform.transformList.startModalStartButton": "启动",
     "xpack.transform.transformList.startModalTitle": "启动 {transformId}",

From b1cb8b8c7f5af8d3b2113e899244a0535163d4a8 Mon Sep 17 00:00:00 2001
From: Oliver Gupte <ogupte@users.noreply.github.com>
Date: Thu, 27 Aug 2020 21:19:36 -0700
Subject: [PATCH 119/148] [APM] Transaction duration anomaly alerting
 integration (#75719)

* Closes #72636. Adds alerting integration for APM transaction duration anomalies.

* Code review feedback

* Display alert summary with the selected anomaly severity label instead of the anomaly score.

* - refactored ALL_OPTION and NOT_DEFINED_OPTION to be shared from common/environment_filter_values
- utilize getEnvironmentLabel in the alerting trigger components and added support for the 'All' label

* refactor get_all_environments to minimize exports and be more consistent and clean

* - Reorg the alerts menu for different alert types (threshold/anomaly)
- default environment alert settings to the selected filter

* - Filters default transaction type to only those supported in the APM anomaly detection jobs
- Removes Service name and transaction type from the set of expressions in the alerting setup

* - remove bell icon from alerts menu

* Adds target service back into the anomaly alert setup as a ready-only expression

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/plugins/apm/common/alert_types.ts      |  19 +++
 .../apm/common/environment_filter_values.ts   |  32 +++--
 .../AlertIntegrations/index.tsx               |  79 +++++-----
 .../components/app/ServiceDetails/index.tsx   |  24 ++--
 .../shared/EnvironmentFilter/index.tsx        |  21 +--
 .../shared/ErrorRateAlertTrigger/index.tsx    |  14 +-
 .../PopoverExpression/index.tsx               |   4 +-
 .../TransactionDurationAlertTrigger/index.tsx |  14 +-
 .../SelectAnomalySeverity.tsx                 | 108 ++++++++++++++
 .../index.tsx                                 | 131 +++++++++++++++++
 .../apm/public/hooks/useEnvironments.tsx      |  14 +-
 x-pack/plugins/apm/public/plugin.ts           |  15 ++
 .../server/lib/alerts/register_apm_alerts.ts  |   8 ++
 .../alerts/register_error_rate_alert_type.ts  |   2 +-
 ...egister_transaction_duration_alert_type.ts |   2 +-
 ...transaction_duration_anomaly_alert_type.ts | 136 ++++++++++++++++++
 .../get_anomaly_detection_jobs.ts             |   2 +-
 .../get_ml_jobs_with_apm_group.ts             |   8 +-
 .../lib/anomaly_detection/has_legacy_jobs.ts  |   2 +-
 .../lib/environments/get_all_environments.ts  |   2 +-
 .../get_environment_ui_filter_es.test.ts      |   2 +-
 .../get_environment_ui_filter_es.ts           |   2 +-
 .../apm/server/lib/helpers/setup_request.ts   |  27 ++--
 .../lib/service_map/get_service_anomalies.ts  |  11 +-
 .../charts/get_anomaly_data/index.ts          |   5 +-
 .../server/lib/ui_filters/get_environments.ts |   2 +-
 x-pack/plugins/apm/server/plugin.ts           |   1 +
 .../providers/anomaly_detectors.ts            |   8 +-
 .../translations/translations/ja-JP.json      |   2 +-
 .../translations/translations/zh-CN.json      |   2 +-
 30 files changed, 577 insertions(+), 122 deletions(-)
 create mode 100644 x-pack/plugins/apm/public/components/shared/TransactionDurationAnomalyAlertTrigger/SelectAnomalySeverity.tsx
 create mode 100644 x-pack/plugins/apm/public/components/shared/TransactionDurationAnomalyAlertTrigger/index.tsx
 create mode 100644 x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts

diff --git a/x-pack/plugins/apm/common/alert_types.ts b/x-pack/plugins/apm/common/alert_types.ts
index ad826a446d823..a1161354e04f4 100644
--- a/x-pack/plugins/apm/common/alert_types.ts
+++ b/x-pack/plugins/apm/common/alert_types.ts
@@ -9,6 +9,7 @@ import { i18n } from '@kbn/i18n';
 export enum AlertType {
   ErrorRate = 'apm.error_rate',
   TransactionDuration = 'apm.transaction_duration',
+  TransactionDurationAnomaly = 'apm.transaction_duration_anomaly',
 }
 
 export const ALERT_TYPES_CONFIG = {
@@ -45,6 +46,24 @@ export const ALERT_TYPES_CONFIG = {
     defaultActionGroupId: 'threshold_met',
     producer: 'apm',
   },
+  [AlertType.TransactionDurationAnomaly]: {
+    name: i18n.translate('xpack.apm.transactionDurationAnomalyAlert.name', {
+      defaultMessage: 'Transaction duration anomaly',
+    }),
+    actionGroups: [
+      {
+        id: 'threshold_met',
+        name: i18n.translate(
+          'xpack.apm.transactionDurationAlert.thresholdMet',
+          {
+            defaultMessage: 'Threshold met',
+          }
+        ),
+      },
+    ],
+    defaultActionGroupId: 'threshold_met',
+    producer: 'apm',
+  },
 };
 
 export const TRANSACTION_ALERT_AGGREGATION_TYPES = {
diff --git a/x-pack/plugins/apm/common/environment_filter_values.ts b/x-pack/plugins/apm/common/environment_filter_values.ts
index 38b6f480ca3d3..e231f37a170ed 100644
--- a/x-pack/plugins/apm/common/environment_filter_values.ts
+++ b/x-pack/plugins/apm/common/environment_filter_values.ts
@@ -6,14 +6,30 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const ENVIRONMENT_ALL = 'ENVIRONMENT_ALL';
-export const ENVIRONMENT_NOT_DEFINED = 'ENVIRONMENT_NOT_DEFINED';
+const ENVIRONMENT_ALL_VALUE = 'ENVIRONMENT_ALL';
+const ENVIRONMENT_NOT_DEFINED_VALUE = 'ENVIRONMENT_NOT_DEFINED';
+
+const environmentLabels: Record<string, string> = {
+  [ENVIRONMENT_ALL_VALUE]: i18n.translate(
+    'xpack.apm.filter.environment.allLabel',
+    { defaultMessage: 'All' }
+  ),
+  [ENVIRONMENT_NOT_DEFINED_VALUE]: i18n.translate(
+    'xpack.apm.filter.environment.notDefinedLabel',
+    { defaultMessage: 'Not defined' }
+  ),
+};
+
+export const ENVIRONMENT_ALL = {
+  value: ENVIRONMENT_ALL_VALUE,
+  text: environmentLabels[ENVIRONMENT_ALL_VALUE],
+};
+
+export const ENVIRONMENT_NOT_DEFINED = {
+  value: ENVIRONMENT_NOT_DEFINED_VALUE,
+  text: environmentLabels[ENVIRONMENT_NOT_DEFINED_VALUE],
+};
 
 export function getEnvironmentLabel(environment: string) {
-  if (environment === ENVIRONMENT_NOT_DEFINED) {
-    return i18n.translate('xpack.apm.filter.environment.notDefinedLabel', {
-      defaultMessage: 'Not defined',
-    });
-  }
-  return environment;
+  return environmentLabels[environment] || environment;
 }
diff --git a/x-pack/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/index.tsx b/x-pack/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/index.tsx
index 80d5f739bea5a..27c4a37e09c00 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceDetails/AlertIntegrations/index.tsx
@@ -18,27 +18,37 @@ import { useApmPluginContext } from '../../../../hooks/useApmPluginContext';
 
 const alertLabel = i18n.translate(
   'xpack.apm.serviceDetails.alertsMenu.alerts',
-  {
-    defaultMessage: 'Alerts',
-  }
+  { defaultMessage: 'Alerts' }
+);
+const transactionDurationLabel = i18n.translate(
+  'xpack.apm.serviceDetails.alertsMenu.transactionDuration',
+  { defaultMessage: 'Transaction duration' }
+);
+const errorRateLabel = i18n.translate(
+  'xpack.apm.serviceDetails.alertsMenu.errorRate',
+  { defaultMessage: 'Error rate' }
 );
-
 const createThresholdAlertLabel = i18n.translate(
   'xpack.apm.serviceDetails.alertsMenu.createThresholdAlert',
-  {
-    defaultMessage: 'Create threshold alert',
-  }
+  { defaultMessage: 'Create threshold alert' }
+);
+const createAnomalyAlertAlertLabel = i18n.translate(
+  'xpack.apm.serviceDetails.alertsMenu.createAnomalyAlert',
+  { defaultMessage: 'Create anomaly alert' }
 );
 
-const CREATE_THRESHOLD_ALERT_PANEL_ID = 'create_threshold';
+const CREATE_TRANSACTION_DURATION_ALERT_PANEL_ID =
+  'create_transaction_duration';
+const CREATE_ERROR_RATE_ALERT_PANEL_ID = 'create_error_rate';
 
 interface Props {
   canReadAlerts: boolean;
   canSaveAlerts: boolean;
+  canReadAnomalies: boolean;
 }
 
 export function AlertIntegrations(props: Props) {
-  const { canSaveAlerts, canReadAlerts } = props;
+  const { canSaveAlerts, canReadAlerts, canReadAnomalies } = props;
 
   const plugin = useApmPluginContext();
 
@@ -52,9 +62,7 @@ export function AlertIntegrations(props: Props) {
       iconSide="right"
       onClick={() => setPopoverOpen(true)}
     >
-      {i18n.translate('xpack.apm.serviceDetails.alertsMenu.alerts', {
-        defaultMessage: 'Alerts',
-      })}
+      {alertLabel}
     </EuiButtonEmpty>
   );
 
@@ -66,10 +74,10 @@ export function AlertIntegrations(props: Props) {
         ...(canSaveAlerts
           ? [
               {
-                name: createThresholdAlertLabel,
-                panel: CREATE_THRESHOLD_ALERT_PANEL_ID,
-                icon: 'bell',
+                name: transactionDurationLabel,
+                panel: CREATE_TRANSACTION_DURATION_ALERT_PANEL_ID,
               },
+              { name: errorRateLabel, panel: CREATE_ERROR_RATE_ALERT_PANEL_ID },
             ]
           : []),
         ...(canReadAlerts
@@ -77,9 +85,7 @@ export function AlertIntegrations(props: Props) {
               {
                 name: i18n.translate(
                   'xpack.apm.serviceDetails.alertsMenu.viewActiveAlerts',
-                  {
-                    defaultMessage: 'View active alerts',
-                  }
+                  { defaultMessage: 'View active alerts' }
                 ),
                 href: plugin.core.http.basePath.prepend(
                   '/app/management/insightsAndAlerting/triggersActions/alerts'
@@ -91,29 +97,38 @@ export function AlertIntegrations(props: Props) {
       ],
     },
     {
-      id: CREATE_THRESHOLD_ALERT_PANEL_ID,
-      title: createThresholdAlertLabel,
+      id: CREATE_TRANSACTION_DURATION_ALERT_PANEL_ID,
+      title: transactionDurationLabel,
       items: [
         {
-          name: i18n.translate(
-            'xpack.apm.serviceDetails.alertsMenu.transactionDuration',
-            {
-              defaultMessage: 'Transaction duration',
-            }
-          ),
+          name: createThresholdAlertLabel,
           onClick: () => {
             setAlertType(AlertType.TransactionDuration);
+            setPopoverOpen(false);
           },
         },
+        ...(canReadAnomalies
+          ? [
+              {
+                name: createAnomalyAlertAlertLabel,
+                onClick: () => {
+                  setAlertType(AlertType.TransactionDurationAnomaly);
+                  setPopoverOpen(false);
+                },
+              },
+            ]
+          : []),
+      ],
+    },
+    {
+      id: CREATE_ERROR_RATE_ALERT_PANEL_ID,
+      title: errorRateLabel,
+      items: [
         {
-          name: i18n.translate(
-            'xpack.apm.serviceDetails.alertsMenu.errorRate',
-            {
-              defaultMessage: 'Error rate',
-            }
-          ),
+          name: createThresholdAlertLabel,
           onClick: () => {
             setAlertType(AlertType.ErrorRate);
+            setPopoverOpen(false);
           },
         },
       ],
diff --git a/x-pack/plugins/apm/public/components/app/ServiceDetails/index.tsx b/x-pack/plugins/apm/public/components/app/ServiceDetails/index.tsx
index 4488a962d0ba8..b5a4ca4799afd 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceDetails/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceDetails/index.tsx
@@ -26,19 +26,18 @@ export function ServiceDetails({ tab }: Props) {
   const plugin = useApmPluginContext();
   const { urlParams } = useUrlParams();
   const { serviceName } = urlParams;
-
-  const canReadAlerts = !!plugin.core.application.capabilities.apm[
-    'alerting:show'
-  ];
-  const canSaveAlerts = !!plugin.core.application.capabilities.apm[
-    'alerting:save'
-  ];
+  const capabilities = plugin.core.application.capabilities;
+  const canReadAlerts = !!capabilities.apm['alerting:show'];
+  const canSaveAlerts = !!capabilities.apm['alerting:save'];
   const isAlertingPluginEnabled = 'alerts' in plugin.plugins;
-
   const isAlertingAvailable =
     isAlertingPluginEnabled && (canReadAlerts || canSaveAlerts);
-
-  const { core } = useApmPluginContext();
+  const isMlPluginEnabled = 'ml' in plugin.plugins;
+  const canReadAnomalies = !!(
+    isMlPluginEnabled &&
+    capabilities.ml.canAccessML &&
+    capabilities.ml.canGetJobs
+  );
 
   const ADD_DATA_LABEL = i18n.translate('xpack.apm.addDataButtonLabel', {
     defaultMessage: 'Add data',
@@ -58,12 +57,15 @@ export function ServiceDetails({ tab }: Props) {
               <AlertIntegrations
                 canReadAlerts={canReadAlerts}
                 canSaveAlerts={canSaveAlerts}
+                canReadAnomalies={canReadAnomalies}
               />
             </EuiFlexItem>
           )}
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty
-              href={core.http.basePath.prepend('/app/home#/tutorial/apm')}
+              href={plugin.core.http.basePath.prepend(
+                '/app/home#/tutorial/apm'
+              )}
               size="s"
               color="primary"
               iconType="plusInCircle"
diff --git a/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx b/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
index 1490ca42679b9..24ebb6bc8bd5f 100644
--- a/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
@@ -15,14 +15,14 @@ import {
   ENVIRONMENT_ALL,
   ENVIRONMENT_NOT_DEFINED,
 } from '../../../../common/environment_filter_values';
-import { useEnvironments, ALL_OPTION } from '../../../hooks/useEnvironments';
+import { useEnvironments } from '../../../hooks/useEnvironments';
 
 function updateEnvironmentUrl(
   location: ReturnType<typeof useLocation>,
   environment?: string
 ) {
   const nextEnvironmentQueryParam =
-    environment !== ENVIRONMENT_ALL ? environment : undefined;
+    environment !== ENVIRONMENT_ALL.value ? environment : undefined;
   history.push({
     ...location,
     search: fromQuery({
@@ -32,13 +32,6 @@ function updateEnvironmentUrl(
   });
 }
 
-const NOT_DEFINED_OPTION = {
-  value: ENVIRONMENT_NOT_DEFINED,
-  text: i18n.translate('xpack.apm.filter.environment.notDefinedLabel', {
-    defaultMessage: 'Not defined',
-  }),
-};
-
 const SEPARATOR_OPTION = {
   text: `- ${i18n.translate(
     'xpack.apm.filter.environment.selectEnvironmentLabel',
@@ -49,16 +42,16 @@ const SEPARATOR_OPTION = {
 
 function getOptions(environments: string[]) {
   const environmentOptions = environments
-    .filter((env) => env !== ENVIRONMENT_NOT_DEFINED)
+    .filter((env) => env !== ENVIRONMENT_NOT_DEFINED.value)
     .map((environment) => ({
       value: environment,
       text: environment,
     }));
 
   return [
-    ALL_OPTION,
-    ...(environments.includes(ENVIRONMENT_NOT_DEFINED)
-      ? [NOT_DEFINED_OPTION]
+    ENVIRONMENT_ALL,
+    ...(environments.includes(ENVIRONMENT_NOT_DEFINED.value)
+      ? [ENVIRONMENT_NOT_DEFINED]
       : []),
     ...(environmentOptions.length > 0 ? [SEPARATOR_OPTION] : []),
     ...environmentOptions,
@@ -83,7 +76,7 @@ export function EnvironmentFilter() {
         defaultMessage: 'environment',
       })}
       options={getOptions(environments)}
-      value={environment || ENVIRONMENT_ALL}
+      value={environment || ENVIRONMENT_ALL.value}
       onChange={(event) => {
         updateEnvironmentUrl(location, event.target.value);
       }}
diff --git a/x-pack/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx b/x-pack/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx
index b457fb1092bc6..7344839795955 100644
--- a/x-pack/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx
@@ -12,8 +12,12 @@ import { ForLastExpression } from '../../../../../triggers_actions_ui/public';
 import { ALERT_TYPES_CONFIG } from '../../../../common/alert_types';
 import { ServiceAlertTrigger } from '../ServiceAlertTrigger';
 import { PopoverExpression } from '../ServiceAlertTrigger/PopoverExpression';
-import { useEnvironments, ALL_OPTION } from '../../../hooks/useEnvironments';
+import { useEnvironments } from '../../../hooks/useEnvironments';
 import { useUrlParams } from '../../../hooks/useUrlParams';
+import {
+  ENVIRONMENT_ALL,
+  getEnvironmentLabel,
+} from '../../../../common/environment_filter_values';
 
 export interface ErrorRateAlertTriggerParams {
   windowSize: number;
@@ -39,7 +43,7 @@ export function ErrorRateAlertTrigger(props: Props) {
     threshold: 25,
     windowSize: 1,
     windowUnit: 'm',
-    environment: ALL_OPTION.value,
+    environment: urlParams.environment || ENVIRONMENT_ALL.value,
   };
 
   const params = {
@@ -51,11 +55,7 @@ export function ErrorRateAlertTrigger(props: Props) {
 
   const fields = [
     <PopoverExpression
-      value={
-        params.environment === ALL_OPTION.value
-          ? ALL_OPTION.text
-          : params.environment
-      }
+      value={getEnvironmentLabel(params.environment)}
       title={i18n.translate('xpack.apm.errorRateAlertTrigger.environment', {
         defaultMessage: 'Environment',
       })}
diff --git a/x-pack/plugins/apm/public/components/shared/ServiceAlertTrigger/PopoverExpression/index.tsx b/x-pack/plugins/apm/public/components/shared/ServiceAlertTrigger/PopoverExpression/index.tsx
index b07672eeaee06..33f61d61f989b 100644
--- a/x-pack/plugins/apm/public/components/shared/ServiceAlertTrigger/PopoverExpression/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/ServiceAlertTrigger/PopoverExpression/index.tsx
@@ -8,8 +8,8 @@ import React, { useState } from 'react';
 import { EuiExpression, EuiPopover } from '@elastic/eui';
 
 interface Props {
-  title: string;
-  value: string;
+  title: React.ReactNode;
+  value: React.ReactNode;
   children?: React.ReactNode;
 }
 
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx b/x-pack/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx
index 473fd432c166a..ba12b11c9527d 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx
@@ -12,11 +12,15 @@ import {
   ALERT_TYPES_CONFIG,
   TRANSACTION_ALERT_AGGREGATION_TYPES,
 } from '../../../../common/alert_types';
-import { ALL_OPTION, useEnvironments } from '../../../hooks/useEnvironments';
+import { useEnvironments } from '../../../hooks/useEnvironments';
 import { useServiceTransactionTypes } from '../../../hooks/useServiceTransactionTypes';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { ServiceAlertTrigger } from '../ServiceAlertTrigger';
 import { PopoverExpression } from '../ServiceAlertTrigger/PopoverExpression';
+import {
+  ENVIRONMENT_ALL,
+  getEnvironmentLabel,
+} from '../../../../common/environment_filter_values';
 
 interface Params {
   windowSize: number;
@@ -54,7 +58,7 @@ export function TransactionDurationAlertTrigger(props: Props) {
     windowSize: 5,
     windowUnit: 'm',
     transactionType: transactionTypes[0],
-    environment: ALL_OPTION.value,
+    environment: urlParams.environment || ENVIRONMENT_ALL.value,
   };
 
   const params = {
@@ -64,11 +68,7 @@ export function TransactionDurationAlertTrigger(props: Props) {
 
   const fields = [
     <PopoverExpression
-      value={
-        params.environment === ALL_OPTION.value
-          ? ALL_OPTION.text
-          : params.environment
-      }
+      value={getEnvironmentLabel(params.environment)}
       title={i18n.translate(
         'xpack.apm.transactionDurationAlertTrigger.environment',
         {
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionDurationAnomalyAlertTrigger/SelectAnomalySeverity.tsx b/x-pack/plugins/apm/public/components/shared/TransactionDurationAnomalyAlertTrigger/SelectAnomalySeverity.tsx
new file mode 100644
index 0000000000000..fcbdb900368ea
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/TransactionDurationAnomalyAlertTrigger/SelectAnomalySeverity.tsx
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiHealth, EuiSpacer, EuiSuperSelect, EuiText } from '@elastic/eui';
+import { getSeverityColor } from '../../app/ServiceMap/cytoscapeOptions';
+import { useTheme } from '../../../hooks/useTheme';
+import { severity as Severity } from '../../app/ServiceMap/Popover/getSeverity';
+
+type SeverityScore = 0 | 25 | 50 | 75;
+const ANOMALY_SCORES: SeverityScore[] = [0, 25, 50, 75];
+
+const anomalyScoreSeverityMap: {
+  [key in SeverityScore]: { label: string; severity: Severity };
+} = {
+  0: {
+    label: i18n.translate('xpack.apm.alerts.anomalySeverity.warningLabel', {
+      defaultMessage: 'warning',
+    }),
+    severity: Severity.warning,
+  },
+  25: {
+    label: i18n.translate('xpack.apm.alerts.anomalySeverity.minorLabel', {
+      defaultMessage: 'minor',
+    }),
+    severity: Severity.minor,
+  },
+  50: {
+    label: i18n.translate('xpack.apm.alerts.anomalySeverity.majorLabel', {
+      defaultMessage: 'major',
+    }),
+    severity: Severity.major,
+  },
+  75: {
+    label: i18n.translate('xpack.apm.alerts.anomalySeverity.criticalLabel', {
+      defaultMessage: 'critical',
+    }),
+    severity: Severity.critical,
+  },
+};
+
+export function AnomalySeverity({
+  severityScore,
+}: {
+  severityScore: SeverityScore;
+}) {
+  const theme = useTheme();
+  const { label, severity } = anomalyScoreSeverityMap[severityScore];
+  const defaultColor = theme.eui.euiColorMediumShade;
+  const color = getSeverityColor(theme, severity) || defaultColor;
+  return (
+    <EuiHealth color={color} style={{ lineHeight: 'inherit' }}>
+      {label}
+    </EuiHealth>
+  );
+}
+
+const getOption = (value: SeverityScore) => {
+  return {
+    value: value.toString(10),
+    inputDisplay: <AnomalySeverity severityScore={value} />,
+    dropdownDisplay: (
+      <>
+        <AnomalySeverity severityScore={value} />
+        <EuiSpacer size="xs" />
+        <EuiText size="xs" color="subdued">
+          <p className="euiTextColor--subdued">
+            <FormattedMessage
+              id="xpack.apm.alerts.anomalySeverity.scoreDetailsDescription"
+              defaultMessage="score {value} and above"
+              values={{ value }}
+            />
+          </p>
+        </EuiText>
+      </>
+    ),
+  };
+};
+
+interface Props {
+  onChange: (value: SeverityScore) => void;
+  value: SeverityScore;
+}
+
+export function SelectAnomalySeverity({ onChange, value }: Props) {
+  const options = ANOMALY_SCORES.map((anomalyScore) => getOption(anomalyScore));
+
+  return (
+    <EuiSuperSelect
+      hasDividers
+      style={{ width: 200 }}
+      options={options}
+      valueOfSelected={value.toString(10)}
+      onChange={(selectedValue: string) => {
+        const selectedAnomalyScore = parseInt(
+          selectedValue,
+          10
+        ) as SeverityScore;
+        onChange(selectedAnomalyScore);
+      }}
+    />
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionDurationAnomalyAlertTrigger/index.tsx b/x-pack/plugins/apm/public/components/shared/TransactionDurationAnomalyAlertTrigger/index.tsx
new file mode 100644
index 0000000000000..911c51013a844
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/TransactionDurationAnomalyAlertTrigger/index.tsx
@@ -0,0 +1,131 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { EuiExpression, EuiSelect } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { ALERT_TYPES_CONFIG } from '../../../../common/alert_types';
+import { useEnvironments } from '../../../hooks/useEnvironments';
+import { useServiceTransactionTypes } from '../../../hooks/useServiceTransactionTypes';
+import { useUrlParams } from '../../../hooks/useUrlParams';
+import { ServiceAlertTrigger } from '../ServiceAlertTrigger';
+import { PopoverExpression } from '../ServiceAlertTrigger/PopoverExpression';
+import {
+  AnomalySeverity,
+  SelectAnomalySeverity,
+} from './SelectAnomalySeverity';
+import {
+  ENVIRONMENT_ALL,
+  getEnvironmentLabel,
+} from '../../../../common/environment_filter_values';
+import {
+  TRANSACTION_PAGE_LOAD,
+  TRANSACTION_REQUEST,
+} from '../../../../common/transaction_types';
+
+interface Params {
+  windowSize: number;
+  windowUnit: string;
+  serviceName: string;
+  transactionType: string;
+  environment: string;
+  anomalyScore: 0 | 25 | 50 | 75;
+}
+
+interface Props {
+  alertParams: Params;
+  setAlertParams: (key: string, value: any) => void;
+  setAlertProperty: (key: string, value: any) => void;
+}
+
+export function TransactionDurationAnomalyAlertTrigger(props: Props) {
+  const { setAlertParams, alertParams, setAlertProperty } = props;
+  const { urlParams } = useUrlParams();
+  const transactionTypes = useServiceTransactionTypes(urlParams);
+  const { serviceName, start, end } = urlParams;
+  const { environmentOptions } = useEnvironments({ serviceName, start, end });
+  const supportedTransactionTypes = transactionTypes.filter((transactionType) =>
+    [TRANSACTION_PAGE_LOAD, TRANSACTION_REQUEST].includes(transactionType)
+  );
+
+  if (!supportedTransactionTypes.length || !serviceName) {
+    return null;
+  }
+
+  const defaults: Params = {
+    windowSize: 15,
+    windowUnit: 'm',
+    transactionType: supportedTransactionTypes[0], // 'page-load' for RUM, 'request' otherwise
+    serviceName,
+    environment: urlParams.environment || ENVIRONMENT_ALL.value,
+    anomalyScore: 75,
+  };
+
+  const params = {
+    ...defaults,
+    ...alertParams,
+  };
+
+  const fields = [
+    <EuiExpression
+      description={i18n.translate(
+        'xpack.apm.transactionDurationAnomalyAlertTrigger.service',
+        {
+          defaultMessage: 'Service',
+        }
+      )}
+      value={serviceName}
+    />,
+    <PopoverExpression
+      value={getEnvironmentLabel(params.environment)}
+      title={i18n.translate(
+        'xpack.apm.transactionDurationAnomalyAlertTrigger.environment',
+        {
+          defaultMessage: 'Environment',
+        }
+      )}
+    >
+      <EuiSelect
+        value={params.environment}
+        options={environmentOptions}
+        onChange={(e) => setAlertParams('environment', e.target.value)}
+        compressed
+      />
+    </PopoverExpression>,
+    <PopoverExpression
+      value={<AnomalySeverity severityScore={params.anomalyScore} />}
+      title={i18n.translate(
+        'xpack.apm.transactionDurationAnomalyAlertTrigger.anomalySeverity',
+        {
+          defaultMessage: 'Has anomaly with severity',
+        }
+      )}
+    >
+      <SelectAnomalySeverity
+        value={params.anomalyScore}
+        onChange={(value) => {
+          setAlertParams('anomalyScore', value);
+        }}
+      />
+    </PopoverExpression>,
+  ];
+
+  return (
+    <ServiceAlertTrigger
+      alertTypeName={
+        ALERT_TYPES_CONFIG['apm.transaction_duration_anomaly'].name
+      }
+      fields={fields}
+      defaults={defaults}
+      setAlertParams={setAlertParams}
+      setAlertProperty={setAlertProperty}
+    />
+  );
+}
+
+// Default export is required for React.lazy loading
+//
+// eslint-disable-next-line import/no-default-export
+export default TransactionDurationAnomalyAlertTrigger;
diff --git a/x-pack/plugins/apm/public/hooks/useEnvironments.tsx b/x-pack/plugins/apm/public/hooks/useEnvironments.tsx
index b358608701fdf..9e01dde274ff7 100644
--- a/x-pack/plugins/apm/public/hooks/useEnvironments.tsx
+++ b/x-pack/plugins/apm/public/hooks/useEnvironments.tsx
@@ -5,30 +5,22 @@
  */
 
 import { useMemo } from 'react';
-import { i18n } from '@kbn/i18n';
 import { useFetcher } from './useFetcher';
 import {
-  ENVIRONMENT_NOT_DEFINED,
   ENVIRONMENT_ALL,
+  ENVIRONMENT_NOT_DEFINED,
 } from '../../common/environment_filter_values';
 import { callApmApi } from '../services/rest/createCallApmApi';
 
-export const ALL_OPTION = {
-  value: ENVIRONMENT_ALL,
-  text: i18n.translate('xpack.apm.environment.allLabel', {
-    defaultMessage: 'All',
-  }),
-};
-
 function getEnvironmentOptions(environments: string[]) {
   const environmentOptions = environments
-    .filter((env) => env !== ENVIRONMENT_NOT_DEFINED)
+    .filter((env) => env !== ENVIRONMENT_NOT_DEFINED.value)
     .map((environment) => ({
       value: environment,
       text: environment,
     }));
 
-  return [ALL_OPTION, ...environmentOptions];
+  return [ENVIRONMENT_ALL, ...environmentOptions];
 }
 
 export function useEnvironments({
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index 0d25ececd5156..5d01df2a17bef 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -168,5 +168,20 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
       }),
       requiresAppContext: true,
     });
+
+    plugins.triggers_actions_ui.alertTypeRegistry.register({
+      id: AlertType.TransactionDurationAnomaly,
+      name: i18n.translate('xpack.apm.alertTypes.transactionDurationAnomaly', {
+        defaultMessage: 'Transaction duration anomaly',
+      }),
+      iconClass: 'bell',
+      alertParamsExpression: lazy(() =>
+        import('./components/shared/TransactionDurationAnomalyAlertTrigger')
+      ),
+      validate: () => ({
+        errors: [],
+      }),
+      requiresAppContext: true,
+    });
   }
 }
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts b/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts
index 4b8e9cf937a2b..44ca80143bcd9 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts
@@ -8,12 +8,15 @@ import { Observable } from 'rxjs';
 import { AlertingPlugin } from '../../../../alerts/server';
 import { ActionsPlugin } from '../../../../actions/server';
 import { registerTransactionDurationAlertType } from './register_transaction_duration_alert_type';
+import { registerTransactionDurationAnomalyAlertType } from './register_transaction_duration_anomaly_alert_type';
 import { registerErrorRateAlertType } from './register_error_rate_alert_type';
 import { APMConfig } from '../..';
+import { MlPluginSetup } from '../../../../ml/server';
 
 interface Params {
   alerts: AlertingPlugin['setup'];
   actions: ActionsPlugin['setup'];
+  ml?: MlPluginSetup;
   config$: Observable<APMConfig>;
 }
 
@@ -22,6 +25,11 @@ export function registerApmAlerts(params: Params) {
     alerts: params.alerts,
     config$: params.config$,
   });
+  registerTransactionDurationAnomalyAlertType({
+    alerts: params.alerts,
+    ml: params.ml,
+    config$: params.config$,
+  });
   registerErrorRateAlertType({
     alerts: params.alerts,
     config$: params.config$,
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts
index 53843b7f7412b..61e3dfee420a5 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts
@@ -75,7 +75,7 @@ export function registerErrorRateAlertType({
       });
 
       const environmentTerm =
-        alertParams.environment === ENVIRONMENT_ALL
+        alertParams.environment === ENVIRONMENT_ALL.value
           ? []
           : [{ term: { [SERVICE_ENVIRONMENT]: alertParams.environment } }];
 
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
index a922457b14cea..ead28c325692d 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
@@ -89,7 +89,7 @@ export function registerTransactionDurationAlertType({
       });
 
       const environmentTerm =
-        alertParams.environment === ENVIRONMENT_ALL
+        alertParams.environment === ENVIRONMENT_ALL.value
           ? []
           : [{ term: { [SERVICE_ENVIRONMENT]: alertParams.environment } }];
 
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
new file mode 100644
index 0000000000000..3abc89c470b21
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
@@ -0,0 +1,136 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+import { Observable } from 'rxjs';
+import { i18n } from '@kbn/i18n';
+import { KibanaRequest } from '../../../../../../src/core/server';
+import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types';
+import { AlertingPlugin } from '../../../../alerts/server';
+import { APMConfig } from '../..';
+import { MlPluginSetup } from '../../../../ml/server';
+import { getMLJobIds } from '../service_map/get_service_anomalies';
+
+interface RegisterAlertParams {
+  alerts: AlertingPlugin['setup'];
+  ml?: MlPluginSetup;
+  config$: Observable<APMConfig>;
+}
+
+const paramsSchema = schema.object({
+  serviceName: schema.string(),
+  transactionType: schema.string(),
+  windowSize: schema.number(),
+  windowUnit: schema.string(),
+  environment: schema.string(),
+  anomalyScore: schema.number(),
+});
+
+const alertTypeConfig =
+  ALERT_TYPES_CONFIG[AlertType.TransactionDurationAnomaly];
+
+export function registerTransactionDurationAnomalyAlertType({
+  alerts,
+  ml,
+  config$,
+}: RegisterAlertParams) {
+  alerts.registerType({
+    id: AlertType.TransactionDurationAnomaly,
+    name: alertTypeConfig.name,
+    actionGroups: alertTypeConfig.actionGroups,
+    defaultActionGroupId: alertTypeConfig.defaultActionGroupId,
+    validate: {
+      params: paramsSchema,
+    },
+    actionVariables: {
+      context: [
+        {
+          description: i18n.translate(
+            'xpack.apm.registerTransactionDurationAnomalyAlertType.variables.serviceName',
+            {
+              defaultMessage: 'Service name',
+            }
+          ),
+          name: 'serviceName',
+        },
+        {
+          description: i18n.translate(
+            'xpack.apm.registerTransactionDurationAnomalyAlertType.variables.transactionType',
+            {
+              defaultMessage: 'Transaction type',
+            }
+          ),
+          name: 'transactionType',
+        },
+      ],
+    },
+    producer: 'apm',
+    executor: async ({ services, params, state }) => {
+      if (!ml) {
+        return;
+      }
+      const alertParams = params as TypeOf<typeof paramsSchema>;
+      const mlClient = services.getLegacyScopedClusterClient(ml.mlClient);
+      const request = { params: 'DummyKibanaRequest' } as KibanaRequest;
+      const { mlAnomalySearch } = ml.mlSystemProvider(mlClient, request);
+      const anomalyDetectors = ml.anomalyDetectorsProvider(mlClient, request);
+
+      const mlJobIds = await getMLJobIds(
+        anomalyDetectors,
+        alertParams.environment
+      );
+      const anomalySearchParams = {
+        body: {
+          size: 0,
+          query: {
+            bool: {
+              filter: [
+                { term: { result_type: 'record' } },
+                { terms: { job_id: mlJobIds } },
+                {
+                  range: {
+                    timestamp: {
+                      gte: `now-${alertParams.windowSize}${alertParams.windowUnit}`,
+                      format: 'epoch_millis',
+                    },
+                  },
+                },
+                {
+                  term: {
+                    partition_field_value: alertParams.serviceName,
+                  },
+                },
+                {
+                  range: {
+                    record_score: {
+                      gte: alertParams.anomalyScore,
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      };
+
+      const response = ((await mlAnomalySearch(
+        anomalySearchParams
+      )) as unknown) as { hits: { total: { value: number } } };
+      const hitCount = response.hits.total.value;
+
+      if (hitCount > 0) {
+        const alertInstance = services.alertInstanceFactory(
+          AlertType.TransactionDurationAnomaly
+        );
+        alertInstance.scheduleActions(alertTypeConfig.defaultActionGroupId, {
+          serviceName: alertParams.serviceName,
+        });
+      }
+
+      return {};
+    },
+  });
+}
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_detection_jobs.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_detection_jobs.ts
index 05f41cdfdffd4..ead0c79a02836 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_detection_jobs.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_detection_jobs.ts
@@ -22,7 +22,7 @@ export async function getAnomalyDetectionJobs(setup: Setup, logger: Logger) {
     throw Boom.forbidden(ML_ERRORS.ML_NOT_AVAILABLE_IN_SPACE);
   }
 
-  const response = await getMlJobsWithAPMGroup(ml);
+  const response = await getMlJobsWithAPMGroup(ml.anomalyDetectors);
   return response.jobs
     .filter((job) => (job.custom_settings?.job_tags?.apm_ml_version ?? 0) >= 2)
     .map((job) => {
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts
index 5c0a3d17648aa..1c39892c3fd96 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts
@@ -4,14 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Setup } from '../helpers/setup_request';
+import { MlPluginSetup } from '../../../../ml/server';
 import { APM_ML_JOB_GROUP } from './constants';
 
 // returns ml jobs containing "apm" group
 // workaround: the ML api returns 404 when no jobs are found. This is handled so instead of throwing an empty response is returned
-export async function getMlJobsWithAPMGroup(ml: NonNullable<Setup['ml']>) {
+export async function getMlJobsWithAPMGroup(
+  anomalyDetectors: ReturnType<MlPluginSetup['anomalyDetectorsProvider']>
+) {
   try {
-    return await ml.anomalyDetectors.jobs(APM_ML_JOB_GROUP);
+    return await anomalyDetectors.jobs(APM_ML_JOB_GROUP);
   } catch (e) {
     if (e.statusCode === 404) {
       return { count: 0, jobs: [] };
diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/has_legacy_jobs.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/has_legacy_jobs.ts
index ed66236726b9f..c1f346aa30e1f 100644
--- a/x-pack/plugins/apm/server/lib/anomaly_detection/has_legacy_jobs.ts
+++ b/x-pack/plugins/apm/server/lib/anomaly_detection/has_legacy_jobs.ts
@@ -23,7 +23,7 @@ export async function hasLegacyJobs(setup: Setup) {
     throw Boom.forbidden(ML_ERRORS.ML_NOT_AVAILABLE_IN_SPACE);
   }
 
-  const response = await getMlJobsWithAPMGroup(ml);
+  const response = await getMlJobsWithAPMGroup(ml.anomalyDetectors);
   return response.jobs.some(
     (job) =>
       job.job_id.endsWith('high_mean_response_time') &&
diff --git a/x-pack/plugins/apm/server/lib/environments/get_all_environments.ts b/x-pack/plugins/apm/server/lib/environments/get_all_environments.ts
index 423b87cb78c3c..29aaa98169fa5 100644
--- a/x-pack/plugins/apm/server/lib/environments/get_all_environments.ts
+++ b/x-pack/plugins/apm/server/lib/environments/get_all_environments.ts
@@ -48,7 +48,7 @@ export async function getAllEnvironments({
           terms: {
             field: SERVICE_ENVIRONMENT,
             size: 100,
-            missing: includeMissing ? ENVIRONMENT_NOT_DEFINED : undefined,
+            missing: includeMissing ? ENVIRONMENT_NOT_DEFINED.value : undefined,
           },
         },
       },
diff --git a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts b/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts
index 800f809727eb6..a319bba1eabe1 100644
--- a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts
@@ -21,7 +21,7 @@ describe('getEnvironmentUiFilterES', () => {
   });
 
   it('should create a filter for missing service environments', () => {
-    const uiFilterES = getEnvironmentUiFilterES(ENVIRONMENT_NOT_DEFINED);
+    const uiFilterES = getEnvironmentUiFilterES(ENVIRONMENT_NOT_DEFINED.value);
     expect(uiFilterES).toHaveLength(1);
     expect(uiFilterES[0]).toHaveProperty(
       ['bool', 'must_not', 'exists', 'field'],
diff --git a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts b/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
index 87bc8dc968373..6ff98a9be75f9 100644
--- a/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
@@ -12,7 +12,7 @@ export function getEnvironmentUiFilterES(environment?: string): ESFilter[] {
   if (!environment) {
     return [];
   }
-  if (environment === ENVIRONMENT_NOT_DEFINED) {
+  if (environment === ENVIRONMENT_NOT_DEFINED.value) {
     return [{ bool: { must_not: { exists: { field: SERVICE_ENVIRONMENT } } } }];
   }
   return [{ term: { [SERVICE_ENVIRONMENT]: environment } }];
diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
index ddad2eb2d22dc..a242a0adb6d4c 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
@@ -98,7 +98,11 @@ export async function setupRequest<TParams extends SetupRequestParams>(
       context,
       request,
     }),
-    ml: getMlSetup(context, request),
+    ml: getMlSetup(
+      context.plugins.ml,
+      context.core.savedObjects.client,
+      request
+    ),
     config,
   };
 
@@ -110,20 +114,21 @@ export async function setupRequest<TParams extends SetupRequestParams>(
   } as InferSetup<TParams>;
 }
 
-function getMlSetup(context: APMRequestHandlerContext, request: KibanaRequest) {
-  if (!context.plugins.ml) {
+function getMlSetup(
+  ml: APMRequestHandlerContext['plugins']['ml'],
+  savedObjectsClient: APMRequestHandlerContext['core']['savedObjects']['client'],
+  request: KibanaRequest
+) {
+  if (!ml) {
     return;
   }
-  const ml = context.plugins.ml;
   const mlClient = ml.mlClient.asScoped(request);
+  const mlSystem = ml.mlSystemProvider(mlClient, request);
   return {
-    mlSystem: ml.mlSystemProvider(mlClient, request),
-    anomalyDetectors: ml.anomalyDetectorsProvider(mlClient, request),
-    modules: ml.modulesProvider(
-      mlClient,
-      request,
-      context.core.savedObjects.client
-    ),
     mlClient,
+    mlSystem,
+    modules: ml.modulesProvider(mlClient, request, savedObjectsClient),
+    anomalyDetectors: ml.anomalyDetectorsProvider(mlClient, request),
+    mlAnomalySearch: mlSystem.mlAnomalySearch,
   };
 }
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
index 03716382af859..ec274d20b6005 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
@@ -16,6 +16,8 @@ import {
   ML_ERRORS,
 } from '../../../common/anomaly_detection';
 import { getMlJobsWithAPMGroup } from '../anomaly_detection/get_ml_jobs_with_apm_group';
+import { ENVIRONMENT_ALL } from '../../../common/environment_filter_values';
+import { MlPluginSetup } from '../../../../ml/server';
 
 export const DEFAULT_ANOMALIES = { mlJobIds: [], serviceAnomalies: {} };
 
@@ -43,7 +45,7 @@ export async function getServiceAnomalies({
     throw Boom.forbidden(ML_ERRORS.ML_NOT_AVAILABLE_IN_SPACE);
   }
 
-  const mlJobIds = await getMLJobIds(ml, environment);
+  const mlJobIds = await getMLJobIds(ml.anomalyDetectors, environment);
   const params = {
     body: {
       size: 0,
@@ -136,16 +138,17 @@ function transformResponseToServiceAnomalies(
 }
 
 export async function getMLJobIds(
-  ml: Required<Setup>['ml'],
+  anomalyDetectors: ReturnType<MlPluginSetup['anomalyDetectorsProvider']>,
   environment?: string
 ) {
-  const response = await getMlJobsWithAPMGroup(ml);
+  const response = await getMlJobsWithAPMGroup(anomalyDetectors);
+
   // to filter out legacy jobs we are filtering by the existence of `apm_ml_version` in `custom_settings`
   // and checking that it is compatable.
   const mlJobs = response.jobs.filter(
     (job) => (job.custom_settings?.job_tags?.apm_ml_version ?? 0) >= 2
   );
-  if (environment) {
+  if (environment && environment !== ENVIRONMENT_ALL.value) {
     const matchingMLJob = mlJobs.find(
       (job) => job.custom_settings?.job_tags?.environment === environment
     );
diff --git a/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts b/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts
index 072099bc9553c..596c3137ec19f 100644
--- a/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/charts/get_anomaly_data/index.ts
@@ -66,7 +66,10 @@ export async function getAnomalySeries({
 
   let mlJobIds: string[] = [];
   try {
-    mlJobIds = await getMLJobIds(setup.ml, uiFilters.environment);
+    mlJobIds = await getMLJobIds(
+      setup.ml.anomalyDetectors,
+      uiFilters.environment
+    );
   } catch (error) {
     logger.error(error);
     return;
diff --git a/x-pack/plugins/apm/server/lib/ui_filters/get_environments.ts b/x-pack/plugins/apm/server/lib/ui_filters/get_environments.ts
index 98f00bf8e6555..7d3af4caa2ca3 100644
--- a/x-pack/plugins/apm/server/lib/ui_filters/get_environments.ts
+++ b/x-pack/plugins/apm/server/lib/ui_filters/get_environments.ts
@@ -47,7 +47,7 @@ export async function getEnvironments(
         environments: {
           terms: {
             field: SERVICE_ENVIRONMENT,
-            missing: ENVIRONMENT_NOT_DEFINED,
+            missing: ENVIRONMENT_NOT_DEFINED.value,
           },
         },
       },
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index deafda67b806d..71202c62e6f6c 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -83,6 +83,7 @@ export class APMPlugin implements Plugin<APMPluginSetup> {
       registerApmAlerts({
         alerts: plugins.alerts,
         actions: plugins.actions,
+        ml: plugins.ml,
         config$: mergedConfig$,
       });
     }
diff --git a/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts b/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
index 1140af0b76404..603b4fba17adb 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/anomaly_detectors.ts
@@ -23,7 +23,13 @@ export function getAnomalyDetectorsProvider({
 }: SharedServicesChecks): AnomalyDetectorsProvider {
   return {
     anomalyDetectorsProvider(mlClusterClient: ILegacyScopedClusterClient, request: KibanaRequest) {
-      const hasMlCapabilities = getHasMlCapabilities(request);
+      //  APM is using this service in anomaly alert, kibana alerting doesn't provide request object
+      // So we are adding a dummy request for now
+      // TODO: Remove this once kibana alerting provides request object
+      const hasMlCapabilities =
+        request.params !== 'DummyKibanaRequest'
+          ? getHasMlCapabilities(request)
+          : (_caps: string[]) => Promise.resolve();
       return {
         async jobs(jobId?: string) {
           isFullLicense();
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index dbbe6072b1fe5..dc07044ce8ed7 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -4742,7 +4742,6 @@
     "xpack.apm.customLink.empty": "カスタムリンクが見つかりません。独自のカスタムリンク、たとえば特定のダッシュボードまたは外部リンクへのリンクをセットアップします。",
     "xpack.apm.emptyMessage.noDataFoundDescription": "別の時間範囲を試すか検索フィルターをリセットしてください。",
     "xpack.apm.emptyMessage.noDataFoundLabel": "データが見つかりません。",
-    "xpack.apm.environment.allLabel": "すべて",
     "xpack.apm.error.prompt.body": "詳細はブラウザの開発者コンソールをご確認ください。",
     "xpack.apm.error.prompt.title": "申し訳ございませんが、エラーが発生しました :(",
     "xpack.apm.errorGroupDetails.avgLabel": "平均",
@@ -4780,6 +4779,7 @@
     "xpack.apm.fetcher.error.title": "リソースの取得中にエラーが発生しました",
     "xpack.apm.fetcher.error.url": "URL",
     "xpack.apm.filter.environment.label": "環境",
+    "xpack.apm.filter.environment.allLabel": "すべて",
     "xpack.apm.filter.environment.notDefinedLabel": "未定義",
     "xpack.apm.filter.environment.selectEnvironmentLabel": "環境を選択",
     "xpack.apm.formatters.hoursTimeUnitLabel": "h",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index ed849c1050497..144bc1cac1852 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -4743,7 +4743,6 @@
     "xpack.apm.customLink.empty": "未找到定制链接。设置自己的定制链接，如特定仪表板的链接或外部链接。",
     "xpack.apm.emptyMessage.noDataFoundDescription": "尝试其他时间范围或重置搜索筛选。",
     "xpack.apm.emptyMessage.noDataFoundLabel": "未找到任何数据",
-    "xpack.apm.environment.allLabel": "全部",
     "xpack.apm.error.prompt.body": "有关详情，请查看您的浏览器开发者控制台。",
     "xpack.apm.error.prompt.title": "抱歉，发生错误 :(",
     "xpack.apm.errorGroupDetails.avgLabel": "平均",
@@ -4781,6 +4780,7 @@
     "xpack.apm.fetcher.error.title": "提取资源时出错",
     "xpack.apm.fetcher.error.url": "URL",
     "xpack.apm.filter.environment.label": "环境",
+    "xpack.apm.filter.environment.allLabel": "全部",
     "xpack.apm.filter.environment.notDefinedLabel": "未定义",
     "xpack.apm.filter.environment.selectEnvironmentLabel": "选择环境",
     "xpack.apm.formatters.hoursTimeUnitLabel": "h",

From f078672c545a36192b4669fa8b9f84eac2f558fb Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Thu, 27 Aug 2020 23:01:53 -0700
Subject: [PATCH 120/148] skip flaky suite (#76223)

---
 .../security_api_integration/tests/session_lifespan/cleanup.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts b/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
index d9cb671282124..dbdaf494fdf27 100644
--- a/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
+++ b/x-pack/test/security_api_integration/tests/session_lifespan/cleanup.ts
@@ -30,7 +30,8 @@ export default function ({ getService }: FtrProviderContext) {
     return (await es.search({ index: '.kibana_security_session*' })).hits.total.value;
   }
 
-  describe('Session Lifespan cleanup', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/76223
+  describe.skip('Session Lifespan cleanup', () => {
     beforeEach(async () => {
       await es.cluster.health({ index: '.kibana_security_session*', waitForStatus: 'green' });
       await es.deleteByQuery({

From 86870d22b84e67b996122057f139d63a1ac87e39 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Thu, 27 Aug 2020 23:02:57 -0700
Subject: [PATCH 121/148] fix eslint issue

---
 x-pack/plugins/apm/public/plugin.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index 5d01df2a17bef..b950b493c0f19 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -175,8 +175,9 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
         defaultMessage: 'Transaction duration anomaly',
       }),
       iconClass: 'bell',
-      alertParamsExpression: lazy(() =>
-        import('./components/shared/TransactionDurationAnomalyAlertTrigger')
+      alertParamsExpression: lazy(
+        () =>
+          import('./components/shared/TransactionDurationAnomalyAlertTrigger')
       ),
       validate: () => ({
         errors: [],

From 712c4bdde79e1b49bb6aa0ad0979f425e57cae64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Fri, 28 Aug 2020 11:43:49 +0100
Subject: [PATCH 122/148] [APM] Prevent imports of public in server code
 (#75979)

* renaming test file

* removing eslint rule

* restructuring observability types

* refactoring fetchOptions type
---
 .eslintrc.js                                  |   5 +-
 x-pack/plugins/apm/common/fetch_options.ts    |  14 +++
 x-pack/plugins/apm/public/hooks/useCallApi.ts |   3 +-
 .../apm/public/services/rest/callApi.ts       |  10 +-
 .../public/services/rest/createCallApmApi.ts  |   3 +-
 .../environments/get_all_environments.test.ts |   2 +-
 .../lib/errors/distribution/queries.test.ts   |   2 +-
 .../apm/server/lib/errors/queries.test.ts     |   2 +-
 .../apm/server/lib/metrics/queries.test.ts    |   2 +-
 .../get_transaction_coordinates.ts            |   2 +-
 .../apm/server/lib/rum_client/queries.test.ts |   2 +-
 .../server/lib/service_nodes/queries.test.ts  |   2 +-
 .../lib/services/annotations/index.test.ts    |   2 +-
 .../apm/server/lib/services/queries.test.ts   |   2 +-
 .../agent_configuration/queries.test.ts       |   2 +-
 .../create_or_update_custom_link.test.ts      |   2 +-
 .../custom_link/get_transaction.test.ts       |   2 +-
 .../custom_link/list_custom_links.test.ts     |   2 +-
 .../apm/server/lib/traces/queries.test.ts     |   2 +-
 .../lib/transaction_groups/queries.test.ts    |   2 +-
 .../server/lib/transactions/queries.test.ts   |   2 +-
 .../local_ui_filters/queries.test.ts          |   2 +-
 .../apm/server/lib/ui_filters/queries.test.ts |   2 +-
 x-pack/plugins/apm/server/routes/typings.ts   |   3 +-
 .../plugins/apm/server/utils/test_helpers.tsx | 117 ++++++++++++++++++
 .../plugins/observability/typings/common.ts   |   2 +
 26 files changed, 159 insertions(+), 34 deletions(-)
 create mode 100644 x-pack/plugins/apm/common/fetch_options.ts
 create mode 100644 x-pack/plugins/apm/server/utils/test_helpers.tsx

diff --git a/.eslintrc.js b/.eslintrc.js
index a07d0830907b6..ff4ac180c3774 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -296,10 +296,7 @@ module.exports = {
                 errorMessage: `Plugins may only import from src/core/server and src/core/public.`,
               },
               {
-                target: [
-                  '(src|x-pack)/plugins/*/server/**/*',
-                  '!x-pack/plugins/apm/**/*', // https://github.com/elastic/kibana/issues/67210
-                ],
+                target: ['(src|x-pack)/plugins/*/server/**/*'],
                 from: ['(src|x-pack)/plugins/*/public/**/*'],
                 errorMessage: `Server code can not import from public, use a common directory.`,
               },
diff --git a/x-pack/plugins/apm/common/fetch_options.ts b/x-pack/plugins/apm/common/fetch_options.ts
new file mode 100644
index 0000000000000..f75d7d7d2480f
--- /dev/null
+++ b/x-pack/plugins/apm/common/fetch_options.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { HttpFetchOptions } from 'kibana/public';
+
+export type FetchOptions = Omit<HttpFetchOptions, 'body'> & {
+  pathname: string;
+  isCachable?: boolean;
+  method?: string;
+  body?: any;
+};
diff --git a/x-pack/plugins/apm/public/hooks/useCallApi.ts b/x-pack/plugins/apm/public/hooks/useCallApi.ts
index 415e6172ae81e..3fec36e7fb24b 100644
--- a/x-pack/plugins/apm/public/hooks/useCallApi.ts
+++ b/x-pack/plugins/apm/public/hooks/useCallApi.ts
@@ -5,8 +5,9 @@
  */
 
 import { useMemo } from 'react';
-import { callApi, FetchOptions } from '../services/rest/callApi';
+import { callApi } from '../services/rest/callApi';
 import { useApmPluginContext } from './useApmPluginContext';
+import { FetchOptions } from '../../common/fetch_options';
 
 export function useCallApi() {
   const { http } = useApmPluginContext().core;
diff --git a/x-pack/plugins/apm/public/services/rest/callApi.ts b/x-pack/plugins/apm/public/services/rest/callApi.ts
index e1ecd6ee1185d..4ee12908b7c79 100644
--- a/x-pack/plugins/apm/public/services/rest/callApi.ts
+++ b/x-pack/plugins/apm/public/services/rest/callApi.ts
@@ -4,17 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { HttpSetup } from 'kibana/public';
 import { isString, startsWith } from 'lodash';
 import LRU from 'lru-cache';
 import hash from 'object-hash';
-import { HttpSetup, HttpFetchOptions } from 'kibana/public';
-
-export type FetchOptions = Omit<HttpFetchOptions, 'body'> & {
-  pathname: string;
-  isCachable?: boolean;
-  method?: string;
-  body?: any;
-};
+import { FetchOptions } from '../../../common/fetch_options';
 
 function fetchOptionsWithDebug(fetchOptions: FetchOptions) {
   const debugEnabled =
diff --git a/x-pack/plugins/apm/public/services/rest/createCallApmApi.ts b/x-pack/plugins/apm/public/services/rest/createCallApmApi.ts
index 8babc72ef129c..08588bd03008d 100644
--- a/x-pack/plugins/apm/public/services/rest/createCallApmApi.ts
+++ b/x-pack/plugins/apm/public/services/rest/createCallApmApi.ts
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { HttpSetup } from 'kibana/public';
-import { callApi, FetchOptions } from './callApi';
+import { FetchOptions } from '../../../common/fetch_options';
+import { callApi } from './callApi';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { APMAPI } from '../../../server/routes/create_apm_api';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
diff --git a/x-pack/plugins/apm/server/lib/environments/get_all_environments.test.ts b/x-pack/plugins/apm/server/lib/environments/get_all_environments.test.ts
index 25fc177694744..dfac607eb7232 100644
--- a/x-pack/plugins/apm/server/lib/environments/get_all_environments.test.ts
+++ b/x-pack/plugins/apm/server/lib/environments/get_all_environments.test.ts
@@ -8,7 +8,7 @@ import { getAllEnvironments } from './get_all_environments';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../public/utils/testHelpers';
+} from '../../utils/test_helpers';
 
 describe('getAllEnvironments', () => {
   let mock: SearchParamsMock;
diff --git a/x-pack/plugins/apm/server/lib/errors/distribution/queries.test.ts b/x-pack/plugins/apm/server/lib/errors/distribution/queries.test.ts
index 1c4db9173688a..0c247d0ef56da 100644
--- a/x-pack/plugins/apm/server/lib/errors/distribution/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/errors/distribution/queries.test.ts
@@ -8,7 +8,7 @@ import { getErrorDistribution } from './get_distribution';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../../public/utils/testHelpers';
+} from '../../../utils/test_helpers';
 
 describe('error distribution queries', () => {
   let mock: SearchParamsMock;
diff --git a/x-pack/plugins/apm/server/lib/errors/queries.test.ts b/x-pack/plugins/apm/server/lib/errors/queries.test.ts
index 158f4db58e15b..fec59393726bf 100644
--- a/x-pack/plugins/apm/server/lib/errors/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/errors/queries.test.ts
@@ -9,7 +9,7 @@ import { getErrorGroups } from './get_error_groups';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../public/utils/testHelpers';
+} from '../../utils/test_helpers';
 
 describe('error queries', () => {
   let mock: SearchParamsMock;
diff --git a/x-pack/plugins/apm/server/lib/metrics/queries.test.ts b/x-pack/plugins/apm/server/lib/metrics/queries.test.ts
index 3cd8ab46bc65d..fc24377ebf390 100644
--- a/x-pack/plugins/apm/server/lib/metrics/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/queries.test.ts
@@ -12,7 +12,7 @@ import { getThreadCountChart } from './by_agent/java/thread_count';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../public/utils/testHelpers';
+} from '../../utils/test_helpers';
 import { SERVICE_NODE_NAME_MISSING } from '../../../common/service_nodes';
 
 describe('metrics queries', () => {
diff --git a/x-pack/plugins/apm/server/lib/observability_overview/get_transaction_coordinates.ts b/x-pack/plugins/apm/server/lib/observability_overview/get_transaction_coordinates.ts
index 116b37a395299..4eb5ff05b45e3 100644
--- a/x-pack/plugins/apm/server/lib/observability_overview/get_transaction_coordinates.ts
+++ b/x-pack/plugins/apm/server/lib/observability_overview/get_transaction_coordinates.ts
@@ -9,7 +9,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { rangeFilter } from '../../../common/utils/range_filter';
-import { Coordinates } from '../../../../observability/public';
+import { Coordinates } from '../../../../observability/typings/common';
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { ProcessorEvent } from '../../../common/processor_event';
 
diff --git a/x-pack/plugins/apm/server/lib/rum_client/queries.test.ts b/x-pack/plugins/apm/server/lib/rum_client/queries.test.ts
index 37432672c5d89..986e99f79904a 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/queries.test.ts
@@ -7,7 +7,7 @@
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../public/utils/testHelpers';
+} from '../../utils/test_helpers';
 import { getClientMetrics } from './get_client_metrics';
 import { getPageViewTrends } from './get_page_view_trends';
 import { getPageLoadDistribution } from './get_page_load_distribution';
diff --git a/x-pack/plugins/apm/server/lib/service_nodes/queries.test.ts b/x-pack/plugins/apm/server/lib/service_nodes/queries.test.ts
index 6ba9516390569..81262f90c4262 100644
--- a/x-pack/plugins/apm/server/lib/service_nodes/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/service_nodes/queries.test.ts
@@ -13,7 +13,7 @@ import { getServiceNodes } from './';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../public/utils/testHelpers';
+} from '../../utils/test_helpers';
 import { getServiceNodeMetadata } from '../services/get_service_node_metadata';
 import { SERVICE_NODE_NAME_MISSING } from '../../../common/service_nodes';
 
diff --git a/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts b/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts
index 4a9aa9e9f4d32..04e6ef322e9ec 100644
--- a/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts
+++ b/x-pack/plugins/apm/server/lib/services/annotations/index.test.ts
@@ -7,7 +7,7 @@ import { getDerivedServiceAnnotations } from './get_derived_service_annotations'
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../../public/utils/testHelpers';
+} from '../../../utils/test_helpers';
 import noVersions from './__fixtures__/no_versions.json';
 import oneVersion from './__fixtures__/one_version.json';
 import multipleVersions from './__fixtures__/multiple_versions.json';
diff --git a/x-pack/plugins/apm/server/lib/services/queries.test.ts b/x-pack/plugins/apm/server/lib/services/queries.test.ts
index b2fe7efeaf959..99c58a17d396a 100644
--- a/x-pack/plugins/apm/server/lib/services/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/services/queries.test.ts
@@ -12,7 +12,7 @@ import { hasHistoricalAgentData } from './get_services/has_historical_agent_data
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../public/utils/testHelpers';
+} from '../../utils/test_helpers';
 
 describe('services queries', () => {
   let mock: SearchParamsMock;
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/queries.test.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/queries.test.ts
index 5fe9d19ffc860..f035aa937c364 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/queries.test.ts
@@ -11,7 +11,7 @@ import { searchConfigurations } from './search_configurations';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../../public/utils/testHelpers';
+} from '../../../utils/test_helpers';
 import { findExactConfiguration } from './find_exact_configuration';
 
 describe('agent configuration queries', () => {
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/create_or_update_custom_link.test.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/create_or_update_custom_link.test.ts
index 0c3922b77901f..9f07c59609425 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/create_or_update_custom_link.test.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/create_or_update_custom_link.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { Setup } from '../../helpers/setup_request';
-import { mockNow } from '../../../../public/utils/testHelpers';
+import { mockNow } from '../../../utils/test_helpers';
 import { CustomLink } from '../../../../common/custom_link/custom_link_types';
 import { createOrUpdateCustomLink } from './create_or_update_custom_link';
 
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/get_transaction.test.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/get_transaction.test.ts
index 0a15c59ac62ae..174fc118eb205 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/get_transaction.test.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/get_transaction.test.ts
@@ -6,7 +6,7 @@
 import {
   inspectSearchParams,
   SearchParamsMock,
-} from '../../../../public/utils/testHelpers';
+} from '../../../utils/test_helpers';
 import { getTransaction } from './get_transaction';
 import { Setup } from '../../helpers/setup_request';
 import {
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.test.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.test.ts
index b09a270018711..ca468f2ed9614 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.test.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.test.ts
@@ -8,7 +8,7 @@ import { listCustomLinks } from './list_custom_links';
 import {
   inspectSearchParams,
   SearchParamsMock,
-} from '../../../../public/utils/testHelpers';
+} from '../../../utils/test_helpers';
 import { Setup } from '../../helpers/setup_request';
 import {
   SERVICE_NAME,
diff --git a/x-pack/plugins/apm/server/lib/traces/queries.test.ts b/x-pack/plugins/apm/server/lib/traces/queries.test.ts
index e85b45f55070b..481fc42c9a656 100644
--- a/x-pack/plugins/apm/server/lib/traces/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/traces/queries.test.ts
@@ -8,7 +8,7 @@ import { getTraceItems } from './get_trace_items';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../public/utils/testHelpers';
+} from '../../utils/test_helpers';
 
 describe('trace queries', () => {
   let mock: SearchParamsMock;
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/queries.test.ts b/x-pack/plugins/apm/server/lib/transaction_groups/queries.test.ts
index 0b2ff3a72975b..5f36189224534 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/queries.test.ts
@@ -8,7 +8,7 @@ import { transactionGroupsFetcher } from './fetcher';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../public/utils/testHelpers';
+} from '../../utils/test_helpers';
 
 describe('transaction group queries', () => {
   let mock: SearchParamsMock;
diff --git a/x-pack/plugins/apm/server/lib/transactions/queries.test.ts b/x-pack/plugins/apm/server/lib/transactions/queries.test.ts
index 586fa1798b7bc..8c8dbe1a3460a 100644
--- a/x-pack/plugins/apm/server/lib/transactions/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/queries.test.ts
@@ -11,7 +11,7 @@ import { getTransaction } from './get_transaction';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../public/utils/testHelpers';
+} from '../../utils/test_helpers';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { loggerMock } from '../../../../../../src/core/server/logging/logger.mock';
 
diff --git a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts
index 92ee67de49314..4cbb9efe012e6 100644
--- a/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/ui_filters/local_ui_filters/queries.test.ts
@@ -8,7 +8,7 @@ import { getLocalUIFilters } from './';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../../public/utils/testHelpers';
+} from '../../../utils/test_helpers';
 import { getServicesProjection } from '../../../projections/services';
 
 describe('local ui filter queries', () => {
diff --git a/x-pack/plugins/apm/server/lib/ui_filters/queries.test.ts b/x-pack/plugins/apm/server/lib/ui_filters/queries.test.ts
index 175319565b8a1..24e1c1a7f654c 100644
--- a/x-pack/plugins/apm/server/lib/ui_filters/queries.test.ts
+++ b/x-pack/plugins/apm/server/lib/ui_filters/queries.test.ts
@@ -8,7 +8,7 @@ import { getEnvironments } from './get_environments';
 import {
   SearchParamsMock,
   inspectSearchParams,
-} from '../../../public/utils/testHelpers';
+} from '../../utils/test_helpers';
 
 describe('ui filter queries', () => {
   let mock: SearchParamsMock;
diff --git a/x-pack/plugins/apm/server/routes/typings.ts b/x-pack/plugins/apm/server/routes/typings.ts
index c95719da881ea..97013273c9bcf 100644
--- a/x-pack/plugins/apm/server/routes/typings.ts
+++ b/x-pack/plugins/apm/server/routes/typings.ts
@@ -15,10 +15,9 @@ import { PickByValue, Optional } from 'utility-types';
 import { Observable } from 'rxjs';
 import { Server } from 'hapi';
 import { ObservabilityPluginSetup } from '../../../observability/server';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { FetchOptions } from '../../public/services/rest/callApi';
 import { SecurityPluginSetup } from '../../../security/server';
 import { MlPluginSetup } from '../../../ml/server';
+import { FetchOptions } from '../../common/fetch_options';
 import { APMConfig } from '..';
 
 export interface Params {
diff --git a/x-pack/plugins/apm/server/utils/test_helpers.tsx b/x-pack/plugins/apm/server/utils/test_helpers.tsx
new file mode 100644
index 0000000000000..98c1436b2b9b8
--- /dev/null
+++ b/x-pack/plugins/apm/server/utils/test_helpers.tsx
@@ -0,0 +1,117 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import {
+  ESFilter,
+  ESSearchResponse,
+  ESSearchRequest,
+} from '../../typings/elasticsearch';
+import { PromiseReturnType } from '../../typings/common';
+import { APMConfig } from '..';
+
+interface Options {
+  mockResponse?: (
+    request: ESSearchRequest
+  ) => ESSearchResponse<unknown, ESSearchRequest>;
+}
+
+interface MockSetup {
+  start: number;
+  end: number;
+  apmEventClient: any;
+  internalClient: any;
+  config: APMConfig;
+  uiFiltersES: ESFilter[];
+  indices: {
+    /* eslint-disable @typescript-eslint/naming-convention */
+    'apm_oss.sourcemapIndices': string;
+    'apm_oss.errorIndices': string;
+    'apm_oss.onboardingIndices': string;
+    'apm_oss.spanIndices': string;
+    'apm_oss.transactionIndices': string;
+    'apm_oss.metricsIndices': string;
+    /* eslint-enable @typescript-eslint/naming-convention */
+    apmAgentConfigurationIndex: string;
+    apmCustomLinkIndex: string;
+  };
+}
+
+export async function inspectSearchParams(
+  fn: (mockSetup: MockSetup) => Promise<any>,
+  options: Options = {}
+) {
+  const spy = jest.fn().mockImplementation(async (request) => {
+    return options.mockResponse
+      ? options.mockResponse(request)
+      : {
+          hits: {
+            hits: {
+              total: {
+                value: 0,
+              },
+            },
+          },
+        };
+  });
+
+  let response;
+  let error;
+
+  const mockSetup = {
+    start: 1528113600000,
+    end: 1528977600000,
+    apmEventClient: { search: spy } as any,
+    internalClient: { search: spy } as any,
+    config: new Proxy(
+      {},
+      {
+        get: (_, key) => {
+          switch (key) {
+            default:
+              return 'myIndex';
+
+            case 'xpack.apm.metricsInterval':
+              return 30;
+          }
+        },
+      }
+    ) as APMConfig,
+    uiFiltersES: [{ term: { 'my.custom.ui.filter': 'foo-bar' } }],
+    indices: {
+      /* eslint-disable @typescript-eslint/naming-convention */
+      'apm_oss.sourcemapIndices': 'myIndex',
+      'apm_oss.errorIndices': 'myIndex',
+      'apm_oss.onboardingIndices': 'myIndex',
+      'apm_oss.spanIndices': 'myIndex',
+      'apm_oss.transactionIndices': 'myIndex',
+      'apm_oss.metricsIndices': 'myIndex',
+      /* eslint-enable @typescript-eslint/naming-convention */
+      apmAgentConfigurationIndex: 'myIndex',
+      apmCustomLinkIndex: 'myIndex',
+    },
+    dynamicIndexPattern: null as any,
+  };
+  try {
+    response = await fn(mockSetup);
+  } catch (err) {
+    error = err;
+    // we're only extracting the search params
+  }
+
+  return {
+    params: spy.mock.calls[0][0],
+    response,
+    error,
+    spy,
+    teardown: () => spy.mockClear(),
+  };
+}
+
+export type SearchParamsMock = PromiseReturnType<typeof inspectSearchParams>;
+
+export function mockNow(date: string | number | Date) {
+  const fakeNow = new Date(date).getTime();
+  return jest.spyOn(Date, 'now').mockReturnValue(fakeNow);
+}
diff --git a/x-pack/plugins/observability/typings/common.ts b/x-pack/plugins/observability/typings/common.ts
index 579c4fe3bbb90..19afac0c0d2b8 100644
--- a/x-pack/plugins/observability/typings/common.ts
+++ b/x-pack/plugins/observability/typings/common.ts
@@ -9,3 +9,5 @@ export type ObservabilityApp = 'infra_metrics' | 'infra_logs' | 'apm' | 'uptime'
 export type PromiseReturnType<Func> = Func extends (...args: any[]) => Promise<infer Value>
   ? Value
   : Func;
+
+export { Coordinates } from '../public/typings/fetch_overview_data/';

From 3fc3f58c62068ac8d1caf254d344661708502d14 Mon Sep 17 00:00:00 2001
From: Robert Austin <robert.austin@elastic.co>
Date: Fri, 28 Aug 2020 08:53:04 -0400
Subject: [PATCH 123/148] [Resolver] model `location.search` in redux (#76140)

Read location.search from the redux store instead of a hook so that the entire view has a single (synchronized) source of truth.

Also, no longer pass `pushToQueryParams` function to various components.
---
 .../public/resolver/models/location_search.ts |  39 ++++++
 .../public/resolver/store/actions.ts          |  28 ++++
 .../public/resolver/store/data/action.ts      |  20 ---
 .../resolver/store/data/selectors.test.ts     |  24 +++-
 .../public/resolver/store/reducer.ts          |   7 +
 .../public/resolver/store/selectors.ts        |   9 ++
 .../public/resolver/store/ui/selectors.ts     |  80 +++++++-----
 .../public/resolver/types.ts                  |  20 ++-
 .../view/panels/event_counts_for_process.tsx  |   5 +-
 .../public/resolver/view/panels/index.tsx     |  21 +--
 .../view/panels/panel_content_error.tsx       | 123 +++++++++---------
 .../resolver/view/panels/process_details.tsx  |   7 +-
 .../view/panels/process_event_list.tsx        |   6 +-
 .../view/panels/process_list_with_counts.tsx  |  14 +-
 .../view/panels/related_event_detail.tsx      |  13 +-
 .../resolver/view/process_event_dot.tsx       |   4 +-
 ...s => use_replace_breadcrumb_parameters.ts} |  24 ++--
 .../view/use_state_syncing_actions.ts         |   6 +-
 18 files changed, 271 insertions(+), 179 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/resolver/models/location_search.ts
 rename x-pack/plugins/security_solution/public/resolver/view/{use_resolver_query_params.ts => use_replace_breadcrumb_parameters.ts} (73%)

diff --git a/x-pack/plugins/security_solution/public/resolver/models/location_search.ts b/x-pack/plugins/security_solution/public/resolver/models/location_search.ts
new file mode 100644
index 0000000000000..8c21043c268d5
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/resolver/models/location_search.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/**
+ * The legacy `crumbEvent` and `crumbId` parameters.
+ * @deprecated
+ */
+export function breadcrumbParameters(
+  locationSearch: string,
+  resolverComponentInstanceID: string
+): { crumbEvent: string; crumbId: string } {
+  const urlSearchParams = new URLSearchParams(locationSearch);
+  const { eventKey, idKey } = parameterNames(resolverComponentInstanceID);
+  return {
+    // Use `''` for backwards compatibility with deprecated code.
+    crumbEvent: urlSearchParams.get(eventKey) ?? '',
+    crumbId: urlSearchParams.get(idKey) ?? '',
+  };
+}
+
+/**
+ * Parameter names based on the `resolverComponentInstanceID`.
+ */
+function parameterNames(
+  resolverComponentInstanceID: string
+): {
+  idKey: string;
+  eventKey: string;
+} {
+  const idKey: string = `resolver-${resolverComponentInstanceID}-id`;
+  const eventKey: string = `resolver-${resolverComponentInstanceID}-event`;
+  return {
+    idKey,
+    eventKey,
+  };
+}
diff --git a/x-pack/plugins/security_solution/public/resolver/store/actions.ts b/x-pack/plugins/security_solution/public/resolver/store/actions.ts
index 29c03215e9ff4..e03f24d78e2a2 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/actions.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/actions.ts
@@ -101,9 +101,37 @@ interface UserSelectedRelatedEventCategory {
   };
 }
 
+/**
+ * Used by `useStateSyncingActions` hook.
+ * This is dispatched when external sources provide new parameters for Resolver.
+ * When the component receives a new 'databaseDocumentID' prop, this is fired.
+ */
+interface AppReceivedNewExternalProperties {
+  type: 'appReceivedNewExternalProperties';
+  /**
+   * Defines the externally provided properties that Resolver acknowledges.
+   */
+  payload: {
+    /**
+     * the `_id` of an ES document. This defines the origin of the Resolver graph.
+     */
+    databaseDocumentID?: string;
+    /**
+     * An ID that uniquely identifies this Resolver instance from other concurrent Resolvers.
+     */
+    resolverComponentInstanceID: string;
+
+    /**
+     * The `search` part of the URL of this page.
+     */
+    locationSearch: string;
+  };
+}
+
 export type ResolverAction =
   | CameraAction
   | DataAction
+  | AppReceivedNewExternalProperties
   | UserBroughtProcessIntoView
   | UserFocusedOnResolverNode
   | UserSelectedResolverNode
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/action.ts b/x-pack/plugins/security_solution/public/resolver/store/data/action.ts
index b6edf68aa7dc2..466c37d4ad5f1 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/action.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/action.ts
@@ -60,30 +60,10 @@ interface ServerReturnedRelatedEventData {
   readonly payload: ResolverRelatedEvents;
 }
 
-/**
- * Used by `useStateSyncingActions` hook.
- * This is dispatched when external sources provide new parameters for Resolver.
- * When the component receives a new 'databaseDocumentID' prop, this is fired.
- */
-interface AppReceivedNewExternalProperties {
-  type: 'appReceivedNewExternalProperties';
-  /**
-   * Defines the externally provided properties that Resolver acknowledges.
-   */
-  payload: {
-    /**
-     * the `_id` of an ES document. This defines the origin of the Resolver graph.
-     */
-    databaseDocumentID?: string;
-    resolverComponentInstanceID: string;
-  };
-}
-
 export type DataAction =
   | ServerReturnedResolverData
   | ServerFailedToReturnResolverData
   | ServerFailedToReturnRelatedEventData
   | ServerReturnedRelatedEventData
-  | AppReceivedNewExternalProperties
   | AppRequestedResolverData
   | AppAbortedResolverDataRequest;
diff --git a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
index 15a981d460730..dc478ede72790 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/data/selectors.test.ts
@@ -6,8 +6,8 @@
 
 import * as selectors from './selectors';
 import { DataState } from '../../types';
+import { ResolverAction } from '../actions';
 import { dataReducer } from './reducer';
-import { DataAction } from './action';
 import { createStore } from 'redux';
 import {
   mockTreeWithNoAncestorsAnd2Children,
@@ -20,7 +20,7 @@ import { uniquePidForProcess } from '../../models/process_event';
 import { EndpointEvent } from '../../../../common/endpoint/types';
 
 describe('data state', () => {
-  let actions: DataAction[] = [];
+  let actions: ResolverAction[] = [];
 
   /**
    * Get state, given an ordered collection of actions.
@@ -68,7 +68,13 @@ describe('data state', () => {
       actions = [
         {
           type: 'appReceivedNewExternalProperties',
-          payload: { databaseDocumentID, resolverComponentInstanceID },
+          payload: {
+            databaseDocumentID,
+            resolverComponentInstanceID,
+
+            // `locationSearch` doesn't matter for this test
+            locationSearch: '',
+          },
         },
       ];
     });
@@ -120,7 +126,13 @@ describe('data state', () => {
       actions = [
         {
           type: 'appReceivedNewExternalProperties',
-          payload: { databaseDocumentID, resolverComponentInstanceID },
+          payload: {
+            databaseDocumentID,
+            resolverComponentInstanceID,
+
+            // `locationSearch` doesn't matter for this test
+            locationSearch: '',
+          },
         },
         {
           type: 'appRequestedResolverData',
@@ -182,6 +194,8 @@ describe('data state', () => {
           payload: {
             databaseDocumentID: firstDatabaseDocumentID,
             resolverComponentInstanceID: resolverComponentInstanceID1,
+            // `locationSearch` doesn't matter for this test
+            locationSearch: '',
           },
         },
         // this happens when the middleware starts the request
@@ -195,6 +209,8 @@ describe('data state', () => {
           payload: {
             databaseDocumentID: secondDatabaseDocumentID,
             resolverComponentInstanceID: resolverComponentInstanceID2,
+            // `locationSearch` doesn't matter for this test
+            locationSearch: '',
           },
         },
       ];
diff --git a/x-pack/plugins/security_solution/public/resolver/store/reducer.ts b/x-pack/plugins/security_solution/public/resolver/store/reducer.ts
index d0f9701fe944e..bf62fd0e60df8 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/reducer.ts
@@ -48,6 +48,13 @@ const uiReducer: Reducer<ResolverUIState, ResolverAction> = (
       selectedNode: nodeID,
     };
     return next;
+  } else if (action.type === 'appReceivedNewExternalProperties') {
+    const next: ResolverUIState = {
+      ...state,
+      locationSearch: action.payload.locationSearch,
+      resolverComponentInstanceID: action.payload.resolverComponentInstanceID,
+    };
+    return next;
   } else {
     return state;
   }
diff --git a/x-pack/plugins/security_solution/public/resolver/store/selectors.ts b/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
index f50aeed3f4d48..909a907626f30 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
@@ -301,6 +301,15 @@ export const ariaFlowtoNodeID: (
   }
 );
 
+/**
+ * The legacy `crumbEvent` and `crumbId` parameters.
+ * @deprecated
+ */
+export const breadcrumbParameters = composeSelectors(
+  uiStateSelector,
+  uiSelectors.breadcrumbParameters
+);
+
 /**
  * Calls the `secondSelector` with the result of the `selector`. Use this when re-exporting a
  * concern-specific selector. `selector` should return the concern-specific state.
diff --git a/x-pack/plugins/security_solution/public/resolver/store/ui/selectors.ts b/x-pack/plugins/security_solution/public/resolver/store/ui/selectors.ts
index 91a2cbecbc04c..5315ffb3c5fdb 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/ui/selectors.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/ui/selectors.ts
@@ -1,30 +1,50 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createSelector } from 'reselect';
-import { ResolverUIState } from '../../types';
-
-/**
- * id of the "current" tree node (fake-focused)
- */
-export const ariaActiveDescendant = createSelector(
-  (uiState: ResolverUIState) => uiState,
-  /* eslint-disable no-shadow */
-  ({ ariaActiveDescendant }) => {
-    return ariaActiveDescendant;
-  }
-);
-
-/**
- * id of the currently "selected" tree node
- */
-export const selectedNode = createSelector(
-  (uiState: ResolverUIState) => uiState,
-  /* eslint-disable no-shadow */
-  ({ selectedNode }: ResolverUIState) => {
-    return selectedNode;
-  }
-);
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createSelector } from 'reselect';
+import { ResolverUIState } from '../../types';
+import * as locationSearchModel from '../../models/location_search';
+
+/**
+ * id of the "current" tree node (fake-focused)
+ */
+export const ariaActiveDescendant = createSelector(
+  (uiState: ResolverUIState) => uiState,
+  /* eslint-disable no-shadow */
+  ({ ariaActiveDescendant }) => {
+    return ariaActiveDescendant;
+  }
+);
+
+/**
+ * id of the currently "selected" tree node
+ */
+export const selectedNode = createSelector(
+  (uiState: ResolverUIState) => uiState,
+  /* eslint-disable no-shadow */
+  ({ selectedNode }: ResolverUIState) => {
+    return selectedNode;
+  }
+);
+
+/**
+ * The legacy `crumbEvent` and `crumbId` parameters.
+ * @deprecated
+ */
+export const breadcrumbParameters = createSelector(
+  (state: ResolverUIState) => state.locationSearch,
+  (state: ResolverUIState) => state.resolverComponentInstanceID,
+  (locationSearch, resolverComponentInstanceID) => {
+    if (locationSearch === undefined || resolverComponentInstanceID === undefined) {
+      // Equivalent to `null`
+      return {
+        crumbId: '',
+        crumbEvent: '',
+      };
+    }
+    return locationSearchModel.breadcrumbParameters(locationSearch, resolverComponentInstanceID);
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/resolver/types.ts b/x-pack/plugins/security_solution/public/resolver/types.ts
index 9ebe3fa14e842..e8304bf838e2d 100644
--- a/x-pack/plugins/security_solution/public/resolver/types.ts
+++ b/x-pack/plugins/security_solution/public/resolver/types.ts
@@ -50,6 +50,16 @@ export interface ResolverUIState {
    * `nodeID` of the selected node
    */
   readonly selectedNode: string | null;
+
+  /**
+   * The `search` part of the URL.
+   */
+  readonly locationSearch?: string;
+
+  /**
+   * An ID that is used to differentiate this Resolver instance from others concurrently running on the same page.
+   */
+  readonly resolverComponentInstanceID?: string;
 }
 
 /**
@@ -198,7 +208,12 @@ export interface DataState {
    * The id used for the pending request, if there is one.
    */
   readonly pendingRequestDatabaseDocumentID?: string;
-  readonly resolverComponentInstanceID: string | undefined;
+
+  /**
+   * An ID that is used to differentiate this Resolver instance from others concurrently running on the same page.
+   * Used to prevent collisions in things like query parameters.
+   */
+  readonly resolverComponentInstanceID?: string;
 
   /**
    * The parameters and response from the last successful request.
@@ -510,8 +525,9 @@ export interface ResolverProps {
    * Used as the origin of the Resolver graph.
    */
   databaseDocumentID?: string;
+
   /**
-   * A string literal describing where in the application resolver is located.
+   * An ID that is used to differentiate this Resolver instance from others concurrently running on the same page.
    * Used to prevent collisions in things like query parameters.
    */
   resolverComponentInstanceID: string;
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx
index c528ba547e6ae..f81dc174d8128 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/event_counts_for_process.tsx
@@ -12,7 +12,7 @@ import { StyledBreadcrumbs } from './panel_content_utilities';
 
 import * as event from '../../../../common/endpoint/models/event';
 import { ResolverEvent, ResolverNodeStats } from '../../../../common/endpoint/types';
-import { CrumbInfo } from '../../types';
+import { useReplaceBreadcrumbParameters } from '../use_replace_breadcrumb_parameters';
 
 /**
  * This view gives counts for all the related events of a process grouped by related event type.
@@ -27,11 +27,9 @@ import { CrumbInfo } from '../../types';
  */
 export const EventCountsForProcess = memo(function EventCountsForProcess({
   processEvent,
-  pushToQueryParams,
   relatedStats,
 }: {
   processEvent: ResolverEvent;
-  pushToQueryParams: (queryStringKeyValuePair: CrumbInfo) => unknown;
   relatedStats: ResolverNodeStats;
 }) {
   interface EventCountsTableView {
@@ -62,6 +60,7 @@ export const EventCountsForProcess = memo(function EventCountsForProcess({
       defaultMessage: 'Events',
     }
   );
+  const pushToQueryParams = useReplaceBreadcrumbParameters();
   const crumbs = useMemo(() => {
     return [
       {
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/index.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/index.tsx
index b3c4eefe5fae7..98b737de8fa59 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/index.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/index.tsx
@@ -17,7 +17,6 @@ import { EventCountsForProcess } from './event_counts_for_process';
 import { ProcessDetails } from './process_details';
 import { ProcessListWithCounts } from './process_list_with_counts';
 import { RelatedEventDetail } from './related_event_detail';
-import { useResolverQueryParams } from '../use_resolver_query_params';
 
 /**
  * The team decided to use this table to determine which breadcrumbs/view to display:
@@ -39,7 +38,7 @@ const PanelContent = memo(function PanelContent() {
 
   const { timestamp } = useContext(SideEffectContext);
 
-  const { pushToQueryParams, queryParams } = useResolverQueryParams();
+  const queryParams = useSelector(selectors.breadcrumbParameters);
 
   const graphableProcesses = useSelector(selectors.graphableProcesses);
   const graphableProcessEntityIds = useMemo(() => {
@@ -164,16 +163,13 @@ const PanelContent = memo(function PanelContent() {
 
   const panelInstance = useMemo(() => {
     if (panelToShow === 'processDetails') {
-      return (
-        <ProcessDetails processEvent={uiSelectedEvent!} pushToQueryParams={pushToQueryParams} />
-      );
+      return <ProcessDetails processEvent={uiSelectedEvent!} />;
     }
 
     if (panelToShow === 'eventCountsForProcess') {
       return (
         <EventCountsForProcess
           processEvent={uiSelectedEvent!}
-          pushToQueryParams={pushToQueryParams}
           relatedStats={relatedStatsForIdFromParams!}
         />
       );
@@ -183,7 +179,6 @@ const PanelContent = memo(function PanelContent() {
       return (
         <ProcessEventList
           processEvent={uiSelectedEvent!}
-          pushToQueryParams={pushToQueryParams}
           relatedStats={relatedStatsForIdFromParams!}
           eventType={crumbEvent}
         />
@@ -198,21 +193,13 @@ const PanelContent = memo(function PanelContent() {
         <RelatedEventDetail
           relatedEventId={crumbId}
           parentEvent={uiSelectedEvent!}
-          pushToQueryParams={pushToQueryParams}
           countForParent={parentCount}
         />
       );
     }
     // The default 'Event List' / 'List of all processes' view
-    return <ProcessListWithCounts pushToQueryParams={pushToQueryParams} />;
-  }, [
-    uiSelectedEvent,
-    crumbEvent,
-    crumbId,
-    pushToQueryParams,
-    relatedStatsForIdFromParams,
-    panelToShow,
-  ]);
+    return <ProcessListWithCounts />;
+  }, [uiSelectedEvent, crumbEvent, crumbId, relatedStatsForIdFromParams, panelToShow]);
 
   return <>{panelInstance}</>;
 });
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx
index b93ef6146f1cf..4162412861f57 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/panel_content_error.tsx
@@ -1,62 +1,61 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-import { EuiSpacer, EuiText, EuiButtonEmpty } from '@elastic/eui';
-import React, { memo, useMemo } from 'react';
-import { StyledBreadcrumbs } from './panel_content_utilities';
-import { CrumbInfo } from '../../types';
-
-/**
- * Display an error in the panel when something goes wrong and give the user a way to "retreat" back to a default state.
- *
- * @param {function} pushToQueryparams A function to update the hash value in the URL to control panel state
- * @param {string} translatedErrorMessage The message to display in the panel when something goes wrong
- */
-export const PanelContentError = memo(function ({
-  translatedErrorMessage,
-  pushToQueryParams,
-}: {
-  translatedErrorMessage: string;
-  pushToQueryParams: (arg0: CrumbInfo) => unknown;
-}) {
-  const crumbs = useMemo(() => {
-    return [
-      {
-        text: i18n.translate('xpack.securitySolution.endpoint.resolver.panel.error.events', {
-          defaultMessage: 'Events',
-        }),
-        onClick: () => {
-          pushToQueryParams({ crumbId: '', crumbEvent: '' });
-        },
-      },
-      {
-        text: i18n.translate('xpack.securitySolution.endpoint.resolver.panel.error.error', {
-          defaultMessage: 'Error',
-        }),
-        onClick: () => {},
-      },
-    ];
-  }, [pushToQueryParams]);
-  return (
-    <>
-      <StyledBreadcrumbs breadcrumbs={crumbs} />
-      <EuiSpacer size="l" />
-      <EuiText textAlign="center">{translatedErrorMessage}</EuiText>
-      <EuiSpacer size="l" />
-      <EuiButtonEmpty
-        onClick={() => {
-          pushToQueryParams({ crumbId: '', crumbEvent: '' });
-        }}
-      >
-        {i18n.translate('xpack.securitySolution.endpoint.resolver.panel.error.goBack', {
-          defaultMessage: 'Click this link to return to the list of all processes.',
-        })}
-      </EuiButtonEmpty>
-    </>
-  );
-});
-PanelContentError.displayName = 'TableServiceError';
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { EuiSpacer, EuiText, EuiButtonEmpty } from '@elastic/eui';
+import React, { memo, useMemo } from 'react';
+import { StyledBreadcrumbs } from './panel_content_utilities';
+import { useReplaceBreadcrumbParameters } from '../use_replace_breadcrumb_parameters';
+
+/**
+ * Display an error in the panel when something goes wrong and give the user a way to "retreat" back to a default state.
+ *
+ * @param {function} pushToQueryparams A function to update the hash value in the URL to control panel state
+ * @param {string} translatedErrorMessage The message to display in the panel when something goes wrong
+ */
+export const PanelContentError = memo(function ({
+  translatedErrorMessage,
+}: {
+  translatedErrorMessage: string;
+}) {
+  const pushToQueryParams = useReplaceBreadcrumbParameters();
+  const crumbs = useMemo(() => {
+    return [
+      {
+        text: i18n.translate('xpack.securitySolution.endpoint.resolver.panel.error.events', {
+          defaultMessage: 'Events',
+        }),
+        onClick: () => {
+          pushToQueryParams({ crumbId: '', crumbEvent: '' });
+        },
+      },
+      {
+        text: i18n.translate('xpack.securitySolution.endpoint.resolver.panel.error.error', {
+          defaultMessage: 'Error',
+        }),
+        onClick: () => {},
+      },
+    ];
+  }, [pushToQueryParams]);
+  return (
+    <>
+      <StyledBreadcrumbs breadcrumbs={crumbs} />
+      <EuiSpacer size="l" />
+      <EuiText textAlign="center">{translatedErrorMessage}</EuiText>
+      <EuiSpacer size="l" />
+      <EuiButtonEmpty
+        onClick={() => {
+          pushToQueryParams({ crumbId: '', crumbEvent: '' });
+        }}
+      >
+        {i18n.translate('xpack.securitySolution.endpoint.resolver.panel.error.goBack', {
+          defaultMessage: 'Click this link to return to the list of all processes.',
+        })}
+      </EuiButtonEmpty>
+    </>
+  );
+});
+PanelContentError.displayName = 'TableServiceError';
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
index 1ec56b8aa169a..01fa912caa866 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_details.tsx
@@ -31,7 +31,8 @@ import {
 import { CubeForProcess } from './cube_for_process';
 import { ResolverEvent } from '../../../../common/endpoint/types';
 import { useResolverTheme } from '../assets';
-import { CrumbInfo, ResolverState } from '../../types';
+import { ResolverState } from '../../types';
+import { useReplaceBreadcrumbParameters } from '../use_replace_breadcrumb_parameters';
 
 const StyledDescriptionList = styled(EuiDescriptionList)`
   &.euiDescriptionList.euiDescriptionList--column dt.euiDescriptionList__title.desc-title {
@@ -49,10 +50,8 @@ const StyledTitle = styled('h4')`
  */
 export const ProcessDetails = memo(function ProcessDetails({
   processEvent,
-  pushToQueryParams,
 }: {
   processEvent: ResolverEvent;
-  pushToQueryParams: (queryStringKeyValuePair: CrumbInfo) => unknown;
 }) {
   const processName = event.eventName(processEvent);
   const entityId = event.entityId(processEvent);
@@ -127,6 +126,8 @@ export const ProcessDetails = memo(function ProcessDetails({
     return processDescriptionListData;
   }, [processEvent]);
 
+  const pushToQueryParams = useReplaceBreadcrumbParameters();
+
   const crumbs = useMemo(() => {
     return [
       {
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx
index a710d3ad846b3..5fe33530f05dc 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_event_list.tsx
@@ -16,7 +16,7 @@ import { ResolverEvent, ResolverNodeStats } from '../../../../common/endpoint/ty
 import * as selectors from '../../store/selectors';
 import { useResolverDispatch } from '../use_resolver_dispatch';
 import { RelatedEventLimitWarning } from '../limit_warnings';
-import { CrumbInfo } from '../../types';
+import { useReplaceBreadcrumbParameters } from '../use_replace_breadcrumb_parameters';
 
 /**
  * This view presents a list of related events of a given type for a given process.
@@ -129,10 +129,8 @@ export const ProcessEventList = memo(function ProcessEventList({
   processEvent,
   eventType,
   relatedStats,
-  pushToQueryParams,
 }: {
   processEvent: ResolverEvent;
-  pushToQueryParams: (arg0: CrumbInfo) => unknown;
   eventType: string;
   relatedStats: ResolverNodeStats;
 }) {
@@ -169,6 +167,8 @@ export const ProcessEventList = memo(function ProcessEventList({
     }
   }, [relatedsReady, dispatch, processEntityId]);
 
+  const pushToQueryParams = useReplaceBreadcrumbParameters();
+
   const waitCrumbs = useMemo(() => {
     return [
       {
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx
index e42140feb928b..6035255824b1c 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/process_list_with_counts.tsx
@@ -3,6 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+
+/* eslint-disable react/display-name */
+
 import React, { memo, useContext, useCallback, useMemo } from 'react';
 import {
   EuiBasicTableColumn,
@@ -22,7 +25,7 @@ import { SideEffectContext } from '../side_effect_context';
 import { CubeForProcess } from './cube_for_process';
 import { SafeResolverEvent } from '../../../../common/endpoint/types';
 import { LimitWarning } from '../limit_warnings';
-import { CrumbInfo } from '../../types';
+import { useReplaceBreadcrumbParameters } from '../use_replace_breadcrumb_parameters';
 
 const StyledLimitWarning = styled(LimitWarning)`
   flex-flow: row wrap;
@@ -46,14 +49,8 @@ const StyledLimitWarning = styled(LimitWarning)`
 
 /**
  * The "default" view for the panel: A list of all the processes currently in the graph.
- *
- * @param {function} pushToQueryparams A function to update the hash value in the URL to control panel state
  */
-export const ProcessListWithCounts = memo(function ProcessListWithCounts({
-  pushToQueryParams,
-}: {
-  pushToQueryParams: (queryStringKeyValuePair: CrumbInfo) => unknown;
-}) {
+export const ProcessListWithCounts = memo(() => {
   interface ProcessTableView {
     name?: string;
     timestamp?: Date;
@@ -63,6 +60,7 @@ export const ProcessListWithCounts = memo(function ProcessListWithCounts({
   const dispatch = useResolverDispatch();
   const { timestamp } = useContext(SideEffectContext);
   const isProcessTerminated = useSelector(selectors.isProcessTerminated);
+  const pushToQueryParams = useReplaceBreadcrumbParameters();
   const handleBringIntoViewClick = useCallback(
     (processTableViewItem) => {
       dispatch({
diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
index dfafbae9c9a16..4762c615ba793 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/panels/related_event_detail.tsx
@@ -16,7 +16,8 @@ import { ResolverEvent } from '../../../../common/endpoint/types';
 import * as selectors from '../../store/selectors';
 import { useResolverDispatch } from '../use_resolver_dispatch';
 import { PanelContentError } from './panel_content_error';
-import { CrumbInfo, ResolverState } from '../../types';
+import { ResolverState } from '../../types';
+import { useReplaceBreadcrumbParameters } from '../use_replace_breadcrumb_parameters';
 
 // Adding some styles to prevent horizontal scrollbars, per request from UX review
 const StyledDescriptionList = memo(styled(EuiDescriptionList)`
@@ -76,15 +77,13 @@ function entriesForDisplay(entries: Array<{ title: string; description: string }
  * This view presents a detailed view of all the available data for a related event, split and titled by the "section"
  * it appears in the underlying ResolverEvent
  */
-export const RelatedEventDetail = memo(function RelatedEventDetail({
+export const RelatedEventDetail = memo(function ({
   relatedEventId,
   parentEvent,
-  pushToQueryParams,
   countForParent,
 }: {
   relatedEventId: string;
   parentEvent: ResolverEvent;
-  pushToQueryParams: (queryStringKeyValuePair: CrumbInfo) => unknown;
   countForParent: number | undefined;
 }) {
   const processName = (parentEvent && event.eventName(parentEvent)) || '*';
@@ -130,6 +129,8 @@ export const RelatedEventDetail = memo(function RelatedEventDetail({
     selectors.relatedEventDisplayInfoByEntityAndSelfId(state)(processEntityId, relatedEventId)
   );
 
+  const pushToQueryParams = useReplaceBreadcrumbParameters();
+
   const waitCrumbs = useMemo(() => {
     return [
       {
@@ -247,9 +248,7 @@ export const RelatedEventDetail = memo(function RelatedEventDetail({
         defaultMessage: 'Related event not found.',
       }
     );
-    return (
-      <PanelContentError translatedErrorMessage={errString} pushToQueryParams={pushToQueryParams} />
-    );
+    return <PanelContentError translatedErrorMessage={errString} />;
   }
 
   return (
diff --git a/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx b/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
index baa8ce1fcdd86..2aacc5f9176c4 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
+++ b/x-pack/plugins/security_solution/public/resolver/view/process_event_dot.tsx
@@ -18,7 +18,7 @@ import { ResolverEvent, SafeResolverEvent } from '../../../common/endpoint/types
 import { useResolverDispatch } from './use_resolver_dispatch';
 import * as eventModel from '../../../common/endpoint/models/event';
 import * as selectors from '../store/selectors';
-import { useResolverQueryParams } from './use_resolver_query_params';
+import { useReplaceBreadcrumbParameters } from './use_replace_breadcrumb_parameters';
 
 interface StyledActionsContainer {
   readonly color: string;
@@ -242,7 +242,7 @@ const UnstyledProcessEventDot = React.memo(
       });
     }, [dispatch, nodeID]);
 
-    const { pushToQueryParams } = useResolverQueryParams();
+    const pushToQueryParams = useReplaceBreadcrumbParameters();
 
     const handleClick = useCallback(() => {
       if (animationTarget.current?.beginElement) {
diff --git a/x-pack/plugins/security_solution/public/resolver/view/use_resolver_query_params.ts b/x-pack/plugins/security_solution/public/resolver/view/use_replace_breadcrumb_parameters.ts
similarity index 73%
rename from x-pack/plugins/security_solution/public/resolver/view/use_resolver_query_params.ts
rename to x-pack/plugins/security_solution/public/resolver/view/use_replace_breadcrumb_parameters.ts
index b6c229181e9f7..6d819337e447d 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/use_resolver_query_params.ts
+++ b/x-pack/plugins/security_solution/public/resolver/view/use_replace_breadcrumb_parameters.ts
@@ -4,12 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useCallback, useMemo } from 'react';
+import { useCallback } from 'react';
 import { useHistory, useLocation } from 'react-router-dom';
 import { useQueryStringKeys } from './use_query_string_keys';
 import { CrumbInfo } from '../types';
 
-export function useResolverQueryParams() {
+/**
+ * @deprecated
+ * Update the browser's `search` with data from `queryStringState`. The URL search parameter names
+ * will include Resolver's `resolverComponentInstanceID`.
+ */
+export function useReplaceBreadcrumbParameters(): (queryStringState: CrumbInfo) => void {
   /**
    * This updates the breadcrumb nav and the panel view. It's supplied to each
    * panel content view to allow them to dispatch transitions to each other.
@@ -17,7 +22,7 @@ export function useResolverQueryParams() {
   const history = useHistory();
   const urlSearch = useLocation().search;
   const { idKey, eventKey } = useQueryStringKeys();
-  const pushToQueryParams = useCallback(
+  return useCallback(
     (queryStringState: CrumbInfo) => {
       const urlSearchParams = new URLSearchParams(urlSearch);
 
@@ -39,17 +44,4 @@ export function useResolverQueryParams() {
     },
     [history, urlSearch, idKey, eventKey]
   );
-  const queryParams: CrumbInfo = useMemo(() => {
-    const urlSearchParams = new URLSearchParams(urlSearch);
-    return {
-      // Use `''` for backwards compatibility with deprecated code.
-      crumbEvent: urlSearchParams.get(eventKey) ?? '',
-      crumbId: urlSearchParams.get(idKey) ?? '',
-    };
-  }, [urlSearch, idKey, eventKey]);
-
-  return {
-    pushToQueryParams,
-    queryParams,
-  };
 }
diff --git a/x-pack/plugins/security_solution/public/resolver/view/use_state_syncing_actions.ts b/x-pack/plugins/security_solution/public/resolver/view/use_state_syncing_actions.ts
index 642a054e8c519..eaba4438bb1fe 100644
--- a/x-pack/plugins/security_solution/public/resolver/view/use_state_syncing_actions.ts
+++ b/x-pack/plugins/security_solution/public/resolver/view/use_state_syncing_actions.ts
@@ -5,6 +5,7 @@
  */
 
 import { useLayoutEffect } from 'react';
+import { useLocation } from 'react-router-dom';
 import { useResolverDispatch } from './use_resolver_dispatch';
 
 /**
@@ -22,10 +23,11 @@ export function useStateSyncingActions({
   resolverComponentInstanceID: string;
 }) {
   const dispatch = useResolverDispatch();
+  const locationSearch = useLocation().search;
   useLayoutEffect(() => {
     dispatch({
       type: 'appReceivedNewExternalProperties',
-      payload: { databaseDocumentID, resolverComponentInstanceID },
+      payload: { databaseDocumentID, resolverComponentInstanceID, locationSearch },
     });
-  }, [dispatch, databaseDocumentID, resolverComponentInstanceID]);
+  }, [dispatch, databaseDocumentID, resolverComponentInstanceID, locationSearch]);
 }

From 641a5ad77f5ab727cf61b4fdd97a275f4645e8ac Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Fri, 28 Aug 2020 08:38:23 -0700
Subject: [PATCH 124/148] [Enterprise Search] Request handler
 refactors/enhancements + update existing routes to use shared handler
 (#76106)

* Refactor enterprise_search_request_handler to a class that stores config/log

- So that routes don't have to continuously pass it in - just params that actually change (paths, queries)

+ misc refactors/lint fixes from code review

* Update mocks/dependencies so other tests pass type checks

* Update /api/workplace_search/overview endpoint to use new request handler

* Update /api/app_search/engines route to use new handler

- This required updating the shared handler to accept custom params set by the route, since the engines route transmutes some param names
- createRequest mock also had to be updated to correctly reflect a curried function in order to get tests passing

* DRY out hasValidData to a reusable/cleaner call

* Update shared handler to output specific message for auth errors

- Check for /login URL (indicates auth issue)
- Refactor final catch return to allow being passed messages from previous throw
- Change hasValidData fallback to only log (potentially sensitive?) JSON data to server, not to client
- Minor test cleanup - move error tests to single describe block, minor URL/newline cleanup

* Update handler to pass method & body requests + pass back response code

- This will support future POST requests as well as support (e.g.) 404 responses

Minor test refactors:
- Set up new request defaults (method, empty body) + expected output & convert KibanaAuthHeader to string since they're set so close to one another
- group request pass tests into a describe block, remove response body portion of their tests (since we don't really care about that for those tests)
- group response tests into describe block
- clarify how passed handler params arg overrides request.params

* PR feedback: Update custom params arg to take an object instead of a query string
---
 .../server/__mocks__/index.ts                 |   7 +-
 .../__mocks__/routerDependencies.mock.ts      |   8 +
 .../enterprise_search_request_handler.test.ts | 153 +++++++++++++-----
 .../lib/enterprise_search_request_handler.ts  | 103 ++++++++----
 .../enterprise_search/server/plugin.ts        |  12 +-
 .../routes/app_search/credentials.test.ts     |  27 +---
 .../server/routes/app_search/credentials.ts   |  10 +-
 .../server/routes/app_search/engines.test.ts  | 121 ++++----------
 .../server/routes/app_search/engines.ts       |  47 ++----
 .../enterprise_search/telemetry.test.ts       |   4 +-
 .../routes/workplace_search/overview.test.ts  | 120 +++-----------
 .../routes/workplace_search/overview.ts       |  39 +----
 12 files changed, 295 insertions(+), 356 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/server/__mocks__/index.ts b/x-pack/plugins/enterprise_search/server/__mocks__/index.ts
index 3cca5e21ce9c3..69f37856b6f2d 100644
--- a/x-pack/plugins/enterprise_search/server/__mocks__/index.ts
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/index.ts
@@ -5,4 +5,9 @@
  */
 
 export { MockRouter } from './router.mock';
-export { mockConfig, mockLogger, mockDependencies } from './routerDependencies.mock';
+export {
+  mockConfig,
+  mockLogger,
+  mockRequestHandler,
+  mockDependencies,
+} from './routerDependencies.mock';
diff --git a/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts b/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
index 7a244be96cfc4..b08a14b540e55 100644
--- a/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
@@ -9,6 +9,13 @@ import { ConfigType } from '../';
 
 export const mockLogger = loggingSystemMock.createLogger().get();
 
+export const mockRequestHandler = {
+  createRequest: jest.fn(() => () => {}),
+  hasValidData(data: any) {
+    return (this.createRequest as jest.Mock).mock.calls[0][0].hasValidData(data);
+  },
+};
+
 export const mockConfig = {
   enabled: true,
   host: 'http://localhost:3002',
@@ -24,4 +31,5 @@ export const mockDependencies = {
   // Mock router should be handled on a per-test basis
   config: mockConfig,
   log: mockLogger,
+  enterpriseSearchRequestHandler: mockRequestHandler as any,
 };
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
index f0c003936996e..3f3f182433144 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
@@ -6,7 +6,7 @@
 
 import { mockConfig, mockLogger } from '../__mocks__';
 
-import { createEnterpriseSearchRequestHandler } from './enterprise_search_request_handler';
+import { EnterpriseSearchRequestHandler } from './enterprise_search_request_handler';
 
 jest.mock('node-fetch');
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -14,12 +14,16 @@ const fetchMock = require('node-fetch') as jest.Mock;
 const { Response } = jest.requireActual('node-fetch');
 
 const responseMock = {
-  ok: jest.fn(),
+  custom: jest.fn(),
   customError: jest.fn(),
 };
-const KibanaAuthHeader = 'Basic 123';
 
-describe('createEnterpriseSearchRequestHandler', () => {
+describe('EnterpriseSearchRequestHandler', () => {
+  const enterpriseSearchRequestHandler = new EnterpriseSearchRequestHandler({
+    config: mockConfig,
+    log: mockLogger,
+  }) as any;
+
   beforeEach(() => {
     jest.clearAllMocks();
     fetchMock.mockReset();
@@ -33,9 +37,7 @@ describe('createEnterpriseSearchRequestHandler', () => {
 
     EnterpriseSearchAPI.mockReturn(responseBody);
 
-    const requestHandler = createEnterpriseSearchRequestHandler({
-      config: mockConfig,
-      log: mockLogger,
+    const requestHandler = enterpriseSearchRequestHandler.createRequest({
       path: '/as/credentials/collection',
     });
 
@@ -47,82 +49,151 @@ describe('createEnterpriseSearchRequestHandler', () => {
     });
 
     EnterpriseSearchAPI.shouldHaveBeenCalledWith(
-      'http://localhost:3002/as/credentials/collection?type=indexed&pageIndex=1'
+      'http://localhost:3002/as/credentials/collection?type=indexed&pageIndex=1',
+      { method: 'GET' }
     );
 
-    expect(responseMock.ok).toHaveBeenCalledWith({
+    expect(responseMock.custom).toHaveBeenCalledWith({
       body: responseBody,
+      statusCode: 200,
     });
   });
 
-  describe('when an API request fails', () => {
-    it('should return 502 with a message', async () => {
-      EnterpriseSearchAPI.mockReturnError();
+  describe('request passing', () => {
+    it('passes route method', async () => {
+      const requestHandler = enterpriseSearchRequestHandler.createRequest({ path: '/api/example' });
 
-      const requestHandler = createEnterpriseSearchRequestHandler({
-        config: mockConfig,
-        log: mockLogger,
-        path: '/as/credentials/collection',
+      await makeAPICall(requestHandler, { route: { method: 'POST' } });
+      EnterpriseSearchAPI.shouldHaveBeenCalledWith('http://localhost:3002/api/example', {
+        method: 'POST',
       });
 
-      await makeAPICall(requestHandler);
+      await makeAPICall(requestHandler, { route: { method: 'DELETE' } });
+      EnterpriseSearchAPI.shouldHaveBeenCalledWith('http://localhost:3002/api/example', {
+        method: 'DELETE',
+      });
+    });
+
+    it('passes request body', async () => {
+      const requestHandler = enterpriseSearchRequestHandler.createRequest({ path: '/api/example' });
+      await makeAPICall(requestHandler, { body: { bodacious: true } });
+
+      EnterpriseSearchAPI.shouldHaveBeenCalledWith('http://localhost:3002/api/example', {
+        body: '{"bodacious":true}',
+      });
+    });
+
+    it('passes custom params set by the handler, which override request params', async () => {
+      const requestHandler = enterpriseSearchRequestHandler.createRequest({
+        path: '/api/example',
+        params: { someQuery: true },
+      });
+      await makeAPICall(requestHandler, { query: { someQuery: false } });
 
       EnterpriseSearchAPI.shouldHaveBeenCalledWith(
-        'http://localhost:3002/as/credentials/collection'
+        'http://localhost:3002/api/example?someQuery=true'
       );
+    });
+  });
 
-      expect(responseMock.customError).toHaveBeenCalledWith({
-        body: 'Error connecting or fetching data from Enterprise Search',
-        statusCode: 502,
-      });
+  describe('response passing', () => {
+    it('returns the response status code from Enterprise Search', async () => {
+      EnterpriseSearchAPI.mockReturn({}, { status: 404 });
+
+      const requestHandler = enterpriseSearchRequestHandler.createRequest({ path: '/api/example' });
+      await makeAPICall(requestHandler);
+
+      EnterpriseSearchAPI.shouldHaveBeenCalledWith('http://localhost:3002/api/example');
+      expect(responseMock.custom).toHaveBeenCalledWith({ body: {}, statusCode: 404 });
     });
+
+    // TODO: It's possible we may also pass back headers at some point
+    // from Enterprise Search, e.g. the x-read-only mode header
   });
 
-  describe('when `hasValidData` fails', () => {
-    it('should return 502 with a message', async () => {
-      const responseBody = {
-        foo: 'bar',
-      };
+  describe('error handling', () => {
+    afterEach(() => {
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        expect.stringContaining('Error connecting to Enterprise Search')
+      );
+    });
+
+    it('returns an error when an API request fails', async () => {
+      EnterpriseSearchAPI.mockReturnError();
+      const requestHandler = enterpriseSearchRequestHandler.createRequest({ path: '/api/failed' });
+
+      await makeAPICall(requestHandler);
+      EnterpriseSearchAPI.shouldHaveBeenCalledWith('http://localhost:3002/api/failed');
 
-      EnterpriseSearchAPI.mockReturn(responseBody);
+      expect(responseMock.customError).toHaveBeenCalledWith({
+        body: 'Error connecting to Enterprise Search: Failed',
+        statusCode: 502,
+      });
+    });
 
-      const requestHandler = createEnterpriseSearchRequestHandler({
-        config: mockConfig,
-        log: mockLogger,
-        path: '/as/credentials/collection',
-        hasValidData: (body?: any) =>
-          Array.isArray(body?.results) && typeof body?.meta?.page?.total_results === 'number',
+    it('returns an error when `hasValidData` fails', async () => {
+      EnterpriseSearchAPI.mockReturn({ results: false });
+      const requestHandler = enterpriseSearchRequestHandler.createRequest({
+        path: '/api/invalid',
+        hasValidData: (body?: any) => Array.isArray(body?.results),
       });
 
       await makeAPICall(requestHandler);
+      EnterpriseSearchAPI.shouldHaveBeenCalledWith('http://localhost:3002/api/invalid');
 
-      EnterpriseSearchAPI.shouldHaveBeenCalledWith(
-        'http://localhost:3002/as/credentials/collection'
+      expect(responseMock.customError).toHaveBeenCalledWith({
+        body: 'Error connecting to Enterprise Search: Invalid data received',
+        statusCode: 502,
+      });
+      expect(mockLogger.debug).toHaveBeenCalledWith(
+        'Invalid data received from <http://localhost:3002/api/invalid>: {"results":false}'
       );
+    });
+
+    it('returns an error when user authentication to Enterprise Search fails', async () => {
+      EnterpriseSearchAPI.mockReturn({}, { url: 'http://localhost:3002/login' });
+      const requestHandler = enterpriseSearchRequestHandler.createRequest({
+        path: '/api/unauthenticated',
+      });
+
+      await makeAPICall(requestHandler);
+      EnterpriseSearchAPI.shouldHaveBeenCalledWith('http://localhost:3002/api/unauthenticated');
 
       expect(responseMock.customError).toHaveBeenCalledWith({
-        body: 'Error connecting or fetching data from Enterprise Search',
+        body: 'Error connecting to Enterprise Search: Cannot authenticate Enterprise Search user',
         statusCode: 502,
       });
     });
   });
+
+  it('has a helper for checking empty objects', async () => {
+    expect(enterpriseSearchRequestHandler.isEmptyObj({})).toEqual(true);
+    expect(enterpriseSearchRequestHandler.isEmptyObj({ empty: false })).toEqual(false);
+  });
 });
 
 const makeAPICall = (handler: Function, params = {}) => {
-  const request = { headers: { authorization: KibanaAuthHeader }, ...params };
+  const request = {
+    headers: { authorization: 'Basic 123' },
+    route: { method: 'GET' },
+    body: {},
+    ...params,
+  };
   return handler(null, request, responseMock);
 };
 
 const EnterpriseSearchAPI = {
   shouldHaveBeenCalledWith(expectedUrl: string, expectedParams = {}) {
     expect(fetchMock).toHaveBeenCalledWith(expectedUrl, {
-      headers: { Authorization: KibanaAuthHeader },
+      headers: { Authorization: 'Basic 123' },
+      method: 'GET',
+      body: undefined,
       ...expectedParams,
     });
   },
-  mockReturn(response: object) {
+  mockReturn(response: object, options?: object) {
     fetchMock.mockImplementation(() => {
-      return Promise.resolve(new Response(JSON.stringify(response)));
+      return Promise.resolve(new Response(JSON.stringify(response), options));
     });
   },
   mockReturnError() {
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
index 11152aa651743..8f31bd9063d4a 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.ts
@@ -7,6 +7,7 @@
 import fetch from 'node-fetch';
 import querystring from 'querystring';
 import {
+  RequestHandler,
   RequestHandlerContext,
   KibanaRequest,
   KibanaResponseFactory,
@@ -14,56 +15,90 @@ import {
 } from 'src/core/server';
 import { ConfigType } from '../index';
 
-interface IEnterpriseSearchRequestParams<ResponseBody> {
+interface IConstructorDependencies {
   config: ConfigType;
   log: Logger;
+}
+interface IRequestParams<ResponseBody> {
   path: string;
+  params?: object;
   hasValidData?: (body?: ResponseBody) => boolean;
 }
+export interface IEnterpriseSearchRequestHandler {
+  createRequest(requestParams?: object): RequestHandler<unknown, Readonly<{}>, unknown>;
+}
 
 /**
- * This helper function creates a single standard DRY way of handling
+ * This helper lib creates a single standard DRY way of handling
  * Enterprise Search API requests.
  *
  * This handler assumes that it will essentially just proxy the
  * Enterprise Search API request, so the request body and request
  * parameters are simply passed through.
  */
-export function createEnterpriseSearchRequestHandler<ResponseBody>({
-  config,
-  log,
-  path,
-  hasValidData = () => true,
-}: IEnterpriseSearchRequestParams<ResponseBody>) {
-  return async (
-    _context: RequestHandlerContext,
-    request: KibanaRequest<unknown, Readonly<{}>, unknown>,
-    response: KibanaResponseFactory
-  ) => {
-    try {
-      const enterpriseSearchUrl = config.host as string;
-      const params = request.query ? `?${querystring.stringify(request.query)}` : '';
-      const url = `${encodeURI(enterpriseSearchUrl)}${path}${params}`;
+export class EnterpriseSearchRequestHandler {
+  private enterpriseSearchUrl: string;
+  private log: Logger;
+
+  constructor({ config, log }: IConstructorDependencies) {
+    this.log = log;
+    this.enterpriseSearchUrl = config.host as string;
+  }
+
+  createRequest<ResponseBody>({
+    path,
+    params = {},
+    hasValidData = () => true,
+  }: IRequestParams<ResponseBody>) {
+    return async (
+      _context: RequestHandlerContext,
+      request: KibanaRequest<unknown, Readonly<{}>, unknown>,
+      response: KibanaResponseFactory
+    ) => {
+      try {
+        // Set up API URL
+        const queryParams = { ...request.query, ...params };
+        const queryString = !this.isEmptyObj(queryParams)
+          ? `?${querystring.stringify(queryParams)}`
+          : '';
+        const url = encodeURI(this.enterpriseSearchUrl + path + queryString);
+
+        // Set up API options
+        const { method } = request.route;
+        const headers = { Authorization: request.headers.authorization as string };
+        const body = !this.isEmptyObj(request.body as object)
+          ? JSON.stringify(request.body)
+          : undefined;
+
+        // Call the Enterprise Search API and pass back response to the front-end
+        const apiResponse = await fetch(url, { method, headers, body });
+
+        if (apiResponse.url.endsWith('/login')) {
+          throw new Error('Cannot authenticate Enterprise Search user');
+        }
+
+        const { status } = apiResponse;
+        const json = await apiResponse.json();
 
-      const apiResponse = await fetch(url, {
-        headers: { Authorization: request.headers.authorization as string },
-      });
+        if (hasValidData(json)) {
+          return response.custom({ statusCode: status, body: json });
+        } else {
+          this.log.debug(`Invalid data received from <${url}>: ${JSON.stringify(json)}`);
+          throw new Error('Invalid data received');
+        }
+      } catch (e) {
+        const errorMessage = `Error connecting to Enterprise Search: ${e?.message || e.toString()}`;
 
-      const body = await apiResponse.json();
+        this.log.error(errorMessage);
+        if (e instanceof Error) this.log.debug(e.stack as string);
 
-      if (hasValidData(body)) {
-        return response.ok({ body });
-      } else {
-        throw new Error(`Invalid data received: ${JSON.stringify(body)}`);
+        return response.customError({ statusCode: 502, body: errorMessage });
       }
-    } catch (e) {
-      log.error(`Cannot connect to Enterprise Search: ${e.toString()}`);
-      if (e instanceof Error) log.debug(e.stack as string);
+    };
+  }
 
-      return response.customError({
-        statusCode: 502,
-        body: 'Error connecting or fetching data from Enterprise Search',
-      });
-    }
-  };
+  // Small helper
+  isEmptyObj(obj: object) {
+    return Object.keys(obj).length === 0;
+  }
 }
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
index ef8c72f0cbca5..617210a544262 100644
--- a/x-pack/plugins/enterprise_search/server/plugin.ts
+++ b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -26,6 +26,11 @@ import {
 } from '../common/constants';
 import { ConfigType } from './';
 import { checkAccess } from './lib/check_access';
+import {
+  EnterpriseSearchRequestHandler,
+  IEnterpriseSearchRequestHandler,
+} from './lib/enterprise_search_request_handler';
+
 import { registerConfigDataRoute } from './routes/enterprise_search/config_data';
 import { registerTelemetryRoute } from './routes/enterprise_search/telemetry';
 
@@ -48,6 +53,7 @@ export interface IRouteDependencies {
   router: IRouter;
   config: ConfigType;
   log: Logger;
+  enterpriseSearchRequestHandler: IEnterpriseSearchRequestHandler;
   getSavedObjectsService?(): SavedObjectsServiceStart;
 }
 
@@ -65,6 +71,7 @@ export class EnterpriseSearchPlugin implements Plugin {
     { usageCollection, security, features }: PluginsSetup
   ) {
     const config = await this.config.pipe(first()).toPromise();
+    const log = this.logger;
 
     /**
      * Register space/feature control
@@ -84,7 +91,7 @@ export class EnterpriseSearchPlugin implements Plugin {
      * Register user access to the Enterprise Search plugins
      */
     capabilities.registerSwitcher(async (request: KibanaRequest) => {
-      const dependencies = { config, security, request, log: this.logger };
+      const dependencies = { config, security, request, log };
 
       const { hasAppSearchAccess, hasWorkplaceSearchAccess } = await checkAccess(dependencies);
 
@@ -105,7 +112,8 @@ export class EnterpriseSearchPlugin implements Plugin {
      * Register routes
      */
     const router = http.createRouter();
-    const dependencies = { router, config, log: this.logger };
+    const enterpriseSearchRequestHandler = new EnterpriseSearchRequestHandler({ config, log });
+    const dependencies = { router, config, log, enterpriseSearchRequestHandler };
 
     registerConfigDataRoute(dependencies);
     registerEnginesRoute(dependencies);
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts
index 682c17aea6d52..000e6d63b5999 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.test.ts
@@ -4,15 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { MockRouter, mockConfig, mockLogger } from '../../__mocks__';
+import { MockRouter, mockRequestHandler, mockDependencies } from '../../__mocks__';
 
 import { registerCredentialsRoutes } from './credentials';
 
-jest.mock('../../lib/enterprise_search_request_handler', () => ({
-  createEnterpriseSearchRequestHandler: jest.fn(),
-}));
-import { createEnterpriseSearchRequestHandler } from '../../lib/enterprise_search_request_handler';
-
 describe('credentials routes', () => {
   describe('GET /api/app_search/credentials', () => {
     let mockRouter: MockRouter;
@@ -22,16 +17,13 @@ describe('credentials routes', () => {
       mockRouter = new MockRouter({ method: 'get', payload: 'query' });
 
       registerCredentialsRoutes({
+        ...mockDependencies,
         router: mockRouter.router,
-        log: mockLogger,
-        config: mockConfig,
       });
     });
 
-    it('creates a handler with createEnterpriseSearchRequestHandler', () => {
-      expect(createEnterpriseSearchRequestHandler).toHaveBeenCalledWith({
-        config: mockConfig,
-        log: mockLogger,
+    it('creates a request handler', () => {
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
         path: '/as/credentials/collection',
         hasValidData: expect.any(Function),
       });
@@ -59,11 +51,7 @@ describe('credentials routes', () => {
           ],
         };
 
-        const {
-          hasValidData,
-        } = (createEnterpriseSearchRequestHandler as jest.Mock).mock.calls[0][0];
-
-        expect(hasValidData(response)).toBe(true);
+        expect(mockRequestHandler.hasValidData(response)).toBe(true);
       });
 
       it('should correctly validate that a response does not have data', () => {
@@ -71,10 +59,7 @@ describe('credentials routes', () => {
           foo: 'bar',
         };
 
-        const hasValidData = (createEnterpriseSearchRequestHandler as jest.Mock).mock.calls[0][0]
-          .hasValidData;
-
-        expect(hasValidData(response)).toBe(false);
+        expect(mockRequestHandler.hasValidData(response)).toBe(false);
       });
     });
 
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.ts
index d9539692069f0..432f54c8e5b1c 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/credentials.ts
@@ -7,7 +7,6 @@
 import { schema } from '@kbn/config-schema';
 
 import { IRouteDependencies } from '../../plugin';
-import { createEnterpriseSearchRequestHandler } from '../../lib/enterprise_search_request_handler';
 
 interface ICredential {
   id: string;
@@ -28,7 +27,10 @@ interface ICredentialsResponse {
   };
 }
 
-export function registerCredentialsRoutes({ router, config, log }: IRouteDependencies) {
+export function registerCredentialsRoutes({
+  router,
+  enterpriseSearchRequestHandler,
+}: IRouteDependencies) {
   router.get(
     {
       path: '/api/app_search/credentials',
@@ -38,9 +40,7 @@ export function registerCredentialsRoutes({ router, config, log }: IRouteDepende
         }),
       },
     },
-    createEnterpriseSearchRequestHandler<ICredentialsResponse>({
-      config,
-      log,
+    enterpriseSearchRequestHandler.createRequest({
       path: '/as/credentials/collection',
       hasValidData: (body?: ICredentialsResponse) => {
         return Array.isArray(body?.results) && typeof body?.meta?.page?.total_results === 'number';
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts
index 03edab89d1b99..cd22ff98b01ce 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.test.ts
@@ -4,16 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { MockRouter, mockConfig, mockLogger } from '../../__mocks__';
+import { MockRouter, mockRequestHandler, mockDependencies } from '../../__mocks__';
 
 import { registerEnginesRoute } from './engines';
 
-jest.mock('node-fetch');
-const fetch = jest.requireActual('node-fetch');
-const { Response } = fetch;
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fetchMock = require('node-fetch') as jest.Mocked<typeof fetch>;
-
 describe('engine routes', () => {
   describe('GET /api/app_search/engines', () => {
     const AUTH_HEADER = 'Basic 123';
@@ -34,71 +28,51 @@ describe('engine routes', () => {
       mockRouter = new MockRouter({ method: 'get', payload: 'query' });
 
       registerEnginesRoute({
+        ...mockDependencies,
         router: mockRouter.router,
-        log: mockLogger,
-        config: mockConfig,
       });
     });
 
-    describe('when the underlying App Search API returns a 200', () => {
-      beforeEach(() => {
-        AppSearchAPI.shouldBeCalledWith(
-          `http://localhost:3002/as/engines/collection?type=indexed&page%5Bcurrent%5D=1&page%5Bsize%5D=10`,
-          { headers: { Authorization: AUTH_HEADER } }
-        ).andReturn({
-          results: [{ name: 'engine1' }],
-          meta: { page: { total_results: 1 } },
-        });
-      });
-
-      it('should return 200 with a list of engines from the App Search API', async () => {
-        await mockRouter.callRoute(mockRequest);
+    it('creates a request handler', () => {
+      mockRouter.callRoute(mockRequest);
 
-        expect(mockRouter.response.ok).toHaveBeenCalledWith({
-          body: { results: [{ name: 'engine1' }], meta: { page: { total_results: 1 } } },
-        });
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+        path: '/as/engines/collection',
+        params: { type: 'indexed', 'page[current]': 1, 'page[size]': 10 },
+        hasValidData: expect.any(Function),
       });
     });
 
-    describe('when the App Search URL is invalid', () => {
-      beforeEach(() => {
-        AppSearchAPI.shouldBeCalledWith(
-          `http://localhost:3002/as/engines/collection?type=indexed&page%5Bcurrent%5D=1&page%5Bsize%5D=10`,
-          { headers: { Authorization: AUTH_HEADER } }
-        ).andReturnError();
-      });
-
-      it('should return 502 with a message', async () => {
-        await mockRouter.callRoute(mockRequest);
+    it('passes custom parameters to enterpriseSearchRequestHandler', () => {
+      mockRouter.callRoute({ query: { type: 'meta', pageIndex: 99 } });
 
-        expect(mockRouter.response.customError).toHaveBeenCalledWith({
-          statusCode: 502,
-          body: 'cannot-connect',
-        });
-        expect(mockLogger.error).toHaveBeenCalledWith('Cannot connect to App Search: Failed');
-        expect(mockLogger.debug).not.toHaveBeenCalled();
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+        path: '/as/engines/collection',
+        params: { type: 'meta', 'page[current]': 99, 'page[size]': 10 },
+        hasValidData: expect.any(Function),
       });
     });
 
-    describe('when the App Search API returns invalid data', () => {
-      beforeEach(() => {
-        AppSearchAPI.shouldBeCalledWith(
-          `http://localhost:3002/as/engines/collection?type=indexed&page%5Bcurrent%5D=1&page%5Bsize%5D=10`,
-          { headers: { Authorization: AUTH_HEADER } }
-        ).andReturnInvalidData();
+    describe('hasValidData', () => {
+      it('should correctly validate that the response has data', () => {
+        const response = {
+          meta: {
+            page: {
+              total_results: 1,
+            },
+          },
+          results: [],
+        };
+
+        mockRouter.callRoute(mockRequest);
+        expect(mockRequestHandler.hasValidData(response)).toBe(true);
       });
 
-      it('should return 502 with a message', async () => {
-        await mockRouter.callRoute(mockRequest);
-
-        expect(mockRouter.response.customError).toHaveBeenCalledWith({
-          statusCode: 502,
-          body: 'cannot-connect',
-        });
-        expect(mockLogger.error).toHaveBeenCalledWith(
-          'Cannot connect to App Search: Error: Invalid data received from App Search: {"foo":"bar"}'
-        );
-        expect(mockLogger.debug).toHaveBeenCalled();
+      it('should correctly validate that a response does not have data', () => {
+        const response = {};
+
+        mockRouter.callRoute(mockRequest);
+        expect(mockRequestHandler.hasValidData(response)).toBe(false);
       });
     });
 
@@ -128,36 +102,5 @@ describe('engine routes', () => {
         mockRouter.shouldThrow(request);
       });
     });
-
-    const AppSearchAPI = {
-      shouldBeCalledWith(expectedUrl: string, expectedParams: object) {
-        return {
-          andReturn(response: object) {
-            fetchMock.mockImplementation((url: string, params: object) => {
-              expect(url).toEqual(expectedUrl);
-              expect(params).toEqual(expectedParams);
-
-              return Promise.resolve(new Response(JSON.stringify(response)));
-            });
-          },
-          andReturnInvalidData() {
-            fetchMock.mockImplementation((url: string, params: object) => {
-              expect(url).toEqual(expectedUrl);
-              expect(params).toEqual(expectedParams);
-
-              return Promise.resolve(new Response(JSON.stringify({ foo: 'bar' })));
-            });
-          },
-          andReturnError() {
-            fetchMock.mockImplementation((url: string, params: object) => {
-              expect(url).toEqual(expectedUrl);
-              expect(params).toEqual(expectedParams);
-
-              return Promise.reject('Failed');
-            });
-          },
-        };
-      },
-    };
   });
 });
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts
index 7190772fb92bb..49fc5b100e0d1 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/engines.ts
@@ -4,14 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import fetch from 'node-fetch';
-import querystring from 'querystring';
 import { schema } from '@kbn/config-schema';
 
 import { IRouteDependencies } from '../../plugin';
 import { ENGINES_PAGE_SIZE } from '../../../common/constants';
 
-export function registerEnginesRoute({ router, config, log }: IRouteDependencies) {
+interface IEnginesResponse {
+  results: object[];
+  meta: { page: { total_results: number } };
+}
+
+export function registerEnginesRoute({
+  router,
+  enterpriseSearchRequestHandler,
+}: IRouteDependencies) {
   router.get(
     {
       path: '/api/app_search/engines',
@@ -23,37 +29,18 @@ export function registerEnginesRoute({ router, config, log }: IRouteDependencies
       },
     },
     async (context, request, response) => {
-      try {
-        const enterpriseSearchUrl = config.host as string;
-        const { type, pageIndex } = request.query;
+      const { type, pageIndex } = request.query;
 
-        const params = querystring.stringify({
+      return enterpriseSearchRequestHandler.createRequest({
+        path: '/as/engines/collection',
+        params: {
           type,
           'page[current]': pageIndex,
           'page[size]': ENGINES_PAGE_SIZE,
-        });
-        const url = `${encodeURI(enterpriseSearchUrl)}/as/engines/collection?${params}`;
-
-        const enginesResponse = await fetch(url, {
-          headers: { Authorization: request.headers.authorization as string },
-        });
-
-        const engines = await enginesResponse.json();
-        const hasValidData =
-          Array.isArray(engines?.results) && typeof engines?.meta?.page?.total_results === 'number';
-
-        if (hasValidData) {
-          return response.ok({ body: engines });
-        } else {
-          // Either a completely incorrect Enterprise Search host URL was configured, or App Search is returning bad data
-          throw new Error(`Invalid data received from App Search: ${JSON.stringify(engines)}`);
-        }
-      } catch (e) {
-        log.error(`Cannot connect to App Search: ${e.toString()}`);
-        if (e instanceof Error) log.debug(e.stack as string);
-
-        return response.customError({ statusCode: 502, body: 'cannot-connect' });
-      }
+        },
+        hasValidData: (body?: IEnginesResponse) =>
+          Array.isArray(body?.results) && typeof body?.meta?.page?.total_results === 'number',
+      })(context, request, response);
     }
   );
 }
diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
index daf0a1e895a61..acddd3539965a 100644
--- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/telemetry.test.ts
@@ -5,7 +5,7 @@
  */
 
 import { loggingSystemMock, savedObjectsServiceMock } from 'src/core/server/mocks';
-import { MockRouter, mockConfig, mockLogger } from '../../__mocks__';
+import { MockRouter, mockLogger, mockDependencies } from '../../__mocks__';
 
 jest.mock('../../collectors/lib/telemetry', () => ({
   incrementUICounter: jest.fn(),
@@ -28,10 +28,10 @@ describe('Enterprise Search Telemetry API', () => {
     mockRouter = new MockRouter({ method: 'put', payload: 'body' });
 
     registerTelemetryRoute({
+      ...mockDependencies,
       router: mockRouter.router,
       getSavedObjectsService: () => savedObjectsServiceMock.createStartContract(),
       log: mockLogger,
-      config: mockConfig,
     });
   });
 
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts
index 69e8354e8b2f7..a9bd4020e74b7 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.test.ts
@@ -4,127 +4,47 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { MockRouter, mockConfig, mockLogger } from '../../__mocks__';
+import { MockRouter, mockRequestHandler, mockDependencies } from '../../__mocks__';
 
 import { registerWSOverviewRoute } from './overview';
 
-jest.mock('node-fetch');
-const fetch = jest.requireActual('node-fetch');
-const { Response } = fetch;
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fetchMock = require('node-fetch') as jest.Mocked<typeof fetch>;
-
-const ORG_ROUTE = 'http://localhost:3002/ws/org';
-
-describe('engine routes', () => {
+describe('Overview route', () => {
   describe('GET /api/workplace_search/overview', () => {
-    const AUTH_HEADER = 'Basic 123';
-    const mockRequest = {
-      headers: {
-        authorization: AUTH_HEADER,
-      },
-      query: {},
-    };
-
-    const mockRouter = new MockRouter({ method: 'get', payload: 'query' });
+    let mockRouter: MockRouter;
 
     beforeEach(() => {
       jest.clearAllMocks();
-      mockRouter.createRouter();
+      mockRouter = new MockRouter({ method: 'get', payload: 'query' });
 
       registerWSOverviewRoute({
+        ...mockDependencies,
         router: mockRouter.router,
-        log: mockLogger,
-        config: mockConfig,
       });
     });
 
-    describe('when the underlying Workplace Search API returns a 200', () => {
-      beforeEach(() => {
-        WorkplaceSearchAPI.shouldBeCalledWith(ORG_ROUTE, {
-          headers: { Authorization: AUTH_HEADER },
-        }).andReturn({ accountsCount: 1 });
-      });
-
-      it('should return 200 with a list of overview from the Workplace Search API', async () => {
-        await mockRouter.callRoute(mockRequest);
-
-        expect(mockRouter.response.ok).toHaveBeenCalledWith({
-          body: { accountsCount: 1 },
-          headers: { 'content-type': 'application/json' },
-        });
+    it('creates a request handler', () => {
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+        path: '/ws/org',
+        hasValidData: expect.any(Function),
       });
     });
 
-    describe('when the Workplace Search URL is invalid', () => {
-      beforeEach(() => {
-        WorkplaceSearchAPI.shouldBeCalledWith(ORG_ROUTE, {
-          headers: { Authorization: AUTH_HEADER },
-        }).andReturnError();
-      });
-
-      it('should return 502 with a message', async () => {
-        await mockRouter.callRoute(mockRequest);
-
-        expect(mockRouter.response.customError).toHaveBeenCalledWith({
-          statusCode: 502,
-          body: 'cannot-connect',
-        });
-        expect(mockLogger.error).toHaveBeenCalledWith('Cannot connect to Workplace Search: Failed');
-        expect(mockLogger.debug).not.toHaveBeenCalled();
-      });
-    });
+    describe('hasValidData', () => {
+      it('should correctly validate that the response has data', () => {
+        const response = {
+          accountsCount: 1,
+        };
 
-    describe('when the Workplace Search API returns invalid data', () => {
-      beforeEach(() => {
-        WorkplaceSearchAPI.shouldBeCalledWith(ORG_ROUTE, {
-          headers: { Authorization: AUTH_HEADER },
-        }).andReturnInvalidData();
+        expect(mockRequestHandler.hasValidData(response)).toBe(true);
       });
 
-      it('should return 502 with a message', async () => {
-        await mockRouter.callRoute(mockRequest);
+      it('should correctly validate that a response does not have data', () => {
+        const response = {
+          foo: 'bar',
+        };
 
-        expect(mockRouter.response.customError).toHaveBeenCalledWith({
-          statusCode: 502,
-          body: 'cannot-connect',
-        });
-        expect(mockLogger.error).toHaveBeenCalledWith(
-          'Cannot connect to Workplace Search: Error: Invalid data received from Workplace Search: {"foo":"bar"}'
-        );
-        expect(mockLogger.debug).toHaveBeenCalled();
+        expect(mockRequestHandler.hasValidData(response)).toBe(false);
       });
     });
-
-    const WorkplaceSearchAPI = {
-      shouldBeCalledWith(expectedUrl: string, expectedParams: object) {
-        return {
-          andReturn(response: object) {
-            fetchMock.mockImplementation((url: string, params: object) => {
-              expect(url).toEqual(expectedUrl);
-              expect(params).toEqual(expectedParams);
-
-              return Promise.resolve(new Response(JSON.stringify(response)));
-            });
-          },
-          andReturnInvalidData() {
-            fetchMock.mockImplementation((url: string, params: object) => {
-              expect(url).toEqual(expectedUrl);
-              expect(params).toEqual(expectedParams);
-
-              return Promise.resolve(new Response(JSON.stringify({ foo: 'bar' })));
-            });
-          },
-          andReturnError() {
-            fetchMock.mockImplementation((url: string, params: object) => {
-              expect(url).toEqual(expectedUrl);
-              expect(params).toEqual(expectedParams);
-
-              return Promise.reject('Failed');
-            });
-          },
-        };
-      },
-    };
   });
 });
diff --git a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.ts b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.ts
index 9e5d94ac1b4fe..8cfd65725a23a 100644
--- a/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/workplace_search/overview.ts
@@ -4,43 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import fetch from 'node-fetch';
-
 import { IRouteDependencies } from '../../plugin';
 
-export function registerWSOverviewRoute({ router, config, log }: IRouteDependencies) {
+export function registerWSOverviewRoute({
+  router,
+  enterpriseSearchRequestHandler,
+}: IRouteDependencies) {
   router.get(
     {
       path: '/api/workplace_search/overview',
       validate: false,
     },
-    async (context, request, response) => {
-      try {
-        const entSearchUrl = config.host as string;
-        const url = `${encodeURI(entSearchUrl)}/ws/org`;
-
-        const overviewResponse = await fetch(url, {
-          headers: { Authorization: request.headers.authorization as string },
-        });
-
-        const body = await overviewResponse.json();
-        const hasValidData = typeof body?.accountsCount === 'number';
-
-        if (hasValidData) {
-          return response.ok({
-            body,
-            headers: { 'content-type': 'application/json' },
-          });
-        } else {
-          // Either a completely incorrect Enterprise Search host URL was configured, or Workplace Search is returning bad data
-          throw new Error(`Invalid data received from Workplace Search: ${JSON.stringify(body)}`);
-        }
-      } catch (e) {
-        log.error(`Cannot connect to Workplace Search: ${e.toString()}`);
-        if (e instanceof Error) log.debug(e.stack as string);
-
-        return response.customError({ statusCode: 502, body: 'cannot-connect' });
-      }
-    }
+    enterpriseSearchRequestHandler.createRequest({
+      path: '/ws/org',
+      hasValidData: (body: { accountsCount: number }) => typeof body?.accountsCount === 'number',
+    })
   );
 }

From 1e20cd4cf44fe1395cc99277a6ac940adb236f49 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Fri, 28 Aug 2020 11:04:24 -0600
Subject: [PATCH 125/148] [Maps] add drilldown support map embeddable (#75598)

* [Maps] add drilldown support

* filter actions view

* use i18n getter

* remove unused changed

* tslint fixes

* more tslint changes

* clean-up and API doc changes

* update snapshots

* do not show first drilldown in tooltip

* add light grey line to seperate feature property rows

* Improving tooltip row styles (#36)

* Improving tooltip actions row styles

* Removind unecessary comment

* update snapshot and add functional test

* switch UiActionsActionDefinition to Action and remove unneeded checks

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Elizabet Oliveira <elizabet.oliveira@elastic.co>
---
 ...-data-public.action_global_apply_filter.md |  11 ++
 .../kibana-plugin-plugins-data-public.md      |   1 +
 src/plugins/data/public/index.ts              |   2 +-
 src/plugins/data/public/public.api.md         |   5 +
 .../common/descriptor_types/map_descriptor.ts |   1 +
 .../geometry_filter_form.test.js.snap         |  16 ++
 .../public/components/_action_select.scss     |   3 +
 .../maps/public/components/_index.scss        |   1 +
 .../maps/public/components/action_select.tsx  |  87 +++++++++++
 .../components/distance_filter_form.tsx       |  23 ++-
 .../public/components/geometry_filter_form.js |  17 ++
 .../feature_properties.test.js.snap           |  96 +++++++++++-
 .../map/features_tooltip/_index.scss          |  12 +-
 .../feature_geometry_filter_form.js           |  38 +----
 .../features_tooltip/feature_properties.js    | 145 +++++++++++++++---
 .../feature_properties.test.js                |  30 +++-
 .../map/features_tooltip/features_tooltip.js  |  73 +++++++--
 .../map/mb/draw_control/draw_control.js       |  25 ++-
 .../map/mb/tooltip_control/tooltip_control.js |   2 +
 .../map/mb/tooltip_control/tooltip_popover.js |   2 +
 .../connected_components/map/mb/view.js       |   2 +
 .../map_container/map_container.tsx           |  16 +-
 .../toolbar_overlay/toolbar_overlay.js        |   8 +-
 .../tools_control/tools_control.js            |   6 +
 .../maps/public/embeddable/map_embeddable.tsx |  42 ++++-
 .../maps/embeddable/tooltip_filter_actions.js |  57 +++++--
 .../es_archives/maps/kibana/data.json         |   6 +-
 27 files changed, 608 insertions(+), 119 deletions(-)
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.action_global_apply_filter.md
 create mode 100644 x-pack/plugins/maps/public/components/_action_select.scss
 create mode 100644 x-pack/plugins/maps/public/components/action_select.tsx

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.action_global_apply_filter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.action_global_apply_filter.md
new file mode 100644
index 0000000000000..14075ba1beba0
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.action_global_apply_filter.md
@@ -0,0 +1,11 @@
+<!-- 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; [ACTION\_GLOBAL\_APPLY\_FILTER](./kibana-plugin-plugins-data-public.action_global_apply_filter.md)
+
+## ACTION\_GLOBAL\_APPLY\_FILTER variable
+
+<b>Signature:</b>
+
+```typescript
+ACTION_GLOBAL_APPLY_FILTER = "ACTION_GLOBAL_APPLY_FILTER"
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
index a5453c7c51d5b..09702df4fdb54 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md
@@ -89,6 +89,7 @@
 
 |  Variable | Description |
 |  --- | --- |
+|  [ACTION\_GLOBAL\_APPLY\_FILTER](./kibana-plugin-plugins-data-public.action_global_apply_filter.md) |  |
 |  [AggGroupLabels](./kibana-plugin-plugins-data-public.agggrouplabels.md) |  |
 |  [AggGroupNames](./kibana-plugin-plugins-data-public.agggroupnames.md) |  |
 |  [baseFormattersPublic](./kibana-plugin-plugins-data-public.baseformatterspublic.md) |  |
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index eb5703f1c63c1..27b16c57ffecf 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -440,7 +440,7 @@ export {
 
 export { isTimeRange, isQuery, isFilter, isFilters } from '../common';
 
-export { ApplyGlobalFilterActionContext } from './actions';
+export { ACTION_GLOBAL_APPLY_FILTER, ApplyGlobalFilterActionContext } from './actions';
 
 export * from '../common/field_mapping';
 
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 9a2a82e8ed206..de4ec58dfdab3 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -78,6 +78,11 @@ import { UnregisterCallback } from 'history';
 import { UnwrapPromiseOrReturn } from '@kbn/utility-types';
 import { UserProvidedValues } from 'src/core/server/types';
 
+// Warning: (ae-missing-release-tag) "ACTION_GLOBAL_APPLY_FILTER" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+//
+// @public (undocumented)
+export const ACTION_GLOBAL_APPLY_FILTER = "ACTION_GLOBAL_APPLY_FILTER";
+
 // Warning: (ae-forgotten-export) The symbol "AggConfigSerialized" needs to be exported by the entry point index.d.ts
 // Warning: (ae-missing-release-tag) "AggConfigOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
diff --git a/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts b/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
index ed0656a2fc265..d064dfb1c4a37 100644
--- a/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
@@ -53,6 +53,7 @@ export type TooltipState = {
 };
 
 export type DrawState = {
+  actionId: string;
   drawType: DRAW_TYPE;
   filterLabel?: string; // point radius filter alias
   geoFieldName?: string;
diff --git a/x-pack/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap b/x-pack/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap
index 85a073c8d9ace..2d39a52dfe974 100644
--- a/x-pack/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap
+++ b/x-pack/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap
@@ -38,6 +38,10 @@ exports[`should not render relation select when geo field is geo_point 1`] = `
       }
     }
   />
+  <ActionSelect
+    onChange={[Function]}
+    value="ACTION_GLOBAL_APPLY_FILTER"
+  />
   <EuiSpacer
     size="m"
   />
@@ -121,6 +125,10 @@ exports[`should not show "within" relation when filter geometry is not closed 1`
       value="INTERSECTS"
     />
   </EuiFormRow>
+  <ActionSelect
+    onChange={[Function]}
+    value="ACTION_GLOBAL_APPLY_FILTER"
+  />
   <EuiSpacer
     size="m"
   />
@@ -177,6 +185,10 @@ exports[`should render error message 1`] = `
       }
     }
   />
+  <ActionSelect
+    onChange={[Function]}
+    value="ACTION_GLOBAL_APPLY_FILTER"
+  />
   <EuiSpacer
     size="m"
   />
@@ -267,6 +279,10 @@ exports[`should render relation select when geo field is geo_shape 1`] = `
       value="INTERSECTS"
     />
   </EuiFormRow>
+  <ActionSelect
+    onChange={[Function]}
+    value="ACTION_GLOBAL_APPLY_FILTER"
+  />
   <EuiSpacer
     size="m"
   />
diff --git a/x-pack/plugins/maps/public/components/_action_select.scss b/x-pack/plugins/maps/public/components/_action_select.scss
new file mode 100644
index 0000000000000..be903ad7d6962
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/_action_select.scss
@@ -0,0 +1,3 @@
+.mapActionSelectIcon {
+  margin-right: $euiSizeS;
+}
diff --git a/x-pack/plugins/maps/public/components/_index.scss b/x-pack/plugins/maps/public/components/_index.scss
index 76e27338bdcd4..76ce9f1bc79e3 100644
--- a/x-pack/plugins/maps/public/components/_index.scss
+++ b/x-pack/plugins/maps/public/components/_index.scss
@@ -1,3 +1,4 @@
+@import 'action_select';
 @import 'metric_editors';
 @import './geometry_filter';
 @import 'tooltip_selector/tooltip_selector';
diff --git a/x-pack/plugins/maps/public/components/action_select.tsx b/x-pack/plugins/maps/public/components/action_select.tsx
new file mode 100644
index 0000000000000..ad61a6a129974
--- /dev/null
+++ b/x-pack/plugins/maps/public/components/action_select.tsx
@@ -0,0 +1,87 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { Component } from 'react';
+import { EuiFormRow, EuiSuperSelect, EuiIcon } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+
+interface Props {
+  value?: string;
+  onChange: (value: string) => void;
+  getFilterActions?: () => Promise<Action[]>;
+  getActionContext?: () => ActionExecutionContext;
+}
+
+interface State {
+  actions: Action[];
+}
+
+export class ActionSelect extends Component<Props, State> {
+  private _isMounted = false;
+  state: State = {
+    actions: [],
+  };
+
+  componentDidMount() {
+    this._isMounted = true;
+    this._loadActions();
+  }
+
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+
+  async _loadActions() {
+    if (!this.props.getFilterActions || !this.props.getActionContext) {
+      return;
+    }
+    const actions = await this.props.getFilterActions();
+    if (this._isMounted) {
+      this.setState({ actions });
+    }
+  }
+
+  render() {
+    if (this.state.actions.length === 0 || !this.props.getActionContext) {
+      return null;
+    }
+
+    if (this.state.actions.length === 1 && this.props.value === this.state.actions[0].id) {
+      return null;
+    }
+
+    const actionContext = this.props.getActionContext();
+    const options = this.state.actions.map((action) => {
+      const iconType = action.getIconType(actionContext);
+      return {
+        value: action.id,
+        inputDisplay: (
+          <div>
+            {iconType ? <EuiIcon className="mapActionSelectIcon" type={iconType} /> : null}
+            {action.getDisplayName(actionContext)}
+          </div>
+        ),
+      };
+    });
+
+    return (
+      <EuiFormRow
+        label={i18n.translate('xpack.maps.actionSelect.label', {
+          defaultMessage: 'Action',
+        })}
+        display="rowCompressed"
+      >
+        <EuiSuperSelect
+          compressed
+          options={options}
+          valueOfSelected={this.props.value ? this.props.value : ''}
+          onChange={this.props.onChange}
+        />
+      </EuiFormRow>
+    );
+  }
+}
diff --git a/x-pack/plugins/maps/public/components/distance_filter_form.tsx b/x-pack/plugins/maps/public/components/distance_filter_form.tsx
index 768be1558bd69..24d9aec5b77b4 100644
--- a/x-pack/plugins/maps/public/components/distance_filter_form.tsx
+++ b/x-pack/plugins/maps/public/components/distance_filter_form.tsx
@@ -14,18 +14,25 @@ import {
   EuiTextAlign,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
 import { MultiIndexGeoFieldSelect } from './multi_index_geo_field_select';
 import { GeoFieldWithIndex } from './geo_field_with_index';
+import { ActionSelect } from './action_select';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../src/plugins/data/public';
 
 interface Props {
   className?: string;
   buttonLabel: string;
   geoFields: GeoFieldWithIndex[];
+  getFilterActions?: () => Promise<Action[]>;
+  getActionContext?: () => ActionExecutionContext;
   onSubmit: ({
+    actionId,
     filterLabel,
     indexPatternId,
     geoFieldName,
   }: {
+    actionId: string;
     filterLabel: string;
     indexPatternId: string;
     geoFieldName: string;
@@ -33,12 +40,14 @@ interface Props {
 }
 
 interface State {
+  actionId: string;
   selectedField: GeoFieldWithIndex | undefined;
   filterLabel: string;
 }
 
 export class DistanceFilterForm extends Component<Props, State> {
-  state = {
+  state: State = {
+    actionId: ACTION_GLOBAL_APPLY_FILTER,
     selectedField: this.props.geoFields.length ? this.props.geoFields[0] : undefined,
     filterLabel: '',
   };
@@ -53,11 +62,16 @@ export class DistanceFilterForm extends Component<Props, State> {
     });
   };
 
+  _onActionIdChange = (value: string) => {
+    this.setState({ actionId: value });
+  };
+
   _onSubmit = () => {
     if (!this.state.selectedField) {
       return;
     }
     this.props.onSubmit({
+      actionId: this.state.actionId,
       filterLabel: this.state.filterLabel,
       indexPatternId: this.state.selectedField.indexPatternId,
       geoFieldName: this.state.selectedField.geoFieldName,
@@ -86,6 +100,13 @@ export class DistanceFilterForm extends Component<Props, State> {
           onChange={this._onGeoFieldChange}
         />
 
+        <ActionSelect
+          getFilterActions={this.props.getFilterActions}
+          getActionContext={this.props.getActionContext}
+          value={this.state.actionId}
+          onChange={this._onActionIdChange}
+        />
+
         <EuiSpacer size="m" />
 
         <EuiTextAlign textAlign="right">
diff --git a/x-pack/plugins/maps/public/components/geometry_filter_form.js b/x-pack/plugins/maps/public/components/geometry_filter_form.js
index d5cdda3c1c324..fde07e8c16bc5 100644
--- a/x-pack/plugins/maps/public/components/geometry_filter_form.js
+++ b/x-pack/plugins/maps/public/components/geometry_filter_form.js
@@ -20,11 +20,15 @@ import { i18n } from '@kbn/i18n';
 import { ES_GEO_FIELD_TYPE, ES_SPATIAL_RELATIONS } from '../../common/constants';
 import { getEsSpatialRelationLabel } from '../../common/i18n_getters';
 import { MultiIndexGeoFieldSelect } from './multi_index_geo_field_select';
+import { ActionSelect } from './action_select';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../src/plugins/data/public';
 
 export class GeometryFilterForm extends Component {
   static propTypes = {
     buttonLabel: PropTypes.string.isRequired,
     geoFields: PropTypes.array.isRequired,
+    getFilterActions: PropTypes.func,
+    getActionContext: PropTypes.func,
     intitialGeometryLabel: PropTypes.string.isRequired,
     onSubmit: PropTypes.func.isRequired,
     isFilterGeometryClosed: PropTypes.bool,
@@ -36,6 +40,7 @@ export class GeometryFilterForm extends Component {
   };
 
   state = {
+    actionId: ACTION_GLOBAL_APPLY_FILTER,
     selectedField: this.props.geoFields.length ? this.props.geoFields[0] : undefined,
     geometryLabel: this.props.intitialGeometryLabel,
     relation: ES_SPATIAL_RELATIONS.INTERSECTS,
@@ -57,8 +62,13 @@ export class GeometryFilterForm extends Component {
     });
   };
 
+  _onActionIdChange = (value) => {
+    this.setState({ actionId: value });
+  };
+
   _onSubmit = () => {
     this.props.onSubmit({
+      actionId: this.state.actionId,
       geometryLabel: this.state.geometryLabel,
       indexPatternId: this.state.selectedField.indexPatternId,
       geoFieldName: this.state.selectedField.geoFieldName,
@@ -134,6 +144,13 @@ export class GeometryFilterForm extends Component {
 
         {this._renderRelationInput()}
 
+        <ActionSelect
+          getFilterActions={this.props.getFilterActions}
+          getActionContext={this.props.getActionContext}
+          value={this.state.actionId}
+          onChange={this._onActionIdChange}
+        />
+
         <EuiSpacer size="m" />
 
         {error}
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/__snapshots__/feature_properties.test.js.snap b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/__snapshots__/feature_properties.test.js.snap
index 3b3d82c92fbb7..29df06a64a3f2 100644
--- a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/__snapshots__/feature_properties.test.js.snap
+++ b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/__snapshots__/feature_properties.test.js.snap
@@ -1,11 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`FeatureProperties should not show filter button 1`] = `
+exports[`FeatureProperties should render 1`] = `
 <table
   className="eui-yScrollWithShadows mapFeatureTooltip_table"
 >
   <tbody>
     <tr
+      className="mapFeatureTooltip_row"
       key="prop1"
     >
       <td
@@ -21,8 +22,10 @@ exports[`FeatureProperties should not show filter button 1`] = `
           }
         }
       />
+      <td />
     </tr>
     <tr
+      className="mapFeatureTooltip_row"
       key="prop2"
     >
       <td
@@ -38,6 +41,7 @@ exports[`FeatureProperties should not show filter button 1`] = `
           }
         }
       />
+      <td />
     </tr>
   </tbody>
 </table>
@@ -56,12 +60,13 @@ exports[`FeatureProperties should show error message if unable to load tooltip c
 </EuiCallOut>
 `;
 
-exports[`FeatureProperties should show only filter button for filterable properties 1`] = `
+exports[`FeatureProperties should show filter button for filterable properties 1`] = `
 <table
   className="eui-yScrollWithShadows mapFeatureTooltip_table"
 >
   <tbody>
     <tr
+      className="mapFeatureTooltip_row"
       key="prop1"
     >
       <td
@@ -78,17 +83,21 @@ exports[`FeatureProperties should show only filter button for filterable propert
         }
       />
       <td>
-        <EuiButtonIcon
+        <EuiButtonEmpty
           aria-label="Filter on property"
-          className="mapFeatureTooltip__filterButton"
           data-test-subj="mapTooltipCreateFilterButton"
-          iconType="plusInCircle"
           onClick={[Function]}
+          size="xs"
           title="Filter on property"
-        />
+        >
+          <EuiIcon
+            type="filter"
+          />
+        </EuiButtonEmpty>
       </td>
     </tr>
     <tr
+      className="mapFeatureTooltip_row"
       key="prop2"
     >
       <td
@@ -104,6 +113,81 @@ exports[`FeatureProperties should show only filter button for filterable propert
           }
         }
       />
+      <td />
+    </tr>
+  </tbody>
+</table>
+`;
+
+exports[`FeatureProperties should show view actions button when there are available actions 1`] = `
+<table
+  className="eui-yScrollWithShadows mapFeatureTooltip_table"
+>
+  <tbody>
+    <tr
+      className="mapFeatureTooltip_row"
+      key="prop1"
+    >
+      <td
+        className="eui-textOverflowWrap mapFeatureTooltip__propertyLabel"
+      >
+        prop1
+      </td>
+      <td
+        className="eui-textOverflowWrap"
+        dangerouslySetInnerHTML={
+          Object {
+            "__html": "foobar1",
+          }
+        }
+      />
+      <td
+        className="mapFeatureTooltip_actionsRow"
+      >
+        <span>
+          <EuiButtonEmpty
+            aria-label="Filter on property"
+            data-test-subj="mapTooltipCreateFilterButton"
+            onClick={[Function]}
+            size="xs"
+            title="Filter on property"
+          >
+            <EuiIcon
+              type="filter"
+            />
+          </EuiButtonEmpty>
+          <EuiButtonEmpty
+            aria-label="View filter actions"
+            data-test-subj="mapTooltipMoreActionsButton"
+            onClick={[Function]}
+            size="xs"
+            title="View filter actions"
+          >
+            <EuiIcon
+              type="arrowRight"
+            />
+          </EuiButtonEmpty>
+        </span>
+      </td>
+    </tr>
+    <tr
+      className="mapFeatureTooltip_row"
+      key="prop2"
+    >
+      <td
+        className="eui-textOverflowWrap mapFeatureTooltip__propertyLabel"
+      >
+        prop2
+      </td>
+      <td
+        className="eui-textOverflowWrap"
+        dangerouslySetInnerHTML={
+          Object {
+            "__html": "foobar2",
+          }
+        }
+      />
+      <td />
     </tr>
   </tbody>
 </table>
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/_index.scss b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/_index.scss
index fb75cc1e2db69..abd747c8fa47a 100644
--- a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/_index.scss
+++ b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/_index.scss
@@ -1,6 +1,5 @@
 .mapFeatureTooltip_table {
   width: 100%;
-  display: block;
   max-height: calc(49vh - #{$euiSizeXL * 2});
 
   td {
@@ -8,6 +7,10 @@
   }
 }
 
+.mapFeatureTooltip_row {
+  border-bottom: 1px solid $euiColorLightestShade;
+}
+
 .mapFeatureTooltip_actionLinks {
   padding: $euiSizeXS;
 }
@@ -20,3 +23,10 @@
   max-width: $euiSizeXL * 4;
   font-weight: $euiFontWeightSemiBold;
 }
+
+.mapFeatureTooltip_actionsRow {
+  > span {
+    display: flex;
+    justify-content: flex-end;
+  }
+}
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js
index b0ce52b4db7ab..98267965fd30f 100644
--- a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js
+++ b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_geometry_filter_form.js
@@ -4,9 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Component, Fragment } from 'react';
-import { EuiIcon } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
+import React, { Component } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import { URL_MAX_LENGTH } from '../../../../../../../src/core/public';
@@ -95,28 +93,7 @@ export class FeatureGeometryFilterForm extends Component {
     this.props.onClose();
   };
 
-  _renderHeader() {
-    return (
-      <button
-        className="euiContextMenuPanelTitle mapFeatureTooltip_backButton"
-        type="button"
-        onClick={this.props.showPropertiesView}
-      >
-        <span className="euiContextMenu__itemLayout">
-          <EuiIcon type="arrowLeft" size="m" className="euiContextMenu__icon" />
-
-          <span className="euiContextMenu__text">
-            <FormattedMessage
-              id="xpack.maps.tooltip.showGeometryFilterViewLinkLabel"
-              defaultMessage="Filter by geometry"
-            />
-          </span>
-        </span>
-      </button>
-    );
-  }
-
-  _renderForm() {
+  render() {
     return (
       <GeometryFilterForm
         buttonLabel={i18n.translate(
@@ -126,6 +103,8 @@ export class FeatureGeometryFilterForm extends Component {
           }
         )}
         geoFields={this.props.geoFields}
+        getFilterActions={this.props.getFilterActions}
+        getActionContext={this.props.getActionContext}
         intitialGeometryLabel={this.props.geometry.type.toLowerCase()}
         onSubmit={this._createFilter}
         isFilterGeometryClosed={
@@ -137,13 +116,4 @@ export class FeatureGeometryFilterForm extends Component {
       />
     );
   }
-
-  render() {
-    return (
-      <Fragment>
-        {this._renderHeader()}
-        {this._renderForm()}
-      </Fragment>
-    );
-  }
 }
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.js b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.js
index 5e2a153b2ccbf..edd501f266690 100644
--- a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.js
+++ b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.js
@@ -5,12 +5,21 @@
  */
 
 import React from 'react';
-import { EuiCallOut, EuiLoadingSpinner, EuiTextAlign, EuiButtonIcon } from '@elastic/eui';
+import {
+  EuiCallOut,
+  EuiLoadingSpinner,
+  EuiTextAlign,
+  EuiButtonEmpty,
+  EuiIcon,
+  EuiContextMenu,
+} from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../src/plugins/data/public';
 
 export class FeatureProperties extends React.Component {
   state = {
     properties: null,
+    actions: [],
     loadPropertiesErrorMsg: null,
     prevWidth: null,
     prevHeight: null,
@@ -21,6 +30,7 @@ export class FeatureProperties extends React.Component {
     this.prevLayerId = undefined;
     this.prevFeatureId = undefined;
     this._loadProperties();
+    this._loadActions();
   }
 
   componentDidUpdate() {
@@ -31,6 +41,16 @@ export class FeatureProperties extends React.Component {
     this._isMounted = false;
   }
 
+  async _loadActions() {
+    if (!this.props.getFilterActions) {
+      return;
+    }
+    const actions = await this.props.getFilterActions();
+    if (this._isMounted) {
+      this.setState({ actions });
+    }
+  }
+
   _loadProperties = async () => {
     this._fetchProperties({
       nextFeatureId: this.props.featureId,
@@ -39,6 +59,10 @@ export class FeatureProperties extends React.Component {
     });
   };
 
+  _showFilterActions = (tooltipProperty) => {
+    this.props.showFilterActions(this._renderFilterActions(tooltipProperty));
+  };
+
   _fetchProperties = async ({ nextLayerId, nextFeatureId, mbProperties }) => {
     if (this.prevLayerId === nextLayerId && this.prevFeatureId === nextFeatureId) {
       // do not reload same feature properties
@@ -83,35 +107,108 @@ export class FeatureProperties extends React.Component {
     }
 
     if (this._isMounted) {
-      this.setState({
-        properties,
-      });
+      this.setState({ properties });
     }
   };
 
+  _renderFilterActions(tooltipProperty) {
+    const panel = {
+      id: 0,
+      items: this.state.actions.map((action) => {
+        const actionContext = this.props.getActionContext();
+        const iconType = action.getIconType(actionContext);
+        const name = action.getDisplayName(actionContext);
+        return {
+          name,
+          icon: iconType ? <EuiIcon type={iconType} /> : null,
+          onClick: async () => {
+            this.props.onCloseTooltip();
+            const filters = await tooltipProperty.getESFilters();
+            this.props.addFilters(filters, action.id);
+          },
+          ['data-test-subj']: `mapFilterActionButton__${name}`,
+        };
+      }),
+    };
+
+    return (
+      <div>
+        <table
+          className="eui-yScrollWithShadows mapFeatureTooltip_table"
+          ref={(node) => (this._node = node)}
+        >
+          <tbody>
+            <tr>
+              <td className="eui-textOverflowWrap mapFeatureTooltip__propertyLabel">
+                {tooltipProperty.getPropertyName()}
+              </td>
+              <td
+                className="eui-textOverflowWrap"
+                /*
+                 * Justification for dangerouslySetInnerHTML:
+                 * Property value contains value generated by Field formatter
+                 * Since these formatters produce raw HTML, this component needs to be able to render them as-is, relying
+                 * on the field formatter to only produce safe HTML.
+                 */
+                dangerouslySetInnerHTML={{ __html: tooltipProperty.getHtmlDisplayValue() }} //eslint-disable-line react/no-danger
+              />
+            </tr>
+          </tbody>
+        </table>
+        <EuiContextMenu initialPanelId={0} panels={[panel]} />
+      </div>
+    );
+  }
+
   _renderFilterCell(tooltipProperty) {
     if (!this.props.showFilterButtons || !tooltipProperty.isFilterable()) {
-      return null;
+      return <td />;
     }
 
-    return (
-      <td>
-        <EuiButtonIcon
-          className="mapFeatureTooltip__filterButton"
-          iconType="plusInCircle"
-          title={i18n.translate('xpack.maps.tooltip.filterOnPropertyTitle', {
-            defaultMessage: 'Filter on property',
-          })}
-          onClick={async () => {
-            this.props.onCloseTooltip();
-            const filters = await tooltipProperty.getESFilters();
-            this.props.addFilters(filters);
-          }}
-          aria-label={i18n.translate('xpack.maps.tooltip.filterOnPropertyAriaLabel', {
-            defaultMessage: 'Filter on property',
-          })}
-          data-test-subj="mapTooltipCreateFilterButton"
-        />
+    const applyFilterButton = (
+      <EuiButtonEmpty
+        size="xs"
+        title={i18n.translate('xpack.maps.tooltip.filterOnPropertyTitle', {
+          defaultMessage: 'Filter on property',
+        })}
+        onClick={async () => {
+          this.props.onCloseTooltip();
+          const filters = await tooltipProperty.getESFilters();
+          this.props.addFilters(filters);
+        }}
+        aria-label={i18n.translate('xpack.maps.tooltip.filterOnPropertyAriaLabel', {
+          defaultMessage: 'Filter on property',
+        })}
+        data-test-subj="mapTooltipCreateFilterButton"
+      >
+        <EuiIcon type="filter" />
+      </EuiButtonEmpty>
+    );
+
+    return this.state.actions.length === 0 ||
+      (this.state.actions.length === 1 &&
+        this.state.actions[0].id === ACTION_GLOBAL_APPLY_FILTER) ? (
+      <td>{applyFilterButton}</td>
+    ) : (
+      <td className="mapFeatureTooltip_actionsRow">
+        <span>
+          {applyFilterButton}
+          <EuiButtonEmpty
+            size="xs"
+            title={i18n.translate('xpack.maps.tooltip.viewActionsTitle', {
+              defaultMessage: 'View filter actions',
+            })}
+            onClick={() => {
+              this._showFilterActions(tooltipProperty);
+            }}
+            aria-label={i18n.translate('xpack.maps.tooltip.viewActionsTitle', {
+              defaultMessage: 'View filter actions',
+            })}
+            data-test-subj="mapTooltipMoreActionsButton"
+          >
+            <EuiIcon type="arrowRight" />
+          </EuiButtonEmpty>
+        </span>
       </td>
     );
   }
@@ -154,7 +251,7 @@ export class FeatureProperties extends React.Component {
     const rows = this.state.properties.map((tooltipProperty) => {
       const label = tooltipProperty.getPropertyName();
       return (
-        <tr key={label}>
+        <tr key={label} className="mapFeatureTooltip_row">
           <td className="eui-textOverflowWrap mapFeatureTooltip__propertyLabel">{label}</td>
           <td
             className="eui-textOverflowWrap"
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.test.js b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.test.js
index c6db9cd96a429..ff0e1a9e2acd8 100644
--- a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.test.js
+++ b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/feature_properties.test.js
@@ -7,6 +7,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { FeatureProperties } from './feature_properties';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../../../src/plugins/data/public';
 
 class MockTooltipProperty {
   constructor(key, value, isFilterable) {
@@ -36,6 +37,9 @@ const defaultProps = {
   layerId: `layer`,
   onCloseTooltip: () => {},
   showFilterButtons: false,
+  getFilterActions: () => {
+    return [{ id: ACTION_GLOBAL_APPLY_FILTER }];
+  },
 };
 
 const mockTooltipProperties = [
@@ -44,10 +48,29 @@ const mockTooltipProperties = [
 ];
 
 describe('FeatureProperties', () => {
-  test('should not show filter button', async () => {
+  test('should render', async () => {
+    const component = shallow(
+      <FeatureProperties
+        {...defaultProps}
+        loadFeatureProperties={() => {
+          return mockTooltipProperties;
+        }}
+      />
+    );
+
+    // Ensure all promises resolve
+    await new Promise((resolve) => process.nextTick(resolve));
+    // Ensure the state changes are reflected
+    component.update();
+
+    expect(component).toMatchSnapshot();
+  });
+
+  test('should show filter button for filterable properties', async () => {
     const component = shallow(
       <FeatureProperties
         {...defaultProps}
+        showFilterButtons={true}
         loadFeatureProperties={() => {
           return mockTooltipProperties;
         }}
@@ -62,7 +85,7 @@ describe('FeatureProperties', () => {
     expect(component).toMatchSnapshot();
   });
 
-  test('should show only filter button for filterable properties', async () => {
+  test('should show view actions button when there are available actions', async () => {
     const component = shallow(
       <FeatureProperties
         {...defaultProps}
@@ -70,6 +93,9 @@ describe('FeatureProperties', () => {
         loadFeatureProperties={() => {
           return mockTooltipProperties;
         }}
+        getFilterActions={() => {
+          return [{ id: 'drilldown1' }];
+        }}
       />
     );
 
diff --git a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/features_tooltip.js b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/features_tooltip.js
index d91bc8e803ab9..8547219b42e30 100644
--- a/x-pack/plugins/maps/public/connected_components/map/features_tooltip/features_tooltip.js
+++ b/x-pack/plugins/maps/public/connected_components/map/features_tooltip/features_tooltip.js
@@ -4,20 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment } from 'react';
-import { EuiLink } from '@elastic/eui';
+import React, { Component, Fragment } from 'react';
+import { EuiIcon, EuiLink } from '@elastic/eui';
 import { FeatureProperties } from './feature_properties';
-import { FormattedMessage } from '@kbn/i18n/react';
 import { GEO_JSON_TYPE, ES_GEO_FIELD_TYPE } from '../../../../common/constants';
 import { FeatureGeometryFilterForm } from './feature_geometry_filter_form';
 import { TooltipHeader } from './tooltip_header';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 const VIEWS = {
   PROPERTIES_VIEW: 'PROPERTIES_VIEW',
   GEOMETRY_FILTER_VIEW: 'GEOMETRY_FILTER_VIEW',
+  FILTER_ACTIONS_VIEW: 'FILTER_ACTIONS_VIEW',
 };
 
-export class FeaturesTooltip extends React.Component {
+export class FeaturesTooltip extends Component {
   state = {};
 
   static getDerivedStateFromProps(nextProps, prevState) {
@@ -41,7 +43,11 @@ export class FeaturesTooltip extends React.Component {
   };
 
   _showPropertiesView = () => {
-    this.setState({ view: VIEWS.PROPERTIES_VIEW });
+    this.setState({ view: VIEWS.PROPERTIES_VIEW, filterView: null });
+  };
+
+  _showFilterActionsView = (filterView) => {
+    this.setState({ view: VIEWS.FILTER_ACTIONS_VIEW, filterView });
   };
 
   _renderActions(geoFields) {
@@ -96,6 +102,22 @@ export class FeaturesTooltip extends React.Component {
     });
   };
 
+  _renderBackButton(label) {
+    return (
+      <button
+        className="euiContextMenuPanelTitle mapFeatureTooltip_backButton"
+        type="button"
+        onClick={this._showPropertiesView}
+      >
+        <span className="euiContextMenu__itemLayout">
+          <EuiIcon type="arrowLeft" size="m" className="euiContextMenu__icon" />
+
+          <span className="euiContextMenu__text">{label}</span>
+        </span>
+      </button>
+    );
+  }
+
   render() {
     if (!this.state.currentFeature) {
       return null;
@@ -109,14 +131,36 @@ export class FeaturesTooltip extends React.Component {
 
     if (this.state.view === VIEWS.GEOMETRY_FILTER_VIEW && currentFeatureGeometry) {
       return (
-        <FeatureGeometryFilterForm
-          onClose={this.props.closeTooltip}
-          showPropertiesView={this._showPropertiesView}
-          geometry={currentFeatureGeometry}
-          geoFields={geoFields}
-          addFilters={this.props.addFilters}
-          loadPreIndexedShape={this._loadCurrentFeaturePreIndexedShape}
-        />
+        <Fragment>
+          {this._renderBackButton(
+            i18n.translate('xpack.maps.tooltip.showGeometryFilterViewLinkLabel', {
+              defaultMessage: 'Filter by geometry',
+            })
+          )}
+          <FeatureGeometryFilterForm
+            onClose={this.props.closeTooltip}
+            showPropertiesView={this._showPropertiesView}
+            geometry={currentFeatureGeometry}
+            geoFields={geoFields}
+            addFilters={this.props.addFilters}
+            getFilterActions={this.props.getFilterActions}
+            getActionContext={this.props.getActionContext}
+            loadPreIndexedShape={this._loadCurrentFeaturePreIndexedShape}
+          />
+        </Fragment>
+      );
+    }
+
+    if (this.state.view === VIEWS.FILTER_ACTIONS_VIEW) {
+      return (
+        <Fragment>
+          {this._renderBackButton(
+            i18n.translate('xpack.maps.tooltip.showAddFilterActionsViewLabel', {
+              defaultMessage: 'Filter actions',
+            })
+          )}
+          {this.state.filterView}
+        </Fragment>
       );
     }
 
@@ -137,6 +181,9 @@ export class FeaturesTooltip extends React.Component {
           showFilterButtons={!!this.props.addFilters && this.props.isLocked}
           onCloseTooltip={this.props.closeTooltip}
           addFilters={this.props.addFilters}
+          getFilterActions={this.props.getFilterActions}
+          getActionContext={this.props.getActionContext}
+          showFilterActions={this._showFilterActionsView}
         />
         {this._renderActions(geoFields)}
       </Fragment>
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js b/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
index 6de936fa4a8f1..49675ac6a3924 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
+++ b/x-pack/plugins/maps/public/connected_components/map/mb/draw_control/draw_control.js
@@ -62,11 +62,12 @@ export class DrawControl extends React.Component {
     }
   }, 0);
 
-  _onDraw = (e) => {
+  _onDraw = async (e) => {
     if (!e.features.length) {
       return;
     }
 
+    let filter;
     if (this.props.drawState.drawType === DRAW_TYPE.DISTANCE) {
       const circle = e.features[0];
       const distanceKm = _.round(
@@ -82,7 +83,7 @@ export class DrawControl extends React.Component {
       } else if (distanceKm <= 100) {
         precision = 3;
       }
-      const filter = createDistanceFilterWithMeta({
+      filter = createDistanceFilterWithMeta({
         alias: this.props.drawState.filterLabel,
         distanceKm,
         geoFieldName: this.props.drawState.geoFieldName,
@@ -92,17 +93,12 @@ export class DrawControl extends React.Component {
           _.round(circle.properties.center[1], precision),
         ],
       });
-      this.props.addFilters([filter]);
-      this.props.disableDrawState();
-      return;
-    }
-
-    const geometry = e.features[0].geometry;
-    // MapboxDraw returns coordinates with 12 decimals. Round to a more reasonable number
-    roundCoordinates(geometry.coordinates);
+    } else {
+      const geometry = e.features[0].geometry;
+      // MapboxDraw returns coordinates with 12 decimals. Round to a more reasonable number
+      roundCoordinates(geometry.coordinates);
 
-    try {
-      const filter = createSpatialFilterWithGeometry({
+      filter = createSpatialFilterWithGeometry({
         geometry:
           this.props.drawState.drawType === DRAW_TYPE.BOUNDS
             ? getBoundingBoxGeometry(geometry)
@@ -113,7 +109,10 @@ export class DrawControl extends React.Component {
         geometryLabel: this.props.drawState.geometryLabel,
         relation: this.props.drawState.relation,
       });
-      this.props.addFilters([filter]);
+    }
+
+    try {
+      await this.props.addFilters([filter], this.props.drawState.actionId);
     } catch (error) {
       // TODO notify user why filter was not created
       console.error(error);
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_control.js b/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_control.js
index 84a29db852539..87d6f8e1d8e71 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_control.js
+++ b/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_control.js
@@ -195,6 +195,8 @@ export class TooltipControl extends React.Component {
           mbMap={this.props.mbMap}
           layerList={this.props.layerList}
           addFilters={this.props.addFilters}
+          getFilterActions={this.props.getFilterActions}
+          getActionContext={this.props.getActionContext}
           renderTooltipContent={this.props.renderTooltipContent}
           geoFields={this.props.geoFields}
           features={features}
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_popover.js b/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_popover.js
index 6c42057680408..4cfddf0034039 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_popover.js
+++ b/x-pack/plugins/maps/public/connected_components/map/mb/tooltip_control/tooltip_popover.js
@@ -117,6 +117,8 @@ export class TooltipPopover extends Component {
   _renderTooltipContent = () => {
     const publicProps = {
       addFilters: this.props.addFilters,
+      getFilterActions: this.props.getFilterActions,
+      getActionContext: this.props.getActionContext,
       closeTooltip: this.props.closeTooltip,
       features: this.props.features,
       isLocked: this.props.isLocked,
diff --git a/x-pack/plugins/maps/public/connected_components/map/mb/view.js b/x-pack/plugins/maps/public/connected_components/map/mb/view.js
index 5a38f6039ae4b..22c374aceedd5 100644
--- a/x-pack/plugins/maps/public/connected_components/map/mb/view.js
+++ b/x-pack/plugins/maps/public/connected_components/map/mb/view.js
@@ -309,6 +309,8 @@ export class MBMap extends React.Component {
         <TooltipControl
           mbMap={this.state.mbMap}
           addFilters={this.props.addFilters}
+          getFilterActions={this.props.getFilterActions}
+          getActionContext={this.props.getActionContext}
           geoFields={this.props.geoFields}
           renderTooltipContent={this.props.renderTooltipContent}
         />
diff --git a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
index beb1eb0947c50..bf75c86ac249d 100644
--- a/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
+++ b/x-pack/plugins/maps/public/connected_components/map_container/map_container.tsx
@@ -11,6 +11,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
 import { Filter } from 'src/plugins/data/public';
+import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
 // @ts-expect-error
 import { MBMap } from '../map/mb';
 // @ts-expect-error
@@ -35,7 +36,9 @@ import 'mapbox-gl/dist/mapbox-gl.css';
 const RENDER_COMPLETE_EVENT = 'renderComplete';
 
 interface Props {
-  addFilters: ((filters: Filter[]) => void) | null;
+  addFilters: ((filters: Filter[]) => Promise<void>) | null;
+  getFilterActions?: () => Promise<Action[]>;
+  getActionContext?: () => ActionExecutionContext;
   areLayersLoaded: boolean;
   cancelAllInFlightRequests: () => void;
   exitFullScreen: () => void;
@@ -183,6 +186,8 @@ export class MapContainer extends Component<Props, State> {
   render() {
     const {
       addFilters,
+      getFilterActions,
+      getActionContext,
       flyoutDisplay,
       isFullScreen,
       exitFullScreen,
@@ -230,11 +235,18 @@ export class MapContainer extends Component<Props, State> {
         <EuiFlexItem className="mapMapWrapper">
           <MBMap
             addFilters={addFilters}
+            getFilterActions={getFilterActions}
+            getActionContext={getActionContext}
             geoFields={this.state.geoFields}
             renderTooltipContent={renderTooltipContent}
           />
           {!this.props.hideToolbarOverlay && (
-            <ToolbarOverlay addFilters={addFilters} geoFields={this.state.geoFields} />
+            <ToolbarOverlay
+              addFilters={addFilters}
+              geoFields={this.state.geoFields}
+              getFilterActions={getFilterActions}
+              getActionContext={getActionContext}
+            />
           )}
           <WidgetOverlay />
         </EuiFlexItem>
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.js b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.js
index a4f85163512f7..a9dc3f822060c 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.js
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.js
@@ -12,14 +12,18 @@ import { FitToData } from './fit_to_data';
 
 export class ToolbarOverlay extends React.Component {
   _renderToolsControl() {
-    const { addFilters, geoFields } = this.props;
+    const { addFilters, geoFields, getFilterActions, getActionContext } = this.props;
     if (!addFilters || !geoFields.length) {
       return null;
     }
 
     return (
       <EuiFlexItem>
-        <ToolsControl geoFields={geoFields} />
+        <ToolsControl
+          geoFields={geoFields}
+          getFilterActions={getFilterActions}
+          getActionContext={getActionContext}
+        />
       </EuiFlexItem>
     );
   }
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.js b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.js
index a06def086b861..017f0369e0b73 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.js
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.js
@@ -123,6 +123,8 @@ export class ToolsControl extends Component {
             className="mapDrawControl__geometryFilterForm"
             buttonLabel={DRAW_SHAPE_LABEL_SHORT}
             geoFields={this.props.geoFields}
+            getFilterActions={this.props.getFilterActions}
+            getActionContext={this.props.getActionContext}
             intitialGeometryLabel={i18n.translate(
               'xpack.maps.toolbarOverlay.drawShape.initialGeometryLabel',
               {
@@ -141,6 +143,8 @@ export class ToolsControl extends Component {
             className="mapDrawControl__geometryFilterForm"
             buttonLabel={DRAW_BOUNDS_LABEL_SHORT}
             geoFields={this.props.geoFields}
+            getFilterActions={this.props.getFilterActions}
+            getActionContext={this.props.getActionContext}
             intitialGeometryLabel={i18n.translate(
               'xpack.maps.toolbarOverlay.drawBounds.initialGeometryLabel',
               {
@@ -161,6 +165,8 @@ export class ToolsControl extends Component {
             geoFields={this.props.geoFields.filter(({ geoFieldType }) => {
               return geoFieldType === ES_GEO_FIELD_TYPE.GEO_POINT;
             })}
+            getFilterActions={this.props.getFilterActions}
+            getActionContext={this.props.getActionContext}
             onSubmit={this._initiateDistanceDraw}
           />
         ),
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
index 43ff274b1353f..1cb393bede956 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
@@ -11,7 +11,12 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { Subscription } from 'rxjs';
 import { Unsubscribe } from 'redux';
 import { Embeddable, IContainer } from '../../../../../src/plugins/embeddable/public';
-import { APPLY_FILTER_TRIGGER } from '../../../../../src/plugins/ui_actions/public';
+import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../src/plugins/data/public';
+import {
+  APPLY_FILTER_TRIGGER,
+  ActionExecutionContext,
+  TriggerContextMapping,
+} from '../../../../../src/plugins/ui_actions/public';
 import {
   esFilters,
   TimeRange,
@@ -99,6 +104,10 @@ export class MapEmbeddable extends Embeddable<MapEmbeddableInput, MapEmbeddableO
     this._subscription = this.getInput$().subscribe((input) => this.onContainerStateChanged(input));
   }
 
+  supportedTriggers(): Array<keyof TriggerContextMapping> {
+    return [APPLY_FILTER_TRIGGER];
+  }
+
   setRenderTooltipContent = (renderTooltipContent: RenderToolTipContent) => {
     this._renderTooltipContent = renderTooltipContent;
   };
@@ -226,6 +235,8 @@ export class MapEmbeddable extends Embeddable<MapEmbeddableInput, MapEmbeddableO
         <I18nContext>
           <MapContainer
             addFilters={this.input.hideFilterActions ? null : this.addFilters}
+            getFilterActions={this.getFilterActions}
+            getActionContext={this.getActionContext}
             renderTooltipContent={this._renderTooltipContent}
           />
         </I18nContext>
@@ -243,13 +254,36 @@ export class MapEmbeddable extends Embeddable<MapEmbeddableInput, MapEmbeddableO
     return await this._store.dispatch<any>(replaceLayerList(this._layerList));
   }
 
-  addFilters = (filters: Filter[]) => {
-    getUiActions().executeTriggerActions(APPLY_FILTER_TRIGGER, {
-      embeddable: this,
+  addFilters = async (filters: Filter[], actionId: string = ACTION_GLOBAL_APPLY_FILTER) => {
+    const executeContext = {
+      ...this.getActionContext(),
       filters,
+    };
+    const action = getUiActions().getAction(actionId);
+    if (!action) {
+      throw new Error('Unable to apply filter, could not locate action');
+    }
+    action.execute(executeContext);
+  };
+
+  getFilterActions = async () => {
+    return await getUiActions().getTriggerCompatibleActions(APPLY_FILTER_TRIGGER, {
+      embeddable: this,
+      filters: [],
     });
   };
 
+  getActionContext = () => {
+    const trigger = getUiActions().getTrigger(APPLY_FILTER_TRIGGER);
+    if (!trigger) {
+      throw new Error('Unable to get context, could not locate trigger');
+    }
+    return {
+      embeddable: this,
+      trigger,
+    } as ActionExecutionContext;
+  };
+
   destroy() {
     super.destroy();
     if (this._unsubscribeFromStore) {
diff --git a/x-pack/test/functional/apps/maps/embeddable/tooltip_filter_actions.js b/x-pack/test/functional/apps/maps/embeddable/tooltip_filter_actions.js
index a996910d4787a..10754d20118e9 100644
--- a/x-pack/test/functional/apps/maps/embeddable/tooltip_filter_actions.js
+++ b/x-pack/test/functional/apps/maps/embeddable/tooltip_filter_actions.js
@@ -13,31 +13,62 @@ export default function ({ getPageObjects, getService }) {
   const filterBar = getService('filterBar');
 
   describe('tooltip filter actions', () => {
-    before(async () => {
+    async function loadDashboardAndOpenTooltip() {
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'c698b940-e149-11e8-a35a-370a8516603a',
       });
       await PageObjects.common.navigateToApp('dashboard');
+      await PageObjects.dashboard.preserveCrossAppState();
       await PageObjects.dashboard.loadSavedDashboard('dash for tooltip filter action test');
 
       await PageObjects.maps.lockTooltipAtPosition(200, -200);
-    });
+    }
+
+    describe('apply filter to current view', () => {
+      before(async () => {
+        await loadDashboardAndOpenTooltip();
+      });
+
+      it('should display create filter button when tooltip is locked', async () => {
+        const exists = await testSubjects.exists('mapTooltipCreateFilterButton');
+        expect(exists).to.be(true);
+      });
+
+      it('should create filters when create filter button is clicked', async () => {
+        await testSubjects.click('mapTooltipCreateFilterButton');
+        await testSubjects.click('applyFiltersPopoverButton');
+
+        // TODO: Fix me #64861
+        // const hasSourceFilter = await filterBar.hasFilter('name', 'charlie');
+        // expect(hasSourceFilter).to.be(true);
 
-    it('should display create filter button when tooltip is locked', async () => {
-      const exists = await testSubjects.exists('mapTooltipCreateFilterButton');
-      expect(exists).to.be(true);
+        const hasJoinFilter = await filterBar.hasFilter('shape_name', 'charlie');
+        expect(hasJoinFilter).to.be(true);
+      });
     });
 
-    it('should create filters when create filter button is clicked', async () => {
-      await testSubjects.click('mapTooltipCreateFilterButton');
-      await testSubjects.click('applyFiltersPopoverButton');
+    describe('panel actions', () => {
+      before(async () => {
+        await loadDashboardAndOpenTooltip();
+      });
+
+      it('should display more actions button when tooltip is locked', async () => {
+        const exists = await testSubjects.exists('mapTooltipMoreActionsButton');
+        expect(exists).to.be(true);
+      });
+
+      it('should trigger drilldown action when clicked', async () => {
+        await testSubjects.click('mapTooltipMoreActionsButton');
+        await testSubjects.click('mapFilterActionButton__drilldown1');
 
-      // TODO: Fix me #64861
-      // const hasSourceFilter = await filterBar.hasFilter('name', 'charlie');
-      // expect(hasSourceFilter).to.be(true);
+        // Assert on new dashboard with filter from action
+        await PageObjects.dashboard.waitForRenderComplete();
+        const panelCount = await PageObjects.dashboard.getPanelCount();
+        expect(panelCount).to.equal(2);
 
-      const hasJoinFilter = await filterBar.hasFilter('shape_name', 'charlie');
-      expect(hasJoinFilter).to.be(true);
+        const hasJoinFilter = await filterBar.hasFilter('shape_name', 'charlie');
+        expect(hasJoinFilter).to.be(true);
+      });
     });
   });
 }
diff --git a/x-pack/test/functional/es_archives/maps/kibana/data.json b/x-pack/test/functional/es_archives/maps/kibana/data.json
index 198174bccb286..0f1fd3c09d706 100644
--- a/x-pack/test/functional/es_archives/maps/kibana/data.json
+++ b/x-pack/test/functional/es_archives/maps/kibana/data.json
@@ -1048,7 +1048,7 @@
         "title" : "dash for tooltip filter action test",
         "hits" : 0,
         "description" : "Zoomed in so entire screen is covered by filter so click to open tooltip can not miss.",
-        "panelsJSON" : "[{\"gridData\":{\"x\":0,\"y\":0,\"w\":48,\"h\":26,\"i\":\"1\"},\"version\":\"8.0.0\",\"panelIndex\":\"1\",\"embeddableConfig\":{\"mapCenter\":{\"lat\":-1.31919,\"lon\":59.53306,\"zoom\":9.67},\"isLayerTOCOpen\":false,\"openTOCDetails\":[\"n1t6f\"]},\"panelRefName\":\"panel_0\"}]",
+        "panelsJSON" : "[{\"version\":\"8.0.0\",\"gridData\":{\"x\":0,\"y\":0,\"w\":48,\"h\":26,\"i\":\"1\"},\"panelIndex\":\"1\",\"embeddableConfig\":{\"mapCenter\":{\"lat\":-1.31919,\"lon\":59.53306,\"zoom\":9.67},\"isLayerTOCOpen\":false,\"openTOCDetails\":[\"n1t6f\"],\"hiddenLayers\":[],\"enhancements\":{\"dynamicActions\":{\"events\":[{\"eventId\":\"669a3521-1215-4228-9ced-77e2edf5ad17\",\"triggers\":[\"FILTER_TRIGGER\"],\"action\":{\"name\":\"drilldown1\",\"config\":{\"dashboardId\":\"19906970-2e40-11e9-85cb-6965aae20f13\",\"useCurrentFilters\":true,\"useCurrentDateRange\":true},\"factoryId\":\"DASHBOARD_TO_DASHBOARD_DRILLDOWN\"}}]}}},\"panelRefName\":\"panel_0\"}]",
         "optionsJSON" : "{\"useMargins\":true,\"hidePanelTitles\":false}",
         "version" : 1,
         "timeRestore" : true,
@@ -1071,9 +1071,9 @@
         }
       ],
       "migrationVersion" : {
-        "dashboard" : "7.0.0"
+        "dashboard" : "7.3.0"
       },
-      "updated_at" : "2019-06-14T14:09:25.039Z"
+      "updated_at" : "2020-08-26T14:32:27.854Z"
     }
   }
 }

From 5f781dcfecc9bcd96d9fa5ecfe5cd3e1cdedf094 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Mon, 31 Aug 2020 08:44:27 +0200
Subject: [PATCH 126/148] add client-side feature usage API (#75486)

* add client-side feature_usage API

* use route context for notify feature usage route
---
 x-pack/plugins/licensing/public/mocks.ts      |  3 +
 x-pack/plugins/licensing/public/plugin.ts     |  5 +-
 .../services/feature_usage_service.mock.ts    | 45 ++++++++++
 .../services/feature_usage_service.test.ts    | 69 ++++++++++++++++
 .../public/services/feature_usage_service.ts  | 68 +++++++++++++++
 .../licensing/public/services/index.ts        | 11 +++
 x-pack/plugins/licensing/public/types.ts      |  9 ++
 x-pack/plugins/licensing/server/plugin.ts     |  6 +-
 .../plugins/licensing/server/routes/index.ts  |  5 ++
 .../licensing/server/routes/internal/index.ts |  8 ++
 .../routes/internal/notify_feature_usage.ts   | 32 ++++++++
 .../routes/internal/register_feature.ts       | 43 ++++++++++
 .../licensing_plugin/public/feature_usage.ts  | 82 +++++++++++++++++++
 x-pack/test/licensing_plugin/public/index.ts  |  1 +
 14 files changed, 384 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/plugins/licensing/public/services/feature_usage_service.mock.ts
 create mode 100644 x-pack/plugins/licensing/public/services/feature_usage_service.test.ts
 create mode 100644 x-pack/plugins/licensing/public/services/feature_usage_service.ts
 create mode 100644 x-pack/plugins/licensing/public/services/index.ts
 create mode 100644 x-pack/plugins/licensing/server/routes/internal/index.ts
 create mode 100644 x-pack/plugins/licensing/server/routes/internal/notify_feature_usage.ts
 create mode 100644 x-pack/plugins/licensing/server/routes/internal/register_feature.ts
 create mode 100644 x-pack/test/licensing_plugin/public/feature_usage.ts

diff --git a/x-pack/plugins/licensing/public/mocks.ts b/x-pack/plugins/licensing/public/mocks.ts
index 8421a343d91ca..1ddde892de0d9 100644
--- a/x-pack/plugins/licensing/public/mocks.ts
+++ b/x-pack/plugins/licensing/public/mocks.ts
@@ -6,12 +6,14 @@
 import { BehaviorSubject } from 'rxjs';
 import { LicensingPluginSetup, LicensingPluginStart } from './types';
 import { licenseMock } from '../common/licensing.mock';
+import { featureUsageMock } from './services/feature_usage_service.mock';
 
 const createSetupMock = () => {
   const license = licenseMock.createLicense();
   const mock: jest.Mocked<LicensingPluginSetup> = {
     license$: new BehaviorSubject(license),
     refresh: jest.fn(),
+    featureUsage: featureUsageMock.createSetup(),
   };
   mock.refresh.mockResolvedValue(license);
 
@@ -23,6 +25,7 @@ const createStartMock = () => {
   const mock: jest.Mocked<LicensingPluginStart> = {
     license$: new BehaviorSubject(license),
     refresh: jest.fn(),
+    featureUsage: featureUsageMock.createStart(),
   };
   mock.refresh.mockResolvedValue(license);
 
diff --git a/x-pack/plugins/licensing/public/plugin.ts b/x-pack/plugins/licensing/public/plugin.ts
index ec42a73f610c0..aa0c25364f2c7 100644
--- a/x-pack/plugins/licensing/public/plugin.ts
+++ b/x-pack/plugins/licensing/public/plugin.ts
@@ -6,12 +6,12 @@
 import { Observable, Subject, Subscription } from 'rxjs';
 
 import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from 'src/core/public';
-
 import { ILicense } from '../common/types';
 import { LicensingPluginSetup, LicensingPluginStart } from './types';
 import { createLicenseUpdate } from '../common/license_update';
 import { License } from '../common/license';
 import { mountExpiredBanner } from './expired_banner';
+import { FeatureUsageService } from './services';
 
 export const licensingSessionStorageKey = 'xpack.licensing';
 
@@ -39,6 +39,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
 
   private refresh?: () => Promise<ILicense>;
   private license$?: Observable<ILicense>;
+  private featureUsage = new FeatureUsageService();
 
   constructor(
     context: PluginInitializerContext,
@@ -116,6 +117,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
     return {
       refresh: refreshManually,
       license$,
+      featureUsage: this.featureUsage.setup({ http: core.http }),
     };
   }
 
@@ -127,6 +129,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
     return {
       refresh: this.refresh,
       license$: this.license$,
+      featureUsage: this.featureUsage.start({ http: core.http }),
     };
   }
 
diff --git a/x-pack/plugins/licensing/public/services/feature_usage_service.mock.ts b/x-pack/plugins/licensing/public/services/feature_usage_service.mock.ts
new file mode 100644
index 0000000000000..fc9d4f9381151
--- /dev/null
+++ b/x-pack/plugins/licensing/public/services/feature_usage_service.mock.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  FeatureUsageService,
+  FeatureUsageServiceSetup,
+  FeatureUsageServiceStart,
+} from './feature_usage_service';
+
+const createSetupMock = (): jest.Mocked<FeatureUsageServiceSetup> => {
+  const mock = {
+    register: jest.fn(),
+  };
+
+  return mock;
+};
+
+const createStartMock = (): jest.Mocked<FeatureUsageServiceStart> => {
+  const mock = {
+    notifyUsage: jest.fn(),
+  };
+
+  return mock;
+};
+
+const createServiceMock = (): jest.Mocked<PublicMethodsOf<FeatureUsageService>> => {
+  const mock = {
+    setup: jest.fn(),
+    start: jest.fn(),
+  };
+
+  mock.setup.mockImplementation(() => createSetupMock());
+  mock.start.mockImplementation(() => createStartMock());
+
+  return mock;
+};
+
+export const featureUsageMock = {
+  create: createServiceMock,
+  createSetup: createSetupMock,
+  createStart: createStartMock,
+};
diff --git a/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts b/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts
new file mode 100644
index 0000000000000..eba2d1e67b509
--- /dev/null
+++ b/x-pack/plugins/licensing/public/services/feature_usage_service.test.ts
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { httpServiceMock } from '../../../../../src/core/public/mocks';
+import { FeatureUsageService } from './feature_usage_service';
+
+describe('FeatureUsageService', () => {
+  let http: ReturnType<typeof httpServiceMock.createSetupContract>;
+  let service: FeatureUsageService;
+
+  beforeEach(() => {
+    http = httpServiceMock.createSetupContract();
+    service = new FeatureUsageService();
+  });
+
+  describe('#setup', () => {
+    describe('#register', () => {
+      it('calls the endpoint with the correct parameters', async () => {
+        const setup = service.setup({ http });
+        await setup.register('my-feature', 'platinum');
+        expect(http.post).toHaveBeenCalledTimes(1);
+        expect(http.post).toHaveBeenCalledWith('/internal/licensing/feature_usage/register', {
+          body: JSON.stringify({
+            featureName: 'my-feature',
+            licenseType: 'platinum',
+          }),
+        });
+      });
+    });
+  });
+
+  describe('#start', () => {
+    describe('#notifyUsage', () => {
+      it('calls the endpoint with the correct parameters', async () => {
+        service.setup({ http });
+        const start = service.start({ http });
+        await start.notifyUsage('my-feature', 42);
+
+        expect(http.post).toHaveBeenCalledTimes(1);
+        expect(http.post).toHaveBeenCalledWith('/internal/licensing/feature_usage/notify', {
+          body: JSON.stringify({
+            featureName: 'my-feature',
+            lastUsed: 42,
+          }),
+        });
+      });
+
+      it('correctly convert dates', async () => {
+        service.setup({ http });
+        const start = service.start({ http });
+
+        const now = new Date();
+
+        await start.notifyUsage('my-feature', now);
+
+        expect(http.post).toHaveBeenCalledTimes(1);
+        expect(http.post).toHaveBeenCalledWith('/internal/licensing/feature_usage/notify', {
+          body: JSON.stringify({
+            featureName: 'my-feature',
+            lastUsed: now.getTime(),
+          }),
+        });
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/licensing/public/services/feature_usage_service.ts b/x-pack/plugins/licensing/public/services/feature_usage_service.ts
new file mode 100644
index 0000000000000..588d22eeb818d
--- /dev/null
+++ b/x-pack/plugins/licensing/public/services/feature_usage_service.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import isDate from 'lodash/isDate';
+import type { HttpSetup, HttpStart } from 'src/core/public';
+import { LicenseType } from '../../common/types';
+
+/** @public */
+export interface FeatureUsageServiceSetup {
+  /**
+   * Register a feature to be able to notify of it's usages using the {@link FeatureUsageServiceStart | service start contract}.
+   */
+  register(featureName: string, licenseType: LicenseType): Promise<void>;
+}
+
+/** @public */
+export interface FeatureUsageServiceStart {
+  /**
+   * Notify of a registered feature usage at given time.
+   *
+   * @param featureName - the name of the feature to notify usage of
+   * @param usedAt - Either a `Date` or an unix timestamp with ms. If not specified, it will be set to the current time.
+   */
+  notifyUsage(featureName: string, usedAt?: Date | number): Promise<void>;
+}
+
+interface SetupDeps {
+  http: HttpSetup;
+}
+
+interface StartDeps {
+  http: HttpStart;
+}
+
+/**
+ * @internal
+ */
+export class FeatureUsageService {
+  public setup({ http }: SetupDeps): FeatureUsageServiceSetup {
+    return {
+      register: async (featureName, licenseType) => {
+        await http.post('/internal/licensing/feature_usage/register', {
+          body: JSON.stringify({
+            featureName,
+            licenseType,
+          }),
+        });
+      },
+    };
+  }
+
+  public start({ http }: StartDeps): FeatureUsageServiceStart {
+    return {
+      notifyUsage: async (featureName, usedAt = Date.now()) => {
+        const lastUsed = isDate(usedAt) ? usedAt.getTime() : usedAt;
+        await http.post('/internal/licensing/feature_usage/notify', {
+          body: JSON.stringify({
+            featureName,
+            lastUsed,
+          }),
+        });
+      },
+    };
+  }
+}
diff --git a/x-pack/plugins/licensing/public/services/index.ts b/x-pack/plugins/licensing/public/services/index.ts
new file mode 100644
index 0000000000000..fc890dd3c927d
--- /dev/null
+++ b/x-pack/plugins/licensing/public/services/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export {
+  FeatureUsageService,
+  FeatureUsageServiceSetup,
+  FeatureUsageServiceStart,
+} from './feature_usage_service';
diff --git a/x-pack/plugins/licensing/public/types.ts b/x-pack/plugins/licensing/public/types.ts
index 71a4a452d163d..43b146c51d9a8 100644
--- a/x-pack/plugins/licensing/public/types.ts
+++ b/x-pack/plugins/licensing/public/types.ts
@@ -6,6 +6,7 @@
 import { Observable } from 'rxjs';
 
 import { ILicense } from '../common/types';
+import { FeatureUsageServiceSetup, FeatureUsageServiceStart } from './services';
 
 /** @public */
 export interface LicensingPluginSetup {
@@ -19,6 +20,10 @@ export interface LicensingPluginSetup {
    * @deprecated in favour of the counterpart provided from start contract
    */
   refresh(): Promise<ILicense>;
+  /**
+   * APIs to register licensed feature usage.
+   */
+  featureUsage: FeatureUsageServiceSetup;
 }
 
 /** @public */
@@ -31,4 +36,8 @@ export interface LicensingPluginStart {
    * Triggers licensing information re-fetch.
    */
   refresh(): Promise<ILicense>;
+  /**
+   * APIs to manage licensed feature usage.
+   */
+  featureUsage: FeatureUsageServiceStart;
 }
diff --git a/x-pack/plugins/licensing/server/plugin.ts b/x-pack/plugins/licensing/server/plugin.ts
index 6cdba0ac46644..2ee8d26419571 100644
--- a/x-pack/plugins/licensing/server/plugin.ts
+++ b/x-pack/plugins/licensing/server/plugin.ts
@@ -133,7 +133,9 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
       createRouteHandlerContext(license$, core.getStartServices)
     );
 
-    registerRoutes(core.http.createRouter(), core.getStartServices);
+    const featureUsageSetup = this.featureUsage.setup();
+
+    registerRoutes(core.http.createRouter(), featureUsageSetup, core.getStartServices);
     core.http.registerOnPreResponse(createOnPreResponseHandler(refresh, license$));
 
     this.refresh = refresh;
@@ -143,7 +145,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
       refresh,
       license$,
       createLicensePoller: this.createLicensePoller.bind(this),
-      featureUsage: this.featureUsage.setup(),
+      featureUsage: featureUsageSetup,
     };
   }
 
diff --git a/x-pack/plugins/licensing/server/routes/index.ts b/x-pack/plugins/licensing/server/routes/index.ts
index 2d073a92e507e..16065d8e19adc 100644
--- a/x-pack/plugins/licensing/server/routes/index.ts
+++ b/x-pack/plugins/licensing/server/routes/index.ts
@@ -6,13 +6,18 @@
 
 import { IRouter, StartServicesAccessor } from 'src/core/server';
 import { LicensingPluginStart } from '../types';
+import { FeatureUsageServiceSetup } from '../services';
 import { registerInfoRoute } from './info';
 import { registerFeatureUsageRoute } from './feature_usage';
+import { registerNotifyFeatureUsageRoute, registerRegisterFeatureRoute } from './internal';
 
 export function registerRoutes(
   router: IRouter,
+  featureUsageSetup: FeatureUsageServiceSetup,
   getStartServices: StartServicesAccessor<{}, LicensingPluginStart>
 ) {
   registerInfoRoute(router);
   registerFeatureUsageRoute(router, getStartServices);
+  registerRegisterFeatureRoute(router, featureUsageSetup);
+  registerNotifyFeatureUsageRoute(router);
 }
diff --git a/x-pack/plugins/licensing/server/routes/internal/index.ts b/x-pack/plugins/licensing/server/routes/internal/index.ts
new file mode 100644
index 0000000000000..a3b06c223fc12
--- /dev/null
+++ b/x-pack/plugins/licensing/server/routes/internal/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { registerNotifyFeatureUsageRoute } from './notify_feature_usage';
+export { registerRegisterFeatureRoute } from './register_feature';
diff --git a/x-pack/plugins/licensing/server/routes/internal/notify_feature_usage.ts b/x-pack/plugins/licensing/server/routes/internal/notify_feature_usage.ts
new file mode 100644
index 0000000000000..ec70472574be3
--- /dev/null
+++ b/x-pack/plugins/licensing/server/routes/internal/notify_feature_usage.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { schema } from '@kbn/config-schema';
+import { IRouter } from 'src/core/server';
+
+export function registerNotifyFeatureUsageRoute(router: IRouter) {
+  router.post(
+    {
+      path: '/internal/licensing/feature_usage/notify',
+      validate: {
+        body: schema.object({
+          featureName: schema.string(),
+          lastUsed: schema.number(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      const { featureName, lastUsed } = request.body;
+
+      context.licensing.featureUsage.notifyUsage(featureName, lastUsed);
+
+      return response.ok({
+        body: {
+          success: true,
+        },
+      });
+    }
+  );
+}
diff --git a/x-pack/plugins/licensing/server/routes/internal/register_feature.ts b/x-pack/plugins/licensing/server/routes/internal/register_feature.ts
new file mode 100644
index 0000000000000..14f7952f86f5a
--- /dev/null
+++ b/x-pack/plugins/licensing/server/routes/internal/register_feature.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { schema } from '@kbn/config-schema';
+import { IRouter } from 'src/core/server';
+import { LicenseType, LICENSE_TYPE } from '../../../common/types';
+import { FeatureUsageServiceSetup } from '../../services';
+
+export function registerRegisterFeatureRoute(
+  router: IRouter,
+  featureUsageSetup: FeatureUsageServiceSetup
+) {
+  router.post(
+    {
+      path: '/internal/licensing/feature_usage/register',
+      validate: {
+        body: schema.object({
+          featureName: schema.string(),
+          licenseType: schema.string({
+            validate: (value) => {
+              if (!(value in LICENSE_TYPE)) {
+                return `Invalid license type: ${value}`;
+              }
+            },
+          }),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      const { featureName, licenseType } = request.body;
+
+      featureUsageSetup.register(featureName, licenseType as LicenseType);
+
+      return response.ok({
+        body: {
+          success: true,
+        },
+      });
+    }
+  );
+}
diff --git a/x-pack/test/licensing_plugin/public/feature_usage.ts b/x-pack/test/licensing_plugin/public/feature_usage.ts
new file mode 100644
index 0000000000000..15d302d71bfab
--- /dev/null
+++ b/x-pack/test/licensing_plugin/public/feature_usage.ts
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../services';
+import {
+  LicensingPluginSetup,
+  LicensingPluginStart,
+  LicenseType,
+} from '../../../plugins/licensing/public';
+import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
+
+interface FeatureUsage {
+  last_used?: number;
+  license_level: LicenseType;
+  name: string;
+}
+
+// eslint-disable-next-line import/no-default-export
+export default function (ftrContext: FtrProviderContext) {
+  const { getService, getPageObjects } = ftrContext;
+  const supertest = getService('supertest');
+  const browser = getService('browser');
+  const PageObjects = getPageObjects(['common', 'security']);
+
+  const registerFeature = async (featureName: string, licenseType: LicenseType) => {
+    await browser.executeAsync(
+      async (feature, type, cb) => {
+        const { setup } = window._coreProvider;
+        const licensing: LicensingPluginSetup = setup.plugins.licensing;
+        await licensing.featureUsage.register(feature, type);
+        cb();
+      },
+      featureName,
+      licenseType
+    );
+  };
+
+  const notifyFeatureUsage = async (featureName: string, lastUsed: number) => {
+    await browser.executeAsync(
+      async (feature, time, cb) => {
+        const { start } = window._coreProvider;
+        const licensing: LicensingPluginStart = start.plugins.licensing;
+        await licensing.featureUsage.notifyUsage(feature, time);
+        cb();
+      },
+      featureName,
+      lastUsed
+    );
+  };
+
+  describe('feature_usage API', () => {
+    before(async () => {
+      await PageObjects.security.login();
+    });
+
+    it('allows to register features to the server', async () => {
+      await registerFeature('test-client-A', 'gold');
+      await registerFeature('test-client-B', 'enterprise');
+
+      const response = await supertest.get('/api/licensing/feature_usage').expect(200);
+      const features = response.body.features.map(({ name }: FeatureUsage) => name);
+
+      expect(features).to.contain('test-client-A');
+      expect(features).to.contain('test-client-B');
+    });
+
+    it('allows to notify feature usage', async () => {
+      const now = new Date();
+
+      await notifyFeatureUsage('test-client-A', now.getTime());
+
+      const response = await supertest.get('/api/licensing/feature_usage').expect(200);
+      const features = response.body.features as FeatureUsage[];
+
+      expect(features.find((f) => f.name === 'test-client-A')?.last_used).to.be(now.toISOString());
+      expect(features.find((f) => f.name === 'test-client-B')?.last_used).to.be(null);
+    });
+  });
+}
diff --git a/x-pack/test/licensing_plugin/public/index.ts b/x-pack/test/licensing_plugin/public/index.ts
index 86a3c21cfdb39..268a74c56bd72 100644
--- a/x-pack/test/licensing_plugin/public/index.ts
+++ b/x-pack/test/licensing_plugin/public/index.ts
@@ -10,6 +10,7 @@ import { FtrProviderContext } from '../services';
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Licensing plugin public client', function () {
     this.tags('ciGroup2');
+    loadTestFile(require.resolve('./feature_usage'));
     // MUST BE LAST! CHANGES LICENSE TYPE!
     loadTestFile(require.resolve('./updates'));
   });

From 9ddd49a9f0d080dda5161eab0dd4f48d7baa9ebd Mon Sep 17 00:00:00 2001
From: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
Date: Mon, 31 Aug 2020 12:40:44 +0300
Subject: [PATCH 127/148] Hides advanced json for count metric (#74636)

* remove advanced json for count agg

* Remove only advanced json from count agg

* use Constant from data plugin

* add the logic to data plugin

* remove json arg from function definition

* remove unecessary translations

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../data/common/search/aggs/agg_type.test.ts    | 11 +++++++++++
 src/plugins/data/common/search/aggs/agg_type.ts | 17 +++++++++++------
 .../data/common/search/aggs/metrics/count.ts    |  1 +
 .../common/search/aggs/metrics/count_fn.test.ts | 14 --------------
 .../data/common/search/aggs/metrics/count_fn.ts | 12 +-----------
 .../public/components/agg_params_helper.ts      |  2 +-
 .../apps/visualize/_point_series_options.js     |  5 +++++
 .../translations/translations/ja-JP.json        |  1 -
 .../translations/translations/zh-CN.json        |  1 -
 9 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/src/plugins/data/common/search/aggs/agg_type.test.ts b/src/plugins/data/common/search/aggs/agg_type.test.ts
index 2fcc6b97b1cc6..bf1136159dfe8 100644
--- a/src/plugins/data/common/search/aggs/agg_type.test.ts
+++ b/src/plugins/data/common/search/aggs/agg_type.test.ts
@@ -99,6 +99,17 @@ describe('AggType Class', () => {
           expect(aggType.params[1].name).toBe('customLabel');
         });
 
+        test('disables json param', () => {
+          const aggType = new AggType({
+            name: 'name',
+            title: 'title',
+            json: false,
+          });
+
+          expect(aggType.params.length).toBe(1);
+          expect(aggType.params[0].name).toBe('customLabel');
+        });
+
         test('can disable customLabel', () => {
           const aggType = new AggType({
             name: 'smart agg',
diff --git a/src/plugins/data/common/search/aggs/agg_type.ts b/src/plugins/data/common/search/aggs/agg_type.ts
index 0ba2bb66e7758..2ee604c1bf25d 100644
--- a/src/plugins/data/common/search/aggs/agg_type.ts
+++ b/src/plugins/data/common/search/aggs/agg_type.ts
@@ -47,6 +47,7 @@ export interface AggTypeConfig<
   getRequestAggs?: ((aggConfig: TAggConfig) => TAggConfig[]) | (() => TAggConfig[] | void);
   getResponseAggs?: ((aggConfig: TAggConfig) => TAggConfig[]) | (() => TAggConfig[] | void);
   customLabels?: boolean;
+  json?: boolean;
   decorateAggConfig?: () => any;
   postFlightRequest?: (
     resp: any,
@@ -235,13 +236,17 @@ export class AggType<
     if (config.params && config.params.length && config.params[0] instanceof BaseParamType) {
       this.params = config.params as TParam[];
     } else {
-      // always append the raw JSON param
+      // always append the raw JSON param unless it is configured to false
       const params: any[] = config.params ? [...config.params] : [];
-      params.push({
-        name: 'json',
-        type: 'json',
-        advanced: true,
-      });
+
+      if (config.json !== false) {
+        params.push({
+          name: 'json',
+          type: 'json',
+          advanced: true,
+        });
+      }
+
       // always append custom label
 
       if (config.customLabels !== false) {
diff --git a/src/plugins/data/common/search/aggs/metrics/count.ts b/src/plugins/data/common/search/aggs/metrics/count.ts
index d990599586e81..9c9f36651f4d2 100644
--- a/src/plugins/data/common/search/aggs/metrics/count.ts
+++ b/src/plugins/data/common/search/aggs/metrics/count.ts
@@ -28,6 +28,7 @@ export const getCountMetricAgg = () =>
       defaultMessage: 'Count',
     }),
     hasNoDsl: true,
+    json: false,
     makeLabel() {
       return i18n.translate('data.search.aggs.metrics.countLabel', {
         defaultMessage: 'Count',
diff --git a/src/plugins/data/common/search/aggs/metrics/count_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/count_fn.test.ts
index 846feb9296fca..32189f07581e6 100644
--- a/src/plugins/data/common/search/aggs/metrics/count_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/count_fn.test.ts
@@ -34,7 +34,6 @@ describe('agg_expression_functions', () => {
             "id": undefined,
             "params": Object {
               "customLabel": undefined,
-              "json": undefined,
             },
             "schema": undefined,
             "type": "count",
@@ -42,18 +41,5 @@ describe('agg_expression_functions', () => {
         }
       `);
     });
-
-    test('correctly parses json string argument', () => {
-      const actual = fn({
-        json: '{ "foo": true }',
-      });
-
-      expect(actual.value.params.json).toEqual({ foo: true });
-      expect(() => {
-        fn({
-          json: '/// intentionally malformed json ///',
-        });
-      }).toThrowErrorMatchingInlineSnapshot(`"Unable to parse json argument string"`);
-    });
   });
 });
diff --git a/src/plugins/data/common/search/aggs/metrics/count_fn.ts b/src/plugins/data/common/search/aggs/metrics/count_fn.ts
index 338ca18209299..7d4616ffdc619 100644
--- a/src/plugins/data/common/search/aggs/metrics/count_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/count_fn.ts
@@ -20,7 +20,6 @@
 import { i18n } from '@kbn/i18n';
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
 import { AggExpressionType, AggExpressionFunctionArgs, METRIC_TYPES } from '../';
-import { getParsedValue } from '../utils/get_parsed_value';
 
 const fnName = 'aggCount';
 
@@ -55,12 +54,6 @@ export const aggCount = (): FunctionDefinition => ({
         defaultMessage: 'Schema to use for this aggregation',
       }),
     },
-    json: {
-      types: ['string'],
-      help: i18n.translate('data.search.aggs.metrics.count.json.help', {
-        defaultMessage: 'Advanced json to include when the agg is sent to Elasticsearch',
-      }),
-    },
     customLabel: {
       types: ['string'],
       help: i18n.translate('data.search.aggs.metrics.count.customLabel.help', {
@@ -78,10 +71,7 @@ export const aggCount = (): FunctionDefinition => ({
         enabled,
         schema,
         type: METRIC_TYPES.COUNT,
-        params: {
-          ...rest,
-          json: getParsedValue(args, 'json'),
-        },
+        params: rest,
       },
     };
   },
diff --git a/src/plugins/vis_default_editor/public/components/agg_params_helper.ts b/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
index ef2f937c8547c..b13ca32601aa9 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_params_helper.ts
@@ -26,7 +26,7 @@ import {
   IAggType,
   IndexPattern,
   IndexPatternField,
-} from 'src/plugins/data/public';
+} from '../../../data/public';
 import { filterAggTypes, filterAggTypeFields } from '../agg_filters';
 import { groupAndSortBy, ComboBoxGroupedOptions } from '../utils';
 import { AggTypeState, AggParamsState } from './agg_params_state';
diff --git a/test/functional/apps/visualize/_point_series_options.js b/test/functional/apps/visualize/_point_series_options.js
index d08bfe3b90913..c88670ee8b741 100644
--- a/test/functional/apps/visualize/_point_series_options.js
+++ b/test/functional/apps/visualize/_point_series_options.js
@@ -24,6 +24,7 @@ export default function ({ getService, getPageObjects }) {
   const retry = getService('retry');
   const kibanaServer = getService('kibanaServer');
   const browser = getService('browser');
+  const testSubjects = getService('testSubjects');
   const PageObjects = getPageObjects([
     'visualize',
     'header',
@@ -148,6 +149,10 @@ export default function ({ getService, getPageObjects }) {
         });
       });
 
+      it('should not show advanced json for count agg', async function () {
+        await testSubjects.missingOrFail('advancedParams-1');
+      });
+
       it('should put secondary axis on the right', async function () {
         const length = await PageObjects.visChart.getRightValueAxes();
         expect(length).to.be(1);
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index dc07044ce8ed7..07b646df74b9f 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1115,7 +1115,6 @@
     "data.search.aggs.metrics.count.customLabel.help": "このアグリゲーションのカスタムラベルを表します",
     "data.search.aggs.metrics.count.enabled.help": "このアグリゲーションが有効かどうかを指定します",
     "data.search.aggs.metrics.count.id.help": "このアグリゲーションのID",
-    "data.search.aggs.metrics.count.json.help": "アグリゲーションがElasticsearchに送信されるときに含める高度なJSON",
     "data.search.aggs.metrics.count.schema.help": "このアグリゲーションで使用するスキーマ",
     "data.search.aggs.metrics.countLabel": "カウント",
     "data.search.aggs.metrics.countTitle": "カウント",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 144bc1cac1852..ffd7d0cfb0f87 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1116,7 +1116,6 @@
     "data.search.aggs.metrics.count.customLabel.help": "表示此聚合的定制标签",
     "data.search.aggs.metrics.count.enabled.help": "指定是否启用此聚合",
     "data.search.aggs.metrics.count.id.help": "此聚合的 ID",
-    "data.search.aggs.metrics.count.json.help": "聚合发送至 Elasticsearch 时要包括的高级 json",
     "data.search.aggs.metrics.count.schema.help": "要用于此聚合的方案",
     "data.search.aggs.metrics.countLabel": "计数",
     "data.search.aggs.metrics.countTitle": "计数",

From aac57fb1a8494d386b37bdfe21ada3cd9c8d7494 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Mon, 31 Aug 2020 11:45:57 +0200
Subject: [PATCH 128/148] [ILM] Add support for frozen phase in UI (#75968)

* ILM public side changes to support frozen phase

This is a very faithful duplication of the cold phase. We are
also excluding the snapshot action as well as the unfollow action
as these are features that require higher than basic license
privilege.

* added "frozen" to the server side schema

* add frozen phases component

* fix i18n and update jest tests

* Slight restructuring to phase types and fix copy paste issues.

- also fixed TS error introduced after TS v4 upgrade (delete)

* fix hot phase type and remove type constraint from error messages

* update validation logic

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../extend_index_management.test.js.snap      |   4 +
 .../public/application/constants/policy.ts    |  11 +
 .../edit_policy/components/min_age_input.tsx  |  11 +-
 .../components/node_allocation.tsx            |   6 +-
 .../components/set_priority_input.tsx         |   6 +-
 .../sections/edit_policy/edit_policy.tsx      |  16 +-
 .../edit_policy/phases/cold_phase.tsx         |   7 +-
 .../edit_policy/phases/delete_phase.tsx       |   7 +-
 .../edit_policy/phases/frozen_phase.tsx       | 210 ++++++++++++++++++
 .../sections/edit_policy/phases/hot_phase.tsx |   7 +-
 .../sections/edit_policy/phases/index.ts      |   1 +
 .../edit_policy/phases/warm_phase.tsx         |   7 +-
 .../services/policies/cold_phase.ts           |   4 +-
 .../services/policies/frozen_phase.ts         | 161 ++++++++++++++
 .../services/policies/policy_serialization.ts |  11 +
 .../services/policies/policy_validation.ts    |  18 +-
 .../application/services/policies/types.ts    |  66 ++++--
 .../public/extend_index_management/index.js   |   6 +
 .../api/policies/register_create_route.ts     |  18 ++
 19 files changed, 527 insertions(+), 50 deletions(-)
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/frozen_phase.tsx
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/policies/frozen_phase.ts

diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
index 38dd49a286b58..39eb54b941ac4 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.js.snap
@@ -76,6 +76,10 @@ Array [
         "value": "warm",
         "view": "Warm",
       },
+      Object {
+        "value": "frozen",
+        "view": "Frozen",
+      },
       Object {
         "value": "cold",
         "view": "Cold",
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts b/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
index 3a19f03547b5b..fb626e7d7fe76 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/constants/policy.ts
@@ -10,6 +10,7 @@ import {
   DeletePhase,
   HotPhase,
   WarmPhase,
+  FrozenPhase,
 } from '../services/policies/types';
 
 export const defaultNewHotPhase: HotPhase = {
@@ -47,6 +48,16 @@ export const defaultNewColdPhase: ColdPhase = {
   phaseIndexPriority: '0',
 };
 
+export const defaultNewFrozenPhase: FrozenPhase = {
+  phaseEnabled: false,
+  selectedMinimumAge: '0',
+  selectedMinimumAgeUnits: 'd',
+  selectedNodeAttrs: '',
+  selectedReplicaCount: '',
+  freezeEnabled: false,
+  phaseIndexPriority: '0',
+};
+
 export const defaultNewDeletePhase: DeletePhase = {
   phaseEnabled: false,
   selectedMinimumAge: '0',
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx
index 11b743ecc4bb6..5128ba1c881a0 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/min_age_input.tsx
@@ -12,7 +12,7 @@ import { EuiFieldNumber, EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect } from
 import { LearnMoreLink } from './learn_more_link';
 import { ErrableFormRow } from './form_errors';
 import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
-import { ColdPhase, DeletePhase, Phase, Phases, WarmPhase } from '../../../services/policies/types';
+import { PhaseWithMinAge, Phases } from '../../../services/policies/types';
 
 function getTimingLabelForPhase(phase: keyof Phases) {
   // NOTE: Hot phase isn't necessary, because indices begin in the hot phase.
@@ -27,6 +27,11 @@ function getTimingLabelForPhase(phase: keyof Phases) {
         defaultMessage: 'Timing for cold phase',
       });
 
+    case 'frozen':
+      return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseFrozen.minimumAgeLabel', {
+        defaultMessage: 'Timing for frozen phase',
+      });
+
     case 'delete':
       return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseDelete.minimumAgeLabel', {
         defaultMessage: 'Timing for delete phase',
@@ -63,7 +68,7 @@ function getUnitsAriaLabelForPhase(phase: keyof Phases) {
   }
 }
 
-interface Props<T extends Phase> {
+interface Props<T extends PhaseWithMinAge> {
   rolloverEnabled: boolean;
   errors?: PhaseValidationErrors<T>;
   phase: keyof Phases & string;
@@ -72,7 +77,7 @@ interface Props<T extends Phase> {
   isShowingErrors: boolean;
 }
 
-export const MinAgeInput = <Phase extends WarmPhase | ColdPhase | DeletePhase>({
+export const MinAgeInput = <Phase extends PhaseWithMinAge>({
   rolloverEnabled,
   errors,
   phaseData,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation.tsx
index 0ce2c0d7ea566..b4ff62bfb03dc 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/node_allocation.tsx
@@ -20,7 +20,7 @@ import { LearnMoreLink } from './learn_more_link';
 import { ErrableFormRow } from './form_errors';
 import { useLoadNodes } from '../../../services/api';
 import { NodeAttrsDetails } from './node_attrs_details';
-import { ColdPhase, Phase, Phases, WarmPhase } from '../../../services/policies/types';
+import { PhaseWithAllocationAction, Phases } from '../../../services/policies/types';
 import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
 
 const learnMoreLink = (
@@ -38,14 +38,14 @@ const learnMoreLink = (
   </Fragment>
 );
 
-interface Props<T extends Phase> {
+interface Props<T extends PhaseWithAllocationAction> {
   phase: keyof Phases & string;
   errors?: PhaseValidationErrors<T>;
   phaseData: T;
   setPhaseData: (dataKey: keyof T & string, value: string) => void;
   isShowingErrors: boolean;
 }
-export const NodeAllocation = <T extends WarmPhase | ColdPhase>({
+export const NodeAllocation = <T extends PhaseWithAllocationAction>({
   phase,
   setPhaseData,
   errors,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/set_priority_input.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/set_priority_input.tsx
index 1da7508049f24..1505532a2b16e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/set_priority_input.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/set_priority_input.tsx
@@ -10,17 +10,17 @@ import { EuiFieldNumber, EuiTextColor, EuiDescribedFormGroup } from '@elastic/eu
 import { LearnMoreLink } from './';
 import { OptionalLabel } from './';
 import { ErrableFormRow } from './';
-import { ColdPhase, HotPhase, Phase, Phases, WarmPhase } from '../../../services/policies/types';
+import { PhaseWithIndexPriority, Phases } from '../../../services/policies/types';
 import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
 
-interface Props<T extends Phase> {
+interface Props<T extends PhaseWithIndexPriority> {
   errors?: PhaseValidationErrors<T>;
   phase: keyof Phases & string;
   phaseData: T;
   setPhaseData: (dataKey: keyof T & string, value: any) => void;
   isShowingErrors: boolean;
 }
-export const SetPriorityInput = <T extends HotPhase | WarmPhase | ColdPhase>({
+export const SetPriorityInput = <T extends PhaseWithIndexPriority>({
   errors,
   phaseData,
   phase,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
index c99d01b546679..db58c64a8ae8c 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/edit_policy.tsx
@@ -28,7 +28,7 @@ import {
 
 import { toasts } from '../../services/notification';
 
-import { Policy, PolicyFromES } from '../../services/policies/types';
+import { Phases, Policy, PolicyFromES } from '../../services/policies/types';
 import {
   validatePolicy,
   ValidationErrors,
@@ -42,7 +42,7 @@ import {
 } from '../../services/policies/policy_serialization';
 
 import { ErrableFormRow, LearnMoreLink, PolicyJsonFlyout } from './components';
-import { ColdPhase, DeletePhase, HotPhase, WarmPhase } from './phases';
+import { ColdPhase, DeletePhase, FrozenPhase, HotPhase, WarmPhase } from './phases';
 
 interface Props {
   policies: PolicyFromES[];
@@ -118,7 +118,7 @@ export const EditPolicy: React.FunctionComponent<Props> = ({
     setIsShowingPolicyJsonFlyout(!isShowingPolicyJsonFlyout);
   };
 
-  const setPhaseData = (phase: 'hot' | 'warm' | 'cold' | 'delete', key: string, value: any) => {
+  const setPhaseData = (phase: keyof Phases, key: string, value: any) => {
     setPolicy({
       ...policy,
       phases: {
@@ -303,6 +303,16 @@ export const EditPolicy: React.FunctionComponent<Props> = ({
 
             <EuiHorizontalRule />
 
+            <FrozenPhase
+              errors={errors?.frozen}
+              isShowingErrors={isShowingErrors && !!errors && Object.keys(errors.frozen).length > 0}
+              setPhaseData={(key, value) => setPhaseData('frozen', key, value)}
+              phaseData={policy.phases.frozen}
+              hotPhaseRolloverEnabled={policy.phases.hot.rolloverEnabled}
+            />
+
+            <EuiHorizontalRule />
+
             <DeletePhase
               errors={errors?.delete}
               isShowingErrors={isShowingErrors && !!errors && Object.keys(errors.delete).length > 0}
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/cold_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/cold_phase.tsx
index fb32752fe24ea..9df6da7a88b2f 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/cold_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/cold_phase.tsx
@@ -19,7 +19,7 @@ import {
 } from '@elastic/eui';
 
 import { ColdPhase as ColdPhaseInterface, Phases } from '../../../services/policies/types';
-import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
+import { PhaseValidationErrors } from '../../../services/policies/policy_validation';
 
 import {
   LearnMoreLink,
@@ -36,9 +36,8 @@ const freezeLabel = i18n.translate('xpack.indexLifecycleMgmt.coldPhase.freezeInd
   defaultMessage: 'Freeze index',
 });
 
-const coldProperty = propertyof<Phases>('cold');
-const phaseProperty = (propertyName: keyof ColdPhaseInterface) =>
-  propertyof<ColdPhaseInterface>(propertyName);
+const coldProperty: keyof Phases = 'cold';
+const phaseProperty = (propertyName: keyof ColdPhaseInterface) => propertyName;
 
 interface Props {
   setPhaseData: (key: keyof ColdPhaseInterface & string, value: string | boolean) => void;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/delete_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/delete_phase.tsx
index d3c73090f25f2..eab93777a72bd 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/delete_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/delete_phase.tsx
@@ -9,7 +9,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiDescribedFormGroup, EuiSwitch, EuiTextColor, EuiFormRow } from '@elastic/eui';
 
 import { DeletePhase as DeletePhaseInterface, Phases } from '../../../services/policies/types';
-import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
+import { PhaseValidationErrors } from '../../../services/policies/policy_validation';
 
 import {
   ActiveBadge,
@@ -20,9 +20,8 @@ import {
   SnapshotPolicies,
 } from '../components';
 
-const deleteProperty = propertyof<Phases>('delete');
-const phaseProperty = (propertyName: keyof DeletePhaseInterface) =>
-  propertyof<DeletePhaseInterface>(propertyName);
+const deleteProperty: keyof Phases = 'delete';
+const phaseProperty = (propertyName: keyof DeletePhaseInterface) => propertyName;
 
 interface Props {
   setPhaseData: (key: keyof DeletePhaseInterface & string, value: string | boolean) => void;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/frozen_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/frozen_phase.tsx
new file mode 100644
index 0000000000000..782906a56a9ba
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/frozen_phase.tsx
@@ -0,0 +1,210 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { PureComponent, Fragment } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+  EuiFieldNumber,
+  EuiDescribedFormGroup,
+  EuiSwitch,
+  EuiTextColor,
+} from '@elastic/eui';
+
+import { FrozenPhase as FrozenPhaseInterface, Phases } from '../../../services/policies/types';
+import { PhaseValidationErrors } from '../../../services/policies/policy_validation';
+
+import {
+  LearnMoreLink,
+  ActiveBadge,
+  PhaseErrorMessage,
+  OptionalLabel,
+  ErrableFormRow,
+  MinAgeInput,
+  NodeAllocation,
+  SetPriorityInput,
+} from '../components';
+
+const freezeLabel = i18n.translate('xpack.indexLifecycleMgmt.frozenPhase.freezeIndexLabel', {
+  defaultMessage: 'Freeze index',
+});
+
+const frozenProperty: keyof Phases = 'frozen';
+const phaseProperty = (propertyName: keyof FrozenPhaseInterface) => propertyName;
+
+interface Props {
+  setPhaseData: (key: keyof FrozenPhaseInterface & string, value: string | boolean) => void;
+  phaseData: FrozenPhaseInterface;
+  isShowingErrors: boolean;
+  errors?: PhaseValidationErrors<FrozenPhaseInterface>;
+  hotPhaseRolloverEnabled: boolean;
+}
+export class FrozenPhase extends PureComponent<Props> {
+  render() {
+    const {
+      setPhaseData,
+      phaseData,
+      errors,
+      isShowingErrors,
+      hotPhaseRolloverEnabled,
+    } = this.props;
+
+    return (
+      <div id="frozenPhaseContent" aria-live="polite" role="region">
+        <EuiDescribedFormGroup
+          title={
+            <div>
+              <h2 className="eui-displayInlineBlock eui-alignMiddle">
+                <FormattedMessage
+                  id="xpack.indexLifecycleMgmt.editPolicy.frozenPhase.frozenPhaseLabel"
+                  defaultMessage="Frozen phase"
+                />
+              </h2>{' '}
+              {phaseData.phaseEnabled && !isShowingErrors ? <ActiveBadge /> : null}
+              <PhaseErrorMessage isShowingErrors={isShowingErrors} />
+            </div>
+          }
+          titleSize="s"
+          description={
+            <Fragment>
+              <p>
+                <FormattedMessage
+                  id="xpack.indexLifecycleMgmt.editPolicy.frozenPhase.frozenPhaseDescriptionText"
+                  defaultMessage="You are querying your index very infrequently, so you can allocate shards
+                  on the least performant hardware.
+                  Because your queries are slower, you can reduce the number of replicas."
+                />
+              </p>
+              <EuiSwitch
+                data-test-subj="enablePhaseSwitch-frozen"
+                label={
+                  <FormattedMessage
+                    id="xpack.indexLifecycleMgmt.editPolicy.frozenPhase.activateWarmPhaseSwitchLabel"
+                    defaultMessage="Activate frozen phase"
+                  />
+                }
+                id={`${frozenProperty}-${phaseProperty('phaseEnabled')}`}
+                checked={phaseData.phaseEnabled}
+                onChange={(e) => {
+                  setPhaseData(phaseProperty('phaseEnabled'), e.target.checked);
+                }}
+                aria-controls="frozenPhaseContent"
+              />
+            </Fragment>
+          }
+          fullWidth
+        >
+          <Fragment>
+            {phaseData.phaseEnabled ? (
+              <Fragment>
+                <MinAgeInput<FrozenPhaseInterface>
+                  errors={errors}
+                  phaseData={phaseData}
+                  phase={frozenProperty}
+                  isShowingErrors={isShowingErrors}
+                  setPhaseData={setPhaseData}
+                  rolloverEnabled={hotPhaseRolloverEnabled}
+                />
+                <EuiSpacer />
+
+                <NodeAllocation<FrozenPhaseInterface>
+                  phase={frozenProperty}
+                  setPhaseData={setPhaseData}
+                  errors={errors}
+                  phaseData={phaseData}
+                  isShowingErrors={isShowingErrors}
+                />
+
+                <EuiFlexGroup>
+                  <EuiFlexItem grow={false} style={{ maxWidth: 188 }}>
+                    <ErrableFormRow
+                      id={`${frozenProperty}-${phaseProperty('freezeEnabled')}`}
+                      label={
+                        <Fragment>
+                          <FormattedMessage
+                            id="xpack.indexLifecycleMgmt.frozenPhase.numberOfReplicasLabel"
+                            defaultMessage="Number of replicas"
+                          />
+                          <OptionalLabel />
+                        </Fragment>
+                      }
+                      isShowingErrors={isShowingErrors}
+                      errors={errors?.freezeEnabled}
+                      helpText={i18n.translate(
+                        'xpack.indexLifecycleMgmt.frozenPhase.replicaCountHelpText',
+                        {
+                          defaultMessage: 'By default, the number of replicas remains the same.',
+                        }
+                      )}
+                    >
+                      <EuiFieldNumber
+                        id={`${frozenProperty}-${phaseProperty('selectedReplicaCount')}`}
+                        value={phaseData.selectedReplicaCount}
+                        onChange={(e) => {
+                          setPhaseData(phaseProperty('selectedReplicaCount'), e.target.value);
+                        }}
+                        min={0}
+                      />
+                    </ErrableFormRow>
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+              </Fragment>
+            ) : (
+              <div />
+            )}
+          </Fragment>
+        </EuiDescribedFormGroup>
+        {phaseData.phaseEnabled ? (
+          <Fragment>
+            <EuiDescribedFormGroup
+              title={
+                <h3>
+                  <FormattedMessage
+                    id="xpack.indexLifecycleMgmt.editPolicy.frozenPhase.freezeText"
+                    defaultMessage="Freeze"
+                  />
+                </h3>
+              }
+              description={
+                <EuiTextColor color="subdued">
+                  <FormattedMessage
+                    id="xpack.indexLifecycleMgmt.editPolicy.frozenPhase.freezeIndexExplanationText"
+                    defaultMessage="A frozen index has little overhead on the cluster and is blocked for write operations.
+                    You can search a frozen index, but expect queries to be slower."
+                  />{' '}
+                  <LearnMoreLink docPath="frozen-indices.html" />
+                </EuiTextColor>
+              }
+              fullWidth
+              titleSize="xs"
+            >
+              <EuiSwitch
+                data-test-subj="freezeSwitch"
+                checked={phaseData.freezeEnabled}
+                onChange={(e) => {
+                  setPhaseData(phaseProperty('freezeEnabled'), e.target.checked);
+                }}
+                label={freezeLabel}
+                aria-label={freezeLabel}
+              />
+            </EuiDescribedFormGroup>
+            <SetPriorityInput<FrozenPhaseInterface>
+              errors={errors}
+              phaseData={phaseData}
+              phase={frozenProperty}
+              isShowingErrors={isShowingErrors}
+              setPhaseData={setPhaseData}
+            />
+          </Fragment>
+        ) : null}
+      </div>
+    );
+  }
+}
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/hot_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/hot_phase.tsx
index 22f0114d16afe..106e3b9139a9b 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/hot_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/hot_phase.tsx
@@ -19,7 +19,7 @@ import {
 } from '@elastic/eui';
 
 import { HotPhase as HotPhaseInterface, Phases } from '../../../services/policies/types';
-import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
+import { PhaseValidationErrors } from '../../../services/policies/policy_validation';
 
 import {
   LearnMoreLink,
@@ -112,9 +112,8 @@ const maxAgeUnits = [
     }),
   },
 ];
-const hotProperty = propertyof<Phases>('hot');
-const phaseProperty = (propertyName: keyof HotPhaseInterface) =>
-  propertyof<HotPhaseInterface>(propertyName);
+const hotProperty: keyof Phases = 'hot';
+const phaseProperty = (propertyName: keyof HotPhaseInterface) => propertyName;
 
 interface Props {
   errors?: PhaseValidationErrors<HotPhaseInterface>;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/index.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/index.ts
index 8d1ace5950497..d59f2ff6413fd 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/index.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/index.ts
@@ -7,4 +7,5 @@
 export { HotPhase } from './hot_phase';
 export { WarmPhase } from './warm_phase';
 export { ColdPhase } from './cold_phase';
+export { FrozenPhase } from './frozen_phase';
 export { DeletePhase } from './delete_phase';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/warm_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/warm_phase.tsx
index f7b8c60a5c71f..2733d01ac222d 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/warm_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/phases/warm_phase.tsx
@@ -30,7 +30,7 @@ import {
 } from '../components';
 
 import { Phases, WarmPhase as WarmPhaseInterface } from '../../../services/policies/types';
-import { PhaseValidationErrors, propertyof } from '../../../services/policies/policy_validation';
+import { PhaseValidationErrors } from '../../../services/policies/policy_validation';
 
 const shrinkLabel = i18n.translate('xpack.indexLifecycleMgmt.warmPhase.shrinkIndexLabel', {
   defaultMessage: 'Shrink index',
@@ -47,9 +47,8 @@ const forcemergeLabel = i18n.translate('xpack.indexLifecycleMgmt.warmPhase.force
   defaultMessage: 'Force merge data',
 });
 
-const warmProperty = propertyof<Phases>('warm');
-const phaseProperty = (propertyName: keyof WarmPhaseInterface) =>
-  propertyof<WarmPhaseInterface>(propertyName);
+const warmProperty: keyof Phases = 'warm';
+const phaseProperty = (propertyName: keyof WarmPhaseInterface) => propertyName;
 
 interface Props {
   setPhaseData: (key: keyof WarmPhaseInterface & string, value: boolean | string) => void;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts
index 6cc43042ed4ff..7fa82a004b872 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/cold_phase.ts
@@ -152,9 +152,9 @@ export const validateColdPhase = (phase: ColdPhase): PhaseValidationErrors<ColdP
 
   // min age needs to be a positive number
   if (!isNumber(phase.selectedMinimumAge)) {
-    phaseErrors.phaseIndexPriority = [numberRequiredMessage];
+    phaseErrors.selectedMinimumAge = [numberRequiredMessage];
   } else if (parseInt(phase.selectedMinimumAge, 10) < 0) {
-    phaseErrors.phaseIndexPriority = [positiveNumberRequiredMessage];
+    phaseErrors.selectedMinimumAge = [positiveNumberRequiredMessage];
   }
 
   return { ...phaseErrors };
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/frozen_phase.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/frozen_phase.ts
new file mode 100644
index 0000000000000..bad43bfcf8a9c
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/frozen_phase.ts
@@ -0,0 +1,161 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { isEmpty } from 'lodash';
+import { serializedPhaseInitialization } from '../../constants';
+import { AllocateAction, FrozenPhase, SerializedFrozenPhase } from './types';
+import { isNumber, splitSizeAndUnits } from './policy_serialization';
+import {
+  numberRequiredMessage,
+  PhaseValidationErrors,
+  positiveNumberRequiredMessage,
+} from './policy_validation';
+
+const frozenPhaseInitialization: FrozenPhase = {
+  phaseEnabled: false,
+  selectedMinimumAge: '0',
+  selectedMinimumAgeUnits: 'd',
+  selectedNodeAttrs: '',
+  selectedReplicaCount: '',
+  freezeEnabled: false,
+  phaseIndexPriority: '',
+};
+
+export const frozenPhaseFromES = (phaseSerialized?: SerializedFrozenPhase): FrozenPhase => {
+  const phase = { ...frozenPhaseInitialization };
+  if (phaseSerialized === undefined || phaseSerialized === null) {
+    return phase;
+  }
+
+  phase.phaseEnabled = true;
+
+  if (phaseSerialized.min_age) {
+    const { size: minAge, units: minAgeUnits } = splitSizeAndUnits(phaseSerialized.min_age);
+    phase.selectedMinimumAge = minAge;
+    phase.selectedMinimumAgeUnits = minAgeUnits;
+  }
+
+  if (phaseSerialized.actions) {
+    const actions = phaseSerialized.actions;
+    if (actions.allocate) {
+      const allocate = actions.allocate;
+      if (allocate.require) {
+        Object.entries(allocate.require).forEach((entry) => {
+          phase.selectedNodeAttrs = entry.join(':');
+        });
+        if (allocate.number_of_replicas) {
+          phase.selectedReplicaCount = allocate.number_of_replicas.toString();
+        }
+      }
+    }
+
+    if (actions.freeze) {
+      phase.freezeEnabled = true;
+    }
+
+    if (actions.set_priority) {
+      phase.phaseIndexPriority = actions.set_priority.priority
+        ? actions.set_priority.priority.toString()
+        : '';
+    }
+  }
+
+  return phase;
+};
+
+export const frozenPhaseToES = (
+  phase: FrozenPhase,
+  originalPhase?: SerializedFrozenPhase
+): SerializedFrozenPhase => {
+  if (!originalPhase) {
+    originalPhase = { ...serializedPhaseInitialization };
+  }
+
+  const esPhase = { ...originalPhase };
+
+  if (isNumber(phase.selectedMinimumAge)) {
+    esPhase.min_age = `${phase.selectedMinimumAge}${phase.selectedMinimumAgeUnits}`;
+  }
+
+  esPhase.actions = esPhase.actions ? { ...esPhase.actions } : {};
+
+  if (phase.selectedNodeAttrs) {
+    const [name, value] = phase.selectedNodeAttrs.split(':');
+    esPhase.actions.allocate = esPhase.actions.allocate || ({} as AllocateAction);
+    esPhase.actions.allocate.require = {
+      [name]: value,
+    };
+  } else {
+    if (esPhase.actions.allocate) {
+      // @ts-expect-error
+      delete esPhase.actions.allocate.require;
+    }
+  }
+
+  if (isNumber(phase.selectedReplicaCount)) {
+    esPhase.actions.allocate = esPhase.actions.allocate || ({} as AllocateAction);
+    esPhase.actions.allocate.number_of_replicas = parseInt(phase.selectedReplicaCount, 10);
+  } else {
+    if (esPhase.actions.allocate) {
+      // @ts-expect-error
+      delete esPhase.actions.allocate.number_of_replicas;
+    }
+  }
+
+  if (
+    esPhase.actions.allocate &&
+    !esPhase.actions.allocate.require &&
+    !isNumber(esPhase.actions.allocate.number_of_replicas) &&
+    isEmpty(esPhase.actions.allocate.include) &&
+    isEmpty(esPhase.actions.allocate.exclude)
+  ) {
+    // remove allocate action if it does not define require or number of nodes
+    // and both include and exclude are empty objects (ES will fail to parse if we don't)
+    delete esPhase.actions.allocate;
+  }
+
+  if (phase.freezeEnabled) {
+    esPhase.actions.freeze = {};
+  } else {
+    delete esPhase.actions.freeze;
+  }
+
+  if (isNumber(phase.phaseIndexPriority)) {
+    esPhase.actions.set_priority = {
+      priority: parseInt(phase.phaseIndexPriority, 10),
+    };
+  } else {
+    delete esPhase.actions.set_priority;
+  }
+
+  return esPhase;
+};
+
+export const validateFrozenPhase = (phase: FrozenPhase): PhaseValidationErrors<FrozenPhase> => {
+  if (!phase.phaseEnabled) {
+    return {};
+  }
+
+  const phaseErrors = {} as PhaseValidationErrors<FrozenPhase>;
+
+  // index priority is optional, but if it's set, it needs to be a positive number
+  if (phase.phaseIndexPriority) {
+    if (!isNumber(phase.phaseIndexPriority)) {
+      phaseErrors.phaseIndexPriority = [numberRequiredMessage];
+    } else if (parseInt(phase.phaseIndexPriority, 10) < 0) {
+      phaseErrors.phaseIndexPriority = [positiveNumberRequiredMessage];
+    }
+  }
+
+  // min age needs to be a positive number
+  if (!isNumber(phase.selectedMinimumAge)) {
+    phaseErrors.selectedMinimumAge = [numberRequiredMessage];
+  } else if (parseInt(phase.selectedMinimumAge, 10) < 0) {
+    phaseErrors.selectedMinimumAge = [positiveNumberRequiredMessage];
+  }
+
+  return { ...phaseErrors };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_serialization.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_serialization.ts
index 3953521df1817..807a6fe8ec395 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_serialization.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_serialization.ts
@@ -9,6 +9,7 @@ import {
   defaultNewDeletePhase,
   defaultNewHotPhase,
   defaultNewWarmPhase,
+  defaultNewFrozenPhase,
   serializedPhaseInitialization,
 } from '../../constants';
 
@@ -17,6 +18,7 @@ import { Policy, PolicyFromES, SerializedPolicy } from './types';
 import { hotPhaseFromES, hotPhaseToES } from './hot_phase';
 import { warmPhaseFromES, warmPhaseToES } from './warm_phase';
 import { coldPhaseFromES, coldPhaseToES } from './cold_phase';
+import { frozenPhaseFromES, frozenPhaseToES } from './frozen_phase';
 import { deletePhaseFromES, deletePhaseToES } from './delete_phase';
 
 export const splitSizeAndUnits = (field: string): { size: string; units: string } => {
@@ -53,6 +55,7 @@ export const initializeNewPolicy = (newPolicyName: string = ''): Policy => {
       hot: { ...defaultNewHotPhase },
       warm: { ...defaultNewWarmPhase },
       cold: { ...defaultNewColdPhase },
+      frozen: { ...defaultNewFrozenPhase },
       delete: { ...defaultNewDeletePhase },
     },
   };
@@ -70,6 +73,7 @@ export const deserializePolicy = (policy: PolicyFromES): Policy => {
       hot: hotPhaseFromES(phases.hot),
       warm: warmPhaseFromES(phases.warm),
       cold: coldPhaseFromES(phases.cold),
+      frozen: frozenPhaseFromES(phases.frozen),
       delete: deletePhaseFromES(phases.delete),
     },
   };
@@ -94,6 +98,13 @@ export const serializePolicy = (
     serializedPolicy.phases.cold = coldPhaseToES(policy.phases.cold, originalEsPolicy.phases.cold);
   }
 
+  if (policy.phases.frozen.phaseEnabled) {
+    serializedPolicy.phases.frozen = frozenPhaseToES(
+      policy.phases.frozen,
+      originalEsPolicy.phases.frozen
+    );
+  }
+
   if (policy.phases.delete.phaseEnabled) {
     serializedPolicy.phases.delete = deletePhaseToES(
       policy.phases.delete,
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_validation.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_validation.ts
index 545488be2cd5e..6fdbc4babd3f3 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_validation.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/policy_validation.ts
@@ -9,7 +9,17 @@ import { validateHotPhase } from './hot_phase';
 import { validateWarmPhase } from './warm_phase';
 import { validateColdPhase } from './cold_phase';
 import { validateDeletePhase } from './delete_phase';
-import { ColdPhase, DeletePhase, HotPhase, Phase, Policy, PolicyFromES, WarmPhase } from './types';
+import { validateFrozenPhase } from './frozen_phase';
+
+import {
+  ColdPhase,
+  DeletePhase,
+  FrozenPhase,
+  HotPhase,
+  Policy,
+  PolicyFromES,
+  WarmPhase,
+} from './types';
 
 export const propertyof = <T>(propertyName: keyof T & string) => propertyName;
 
@@ -100,7 +110,7 @@ export const policyNameAlreadyUsedErrorMessage = i18n.translate(
     defaultMessage: 'That policy name is already used.',
   }
 );
-export type PhaseValidationErrors<T extends Phase> = {
+export type PhaseValidationErrors<T> = {
   [P in keyof Partial<T>]: string[];
 };
 
@@ -108,6 +118,7 @@ export interface ValidationErrors {
   hot: PhaseValidationErrors<HotPhase>;
   warm: PhaseValidationErrors<WarmPhase>;
   cold: PhaseValidationErrors<ColdPhase>;
+  frozen: PhaseValidationErrors<FrozenPhase>;
   delete: PhaseValidationErrors<DeletePhase>;
   policyName: string[];
 }
@@ -148,12 +159,14 @@ export const validatePolicy = (
   const hotPhaseErrors = validateHotPhase(policy.phases.hot);
   const warmPhaseErrors = validateWarmPhase(policy.phases.warm);
   const coldPhaseErrors = validateColdPhase(policy.phases.cold);
+  const frozenPhaseErrors = validateFrozenPhase(policy.phases.frozen);
   const deletePhaseErrors = validateDeletePhase(policy.phases.delete);
   const isValid =
     policyNameErrors.length === 0 &&
     Object.keys(hotPhaseErrors).length === 0 &&
     Object.keys(warmPhaseErrors).length === 0 &&
     Object.keys(coldPhaseErrors).length === 0 &&
+    Object.keys(frozenPhaseErrors).length === 0 &&
     Object.keys(deletePhaseErrors).length === 0;
   return [
     isValid,
@@ -162,6 +175,7 @@ export const validatePolicy = (
       hot: hotPhaseErrors,
       warm: warmPhaseErrors,
       cold: coldPhaseErrors,
+      frozen: frozenPhaseErrors,
       delete: deletePhaseErrors,
     },
   ];
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/types.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/types.ts
index 2e2ed5b38bb87..3d4c73cf4a82c 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/policies/types.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/policies/types.ts
@@ -13,6 +13,7 @@ export interface Phases {
   hot?: SerializedHotPhase;
   warm?: SerializedWarmPhase;
   cold?: SerializedColdPhase;
+  frozen?: SerializedFrozenPhase;
   delete?: SerializedDeletePhase;
 }
 
@@ -68,6 +69,16 @@ export interface SerializedColdPhase extends SerializedPhase {
   };
 }
 
+export interface SerializedFrozenPhase extends SerializedPhase {
+  actions: {
+    freeze?: {};
+    allocate?: AllocateAction;
+    set_priority?: {
+      priority: number | null;
+    };
+  };
+}
+
 export interface SerializedDeletePhase extends SerializedPhase {
   actions: {
     wait_for_snapshot?: {
@@ -94,47 +105,66 @@ export interface Policy {
     hot: HotPhase;
     warm: WarmPhase;
     cold: ColdPhase;
+    frozen: FrozenPhase;
     delete: DeletePhase;
   };
 }
 
-export interface Phase {
+export interface CommonPhaseSettings {
   phaseEnabled: boolean;
 }
-export interface HotPhase extends Phase {
+
+export interface PhaseWithMinAge {
+  selectedMinimumAge: string;
+  selectedMinimumAgeUnits: string;
+}
+
+export interface PhaseWithAllocationAction {
+  selectedNodeAttrs: string;
+  selectedReplicaCount: string;
+}
+
+export interface PhaseWithIndexPriority {
+  phaseIndexPriority: string;
+}
+
+export interface HotPhase extends CommonPhaseSettings, PhaseWithIndexPriority {
   rolloverEnabled: boolean;
   selectedMaxSizeStored: string;
   selectedMaxSizeStoredUnits: string;
   selectedMaxDocuments: string;
   selectedMaxAge: string;
   selectedMaxAgeUnits: string;
-  phaseIndexPriority: string;
 }
 
-export interface WarmPhase extends Phase {
+export interface WarmPhase
+  extends CommonPhaseSettings,
+    PhaseWithMinAge,
+    PhaseWithAllocationAction,
+    PhaseWithIndexPriority {
   warmPhaseOnRollover: boolean;
-  selectedMinimumAge: string;
-  selectedMinimumAgeUnits: string;
-  selectedNodeAttrs: string;
-  selectedReplicaCount: string;
   shrinkEnabled: boolean;
   selectedPrimaryShardCount: string;
   forceMergeEnabled: boolean;
   selectedForceMergeSegments: string;
-  phaseIndexPriority: string;
 }
 
-export interface ColdPhase extends Phase {
-  selectedMinimumAge: string;
-  selectedMinimumAgeUnits: string;
-  selectedNodeAttrs: string;
-  selectedReplicaCount: string;
+export interface ColdPhase
+  extends CommonPhaseSettings,
+    PhaseWithMinAge,
+    PhaseWithAllocationAction,
+    PhaseWithIndexPriority {
   freezeEnabled: boolean;
-  phaseIndexPriority: string;
 }
 
-export interface DeletePhase extends Phase {
-  selectedMinimumAge: string;
-  selectedMinimumAgeUnits: string;
+export interface FrozenPhase
+  extends CommonPhaseSettings,
+    PhaseWithMinAge,
+    PhaseWithAllocationAction,
+    PhaseWithIndexPriority {
+  freezeEnabled: boolean;
+}
+
+export interface DeletePhase extends CommonPhaseSettings, PhaseWithMinAge {
   waitForSnapshotPolicy: string;
 }
diff --git a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.js b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.js
index a1eac5264bb6a..8d01f4a4c200e 100644
--- a/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.js
+++ b/x-pack/plugins/index_lifecycle_management/public/extend_index_management/index.js
@@ -176,6 +176,12 @@ export const ilmFilterExtension = (indices) => {
               defaultMessage: 'Warm',
             }),
           },
+          {
+            value: 'frozen',
+            view: i18n.translate('xpack.indexLifecycleMgmt.indexMgmtFilter.frozenLabel', {
+              defaultMessage: 'Frozen',
+            }),
+          },
           {
             value: 'cold',
             view: i18n.translate('xpack.indexLifecycleMgmt.indexMgmtFilter.coldLabel', {
diff --git a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
index 2d02802119e47..9b51164fd4c28 100644
--- a/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
+++ b/x-pack/plugins/index_lifecycle_management/server/routes/api/policies/register_create_route.ts
@@ -104,6 +104,23 @@ const coldPhaseSchema = schema.maybe(
   })
 );
 
+const frozenPhaseSchema = schema.maybe(
+  schema.object({
+    min_age: minAgeSchema,
+    actions: schema.object({
+      set_priority: setPrioritySchema,
+      unfollow: unfollowSchema,
+      allocate: allocateSchema,
+      freeze: schema.maybe(schema.object({})), // Freeze has no options
+      searchable_snapshot: schema.maybe(
+        schema.object({
+          snapshot_repository: schema.string(),
+        })
+      ),
+    }),
+  })
+);
+
 const deletePhaseSchema = schema.maybe(
   schema.object({
     min_age: minAgeSchema,
@@ -129,6 +146,7 @@ const bodySchema = schema.object({
     hot: hotPhaseSchema,
     warm: warmPhaseSchema,
     cold: coldPhaseSchema,
+    frozen: frozenPhaseSchema,
     delete: deletePhaseSchema,
   }),
 });

From 647f397c50a74cf72c268a432e01311745a5b303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Mon, 31 Aug 2020 10:46:29 +0100
Subject: [PATCH 129/148] [APM] Chart units don't update when toggling the
 chart legends (#74931)

* changing unit when legend is disabled

* changing unit when legend is disabled

* show individual units in the tooltip

* addressing PR comment

* increasing duration threshold

* change formatter based on available legends

* addressing PR comment

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../shared/charts/CustomPlot/index.js         |   5 +
 .../TransactionCharts/BrowserLineChart.tsx    |  14 +-
 .../TransactionLineChart/index.tsx            |  16 +-
 .../charts/TransactionCharts/helper.test.ts   |  69 +++++
 .../charts/TransactionCharts/helper.tsx       |  35 +++
 .../shared/charts/TransactionCharts/index.tsx | 277 ++++++------------
 .../charts/TransactionCharts/ml_header.tsx    |  96 ++++++
 .../TransactionCharts/use_formatter.test.tsx  | 109 +++++++
 .../charts/TransactionCharts/use_formatter.ts |  30 ++
 .../formatters/__test__/duration.test.ts      |   7 +-
 .../apm/public/utils/formatters/duration.ts   |   4 +-
 11 files changed, 457 insertions(+), 205 deletions(-)
 create mode 100644 x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/helper.test.ts
 create mode 100644 x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/helper.tsx
 create mode 100644 x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/ml_header.tsx
 create mode 100644 x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/use_formatter.test.tsx
 create mode 100644 x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/use_formatter.ts

diff --git a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/index.js b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/index.js
index 7e74961e57ea1..41925d651e361 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/index.js
+++ b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/index.js
@@ -79,6 +79,10 @@ export class InnerCustomPlot extends PureComponent {
         return i === _i ? !disabledValue : !!disabledValue;
       });
 
+      if (typeof this.props.onToggleLegend === 'function') {
+        this.props.onToggleLegend(nextSeriesEnabledState);
+      }
+
       return {
         seriesEnabledState: nextSeriesEnabledState,
       };
@@ -235,6 +239,7 @@ InnerCustomPlot.propTypes = {
     })
   ),
   noHits: PropTypes.bool,
+  onToggleLegend: PropTypes.func,
 };
 
 InnerCustomPlot.defaultProps = {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/BrowserLineChart.tsx b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/BrowserLineChart.tsx
index 0e19c63775d31..40caf35155918 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/BrowserLineChart.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/BrowserLineChart.tsx
@@ -4,17 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import { i18n } from '@kbn/i18n';
 import { EuiTitle } from '@elastic/eui';
-import { TransactionLineChart } from './TransactionLineChart';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { useAvgDurationByBrowser } from '../../../../hooks/useAvgDurationByBrowser';
+import { getDurationFormatter } from '../../../../utils/formatters';
 import {
-  getMaxY,
   getResponseTimeTickFormatter,
   getResponseTimeTooltipFormatter,
-} from '.';
-import { getDurationFormatter } from '../../../../utils/formatters';
-import { useAvgDurationByBrowser } from '../../../../hooks/useAvgDurationByBrowser';
+  getMaxY,
+} from './helper';
+import { TransactionLineChart } from './TransactionLineChart';
 
 export function BrowserLineChart() {
   const { data } = useAvgDurationByBrowser();
diff --git a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/TransactionLineChart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/TransactionLineChart/index.tsx
index eaad883d2f9f6..07b7f01194d5c 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/TransactionLineChart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/TransactionLineChart/index.tsx
@@ -5,22 +5,13 @@
  */
 
 import React, { useCallback } from 'react';
-import {
-  Coordinate,
-  RectCoordinate,
-} from '../../../../../../typings/timeseries';
+import { Coordinate, TimeSeries } from '../../../../../../typings/timeseries';
 import { useChartsSync } from '../../../../../hooks/useChartsSync';
 // @ts-ignore
 import CustomPlot from '../../CustomPlot';
 
 interface Props {
-  series: Array<{
-    color: string;
-    title: React.ReactNode;
-    titleShort?: React.ReactNode;
-    data: Array<Coordinate | RectCoordinate>;
-    type: string;
-  }>;
+  series: TimeSeries[];
   truncateLegends?: boolean;
   tickFormatY: (y: number) => React.ReactNode;
   formatTooltipValue: (c: Coordinate) => React.ReactNode;
@@ -28,6 +19,7 @@ interface Props {
   height?: number;
   stacked?: boolean;
   onHover?: () => void;
+  onToggleLegend?: (disabledSeriesState: boolean[]) => void;
 }
 
 function TransactionLineChart(props: Props) {
@@ -40,6 +32,7 @@ function TransactionLineChart(props: Props) {
     truncateLegends,
     stacked = false,
     onHover,
+    onToggleLegend,
   } = props;
 
   const syncedChartsProps = useChartsSync();
@@ -66,6 +59,7 @@ function TransactionLineChart(props: Props) {
       height={height}
       truncateLegends={truncateLegends}
       {...(stacked ? { stackBy: 'y' } : {})}
+      onToggleLegend={onToggleLegend}
     />
   );
 }
diff --git a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/helper.test.ts b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/helper.test.ts
new file mode 100644
index 0000000000000..a476892fa4a3f
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/helper.test.ts
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  getResponseTimeTickFormatter,
+  getResponseTimeTooltipFormatter,
+  getMaxY,
+} from './helper';
+import {
+  getDurationFormatter,
+  toMicroseconds,
+} from '../../../../utils/formatters';
+import { TimeSeries } from '../../../../../typings/timeseries';
+
+describe('transaction chart helper', () => {
+  describe('getResponseTimeTickFormatter', () => {
+    it('formattes time tick in minutes', () => {
+      const formatter = getDurationFormatter(toMicroseconds(11, 'minutes'));
+      const timeTickFormatter = getResponseTimeTickFormatter(formatter);
+      expect(timeTickFormatter(toMicroseconds(60, 'seconds'))).toEqual(
+        '1.0 min'
+      );
+    });
+    it('formattes time tick in seconds', () => {
+      const formatter = getDurationFormatter(toMicroseconds(11, 'seconds'));
+      const timeTickFormatter = getResponseTimeTickFormatter(formatter);
+      expect(timeTickFormatter(toMicroseconds(6, 'seconds'))).toEqual('6.0 s');
+    });
+  });
+  describe('getResponseTimeTooltipFormatter', () => {
+    const formatter = getDurationFormatter(toMicroseconds(11, 'minutes'));
+    const tooltipFormatter = getResponseTimeTooltipFormatter(formatter);
+    it("doesn't format invalid y coordinate", () => {
+      expect(tooltipFormatter({ x: 1, y: undefined })).toEqual('N/A');
+      expect(tooltipFormatter({ x: 1, y: null })).toEqual('N/A');
+    });
+    it('formattes tooltip in minutes', () => {
+      expect(
+        tooltipFormatter({ x: 1, y: toMicroseconds(60, 'seconds') })
+      ).toEqual('1.0 min');
+    });
+  });
+  describe('getMaxY', () => {
+    it('returns zero when empty time series', () => {
+      expect(getMaxY([])).toEqual(0);
+    });
+    it('returns zero for invalid y coordinate', () => {
+      const timeSeries = ([
+        { data: [{ x: 1 }, { x: 2 }, { x: 3, y: -1 }] },
+      ] as unknown) as TimeSeries[];
+      expect(getMaxY(timeSeries)).toEqual(0);
+    });
+    it('returns the max y coordinate', () => {
+      const timeSeries = ([
+        {
+          data: [
+            { x: 1, y: 10 },
+            { x: 2, y: 5 },
+            { x: 3, y: 1 },
+          ],
+        },
+      ] as unknown) as TimeSeries[];
+      expect(getMaxY(timeSeries)).toEqual(10);
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/helper.tsx b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/helper.tsx
new file mode 100644
index 0000000000000..f11a33f932553
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/helper.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { flatten } from 'lodash';
+import { NOT_AVAILABLE_LABEL } from '../../../../../common/i18n';
+import { isValidCoordinateValue } from '../../../../utils/isValidCoordinateValue';
+import { TimeSeries, Coordinate } from '../../../../../typings/timeseries';
+import { TimeFormatter } from '../../../../utils/formatters';
+
+export function getResponseTimeTickFormatter(formatter: TimeFormatter) {
+  return (t: number) => {
+    return formatter(t).formatted;
+  };
+}
+
+export function getResponseTimeTooltipFormatter(formatter: TimeFormatter) {
+  return (coordinate: Coordinate) => {
+    return isValidCoordinateValue(coordinate.y)
+      ? formatter(coordinate.y).formatted
+      : NOT_AVAILABLE_LABEL;
+  };
+}
+
+export function getMaxY(timeSeries: TimeSeries[]) {
+  const coordinates = flatten(
+    timeSeries.map((serie: TimeSeries) => serie.data as Coordinate[])
+  );
+
+  const numbers: number[] = coordinates.map((c: Coordinate) => (c.y ? c.y : 0));
+
+  return Math.max(...numbers, 0);
+}
diff --git a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/index.tsx
index 1f80dbf5f4d95..d11925dc0303d 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/index.tsx
@@ -8,38 +8,34 @@ import {
   EuiFlexGrid,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiIconTip,
   EuiPanel,
-  EuiText,
-  EuiTitle,
   EuiSpacer,
+  EuiTitle,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
-import React, { Component } from 'react';
-import { isEmpty, flatten } from 'lodash';
-import styled from 'styled-components';
+import React from 'react';
 import { NOT_AVAILABLE_LABEL } from '../../../../../common/i18n';
-import { Coordinate, TimeSeries } from '../../../../../typings/timeseries';
-import { ITransactionChartData } from '../../../../selectors/chartSelectors';
-import { IUrlParams } from '../../../../context/UrlParamsContext/types';
 import {
-  tpmUnit,
-  TimeFormatter,
-  getDurationFormatter,
-  asDecimal,
-} from '../../../../utils/formatters';
-import { MLJobLink } from '../../Links/MachineLearningLinks/MLJobLink';
+  TRANSACTION_PAGE_LOAD,
+  TRANSACTION_REQUEST,
+  TRANSACTION_ROUTE_CHANGE,
+} from '../../../../../common/transaction_types';
+import { Coordinate } from '../../../../../typings/timeseries';
 import { LicenseContext } from '../../../../context/LicenseContext';
-import { TransactionLineChart } from './TransactionLineChart';
+import { IUrlParams } from '../../../../context/UrlParamsContext/types';
+import { ITransactionChartData } from '../../../../selectors/chartSelectors';
+import { asDecimal, tpmUnit } from '../../../../utils/formatters';
 import { isValidCoordinateValue } from '../../../../utils/isValidCoordinateValue';
 import { BrowserLineChart } from './BrowserLineChart';
 import { DurationByCountryMap } from './DurationByCountryMap';
 import {
-  TRANSACTION_PAGE_LOAD,
-  TRANSACTION_ROUTE_CHANGE,
-  TRANSACTION_REQUEST,
-} from '../../../../../common/transaction_types';
+  getResponseTimeTickFormatter,
+  getResponseTimeTooltipFormatter,
+} from './helper';
+import { MLHeader } from './ml_header';
+import { TransactionLineChart } from './TransactionLineChart';
+import { useFormatter } from './use_formatter';
 
 interface TransactionChartProps {
   charts: ITransactionChartData;
@@ -47,181 +43,96 @@ interface TransactionChartProps {
   urlParams: IUrlParams;
 }
 
-const ShiftedIconWrapper = styled.span`
-  padding-right: 5px;
-  position: relative;
-  top: -1px;
-  display: inline-block;
-`;
-
-const ShiftedEuiText = styled(EuiText)`
-  position: relative;
-  top: 5px;
-`;
-
-export function getResponseTimeTickFormatter(formatter: TimeFormatter) {
-  return (t: number) => formatter(t).formatted;
-}
-
-export function getResponseTimeTooltipFormatter(formatter: TimeFormatter) {
-  return (p: Coordinate) => {
-    return isValidCoordinateValue(p.y)
-      ? formatter(p.y).formatted
-      : NOT_AVAILABLE_LABEL;
-  };
-}
-
-export function getMaxY(responseTimeSeries: TimeSeries[]) {
-  const coordinates = flatten(
-    responseTimeSeries.map((serie: TimeSeries) => serie.data as Coordinate[])
-  );
-
-  const numbers: number[] = coordinates.map((c: Coordinate) => (c.y ? c.y : 0));
-
-  return Math.max(...numbers, 0);
-}
-
-export class TransactionCharts extends Component<TransactionChartProps> {
-  public getTPMFormatter = (t: number) => {
-    const { urlParams } = this.props;
+export function TransactionCharts({
+  charts,
+  location,
+  urlParams,
+}: TransactionChartProps) {
+  const getTPMFormatter = (t: number) => {
     const unit = tpmUnit(urlParams.transactionType);
     return `${asDecimal(t)} ${unit}`;
   };
 
-  public getTPMTooltipFormatter = (p: Coordinate) => {
+  const getTPMTooltipFormatter = (p: Coordinate) => {
     return isValidCoordinateValue(p.y)
-      ? this.getTPMFormatter(p.y)
+      ? getTPMFormatter(p.y)
       : NOT_AVAILABLE_LABEL;
   };
 
-  public renderMLHeader(hasValidMlLicense: boolean | undefined) {
-    const { mlJobId } = this.props.charts;
-
-    if (!hasValidMlLicense || !mlJobId) {
-      return null;
-    }
-
-    const { serviceName, kuery, transactionType } = this.props.urlParams;
-    if (!serviceName) {
-      return null;
-    }
+  const { transactionType } = urlParams;
 
-    const hasKuery = !isEmpty(kuery);
-    const icon = hasKuery ? (
-      <EuiIconTip
-        aria-label="Warning"
-        type="alert"
-        color="warning"
-        content="The Machine learning results are hidden when the search bar is used for filtering"
-      />
-    ) : (
-      <EuiIconTip
-        content={i18n.translate(
-          'xpack.apm.metrics.transactionChart.machineLearningTooltip',
-          {
-            defaultMessage:
-              'The stream around the average duration shows the expected bounds. An annotation is shown for anomaly scores ≥ 75.',
-          }
-        )}
-      />
-    );
-
-    return (
-      <EuiFlexItem grow={false}>
-        <ShiftedEuiText size="xs">
-          <ShiftedIconWrapper>{icon}</ShiftedIconWrapper>
-          <span>
-            {i18n.translate(
-              'xpack.apm.metrics.transactionChart.machineLearningLabel',
-              {
-                defaultMessage: 'Machine learning:',
-              }
-            )}{' '}
-          </span>
-          <MLJobLink
-            jobId={mlJobId}
-            serviceName={serviceName}
-            transactionType={transactionType}
-          >
-            View Job
-          </MLJobLink>
-        </ShiftedEuiText>
-      </EuiFlexItem>
-    );
-  }
+  const { responseTimeSeries, tpmSeries } = charts;
 
-  public render() {
-    const { charts, urlParams } = this.props;
-    const { responseTimeSeries, tpmSeries } = charts;
-    const { transactionType } = urlParams;
-    const maxY = getMaxY(responseTimeSeries);
-    const formatter = getDurationFormatter(maxY);
+  const { formatter, setDisabledSeriesState } = useFormatter(
+    responseTimeSeries
+  );
 
-    return (
-      <>
-        <EuiFlexGrid columns={2} gutterSize="s">
-          <EuiFlexItem data-cy={`transaction-duration-charts`}>
-            <EuiPanel>
-              <React.Fragment>
-                <EuiFlexGroup justifyContent="spaceBetween">
-                  <EuiFlexItem>
-                    <EuiTitle size="xs">
-                      <span>{responseTimeLabel(transactionType)}</span>
-                    </EuiTitle>
-                  </EuiFlexItem>
-                  <LicenseContext.Consumer>
-                    {(license) =>
-                      this.renderMLHeader(license?.getFeature('ml').isAvailable)
-                    }
-                  </LicenseContext.Consumer>
-                </EuiFlexGroup>
-                <TransactionLineChart
-                  series={responseTimeSeries}
-                  tickFormatY={getResponseTimeTickFormatter(formatter)}
-                  formatTooltipValue={getResponseTimeTooltipFormatter(
-                    formatter
+  return (
+    <>
+      <EuiFlexGrid columns={2} gutterSize="s">
+        <EuiFlexItem data-cy={`transaction-duration-charts`}>
+          <EuiPanel>
+            <React.Fragment>
+              <EuiFlexGroup justifyContent="spaceBetween">
+                <EuiFlexItem>
+                  <EuiTitle size="xs">
+                    <span>{responseTimeLabel(transactionType)}</span>
+                  </EuiTitle>
+                </EuiFlexItem>
+                <LicenseContext.Consumer>
+                  {(license) => (
+                    <MLHeader
+                      hasValidMlLicense={license?.getFeature('ml').isAvailable}
+                      mlJobId={charts.mlJobId}
+                    />
                   )}
-                />
-              </React.Fragment>
-            </EuiPanel>
-          </EuiFlexItem>
-
-          <EuiFlexItem style={{ flexShrink: 1 }}>
-            <EuiPanel>
-              <React.Fragment>
-                <EuiTitle size="xs">
-                  <span>{tpmLabel(transactionType)}</span>
-                </EuiTitle>
-                <TransactionLineChart
-                  series={tpmSeries}
-                  tickFormatY={this.getTPMFormatter}
-                  formatTooltipValue={this.getTPMTooltipFormatter}
-                  truncateLegends
-                />
-              </React.Fragment>
-            </EuiPanel>
-          </EuiFlexItem>
-        </EuiFlexGrid>
-        {transactionType === TRANSACTION_PAGE_LOAD && (
-          <>
-            <EuiSpacer size="s" />
-            <EuiFlexGrid columns={2} gutterSize="s">
-              <EuiFlexItem>
-                <EuiPanel>
-                  <DurationByCountryMap />
-                </EuiPanel>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <EuiPanel>
-                  <BrowserLineChart />
-                </EuiPanel>
-              </EuiFlexItem>
-            </EuiFlexGrid>
-          </>
-        )}
-      </>
-    );
-  }
+                </LicenseContext.Consumer>
+              </EuiFlexGroup>
+              <TransactionLineChart
+                series={responseTimeSeries}
+                tickFormatY={getResponseTimeTickFormatter(formatter)}
+                formatTooltipValue={getResponseTimeTooltipFormatter(formatter)}
+                onToggleLegend={setDisabledSeriesState}
+              />
+            </React.Fragment>
+          </EuiPanel>
+        </EuiFlexItem>
+
+        <EuiFlexItem style={{ flexShrink: 1 }}>
+          <EuiPanel>
+            <React.Fragment>
+              <EuiTitle size="xs">
+                <span>{tpmLabel(transactionType)}</span>
+              </EuiTitle>
+              <TransactionLineChart
+                series={tpmSeries}
+                tickFormatY={getTPMFormatter}
+                formatTooltipValue={getTPMTooltipFormatter}
+                truncateLegends
+              />
+            </React.Fragment>
+          </EuiPanel>
+        </EuiFlexItem>
+      </EuiFlexGrid>
+      {transactionType === TRANSACTION_PAGE_LOAD && (
+        <>
+          <EuiSpacer size="s" />
+          <EuiFlexGrid columns={2} gutterSize="s">
+            <EuiFlexItem>
+              <EuiPanel>
+                <DurationByCountryMap />
+              </EuiPanel>
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiPanel>
+                <BrowserLineChart />
+              </EuiPanel>
+            </EuiFlexItem>
+          </EuiFlexGrid>
+        </>
+      )}
+    </>
+  );
 }
 
 function tpmLabel(type?: string) {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/ml_header.tsx b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/ml_header.tsx
new file mode 100644
index 0000000000000..f829b5841efa9
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/ml_header.tsx
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { EuiIconTip } from '@elastic/eui';
+import { isEmpty } from 'lodash';
+import React from 'react';
+import { EuiFlexItem } from '@elastic/eui';
+import styled from 'styled-components';
+import { i18n } from '@kbn/i18n';
+import { EuiText } from '@elastic/eui';
+import { useUrlParams } from '../../../../hooks/useUrlParams';
+import { MLJobLink } from '../../Links/MachineLearningLinks/MLJobLink';
+
+interface Props {
+  hasValidMlLicense?: boolean;
+  mlJobId?: string;
+}
+
+const ShiftedIconWrapper = styled.span`
+  padding-right: 5px;
+  position: relative;
+  top: -1px;
+  display: inline-block;
+`;
+
+const ShiftedEuiText = styled(EuiText)`
+  position: relative;
+  top: 5px;
+`;
+
+export function MLHeader({ hasValidMlLicense, mlJobId }: Props) {
+  const { urlParams } = useUrlParams();
+
+  if (!hasValidMlLicense || !mlJobId) {
+    return null;
+  }
+
+  const { serviceName, kuery, transactionType } = urlParams;
+  if (!serviceName) {
+    return null;
+  }
+
+  const hasKuery = !isEmpty(kuery);
+  const icon = hasKuery ? (
+    <EuiIconTip
+      aria-label="Warning"
+      type="alert"
+      color="warning"
+      content={i18n.translate(
+        'xpack.apm.metrics.transactionChart.machineLearningTooltip.withKuery',
+        {
+          defaultMessage:
+            'The Machine learning results are hidden when the search bar is used for filtering',
+        }
+      )}
+    />
+  ) : (
+    <EuiIconTip
+      content={i18n.translate(
+        'xpack.apm.metrics.transactionChart.machineLearningTooltip',
+        {
+          defaultMessage:
+            'The stream around the average duration shows the expected bounds. An annotation is shown for anomaly scores ≥ 75.',
+        }
+      )}
+    />
+  );
+
+  return (
+    <EuiFlexItem grow={false}>
+      <ShiftedEuiText size="xs">
+        <ShiftedIconWrapper>{icon}</ShiftedIconWrapper>
+        <span>
+          {i18n.translate(
+            'xpack.apm.metrics.transactionChart.machineLearningLabel',
+            {
+              defaultMessage: 'Machine learning:',
+            }
+          )}{' '}
+        </span>
+        <MLJobLink
+          jobId={mlJobId}
+          serviceName={serviceName}
+          transactionType={transactionType}
+        >
+          {i18n.translate('xpack.apm.metrics.transactionChart.viewJob', {
+            defaultMessage: 'View Job:',
+          })}
+        </MLJobLink>
+      </ShiftedEuiText>
+    </EuiFlexItem>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/use_formatter.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/use_formatter.test.tsx
new file mode 100644
index 0000000000000..78ff9a398b2e7
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/use_formatter.test.tsx
@@ -0,0 +1,109 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React from 'react';
+import { TimeSeries } from '../../../../../typings/timeseries';
+import { toMicroseconds } from '../../../../utils/formatters';
+import { useFormatter } from './use_formatter';
+import { render, fireEvent, act } from '@testing-library/react';
+
+function MockComponent({
+  timeSeries,
+  disabledSeries,
+  value,
+}: {
+  timeSeries: TimeSeries[];
+  disabledSeries: boolean[];
+  value: number;
+}) {
+  const { formatter, setDisabledSeriesState } = useFormatter(timeSeries);
+
+  const onDisableSeries = () => {
+    setDisabledSeriesState(disabledSeries);
+  };
+
+  return (
+    <div>
+      <button onClick={onDisableSeries}>disable series</button>
+      {formatter(value).formatted}
+    </div>
+  );
+}
+
+describe('useFormatter', () => {
+  const timeSeries = ([
+    {
+      data: [
+        { x: 1, y: toMicroseconds(11, 'minutes') },
+        { x: 2, y: toMicroseconds(1, 'minutes') },
+        { x: 3, y: toMicroseconds(60, 'seconds') },
+      ],
+    },
+    {
+      data: [
+        { x: 1, y: toMicroseconds(120, 'seconds') },
+        { x: 2, y: toMicroseconds(1, 'minutes') },
+        { x: 3, y: toMicroseconds(60, 'seconds') },
+      ],
+    },
+    {
+      data: [
+        { x: 1, y: toMicroseconds(60, 'seconds') },
+        { x: 2, y: toMicroseconds(5, 'minutes') },
+        { x: 3, y: toMicroseconds(100, 'seconds') },
+      ],
+    },
+  ] as unknown) as TimeSeries[];
+  it('returns new formatter when disabled series state changes', () => {
+    const { getByText } = render(
+      <MockComponent
+        timeSeries={timeSeries}
+        value={toMicroseconds(120, 'seconds')}
+        disabledSeries={[true, true, false]}
+      />
+    );
+    expect(getByText('2.0 min')).toBeInTheDocument();
+    act(() => {
+      fireEvent.click(getByText('disable series'));
+    });
+    expect(getByText('120 s')).toBeInTheDocument();
+  });
+  it('falls back to the first formatter when disabled series is empty', () => {
+    const { getByText } = render(
+      <MockComponent
+        timeSeries={timeSeries}
+        value={toMicroseconds(120, 'seconds')}
+        disabledSeries={[]}
+      />
+    );
+    expect(getByText('2.0 min')).toBeInTheDocument();
+    act(() => {
+      fireEvent.click(getByText('disable series'));
+    });
+    expect(getByText('2.0 min')).toBeInTheDocument();
+    // const { formatter, setDisabledSeriesState } = useFormatter(timeSeries);
+    // expect(formatter(toMicroseconds(120, 'seconds'))).toEqual('2.0 min');
+    // setDisabledSeriesState([true, true, false]);
+    // expect(formatter(toMicroseconds(120, 'seconds'))).toEqual('2.0 min');
+  });
+  it('falls back to the first formatter when disabled series is all true', () => {
+    const { getByText } = render(
+      <MockComponent
+        timeSeries={timeSeries}
+        value={toMicroseconds(120, 'seconds')}
+        disabledSeries={[true, true, true]}
+      />
+    );
+    expect(getByText('2.0 min')).toBeInTheDocument();
+    act(() => {
+      fireEvent.click(getByText('disable series'));
+    });
+    expect(getByText('2.0 min')).toBeInTheDocument();
+    // const { formatter, setDisabledSeriesState } = useFormatter(timeSeries);
+    // expect(formatter(toMicroseconds(120, 'seconds'))).toEqual('2.0 min');
+    // setDisabledSeriesState([true, true, false]);
+    // expect(formatter(toMicroseconds(120, 'seconds'))).toEqual('2.0 min');
+  });
+});
diff --git a/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/use_formatter.ts b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/use_formatter.ts
new file mode 100644
index 0000000000000..8cd8929c89960
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/charts/TransactionCharts/use_formatter.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useState, Dispatch, SetStateAction } from 'react';
+import { isEmpty } from 'lodash';
+import {
+  getDurationFormatter,
+  TimeFormatter,
+} from '../../../../utils/formatters';
+import { TimeSeries } from '../../../../../typings/timeseries';
+import { getMaxY } from './helper';
+
+export const useFormatter = (
+  series: TimeSeries[]
+): {
+  formatter: TimeFormatter;
+  setDisabledSeriesState: Dispatch<SetStateAction<boolean[]>>;
+} => {
+  const [disabledSeriesState, setDisabledSeriesState] = useState<boolean[]>([]);
+  const visibleSeries = series.filter(
+    (serie, index) => disabledSeriesState[index] !== true
+  );
+  const maxY = getMaxY(isEmpty(visibleSeries) ? series : visibleSeries);
+  const formatter = getDurationFormatter(maxY);
+
+  return { formatter, setDisabledSeriesState };
+};
diff --git a/x-pack/plugins/apm/public/utils/formatters/__test__/duration.test.ts b/x-pack/plugins/apm/public/utils/formatters/__test__/duration.test.ts
index c4d59beb4b7a2..ca8a4919dd216 100644
--- a/x-pack/plugins/apm/public/utils/formatters/__test__/duration.test.ts
+++ b/x-pack/plugins/apm/public/utils/formatters/__test__/duration.test.ts
@@ -20,9 +20,12 @@ describe('duration formatters', () => {
         '10,000 ms'
       );
       expect(asDuration(toMicroseconds(20, 'seconds'))).toEqual('20 s');
-      expect(asDuration(toMicroseconds(10, 'minutes'))).toEqual('10 min');
+      expect(asDuration(toMicroseconds(10, 'minutes'))).toEqual('600 s');
+      expect(asDuration(toMicroseconds(11, 'minutes'))).toEqual('11 min');
       expect(asDuration(toMicroseconds(1, 'hours'))).toEqual('60 min');
-      expect(asDuration(toMicroseconds(1.5, 'hours'))).toEqual('1.5 h');
+      expect(asDuration(toMicroseconds(1.5, 'hours'))).toEqual('90 min');
+      expect(asDuration(toMicroseconds(10, 'hours'))).toEqual('600 min');
+      expect(asDuration(toMicroseconds(11, 'hours'))).toEqual('11 h');
     });
 
     it('falls back to default value', () => {
diff --git a/x-pack/plugins/apm/public/utils/formatters/duration.ts b/x-pack/plugins/apm/public/utils/formatters/duration.ts
index 64a9e3b952b98..8381b0afb5f07 100644
--- a/x-pack/plugins/apm/public/utils/formatters/duration.ts
+++ b/x-pack/plugins/apm/public/utils/formatters/duration.ts
@@ -127,10 +127,10 @@ export const toMicroseconds = (value: number, timeUnit: TimeUnit) =>
   moment.duration(value, timeUnit).asMilliseconds() * 1000;
 
 function getDurationUnitKey(max: number): DurationTimeUnit {
-  if (max > toMicroseconds(1, 'hours')) {
+  if (max > toMicroseconds(10, 'hours')) {
     return 'hours';
   }
-  if (max > toMicroseconds(1, 'minutes')) {
+  if (max > toMicroseconds(10, 'minutes')) {
     return 'minutes';
   }
   if (max > toMicroseconds(10, 'seconds')) {

From 833d76442f70ae5a8c2497e1e0ef01033f03b2e2 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alison.goryachev@elastic.co>
Date: Mon, 31 Aug 2020 09:34:39 -0400
Subject: [PATCH 130/148] [Ingest pipelines] Tests for pipeline debugging
 enhancement (#75606)

---
 .../__jest__/constants.ts                     |  75 ++++++
 .../__jest__/http_requests.helpers.ts         |  45 ++++
 .../__jest__/test_pipeline.helpers.tsx        | 231 +++++++++++++++++
 .../__jest__/test_pipeline.test.tsx           | 240 ++++++++++++++++++
 .../documents_dropdown/documents_dropdown.tsx |   1 +
 .../processor_output.tsx                      |   4 +-
 .../pipeline_processors_editor_item.tsx       |   1 +
 ...pipeline_processors_editor_item_status.tsx |   8 +-
 .../test_pipeline/test_output_button.tsx      |   4 +-
 .../test_pipeline/test_pipeline_flyout.tsx    |   1 +
 .../tab_documents.tsx                         |   7 +-
 .../test_pipeline_flyout_tabs/tab_output.tsx  |   6 +-
 .../test_pipeline_tabs.tsx                    |   2 +-
 .../deserialize.test.ts                       | 168 ++++++++----
 .../pipeline_processors_editor/types.ts       |   2 +-
 15 files changed, 735 insertions(+), 60 deletions(-)
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/constants.ts
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/http_requests.helpers.ts
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/test_pipeline.helpers.tsx
 create mode 100644 x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/test_pipeline.test.tsx

diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/constants.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/constants.ts
new file mode 100644
index 0000000000000..e75ba56277c5c
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/constants.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Pipeline } from '../../../../../common/types';
+import { VerboseTestOutput, Document } from '../types';
+
+export const PROCESSORS: Pick<Pipeline, 'processors'> = {
+  processors: [
+    {
+      set: {
+        field: 'field1',
+        value: 'value1',
+      },
+    },
+  ],
+};
+
+export const DOCUMENTS: Document[] = [
+  {
+    _index: 'index',
+    _id: 'id1',
+    _source: {
+      name: 'foo',
+    },
+  },
+  {
+    _index: 'index',
+    _id: 'id2',
+    _source: {
+      name: 'bar',
+    },
+  },
+];
+
+export const SIMULATE_RESPONSE: VerboseTestOutput = {
+  docs: [
+    {
+      processor_results: [
+        {
+          processor_type: 'set',
+          status: 'success',
+          tag: 'some_tag',
+          doc: {
+            _index: 'index',
+            _id: 'id1',
+            _source: {
+              name: 'foo',
+              foo: 'bar',
+            },
+          },
+        },
+      ],
+    },
+    {
+      processor_results: [
+        {
+          processor_type: 'set',
+          status: 'success',
+          tag: 'some_tag',
+          doc: {
+            _index: 'index',
+            _id: 'id2',
+            _source: {
+              name: 'bar',
+              foo: 'bar',
+            },
+          },
+        },
+      ],
+    },
+  ],
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/http_requests.helpers.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/http_requests.helpers.ts
new file mode 100644
index 0000000000000..541a6853a99b3
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/http_requests.helpers.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import sinon, { SinonFakeServer } from 'sinon';
+
+type HttpResponse = Record<string, any> | any[];
+
+// Register helpers to mock HTTP Requests
+const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
+  const setSimulatePipelineResponse = (response?: HttpResponse, error?: any) => {
+    const status = error ? error.status || 400 : 200;
+    const body = error ? JSON.stringify(error.body) : JSON.stringify(response);
+
+    server.respondWith('POST', '/api/ingest_pipelines/simulate', [
+      status,
+      { 'Content-Type': 'application/json' },
+      body,
+    ]);
+  };
+
+  return {
+    setSimulatePipelineResponse,
+  };
+};
+
+export const initHttpRequests = () => {
+  const server = sinon.fakeServer.create();
+
+  server.respondImmediately = true;
+
+  // Define default response for unhandled requests.
+  // We make requests to APIs which don't impact the component under test, e.g. UI metric telemetry,
+  // and we can mock them all with a 200 instead of mocking each one individually.
+  server.respondWith([200, {}, 'DefaultSinonMockServerResponse']);
+
+  const httpRequestsMockHelpers = registerHttpRequestMockHelpers(server);
+
+  return {
+    server,
+    httpRequestsMockHelpers,
+  };
+};
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/test_pipeline.helpers.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/test_pipeline.helpers.tsx
new file mode 100644
index 0000000000000..fec3259fa019b
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/test_pipeline.helpers.tsx
@@ -0,0 +1,231 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { act } from 'react-dom/test-utils';
+import React from 'react';
+import axios from 'axios';
+import axiosXhrAdapter from 'axios/lib/adapters/xhr';
+
+import { notificationServiceMock, scopedHistoryMock } from 'src/core/public/mocks';
+
+import { LocationDescriptorObject } from 'history';
+import { KibanaContextProvider } from 'src/plugins/kibana_react/public';
+/* eslint-disable @kbn/eslint/no-restricted-paths */
+import { usageCollectionPluginMock } from 'src/plugins/usage_collection/public/mocks';
+
+import { registerTestBed, TestBed } from '../../../../../../../test_utils';
+import { stubWebWorker } from '../../../../../../../test_utils/stub_web_worker';
+
+import {
+  breadcrumbService,
+  uiMetricService,
+  documentationService,
+  apiService,
+} from '../../../services';
+
+import {
+  ProcessorsEditorContextProvider,
+  Props,
+  GlobalOnFailureProcessorsEditor,
+  ProcessorsEditor,
+} from '../';
+import { TestPipelineActions } from '../';
+
+import { initHttpRequests } from './http_requests.helpers';
+
+stubWebWorker();
+
+jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => {
+  const original = jest.requireActual('../../../../../../../../src/plugins/kibana_react/public');
+  return {
+    ...original,
+    // Mocking CodeEditor, which uses React Monaco under the hood
+    CodeEditor: (props: any) => (
+      <input
+        data-test-subj={props['data-test-subj'] || 'mockCodeEditor'}
+        data-currentvalue={props.value}
+        onChange={(e: any) => {
+          props.onChange(e.jsonContent);
+        }}
+      />
+    ),
+  };
+});
+
+jest.mock('@elastic/eui', () => {
+  const original = jest.requireActual('@elastic/eui');
+  return {
+    ...original,
+    // Mocking EuiCodeEditor, which uses React Ace under the hood
+    EuiCodeEditor: (props: any) => (
+      <input
+        data-test-subj={props['data-test-subj']}
+        onChange={(syntheticEvent: any) => {
+          props.onChange(syntheticEvent.jsonString);
+        }}
+      />
+    ),
+  };
+});
+
+jest.mock('react-virtualized', () => {
+  const original = jest.requireActual('react-virtualized');
+
+  return {
+    ...original,
+    AutoSizer: ({ children }: { children: any }) => (
+      <div>{children({ height: 500, width: 500 })}</div>
+    ),
+  };
+});
+
+const history = scopedHistoryMock.create();
+history.createHref.mockImplementation((location: LocationDescriptorObject) => {
+  return `${location.pathname}?${location.search}`;
+});
+
+const appServices = {
+  breadcrumbs: breadcrumbService,
+  metric: uiMetricService,
+  documentation: documentationService,
+  api: apiService,
+  notifications: notificationServiceMock.createSetupContract(),
+  history,
+  uiSettings: {},
+};
+
+const testBedSetup = registerTestBed<TestSubject>(
+  (props: Props) => (
+    <KibanaContextProvider services={appServices}>
+      <ProcessorsEditorContextProvider {...props}>
+        <TestPipelineActions />
+        <ProcessorsEditor />
+        <GlobalOnFailureProcessorsEditor />
+      </ProcessorsEditorContextProvider>
+    </KibanaContextProvider>
+  ),
+  {
+    doMountAsync: false,
+  }
+);
+
+export interface SetupResult extends TestBed<TestSubject> {
+  actions: ReturnType<typeof createActions>;
+}
+
+const createActions = (testBed: TestBed<TestSubject>) => {
+  const { find, component, form } = testBed;
+
+  return {
+    clickAddDocumentsButton() {
+      act(() => {
+        find('addDocumentsButton').simulate('click');
+      });
+      component.update();
+    },
+
+    async clickViewOutputButton() {
+      await act(async () => {
+        find('viewOutputButton').simulate('click');
+      });
+      component.update();
+    },
+
+    closeTestPipelineFlyout() {
+      act(() => {
+        find('euiFlyoutCloseButton').simulate('click');
+      });
+      component.update();
+    },
+
+    clickProcessorOutputTab() {
+      act(() => {
+        find('outputTab').simulate('click');
+      });
+      component.update();
+    },
+
+    async clickRefreshOutputButton() {
+      await act(async () => {
+        find('refreshOutputButton').simulate('click');
+      });
+      component.update();
+    },
+
+    async clickRunPipelineButton() {
+      await act(async () => {
+        find('runPipelineButton').simulate('click');
+      });
+      component.update();
+    },
+
+    async toggleVerboseSwitch() {
+      await act(async () => {
+        form.toggleEuiSwitch('verboseOutputToggle');
+      });
+      component.update();
+    },
+
+    addDocumentsJson(jsonString: string) {
+      find('documentsEditor').simulate('change', {
+        jsonString,
+      });
+    },
+
+    async clickProcessor(processorSelector: string) {
+      await act(async () => {
+        find(`${processorSelector}.manageItemButton`).simulate('click');
+      });
+      component.update();
+    },
+  };
+};
+
+export const setup = async (props: Props): Promise<SetupResult> => {
+  const testBed = await testBedSetup(props);
+  return {
+    ...testBed,
+    actions: createActions(testBed),
+  };
+};
+
+const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
+
+export const setupEnvironment = () => {
+  // Initialize mock services
+  uiMetricService.setup(usageCollectionPluginMock.createSetupContract());
+  // @ts-ignore
+  apiService.setup(mockHttpClient, uiMetricService);
+
+  const { server, httpRequestsMockHelpers } = initHttpRequests();
+
+  return {
+    server,
+    httpRequestsMockHelpers,
+  };
+};
+
+type TestSubject =
+  | 'addDocumentsButton'
+  | 'testPipelineFlyout'
+  | 'documentsDropdown'
+  | 'outputTab'
+  | 'documentsEditor'
+  | 'runPipelineButton'
+  | 'documentsTabContent'
+  | 'outputTabContent'
+  | 'verboseOutputToggle'
+  | 'refreshOutputButton'
+  | 'viewOutputButton'
+  | 'pipelineExecutionError'
+  | 'euiFlyoutCloseButton'
+  | 'processorStatusIcon'
+  | 'documentsTab'
+  | 'manageItemButton'
+  | 'processorSettingsForm'
+  | 'configurationTab'
+  | 'outputTab'
+  | 'processorOutputTabContent'
+  | string;
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/test_pipeline.test.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/test_pipeline.test.tsx
new file mode 100644
index 0000000000000..339c840bb86f1
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/__jest__/test_pipeline.test.tsx
@@ -0,0 +1,240 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Pipeline } from '../../../../../common/types';
+
+import { VerboseTestOutput, Document } from '../types';
+import { setup, SetupResult, setupEnvironment } from './test_pipeline.helpers';
+import { DOCUMENTS, SIMULATE_RESPONSE, PROCESSORS } from './constants';
+
+interface ReqBody {
+  documents: Document[];
+  verbose?: boolean;
+  pipeline: Pick<Pipeline, 'processors' | 'on_failure'>;
+}
+
+describe('Test pipeline', () => {
+  let onUpdate: jest.Mock;
+  let testBed: SetupResult;
+
+  const { server, httpRequestsMockHelpers } = setupEnvironment();
+
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    server.restore();
+    jest.useRealTimers();
+  });
+
+  beforeEach(async () => {
+    onUpdate = jest.fn();
+    testBed = await setup({
+      value: {
+        ...PROCESSORS,
+      },
+      onFlyoutOpen: jest.fn(),
+      onUpdate,
+    });
+  });
+
+  describe('Test pipeline actions', () => {
+    it('should successfully add sample documents and execute the pipeline', async () => {
+      const { find, actions, exists } = testBed;
+
+      httpRequestsMockHelpers.setSimulatePipelineResponse(SIMULATE_RESPONSE);
+
+      // Flyout and document dropdown should not be visible
+      expect(exists('testPipelineFlyout')).toBe(false);
+      expect(exists('documentsDropdown')).toBe(false);
+
+      // Open flyout
+      actions.clickAddDocumentsButton();
+
+      // Flyout should be visible with output tab initially disabled
+      expect(exists('testPipelineFlyout')).toBe(true);
+      expect(exists('documentsTabContent')).toBe(true);
+      expect(exists('outputTabContent')).toBe(false);
+      expect(find('outputTab').props().disabled).toEqual(true);
+
+      // Add sample documents and click run
+      actions.addDocumentsJson(JSON.stringify(DOCUMENTS));
+      await actions.clickRunPipelineButton();
+
+      // Verify request
+      const latestRequest = server.requests[server.requests.length - 1];
+      const requestBody: ReqBody = JSON.parse(JSON.parse(latestRequest.requestBody).body);
+      const {
+        documents: reqDocuments,
+        verbose: reqVerbose,
+        pipeline: { processors: reqProcessors },
+      } = requestBody;
+
+      expect(reqDocuments).toEqual(DOCUMENTS);
+      expect(reqVerbose).toEqual(true);
+
+      // We programatically add a unique tag field when calling the simulate API
+      // We do not know this value in the test, so we simply check that the field exists
+      // and only verify the processor configuration
+      reqProcessors.forEach((processor, index) => {
+        Object.entries(processor).forEach(([key, value]) => {
+          const { tag, ...config } = value;
+          expect(tag).toBeDefined();
+          expect(config).toEqual(PROCESSORS.processors[index][key]);
+        });
+      });
+
+      // Verify output tab is active
+      expect(find('outputTab').props().disabled).toEqual(false);
+      expect(exists('documentsTabContent')).toBe(false);
+      expect(exists('outputTabContent')).toBe(true);
+
+      // Click reload button and verify request
+      const totalRequests = server.requests.length;
+      await actions.clickRefreshOutputButton();
+      expect(server.requests.length).toBe(totalRequests + 1);
+      expect(server.requests[server.requests.length - 1].url).toBe(
+        '/api/ingest_pipelines/simulate'
+      );
+
+      // Click verbose toggle and verify request
+      await actions.toggleVerboseSwitch();
+      expect(server.requests.length).toBe(totalRequests + 2);
+      expect(server.requests[server.requests.length - 1].url).toBe(
+        '/api/ingest_pipelines/simulate'
+      );
+    });
+
+    test('should enable the output tab if cached documents exist', async () => {
+      const { actions, exists } = testBed;
+
+      httpRequestsMockHelpers.setSimulatePipelineResponse(SIMULATE_RESPONSE);
+
+      // Open flyout
+      actions.clickAddDocumentsButton();
+
+      // Add sample documents and click run
+      actions.addDocumentsJson(JSON.stringify(DOCUMENTS));
+      await actions.clickRunPipelineButton();
+
+      // Close flyout
+      actions.closeTestPipelineFlyout();
+      expect(exists('testPipelineFlyout')).toBe(false);
+      expect(exists('addDocumentsButton')).toBe(false);
+      expect(exists('documentsDropdown')).toBe(true);
+
+      // Reopen flyout and verify output tab is enabled
+      await actions.clickViewOutputButton();
+      expect(exists('testPipelineFlyout')).toBe(true);
+      expect(exists('documentsTabContent')).toBe(false);
+      expect(exists('outputTabContent')).toBe(true);
+    });
+
+    test('should surface API errors from the request', async () => {
+      const { actions, find, exists } = testBed;
+
+      const error = {
+        status: 400,
+        error: 'Bad Request',
+        message:
+          '"[parse_exception] [_source] required property is missing, with { property_name="_source" }"',
+      };
+
+      httpRequestsMockHelpers.setSimulatePipelineResponse(undefined, { body: error });
+
+      // Open flyout
+      actions.clickAddDocumentsButton();
+
+      // Add invalid sample documents array and run the pipeline
+      actions.addDocumentsJson(JSON.stringify([{}]));
+      await actions.clickRunPipelineButton();
+
+      // Verify error rendered
+      expect(exists('pipelineExecutionError')).toBe(true);
+      expect(find('pipelineExecutionError').text()).toContain(error.message);
+    });
+  });
+
+  describe('Processors', () => {
+    // This is a hack
+    // We need to provide the processor id in the mocked output;
+    // this is generated dynamically and not something we can stub.
+    // As a workaround, the value is added as a data attribute in the UI
+    // and we retrieve it to generate the mocked output.
+    const addProcessorTagtoMockOutput = (output: VerboseTestOutput) => {
+      const { find } = testBed;
+
+      const docs = output.docs.map((doc) => {
+        const results = doc.processor_results.map((result, index) => {
+          const tag = find(`processors>${index}`).props()['data-processor-id'];
+          return {
+            ...result,
+            tag,
+          };
+        });
+        return { processor_results: results };
+      });
+      return { docs };
+    };
+
+    it('should show "inactive" processor status by default', async () => {
+      const { find } = testBed;
+
+      const statusIconLabel = find('processors>0.processorStatusIcon').props()['aria-label'];
+
+      expect(statusIconLabel).toEqual('Not run');
+    });
+
+    it('should update the processor status after execution', async () => {
+      const { actions, find } = testBed;
+
+      const mockVerboseOutputWithProcessorTag = addProcessorTagtoMockOutput(SIMULATE_RESPONSE);
+      httpRequestsMockHelpers.setSimulatePipelineResponse(mockVerboseOutputWithProcessorTag);
+
+      // Open flyout
+      actions.clickAddDocumentsButton();
+
+      // Add sample documents and click run
+      actions.addDocumentsJson(JSON.stringify(DOCUMENTS));
+      await actions.clickRunPipelineButton();
+      actions.closeTestPipelineFlyout();
+
+      // Verify status
+      const statusIconLabel = find('processors>0.processorStatusIcon').props()['aria-label'];
+      expect(statusIconLabel).toEqual('Success');
+    });
+
+    describe('Output tab', () => {
+      beforeEach(async () => {
+        const { actions } = testBed;
+
+        const mockVerboseOutputWithProcessorTag = addProcessorTagtoMockOutput(SIMULATE_RESPONSE);
+        httpRequestsMockHelpers.setSimulatePipelineResponse(mockVerboseOutputWithProcessorTag);
+
+        // Add documents and run the pipeline
+        actions.clickAddDocumentsButton();
+        actions.addDocumentsJson(JSON.stringify(DOCUMENTS));
+        await actions.clickRunPipelineButton();
+        actions.closeTestPipelineFlyout();
+      });
+
+      it('should show the output of the processor', async () => {
+        const { actions, exists } = testBed;
+
+        // Click processor to open manage flyout
+        await actions.clickProcessor('processors>0');
+        // Verify flyout opened
+        expect(exists('processorSettingsForm')).toBe(true);
+
+        // Navigate to "Output" tab
+        actions.clickProcessorOutputTab();
+        // Verify content
+        expect(exists('processorOutputTabContent')).toBe(true);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.tsx
index e9aa5c1d56f73..e26b6a2890fe4 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/documents_dropdown/documents_dropdown.tsx
@@ -62,6 +62,7 @@ export const DocumentsDropdown: FunctionComponent<Props> = ({
             updateSelectedDocument(Number(e.target.value));
           }}
           aria-label={i18nTexts.ariaLabel}
+          data-test-subj="documentsDropdown"
         />
       </EuiFlexItem>
     </EuiFlexGroup>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_output.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_output.tsx
index c081f69fd41fe..c30fdad969b24 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_output.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/manage_processor_form/processor_output.tsx
@@ -91,7 +91,7 @@ export const ProcessorOutput: React.FunctionComponent<Props> = ({
   } = processorOutput!;
 
   return (
-    <>
+    <div data-test-subj="processorOutputTabContent">
       <EuiText>
         <p>{i18nTexts.tabDescription}</p>
       </EuiText>
@@ -212,6 +212,6 @@ export const ProcessorOutput: React.FunctionComponent<Props> = ({
           </EuiAccordion>
         </>
       )}
-    </>
+    </div>
   );
 };
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.tsx
index 4a67e27d2ebe6..bf69f817183ab 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item/pipeline_processors_editor_item.tsx
@@ -141,6 +141,7 @@ export const PipelineProcessorsEditorItem: FunctionComponent<Props> = memo(
           alignItems="center"
           justifyContent="spaceBetween"
           data-test-subj={selectorToDataTestSubject(selector)}
+          data-processor-id={processor.id}
         >
           <EuiFlexItem>
             <EuiFlexGroup gutterSize="m" alignItems="center" responsive={false}>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item_status.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item_status.tsx
index 26ff113b97440..a58d482022b4d 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item_status.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/pipeline_processors_editor_item_status.tsx
@@ -79,7 +79,13 @@ export const PipelineProcessorsItemStatus: FunctionComponent<Props> = ({ process
 
   return (
     <EuiToolTip position="top" content={<p>{label}</p>}>
-      <EuiIcon color={iconColor} type={icon} aria-label={label} size="s" />
+      <EuiIcon
+        color={iconColor}
+        type={icon}
+        aria-label={label}
+        size="s"
+        data-test-subj="processorStatusIcon"
+      />
     </EuiToolTip>
   );
 };
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_output_button.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_output_button.tsx
index 361e32c77d59b..6fd1adad54f84 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_output_button.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_output_button.tsx
@@ -37,7 +37,7 @@ export const TestOutputButton: FunctionComponent<Props> = ({
         <EuiButton
           size="s"
           onClick={openTestPipelineFlyout}
-          data-test-subj="outputButton"
+          data-test-subj="viewOutputButton"
           iconType="crossInACircleFilled"
           isDisabled={isDisabled}
         >
@@ -51,7 +51,7 @@ export const TestOutputButton: FunctionComponent<Props> = ({
     <EuiButton
       size="s"
       onClick={openTestPipelineFlyout}
-      data-test-subj="outputButton"
+      data-test-subj="viewOutputButton"
       iconType="checkInCircleFilled"
     >
       {i18nTexts.buttonLabel}
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout.tsx
index e8bb1aa1d357f..b26c6f536366d 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout.tsx
@@ -182,6 +182,7 @@ export const TestPipelineFlyout: React.FunctionComponent<Props> = ({
               }
               color="danger"
               iconType="alert"
+              data-test-subj="pipelineExecutionError"
             >
               <p>{testingError.message}</p>
             </EuiCallOut>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_documents.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_documents.tsx
index 8968416683c3e..dd12cdab0c934 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_documents.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_documents.tsx
@@ -72,7 +72,7 @@ export const DocumentsTab: React.FunctionComponent<Props> = ({
   });
 
   return (
-    <>
+    <div data-test-subj="documentsTabContent">
       <EuiText>
         <p>
           <FormattedMessage
@@ -112,8 +112,8 @@ export const DocumentsTab: React.FunctionComponent<Props> = ({
           path="documents"
           component={JsonEditorField}
           componentProps={{
-            ['data-test-subj']: 'documentsField',
             euiCodeEditorProps: {
+              'data-test-subj': 'documentsEditor',
               height: '300px',
               'aria-label': i18n.translate(
                 'xpack.ingestPipelines.testPipelineFlyout.documentsTab.editorFieldAriaLabel',
@@ -128,6 +128,7 @@ export const DocumentsTab: React.FunctionComponent<Props> = ({
         <EuiSpacer size="m" />
 
         <EuiButton
+          data-test-subj="runPipelineButton"
           onClick={testPipeline}
           size="s"
           isLoading={isRunningTest}
@@ -146,6 +147,6 @@ export const DocumentsTab: React.FunctionComponent<Props> = ({
           )}
         </EuiButton>
       </Form>
-    </>
+    </div>
   );
 };
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_output.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_output.tsx
index 586fc9e60017a..926bab6da993c 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_output.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/tab_output.tsx
@@ -56,7 +56,7 @@ export const OutputTab: React.FunctionComponent<Props> = ({
   }
 
   return (
-    <>
+    <div data-test-subj="outputTabContent">
       <EuiText>
         <p>
           <FormattedMessage
@@ -79,6 +79,7 @@ export const OutputTab: React.FunctionComponent<Props> = ({
             }
             checked={isVerboseEnabled}
             onChange={(e) => onEnableVerbose(e.target.checked)}
+            data-test-subj="verboseOutputToggle"
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
@@ -88,6 +89,7 @@ export const OutputTab: React.FunctionComponent<Props> = ({
               handleTestPipeline({ documents: cachedDocuments!, verbose: isVerboseEnabled })
             }
             iconType="refresh"
+            data-test-subj="refreshOutputButton"
           >
             <FormattedMessage
               id="xpack.ingestPipelines.testPipelineFlyout.outputTab.descriptionLinkLabel"
@@ -100,6 +102,6 @@ export const OutputTab: React.FunctionComponent<Props> = ({
       <EuiSpacer size="m" />
 
       {content}
-    </>
+    </div>
   );
 };
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/test_pipeline_tabs.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/test_pipeline_tabs.tsx
index d0ea226e8db80..abfb86c2afda1 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/test_pipeline_tabs.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/components/test_pipeline/test_pipeline_flyout_tabs/test_pipeline_tabs.tsx
@@ -50,7 +50,7 @@ export const Tabs: React.FunctionComponent<Props> = ({
           isSelected={tab.id === selectedTab}
           key={tab.id}
           disabled={getIsDisabled(tab.id)}
-          data-test-subj={tab.id.toLowerCase() + '_tab'}
+          data-test-subj={tab.id.toLowerCase() + 'Tab'}
         >
           {tab.name}
         </EuiTab>
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.test.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.test.ts
index 9b7c2069fcddd..a70c0d281cf95 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.test.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/deserialize.test.ts
@@ -4,71 +4,143 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { deserialize } from './deserialize';
+import { deserialize, deserializeVerboseTestOutput } from './deserialize';
 
-describe('deserialize', () => {
-  it('tolerates certain bad values correctly', () => {
-    expect(
-      deserialize({
+describe('Deserialization', () => {
+  describe('deserialize()', () => {
+    it('tolerates certain bad values correctly', () => {
+      expect(
+        deserialize({
+          processors: [
+            { set: { field: 'test', value: 123 } },
+            { badType1: null } as any,
+            { badType2: 1 } as any,
+          ],
+          onFailure: [
+            {
+              gsub: {
+                field: '_index',
+                pattern: '(.monitoring-\\w+-)6(-.+)',
+                replacement: '$17$2',
+              },
+            },
+          ],
+        })
+      ).toEqual({
         processors: [
-          { set: { field: 'test', value: 123 } },
-          { badType1: null } as any,
-          { badType2: 1 } as any,
+          {
+            id: expect.any(String),
+            type: 'set',
+            options: {
+              field: 'test',
+              value: 123,
+            },
+          },
+          {
+            id: expect.any(String),
+            onFailure: undefined,
+            type: 'badType1',
+            options: {},
+          },
+          {
+            id: expect.any(String),
+            onFailure: undefined,
+            type: 'badType2',
+            options: {},
+          },
         ],
         onFailure: [
           {
-            gsub: {
+            id: expect.any(String),
+            type: 'gsub',
+            onFailure: undefined,
+            options: {
               field: '_index',
               pattern: '(.monitoring-\\w+-)6(-.+)',
               replacement: '$17$2',
             },
           },
         ],
-      })
-    ).toEqual({
-      processors: [
+      });
+    });
+
+    it('throws for unacceptable values', () => {
+      expect(() => {
+        deserialize({
+          processors: [{ reallyBad: undefined } as any, 1 as any],
+          onFailure: [],
+        });
+      }).toThrow('Invalid processor type');
+    });
+  });
+
+  describe('deserializeVerboseOutput()', () => {
+    it('deserializes the verbose output of a simulated pipeline', () => {
+      expect(
+        deserializeVerboseTestOutput({
+          docs: [
+            {
+              processor_results: [
+                {
+                  doc: {
+                    _id: 'id1',
+                    _source: {
+                      name: 'foo',
+                      foo: 'bar',
+                    },
+                  },
+                  processor_type: 'set',
+                  status: 'success',
+                  tag: 'e457615c-69c9-4d14-9e85-c477ad96e60f',
+                },
+              ],
+            },
+            {
+              processor_results: [
+                {
+                  doc: {
+                    _id: 'id2',
+                    _source: {
+                      name: 'baz',
+                      foo: 'bar',
+                    },
+                  },
+                  processor_type: 'set',
+                  status: 'success',
+                  tag: 'e457615c-69c9-4d14-9e85-c477ad96e60f',
+                },
+              ],
+            },
+          ],
+        })
+      ).toEqual([
         {
-          id: expect.any(String),
-          type: 'set',
-          options: {
-            field: 'test',
-            value: 123,
+          'e457615c-69c9-4d14-9e85-c477ad96e60f': {
+            doc: {
+              _id: 'id1',
+              _source: {
+                name: 'foo',
+                foo: 'bar',
+              },
+            },
+            processor_type: 'set',
+            status: 'success',
           },
         },
         {
-          id: expect.any(String),
-          onFailure: undefined,
-          type: 'badType1',
-          options: {},
-        },
-        {
-          id: expect.any(String),
-          onFailure: undefined,
-          type: 'badType2',
-          options: {},
-        },
-      ],
-      onFailure: [
-        {
-          id: expect.any(String),
-          type: 'gsub',
-          onFailure: undefined,
-          options: {
-            field: '_index',
-            pattern: '(.monitoring-\\w+-)6(-.+)',
-            replacement: '$17$2',
+          'e457615c-69c9-4d14-9e85-c477ad96e60f': {
+            doc: {
+              _id: 'id2',
+              _source: {
+                name: 'baz',
+                foo: 'bar',
+              },
+            },
+            processor_type: 'set',
+            status: 'success',
           },
         },
-      ],
+      ]);
     });
   });
-
-  it('throws for unacceptable values', () => {
-    expect(() => {
-      deserialize({
-        processors: [{ reallyBad: undefined } as any, 1 as any],
-        onFailure: [],
-      });
-    }).toThrow('Invalid processor type');
-  });
 });
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/types.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/types.ts
index 9083985b0ff2e..5229f5eb0bb21 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/types.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_processors_editor/types.ts
@@ -90,7 +90,7 @@ export type ProcessorStatus =
 export interface ProcessorResult {
   processor_type: string;
   status: ProcessorStatus;
-  doc: Document;
+  doc?: Document;
   tag: string;
   ignored_error?: any;
   error?: any;

From 9b5912203f2211bd16f871a5f05cb59f1cae173a Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Mon, 31 Aug 2020 08:43:35 -0500
Subject: [PATCH 131/148] Use platform history (#74328)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: cauemarcondes <caue.marcondes@elastic.co>
---
 .../public/application/application.test.tsx   |  74 +++++
 .../plugins/apm/public/application/csmApp.tsx |  44 ++-
 .../plugins/apm/public/application/index.tsx  | 113 ++++---
 .../ErrorGroupDetails/DetailView/index.tsx    |  17 +-
 .../List/__test__/List.test.tsx               |  11 +-
 .../__test__/__snapshots__/List.test.tsx.snap |  48 +--
 .../app/Home/__snapshots__/Home.test.tsx.snap |  34 +++
 .../app/Main/UpdateBreadcrumbs.test.tsx       | 133 ++++++---
 .../components/app/Main/UpdateBreadcrumbs.tsx |  25 +-
 .../app/Main/route_config/index.tsx           |  30 +-
 .../Main/route_config/route_config.test.tsx   |  40 +++
 .../route_handlers/agent_configuration.tsx    |   6 +-
 .../RumDashboard/Charts/PageViewsChart.tsx    |  19 +-
 .../app/ServiceMap/Controls.test.tsx          |  45 +++
 .../components/app/ServiceMap/Controls.tsx    |  26 +-
 .../app/ServiceMap/Popover/Buttons.test.tsx   |  14 +-
 .../app/ServiceMap/Popover/Buttons.tsx        |  23 +-
 .../components/app/ServiceMap/index.test.tsx  |  16 +-
 .../__test__/ServiceOverview.test.tsx         |  56 ++--
 .../ServiceOverview.test.tsx.snap             |   4 +-
 .../SettingsPage/SettingsPage.tsx             |  33 +-
 .../AgentConfigurationCreateEdit/index.tsx    |  28 +-
 .../AgentConfigurations/List/index.tsx        |  35 ++-
 .../Settings/AgentConfigurations/index.tsx    |  19 +-
 .../components/app/Settings/Settings.test.tsx |  34 +++
 .../public/components/app/Settings/index.tsx  |  21 +-
 .../TransactionDetails/Distribution/index.tsx |   3 +-
 .../WaterfallWithSummmary/TransactionTabs.tsx |   3 +-
 .../Waterfall/WaterfallFlyout.tsx             |  16 +-
 .../WaterfallContainer/Waterfall/index.tsx    |   9 +-
 .../WaterfallWithSummmary/index.tsx           |   3 +-
 .../TransactionOverview.test.tsx              |  39 ++-
 .../app/TransactionOverview/index.tsx         |  42 ++-
 .../app/TransactionOverview/useRedirect.ts    |   9 +-
 .../DatePicker/__test__/DatePicker.test.tsx   |  19 +-
 .../components/shared/DatePicker/index.tsx    |  11 +-
 .../shared/EnvironmentFilter/index.tsx        |  13 +-
 .../components/shared/KueryBar/index.tsx      |  25 +-
 .../Links/DiscoverLinks/DiscoverLink.tsx      |  10 +-
 .../components/shared/Links/InfraLink.tsx     |   8 +-
 .../shared/Links/apm/APMLink.test.tsx         |  82 ++---
 .../components/shared/Links/apm/APMLink.tsx   |  36 ++-
 .../Links/apm/agentConfigurationLinks.tsx     |  36 ++-
 .../ServiceNameFilter/index.tsx               |  34 ++-
 .../TransactionTypeFilter/index.tsx           |   9 +-
 .../components/shared/ManagedTable/index.tsx  |   7 +-
 .../components/shared/MetadataTable/index.tsx |  19 +-
 .../CustomLink/CustomLinkPopover.test.tsx     |  22 +-
 .../CustomLink/ManageCustomLink.test.tsx      |  16 +-
 .../CustomLink/index.test.tsx                 |  29 +-
 .../TransactionActionMenu.tsx                 |  39 +--
 .../__test__/TransactionActionMenu.test.tsx   | 282 ++++++++----------
 .../TransactionActionMenu.test.tsx.snap       |   2 +-
 .../__test__/sections.test.ts                 |   6 +-
 .../shared/TransactionActionMenu/sections.ts  |   6 +-
 .../charts/CustomPlot/test/CustomPlot.test.js |  15 +-
 .../Histogram/__test__/Histogram.test.js      |  16 +-
 .../Timeline/Marker/ErrorMarker.test.tsx      |  24 +-
 .../shared/charts/Timeline/Timeline.test.tsx  |   8 +
 .../ApmPluginContext/MockApmPluginContext.tsx |  18 +-
 .../public/context/ApmPluginContext/index.tsx |   8 +-
 .../apm/public/context/ChartsSyncContext.tsx  |   9 +-
 .../apm/public/hooks/useLocalUIFilters.ts     |  13 +-
 x-pack/plugins/apm/public/utils/history.ts    |  17 --
 .../plugins/apm/public/utils/testHelpers.tsx  |  14 +
 .../public/application/application.test.tsx   |   6 +-
 .../public/application/index.tsx              |   5 +-
 67 files changed, 1190 insertions(+), 746 deletions(-)
 create mode 100644 x-pack/plugins/apm/public/application/application.test.tsx
 create mode 100644 x-pack/plugins/apm/public/components/app/Main/route_config/route_config.test.tsx
 create mode 100644 x-pack/plugins/apm/public/components/app/ServiceMap/Controls.test.tsx
 create mode 100644 x-pack/plugins/apm/public/components/app/Settings/Settings.test.tsx
 delete mode 100644 x-pack/plugins/apm/public/utils/history.ts

diff --git a/x-pack/plugins/apm/public/application/application.test.tsx b/x-pack/plugins/apm/public/application/application.test.tsx
new file mode 100644
index 0000000000000..fc369b9cf672a
--- /dev/null
+++ b/x-pack/plugins/apm/public/application/application.test.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { act } from '@testing-library/react';
+import { createMemoryHistory } from 'history';
+import { Observable } from 'rxjs';
+import { AppMountParameters, CoreStart, HttpSetup } from 'src/core/public';
+import { mockApmPluginContextValue } from '../context/ApmPluginContext/MockApmPluginContext';
+import { ApmPluginSetupDeps } from '../plugin';
+import { createCallApmApi } from '../services/rest/createCallApmApi';
+import { renderApp } from './';
+import { disableConsoleWarning } from '../utils/testHelpers';
+
+describe('renderApp', () => {
+  let mockConsole: jest.SpyInstance;
+
+  beforeAll(() => {
+    // The RUM agent logs an unnecessary message here. There's a couple open
+    // issues need to be fixed to get the ability to turn off all of the logging:
+    //
+    // * https://github.com/elastic/apm-agent-rum-js/issues/799
+    // * https://github.com/elastic/apm-agent-rum-js/issues/861
+    //
+    // for now, override `console.warn` to filter those messages out.
+    mockConsole = disableConsoleWarning('[Elastic APM]');
+  });
+
+  afterAll(() => {
+    mockConsole.mockRestore();
+  });
+
+  it('renders the app', () => {
+    const { core, config } = mockApmPluginContextValue;
+    const plugins = {
+      licensing: { license$: new Observable() },
+      triggers_actions_ui: { actionTypeRegistry: {}, alertTypeRegistry: {} },
+      usageCollection: { reportUiStats: () => {} },
+    };
+    const params = {
+      element: document.createElement('div'),
+      history: createMemoryHistory(),
+    };
+    jest.spyOn(window, 'scrollTo').mockReturnValueOnce(undefined);
+    createCallApmApi((core.http as unknown) as HttpSetup);
+
+    jest
+      .spyOn(window.console, 'warn')
+      .mockImplementationOnce((message: string) => {
+        if (message.startsWith('[Elastic APM')) {
+          return;
+        } else {
+          console.warn(message); // eslint-disable-line no-console
+        }
+      });
+
+    let unmount: () => void;
+
+    act(() => {
+      unmount = renderApp(
+        (core as unknown) as CoreStart,
+        (plugins as unknown) as ApmPluginSetupDeps,
+        (params as unknown) as AppMountParameters,
+        config
+      );
+    });
+
+    expect(() => {
+      unmount();
+    }).not.toThrowError();
+  });
+});
diff --git a/x-pack/plugins/apm/public/application/csmApp.tsx b/x-pack/plugins/apm/public/application/csmApp.tsx
index cf3fe2decfa44..d76ed5c2100b2 100644
--- a/x-pack/plugins/apm/public/application/csmApp.tsx
+++ b/x-pack/plugins/apm/public/application/csmApp.tsx
@@ -16,11 +16,11 @@ import { ApmPluginSetupDeps } from '../plugin';
 import {
   KibanaContextProvider,
   useUiSetting$,
+  RedirectAppLinks,
 } from '../../../../../src/plugins/kibana_react/public';
 import { px, units } from '../style/variables';
 import { UpdateBreadcrumbs } from '../components/app/Main/UpdateBreadcrumbs';
 import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
-import { history, resetHistory } from '../utils/history';
 import 'react-vis/dist/style.css';
 import { RumHome } from '../components/app/RumDashboard/RumHome';
 import { ConfigSchema } from '../index';
@@ -70,12 +70,12 @@ function CsmApp() {
 export function CsmAppRoot({
   core,
   deps,
-  routerHistory,
+  history,
   config,
 }: {
   core: CoreStart;
   deps: ApmPluginSetupDeps;
-  routerHistory: typeof history;
+  history: AppMountParameters['history'];
   config: ConfigSchema;
 }) {
   const i18nCore = core.i18n;
@@ -86,19 +86,21 @@ export function CsmAppRoot({
     plugins,
   };
   return (
-    <ApmPluginContext.Provider value={apmPluginContextValue}>
-      <KibanaContextProvider services={{ ...core, ...plugins }}>
-        <i18nCore.Context>
-          <Router history={routerHistory}>
-            <UrlParamsProvider>
-              <LoadingIndicatorProvider>
-                <CsmApp />
-              </LoadingIndicatorProvider>
-            </UrlParamsProvider>
-          </Router>
-        </i18nCore.Context>
-      </KibanaContextProvider>
-    </ApmPluginContext.Provider>
+    <RedirectAppLinks application={core.application}>
+      <ApmPluginContext.Provider value={apmPluginContextValue}>
+        <KibanaContextProvider services={{ ...core, ...plugins }}>
+          <i18nCore.Context>
+            <Router history={history}>
+              <UrlParamsProvider>
+                <LoadingIndicatorProvider>
+                  <CsmApp />
+                </LoadingIndicatorProvider>
+              </UrlParamsProvider>
+            </Router>
+          </i18nCore.Context>
+        </KibanaContextProvider>
+      </ApmPluginContext.Provider>
+    </RedirectAppLinks>
   );
 }
 
@@ -109,19 +111,13 @@ export function CsmAppRoot({
 export const renderApp = (
   core: CoreStart,
   deps: ApmPluginSetupDeps,
-  { element }: AppMountParameters,
+  { element, history }: AppMountParameters,
   config: ConfigSchema
 ) => {
   createCallApmApi(core.http);
 
-  resetHistory();
   ReactDOM.render(
-    <CsmAppRoot
-      core={core}
-      deps={deps}
-      routerHistory={history}
-      config={config}
-    />,
+    <CsmAppRoot core={core} deps={deps} history={history} config={config} />,
     element
   );
   return () => {
diff --git a/x-pack/plugins/apm/public/application/index.tsx b/x-pack/plugins/apm/public/application/index.tsx
index 5e502f58e5f56..3f4f3116152c4 100644
--- a/x-pack/plugins/apm/public/application/index.tsx
+++ b/x-pack/plugins/apm/public/application/index.tsx
@@ -5,36 +5,36 @@
  */
 
 import { ApmRoute } from '@elastic/apm-rum-react';
+import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Router, Switch } from 'react-router-dom';
-import styled, { ThemeProvider, DefaultTheme } from 'styled-components';
-import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
-import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
-import { CoreStart, AppMountParameters } from '../../../../../src/core/public';
-import { ApmPluginSetupDeps } from '../plugin';
+import 'react-vis/dist/style.css';
+import styled, { DefaultTheme, ThemeProvider } from 'styled-components';
+import { ConfigSchema } from '../';
+import { AppMountParameters, CoreStart } from '../../../../../src/core/public';
+import {
+  KibanaContextProvider,
+  RedirectAppLinks,
+  useUiSetting$,
+} from '../../../../../src/plugins/kibana_react/public';
+import { AlertsContextProvider } from '../../../triggers_actions_ui/public';
+import { routes } from '../components/app/Main/route_config';
+import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
+import { UpdateBreadcrumbs } from '../components/app/Main/UpdateBreadcrumbs';
 import { ApmPluginContext } from '../context/ApmPluginContext';
 import { LicenseProvider } from '../context/LicenseContext';
 import { LoadingIndicatorProvider } from '../context/LoadingIndicatorContext';
 import { LocationProvider } from '../context/LocationContext';
 import { MatchedRouteProvider } from '../context/MatchedRouteContext';
 import { UrlParamsProvider } from '../context/UrlParamsContext';
-import { AlertsContextProvider } from '../../../triggers_actions_ui/public';
+import { ApmPluginSetupDeps } from '../plugin';
+import { createCallApmApi } from '../services/rest/createCallApmApi';
 import { createStaticIndexPattern } from '../services/rest/index_pattern';
-import {
-  KibanaContextProvider,
-  useUiSetting$,
-} from '../../../../../src/plugins/kibana_react/public';
-import { px, units } from '../style/variables';
-import { UpdateBreadcrumbs } from '../components/app/Main/UpdateBreadcrumbs';
-import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
-import { routes } from '../components/app/Main/route_config';
-import { history, resetHistory } from '../utils/history';
 import { setHelpExtension } from '../setHelpExtension';
+import { px, units } from '../style/variables';
 import { setReadonlyBadge } from '../updateBadge';
-import { createCallApmApi } from '../services/rest/createCallApmApi';
-import { ConfigSchema } from '..';
-import 'react-vis/dist/style.css';
 
 const MainContainer = styled.div`
   padding: ${px(units.plus)};
@@ -68,12 +68,12 @@ function App() {
 export function ApmAppRoot({
   core,
   deps,
-  routerHistory,
+  history,
   config,
 }: {
   core: CoreStart;
   deps: ApmPluginSetupDeps;
-  routerHistory: typeof history;
+  history: AppMountParameters['history'];
   config: ConfigSchema;
 }) {
   const i18nCore = core.i18n;
@@ -84,36 +84,38 @@ export function ApmAppRoot({
     plugins,
   };
   return (
-    <ApmPluginContext.Provider value={apmPluginContextValue}>
-      <AlertsContextProvider
-        value={{
-          http: core.http,
-          docLinks: core.docLinks,
-          capabilities: core.application.capabilities,
-          toastNotifications: core.notifications.toasts,
-          actionTypeRegistry: plugins.triggers_actions_ui.actionTypeRegistry,
-          alertTypeRegistry: plugins.triggers_actions_ui.alertTypeRegistry,
-        }}
-      >
-        <KibanaContextProvider services={{ ...core, ...plugins }}>
-          <i18nCore.Context>
-            <Router history={routerHistory}>
-              <LocationProvider>
-                <MatchedRouteProvider routes={routes}>
-                  <UrlParamsProvider>
-                    <LoadingIndicatorProvider>
-                      <LicenseProvider>
-                        <App />
-                      </LicenseProvider>
-                    </LoadingIndicatorProvider>
-                  </UrlParamsProvider>
-                </MatchedRouteProvider>
-              </LocationProvider>
-            </Router>
-          </i18nCore.Context>
-        </KibanaContextProvider>
-      </AlertsContextProvider>
-    </ApmPluginContext.Provider>
+    <RedirectAppLinks application={core.application}>
+      <ApmPluginContext.Provider value={apmPluginContextValue}>
+        <AlertsContextProvider
+          value={{
+            http: core.http,
+            docLinks: core.docLinks,
+            capabilities: core.application.capabilities,
+            toastNotifications: core.notifications.toasts,
+            actionTypeRegistry: plugins.triggers_actions_ui.actionTypeRegistry,
+            alertTypeRegistry: plugins.triggers_actions_ui.alertTypeRegistry,
+          }}
+        >
+          <KibanaContextProvider services={{ ...core, ...plugins }}>
+            <i18nCore.Context>
+              <Router history={history}>
+                <LocationProvider>
+                  <MatchedRouteProvider routes={routes}>
+                    <UrlParamsProvider>
+                      <LoadingIndicatorProvider>
+                        <LicenseProvider>
+                          <App />
+                        </LicenseProvider>
+                      </LoadingIndicatorProvider>
+                    </UrlParamsProvider>
+                  </MatchedRouteProvider>
+                </LocationProvider>
+              </Router>
+            </i18nCore.Context>
+          </KibanaContextProvider>
+        </AlertsContextProvider>
+      </ApmPluginContext.Provider>
+    </RedirectAppLinks>
   );
 }
 
@@ -124,7 +126,7 @@ export function ApmAppRoot({
 export const renderApp = (
   core: CoreStart,
   deps: ApmPluginSetupDeps,
-  { element }: AppMountParameters,
+  { element, history }: AppMountParameters,
   config: ConfigSchema
 ) => {
   // render APM feedback link in global help menu
@@ -133,8 +135,6 @@ export const renderApp = (
 
   createCallApmApi(core.http);
 
-  resetHistory();
-
   // Automatically creates static index pattern and stores as saved object
   createStaticIndexPattern().catch((e) => {
     // eslint-disable-next-line no-console
@@ -142,12 +142,7 @@ export const renderApp = (
   });
 
   ReactDOM.render(
-    <ApmAppRoot
-      core={core}
-      deps={deps}
-      routerHistory={history}
-      config={config}
-    />,
+    <ApmAppRoot core={core} deps={deps} history={history} config={config} />,
     element
   );
   return () => {
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
index 4e1af6e0dc239..5202ca13ed102 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
@@ -6,40 +6,40 @@
 
 import {
   EuiButtonEmpty,
+  EuiIcon,
   EuiPanel,
   EuiSpacer,
   EuiTab,
   EuiTabs,
   EuiTitle,
-  EuiIcon,
   EuiToolTip,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
+import { first } from 'lodash';
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import styled from 'styled-components';
-import { first } from 'lodash';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ErrorGroupAPIResponse } from '../../../../../server/lib/errors/get_error_group';
 import { APMError } from '../../../../../typings/es_schemas/ui/apm_error';
 import { IUrlParams } from '../../../../context/UrlParamsContext/types';
 import { px, unit, units } from '../../../../style/variables';
+import { TransactionDetailLink } from '../../../shared/Links/apm/TransactionDetailLink';
 import { DiscoverErrorLink } from '../../../shared/Links/DiscoverLinks/DiscoverErrorLink';
 import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
-import { history } from '../../../../utils/history';
 import { ErrorMetadata } from '../../../shared/MetadataTable/ErrorMetadata';
 import { Stacktrace } from '../../../shared/Stacktrace';
+import { Summary } from '../../../shared/Summary';
+import { HttpInfoSummaryItem } from '../../../shared/Summary/HttpInfoSummaryItem';
+import { UserAgentSummaryItem } from '../../../shared/Summary/UserAgentSummaryItem';
+import { TimestampTooltip } from '../../../shared/TimestampTooltip';
 import {
   ErrorTab,
   exceptionStacktraceTab,
   getTabs,
   logStacktraceTab,
 } from './ErrorTabs';
-import { Summary } from '../../../shared/Summary';
-import { TimestampTooltip } from '../../../shared/TimestampTooltip';
-import { HttpInfoSummaryItem } from '../../../shared/Summary/HttpInfoSummaryItem';
-import { TransactionDetailLink } from '../../../shared/Links/apm/TransactionDetailLink';
-import { UserAgentSummaryItem } from '../../../shared/Summary/UserAgentSummaryItem';
 import { ExceptionStacktrace } from './ExceptionStacktrace';
 
 const HeaderContainer = styled.div`
@@ -71,6 +71,7 @@ function getCurrentTab(
 }
 
 export function DetailView({ errorGroup, urlParams, location }: Props) {
+  const history = useHistory();
   const { transaction, error, occurrencesCount } = errorGroup;
 
   if (!error) {
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx
index a173f4068db6a..5798deaf19c9c 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/List.test.tsx
@@ -6,10 +6,11 @@
 
 import { mount } from 'enzyme';
 import React from 'react';
+import { MockApmPluginContextWrapper } from '../../../../../context/ApmPluginContext/MockApmPluginContext';
+import { MockUrlParamsContextProvider } from '../../../../../context/UrlParamsContext/MockUrlParamsContextProvider';
 import { mockMoment, toJson } from '../../../../../utils/testHelpers';
 import { ErrorGroupList } from '../index';
 import props from './props.json';
-import { MockUrlParamsContextProvider } from '../../../../../context/UrlParamsContext/MockUrlParamsContextProvider';
 
 jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => {
   return {
@@ -36,9 +37,11 @@ describe('ErrorGroupOverview -> List', () => {
 
   it('should render with data', () => {
     const wrapper = mount(
-      <MockUrlParamsContextProvider>
-        <ErrorGroupList items={props.items} />
-      </MockUrlParamsContextProvider>
+      <MockApmPluginContextWrapper>
+        <MockUrlParamsContextProvider>
+          <ErrorGroupList items={props.items} />
+        </MockUrlParamsContextProvider>
+      </MockApmPluginContextWrapper>
     );
 
     expect(toJson(wrapper)).toMatchSnapshot();
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
index 40522edc21b52..5183432b4ae0f 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
@@ -784,11 +784,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 >
                   <EuiLink
                     className="c0"
-                    href="#/services/opbeans-python/errors/a0ce2c8978ef92cdf2ff163ae28576ee?"
+                    href="/basepath/app/apm/services/opbeans-python/errors/a0ce2c8978ef92cdf2ff163ae28576ee"
                   >
                     <a
                       className="euiLink euiLink--primary c0"
-                      href="#/services/opbeans-python/errors/a0ce2c8978ef92cdf2ff163ae28576ee?"
+                      href="/basepath/app/apm/services/opbeans-python/errors/a0ce2c8978ef92cdf2ff163ae28576ee"
                       rel="noreferrer"
                     >
                       a0ce2
@@ -829,11 +829,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 >
                   <EuiLink
                     className="c1"
-                    href="#/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
+                    href="/basepath/app/apm/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
                   >
                     <a
                       className="euiLink euiLink--primary c1"
-                      href="#/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
+                      href="/basepath/app/apm/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
                       rel="noreferrer"
                     />
                   </EuiLink>
@@ -876,13 +876,13 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                       >
                         <EuiLink
                           className="c3"
-                          href="#/services/opbeans-python/errors/a0ce2c8978ef92cdf2ff163ae28576ee?"
+                          href="/basepath/app/apm/services/opbeans-python/errors/a0ce2c8978ef92cdf2ff163ae28576ee"
                           onBlur={[Function]}
                           onFocus={[Function]}
                         >
                           <a
                             className="euiLink euiLink--primary c3"
-                            href="#/services/opbeans-python/errors/a0ce2c8978ef92cdf2ff163ae28576ee?"
+                            href="/basepath/app/apm/services/opbeans-python/errors/a0ce2c8978ef92cdf2ff163ae28576ee"
                             onBlur={[Function]}
                             onFocus={[Function]}
                             rel="noreferrer"
@@ -1018,11 +1018,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 >
                   <EuiLink
                     className="c0"
-                    href="#/services/opbeans-python/errors/f3ac95493913cc7a3cfec30a19d2120a?"
+                    href="/basepath/app/apm/services/opbeans-python/errors/f3ac95493913cc7a3cfec30a19d2120a"
                   >
                     <a
                       className="euiLink euiLink--primary c0"
-                      href="#/services/opbeans-python/errors/f3ac95493913cc7a3cfec30a19d2120a?"
+                      href="/basepath/app/apm/services/opbeans-python/errors/f3ac95493913cc7a3cfec30a19d2120a"
                       rel="noreferrer"
                     >
                       f3ac9
@@ -1063,11 +1063,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 >
                   <EuiLink
                     className="c1"
-                    href="#/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
+                    href="/basepath/app/apm/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
                   >
                     <a
                       className="euiLink euiLink--primary c1"
-                      href="#/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
+                      href="/basepath/app/apm/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
                       rel="noreferrer"
                     />
                   </EuiLink>
@@ -1110,13 +1110,13 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                       >
                         <EuiLink
                           className="c3"
-                          href="#/services/opbeans-python/errors/f3ac95493913cc7a3cfec30a19d2120a?"
+                          href="/basepath/app/apm/services/opbeans-python/errors/f3ac95493913cc7a3cfec30a19d2120a"
                           onBlur={[Function]}
                           onFocus={[Function]}
                         >
                           <a
                             className="euiLink euiLink--primary c3"
-                            href="#/services/opbeans-python/errors/f3ac95493913cc7a3cfec30a19d2120a?"
+                            href="/basepath/app/apm/services/opbeans-python/errors/f3ac95493913cc7a3cfec30a19d2120a"
                             onBlur={[Function]}
                             onFocus={[Function]}
                             rel="noreferrer"
@@ -1252,11 +1252,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 >
                   <EuiLink
                     className="c0"
-                    href="#/services/opbeans-python/errors/e90863d04b7a692435305f09bbe8c840?"
+                    href="/basepath/app/apm/services/opbeans-python/errors/e90863d04b7a692435305f09bbe8c840"
                   >
                     <a
                       className="euiLink euiLink--primary c0"
-                      href="#/services/opbeans-python/errors/e90863d04b7a692435305f09bbe8c840?"
+                      href="/basepath/app/apm/services/opbeans-python/errors/e90863d04b7a692435305f09bbe8c840"
                       rel="noreferrer"
                     >
                       e9086
@@ -1297,11 +1297,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 >
                   <EuiLink
                     className="c1"
-                    href="#/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
+                    href="/basepath/app/apm/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
                   >
                     <a
                       className="euiLink euiLink--primary c1"
-                      href="#/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
+                      href="/basepath/app/apm/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
                       rel="noreferrer"
                     />
                   </EuiLink>
@@ -1344,13 +1344,13 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                       >
                         <EuiLink
                           className="c3"
-                          href="#/services/opbeans-python/errors/e90863d04b7a692435305f09bbe8c840?"
+                          href="/basepath/app/apm/services/opbeans-python/errors/e90863d04b7a692435305f09bbe8c840"
                           onBlur={[Function]}
                           onFocus={[Function]}
                         >
                           <a
                             className="euiLink euiLink--primary c3"
-                            href="#/services/opbeans-python/errors/e90863d04b7a692435305f09bbe8c840?"
+                            href="/basepath/app/apm/services/opbeans-python/errors/e90863d04b7a692435305f09bbe8c840"
                             onBlur={[Function]}
                             onFocus={[Function]}
                             rel="noreferrer"
@@ -1486,11 +1486,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 >
                   <EuiLink
                     className="c0"
-                    href="#/services/opbeans-python/errors/8673d8bf7a032e387c101bafbab0d2bc?"
+                    href="/basepath/app/apm/services/opbeans-python/errors/8673d8bf7a032e387c101bafbab0d2bc"
                   >
                     <a
                       className="euiLink euiLink--primary c0"
-                      href="#/services/opbeans-python/errors/8673d8bf7a032e387c101bafbab0d2bc?"
+                      href="/basepath/app/apm/services/opbeans-python/errors/8673d8bf7a032e387c101bafbab0d2bc"
                       rel="noreferrer"
                     >
                       8673d
@@ -1531,11 +1531,11 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 >
                   <EuiLink
                     className="c1"
-                    href="#/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
+                    href="/basepath/app/apm/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
                   >
                     <a
                       className="euiLink euiLink--primary c1"
-                      href="#/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
+                      href="/basepath/app/apm/services/opbeans-python/errors?page=0&serviceName=opbeans-python&transactionType=request&start=2018-01-10T09:51:41.050Z&end=2018-01-10T10:06:41.050Z&kuery=error.exception.type:undefined"
                       rel="noreferrer"
                     />
                   </EuiLink>
@@ -1578,13 +1578,13 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                       >
                         <EuiLink
                           className="c3"
-                          href="#/services/opbeans-python/errors/8673d8bf7a032e387c101bafbab0d2bc?"
+                          href="/basepath/app/apm/services/opbeans-python/errors/8673d8bf7a032e387c101bafbab0d2bc"
                           onBlur={[Function]}
                           onFocus={[Function]}
                         >
                           <a
                             className="euiLink euiLink--primary c3"
-                            href="#/services/opbeans-python/errors/8673d8bf7a032e387c101bafbab0d2bc?"
+                            href="/basepath/app/apm/services/opbeans-python/errors/8673d8bf7a032e387c101bafbab0d2bc"
                             onBlur={[Function]}
                             onFocus={[Function]}
                             rel="noreferrer"
diff --git a/x-pack/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap b/x-pack/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap
index 4ded8286d8598..24b51e3fba917 100644
--- a/x-pack/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap
@@ -11,8 +11,21 @@ exports[`Home component should render services 1`] = `
         },
       },
       "core": Object {
+        "application": Object {
+          "capabilities": Object {
+            "apm": Object {},
+          },
+          "currentAppId$": Observable {
+            "_isScalar": false,
+          },
+        },
         "chrome": Object {
+          "docTitle": Object {
+            "change": [Function],
+          },
+          "setBadge": [Function],
           "setBreadcrumbs": [Function],
+          "setHelpExtension": [Function],
         },
         "docLinks": Object {
           "DOC_LINK_VERSION": "0",
@@ -23,6 +36,9 @@ exports[`Home component should render services 1`] = `
             "prepend": [Function],
           },
         },
+        "i18n": Object {
+          "Context": [Function],
+        },
         "notifications": Object {
           "toasts": Object {
             "addDanger": [Function],
@@ -31,6 +47,7 @@ exports[`Home component should render services 1`] = `
         },
         "uiSettings": Object {
           "get": [Function],
+          "get$": [Function],
         },
       },
       "plugins": Object {},
@@ -54,8 +71,21 @@ exports[`Home component should render traces 1`] = `
         },
       },
       "core": Object {
+        "application": Object {
+          "capabilities": Object {
+            "apm": Object {},
+          },
+          "currentAppId$": Observable {
+            "_isScalar": false,
+          },
+        },
         "chrome": Object {
+          "docTitle": Object {
+            "change": [Function],
+          },
+          "setBadge": [Function],
           "setBreadcrumbs": [Function],
+          "setHelpExtension": [Function],
         },
         "docLinks": Object {
           "DOC_LINK_VERSION": "0",
@@ -66,6 +96,9 @@ exports[`Home component should render traces 1`] = `
             "prepend": [Function],
           },
         },
+        "i18n": Object {
+          "Context": [Function],
+        },
         "notifications": Object {
           "toasts": Object {
             "addDanger": [Function],
@@ -74,6 +107,7 @@ exports[`Home component should render traces 1`] = `
         },
         "uiSettings": Object {
           "get": [Function],
+          "get$": [Function],
         },
       },
       "plugins": Object {},
diff --git a/x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.test.tsx b/x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.test.tsx
index 2c19356a7fd52..102a3d91e4a91 100644
--- a/x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.test.tsx
@@ -60,29 +60,32 @@ describe('UpdateBreadcrumbs', () => {
       'rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0'
     );
     const breadcrumbs = setBreadcrumbs.mock.calls[0][0];
-    expect(breadcrumbs).toEqual([
-      {
-        text: 'APM',
-        href:
-          '#/?kuery=myKuery&rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0',
-      },
-      {
-        text: 'Services',
-        href:
-          '#/services?kuery=myKuery&rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0',
-      },
-      {
-        text: 'opbeans-node',
-        href:
-          '#/services/opbeans-node?kuery=myKuery&rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0',
-      },
-      {
-        text: 'Errors',
-        href:
-          '#/services/opbeans-node/errors?kuery=myKuery&rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0',
-      },
-      { text: 'myGroupId', href: undefined },
-    ]);
+    expect(breadcrumbs).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          text: 'APM',
+          href:
+            '/basepath/app/apm/?kuery=myKuery&rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0',
+        }),
+        expect.objectContaining({
+          text: 'Services',
+          href:
+            '/basepath/app/apm/services?kuery=myKuery&rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0',
+        }),
+        expect.objectContaining({
+          text: 'opbeans-node',
+          href:
+            '/basepath/app/apm/services/opbeans-node?kuery=myKuery&rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0',
+        }),
+        expect.objectContaining({
+          text: 'Errors',
+          href:
+            '/basepath/app/apm/services/opbeans-node/errors?kuery=myKuery&rangeFrom=now-24h&rangeTo=now&refreshPaused=true&refreshInterval=0',
+        }),
+        expect.objectContaining({ text: 'myGroupId', href: undefined }),
+      ])
+    );
+
     expect(changeTitle).toHaveBeenCalledWith([
       'myGroupId',
       'Errors',
@@ -95,12 +98,23 @@ describe('UpdateBreadcrumbs', () => {
   it('/services/:serviceName/errors', () => {
     mountBreadcrumb('/services/opbeans-node/errors');
     const breadcrumbs = setBreadcrumbs.mock.calls[0][0];
-    expect(breadcrumbs).toEqual([
-      { text: 'APM', href: '#/?kuery=myKuery' },
-      { text: 'Services', href: '#/services?kuery=myKuery' },
-      { text: 'opbeans-node', href: '#/services/opbeans-node?kuery=myKuery' },
-      { text: 'Errors', href: undefined },
-    ]);
+    expect(breadcrumbs).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          text: 'APM',
+          href: '/basepath/app/apm/?kuery=myKuery',
+        }),
+        expect.objectContaining({
+          text: 'Services',
+          href: '/basepath/app/apm/services?kuery=myKuery',
+        }),
+        expect.objectContaining({
+          text: 'opbeans-node',
+          href: '/basepath/app/apm/services/opbeans-node?kuery=myKuery',
+        }),
+        expect.objectContaining({ text: 'Errors', href: undefined }),
+      ])
+    );
     expect(changeTitle).toHaveBeenCalledWith([
       'Errors',
       'opbeans-node',
@@ -112,12 +126,24 @@ describe('UpdateBreadcrumbs', () => {
   it('/services/:serviceName/transactions', () => {
     mountBreadcrumb('/services/opbeans-node/transactions');
     const breadcrumbs = setBreadcrumbs.mock.calls[0][0];
-    expect(breadcrumbs).toEqual([
-      { text: 'APM', href: '#/?kuery=myKuery' },
-      { text: 'Services', href: '#/services?kuery=myKuery' },
-      { text: 'opbeans-node', href: '#/services/opbeans-node?kuery=myKuery' },
-      { text: 'Transactions', href: undefined },
-    ]);
+    expect(breadcrumbs).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          text: 'APM',
+          href: '/basepath/app/apm/?kuery=myKuery',
+        }),
+        expect.objectContaining({
+          text: 'Services',
+          href: '/basepath/app/apm/services?kuery=myKuery',
+        }),
+        expect.objectContaining({
+          text: 'opbeans-node',
+          href: '/basepath/app/apm/services/opbeans-node?kuery=myKuery',
+        }),
+        expect.objectContaining({ text: 'Transactions', href: undefined }),
+      ])
+    );
+
     expect(changeTitle).toHaveBeenCalledWith([
       'Transactions',
       'opbeans-node',
@@ -132,16 +158,33 @@ describe('UpdateBreadcrumbs', () => {
       'transactionName=my-transaction-name'
     );
     const breadcrumbs = setBreadcrumbs.mock.calls[0][0];
-    expect(breadcrumbs).toEqual([
-      { text: 'APM', href: '#/?kuery=myKuery' },
-      { text: 'Services', href: '#/services?kuery=myKuery' },
-      { text: 'opbeans-node', href: '#/services/opbeans-node?kuery=myKuery' },
-      {
-        text: 'Transactions',
-        href: '#/services/opbeans-node/transactions?kuery=myKuery',
-      },
-      { text: 'my-transaction-name', href: undefined },
-    ]);
+
+    expect(breadcrumbs).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          text: 'APM',
+          href: '/basepath/app/apm/?kuery=myKuery',
+        }),
+        expect.objectContaining({
+          text: 'Services',
+          href: '/basepath/app/apm/services?kuery=myKuery',
+        }),
+        expect.objectContaining({
+          text: 'opbeans-node',
+          href: '/basepath/app/apm/services/opbeans-node?kuery=myKuery',
+        }),
+        expect.objectContaining({
+          text: 'Transactions',
+          href:
+            '/basepath/app/apm/services/opbeans-node/transactions?kuery=myKuery',
+        }),
+        expect.objectContaining({
+          text: 'my-transaction-name',
+          href: undefined,
+        }),
+      ])
+    );
+
     expect(changeTitle).toHaveBeenCalledWith([
       'my-transaction-name',
       'Transactions',
diff --git a/x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx b/x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx
index e7657c63f41bb..5bf5cea587f93 100644
--- a/x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx
+++ b/x-pack/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx
@@ -5,20 +5,20 @@
  */
 
 import { Location } from 'history';
-import React from 'react';
-import { AppMountContext } from 'src/core/public';
+import React, { MouseEvent } from 'react';
+import { CoreStart } from 'src/core/public';
+import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
 import { getAPMHref } from '../../shared/Links/apm/APMLink';
 import {
   Breadcrumb,
-  ProvideBreadcrumbs,
   BreadcrumbRoute,
+  ProvideBreadcrumbs,
 } from './ProvideBreadcrumbs';
-import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
 
 interface Props {
   location: Location;
   breadcrumbs: Breadcrumb[];
-  core: AppMountContext['core'];
+  core: CoreStart;
 }
 
 function getTitleFromBreadCrumbs(breadcrumbs: Breadcrumb[]) {
@@ -27,15 +27,24 @@ function getTitleFromBreadCrumbs(breadcrumbs: Breadcrumb[]) {
 
 class UpdateBreadcrumbsComponent extends React.Component<Props> {
   public updateHeaderBreadcrumbs() {
+    const { basePath } = this.props.core.http;
     const breadcrumbs = this.props.breadcrumbs.map(
       ({ value, match }, index) => {
+        const { search } = this.props.location;
         const isLastBreadcrumbItem =
           index === this.props.breadcrumbs.length - 1;
+        const href = isLastBreadcrumbItem
+          ? undefined // makes the breadcrumb item not clickable
+          : getAPMHref({ basePath, path: match.url, search });
         return {
           text: value,
-          href: isLastBreadcrumbItem
-            ? undefined // makes the breadcrumb item not clickable
-            : getAPMHref(match.url, this.props.location.search),
+          href,
+          onClick: (event: MouseEvent<HTMLAnchorElement>) => {
+            if (href) {
+              event.preventDefault();
+              this.props.core.application.navigateToUrl(href);
+            }
+          },
         };
       }
     );
diff --git a/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx b/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
index 8caddc94b6907..56026dcf477ec 100644
--- a/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
@@ -38,14 +38,28 @@ interface RouteParams {
 }
 
 export const renderAsRedirectTo = (to: string) => {
-  return ({ location }: RouteComponentProps<RouteParams>) => (
-    <Redirect
-      to={{
-        ...location,
-        pathname: to,
-      }}
-    />
-  );
+  return ({ location }: RouteComponentProps<RouteParams>) => {
+    let resolvedUrl: URL | undefined;
+
+    // Redirect root URLs with a hash to support backward compatibility with URLs
+    // from before we switched to the non-hash platform history.
+    if (location.pathname === '' && location.hash.length > 0) {
+      // We just want the search and pathname so the host doesn't matter
+      resolvedUrl = new URL(location.hash.slice(1), 'http://localhost');
+      to = resolvedUrl.pathname;
+    }
+
+    return (
+      <Redirect
+        to={{
+          ...location,
+          hash: '',
+          pathname: to,
+          search: resolvedUrl ? resolvedUrl.search : location.search,
+        }}
+      />
+    );
+  };
 };
 
 export const routes: BreadcrumbRoute[] = [
diff --git a/x-pack/plugins/apm/public/components/app/Main/route_config/route_config.test.tsx b/x-pack/plugins/apm/public/components/app/Main/route_config/route_config.test.tsx
new file mode 100644
index 0000000000000..ad12afe35fa20
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/Main/route_config/route_config.test.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { routes } from './';
+
+describe('routes', () => {
+  describe('/', () => {
+    const route = routes.find((r) => r.path === '/');
+
+    describe('with no hash path', () => {
+      it('redirects to /services', () => {
+        const location = { hash: '', pathname: '/', search: '' };
+        expect(
+          (route as any).render({ location } as any).props.to.pathname
+        ).toEqual('/services');
+      });
+    });
+
+    describe('with a hash path', () => {
+      it('redirects to the hash path', () => {
+        const location = {
+          hash:
+            '#/services/opbeans-python/transactions/view?rangeFrom=now-24h&rangeTo=now&refreshInterval=10000&refreshPaused=false&traceId=d919c89dc7ca48d84b9dde1fef01d1f8&transactionId=1b542853d787ba7b&transactionName=GET%20opbeans.views.product_customers&transactionType=request&flyoutDetailTab=&waterfallItemId=1b542853d787ba7b',
+          pathname: '',
+          search: '',
+        };
+
+        expect(((route as any).render({ location }) as any).props.to).toEqual({
+          hash: '',
+          pathname: '/services/opbeans-python/transactions/view',
+          search:
+            '?rangeFrom=now-24h&rangeTo=now&refreshInterval=10000&refreshPaused=false&traceId=d919c89dc7ca48d84b9dde1fef01d1f8&transactionId=1b542853d787ba7b&transactionName=GET%20opbeans.views.product_customers&transactionType=request&flyoutDetailTab=&waterfallItemId=1b542853d787ba7b',
+        });
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx b/x-pack/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx
index 14c912d0bd519..d99dc4d5cd37a 100644
--- a/x-pack/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx
+++ b/x-pack/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx
@@ -5,13 +5,14 @@
  */
 
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import { useFetcher } from '../../../../../hooks/useFetcher';
-import { history } from '../../../../../utils/history';
+import { toQuery } from '../../../../shared/Links/url_helpers';
 import { Settings } from '../../../Settings';
 import { AgentConfigurationCreateEdit } from '../../../Settings/AgentConfigurations/AgentConfigurationCreateEdit';
-import { toQuery } from '../../../../shared/Links/url_helpers';
 
 export function EditAgentConfigurationRouteHandler() {
+  const history = useHistory();
   const { search } = history.location;
 
   // typescript complains because `pageStop` does not exist in `APMQueryParams`
@@ -40,6 +41,7 @@ export function EditAgentConfigurationRouteHandler() {
 }
 
 export function CreateAgentConfigurationRouteHandler() {
+  const history = useHistory();
   const { search } = history.location;
 
   // Ignoring here because we specifically DO NOT want to add the query params to the global route handler
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx
index 9211504a2dffe..c76be19edfe47 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageViewsChart.tsx
@@ -4,33 +4,33 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import numeral from '@elastic/numeral';
 import {
   Axis,
   BarSeries,
   BrushEndListener,
   Chart,
+  DARK_THEME,
+  LIGHT_THEME,
   niceTimeFormatByDay,
   ScaleType,
   SeriesNameFn,
   Settings,
   timeFormatter,
 } from '@elastic/charts';
-import { DARK_THEME, LIGHT_THEME } from '@elastic/charts';
-
+import { Position } from '@elastic/charts/dist/utils/commons';
 import {
   EUI_CHARTS_THEME_DARK,
   EUI_CHARTS_THEME_LIGHT,
 } from '@elastic/eui/dist/eui_charts_theme';
+import numeral from '@elastic/numeral';
 import moment from 'moment';
-import { Position } from '@elastic/charts/dist/utils/commons';
-import { I18LABELS } from '../translations';
-import { history } from '../../../../utils/history';
-import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
-import { ChartWrapper } from '../ChartWrapper';
+import React from 'react';
+import { useHistory } from 'react-router-dom';
 import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
 import { useUrlParams } from '../../../../hooks/useUrlParams';
+import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
+import { ChartWrapper } from '../ChartWrapper';
+import { I18LABELS } from '../translations';
 
 interface Props {
   data?: Array<Record<string, number | null>>;
@@ -38,6 +38,7 @@ interface Props {
 }
 
 export function PageViewsChart({ data, loading }: Props) {
+  const history = useHistory();
   const { urlParams } = useUrlParams();
 
   const { start, end } = urlParams;
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Controls.test.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Controls.test.tsx
new file mode 100644
index 0000000000000..1187b71dff825
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/Controls.test.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import lightTheme from '@elastic/eui/dist/eui_theme_light.json';
+import { render } from '@testing-library/react';
+import cytoscape from 'cytoscape';
+import React, { ReactNode } from 'react';
+import { ThemeContext } from 'styled-components';
+import { MockApmPluginContextWrapper } from '../../../context/ApmPluginContext/MockApmPluginContext';
+import { Controls } from './Controls';
+import { CytoscapeContext } from './Cytoscape';
+
+const cy = cytoscape({
+  elements: [{ classes: 'primary', data: { id: 'test node' } }],
+});
+
+function Wrapper({ children }: { children?: ReactNode }) {
+  return (
+    <CytoscapeContext.Provider value={cy}>
+      <MockApmPluginContextWrapper>
+        <ThemeContext.Provider value={{ eui: lightTheme }}>
+          {children}
+        </ThemeContext.Provider>
+      </MockApmPluginContextWrapper>
+    </CytoscapeContext.Provider>
+  );
+}
+
+describe('Controls', () => {
+  describe('with a primary node', () => {
+    it('links to the full map', async () => {
+      const result = render(<Controls />, { wrapper: Wrapper });
+      const { findByTestId } = result;
+
+      const button = await findByTestId('viewFullMapButton');
+
+      expect(button.getAttribute('href')).toEqual(
+        '/basepath/app/apm/service-map'
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Controls.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Controls.tsx
index bcc87cbf35819..c8f586240471f 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/Controls.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/Controls.tsx
@@ -4,16 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useContext, useEffect, useState } from 'react';
 import { EuiButtonIcon, EuiPanel, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import React, { useContext, useEffect, useState } from 'react';
 import styled from 'styled-components';
-import { CytoscapeContext } from './Cytoscape';
-import { getAnimationOptions, getNodeHeight } from './cytoscapeOptions';
-import { getAPMHref } from '../../shared/Links/apm/APMLink';
+import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
+import { useTheme } from '../../../hooks/useTheme';
 import { useUrlParams } from '../../../hooks/useUrlParams';
+import { getAPMHref } from '../../shared/Links/apm/APMLink';
 import { APMQueryParams } from '../../shared/Links/url_helpers';
-import { useTheme } from '../../../hooks/useTheme';
+import { CytoscapeContext } from './Cytoscape';
+import { getAnimationOptions, getNodeHeight } from './cytoscapeOptions';
 
 const ControlsContainer = styled('div')`
   left: ${({ theme }) => theme.eui.gutterTypes.gutterMedium};
@@ -96,6 +97,8 @@ function useDebugDownloadUrl(cy?: cytoscape.Core) {
 }
 
 export function Controls() {
+  const { core } = useApmPluginContext();
+  const { basePath } = core.http;
   const theme = useTheme();
   const cy = useContext(CytoscapeContext);
   const { urlParams } = useUrlParams();
@@ -103,6 +106,12 @@ export function Controls() {
   const [zoom, setZoom] = useState((cy && cy.zoom()) || 1);
   const duration = parseInt(theme.eui.euiAnimSpeedFast, 10);
   const downloadUrl = useDebugDownloadUrl(cy);
+  const viewFullMapUrl = getAPMHref({
+    basePath,
+    path: '/service-map',
+    search: currentSearch,
+    query: urlParams as APMQueryParams,
+  });
 
   // Handle zoom events
   useEffect(() => {
@@ -209,11 +218,8 @@ export function Controls() {
             <Button
               aria-label={viewFullMapLabel}
               color="text"
-              href={getAPMHref(
-                '/service-map',
-                currentSearch,
-                urlParams as APMQueryParams
-              )}
+              data-test-subj="viewFullMapButton"
+              href={viewFullMapUrl}
               iconType="apps"
             />
           </EuiToolTip>
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.test.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.test.tsx
index 4146266b17916..f98a7a1b33dd8 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.test.tsx
@@ -4,14 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { Buttons } from './Buttons';
 import { render } from '@testing-library/react';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
+
+function Wrapper({ children }: { children?: ReactNode }) {
+  return <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>;
+}
 
 describe('Popover Buttons', () => {
   it('renders', () => {
     expect(() =>
-      render(<Buttons selectedNodeServiceName="test service name" />)
+      render(<Buttons selectedNodeServiceName="test service name" />, {
+        wrapper: Wrapper,
+      })
     ).not.toThrowError();
   });
 
@@ -21,7 +28,8 @@ describe('Popover Buttons', () => {
       <Buttons
         onFocusClick={onFocusClick}
         selectedNodeServiceName="test service name"
-      />
+      />,
+      { wrapper: Wrapper }
     );
     const focusButton = await result.findByText('Focus map');
 
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.tsx
index cb33fb32f3b0d..55d068cba5935 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.tsx
@@ -9,6 +9,7 @@
 import { EuiButton, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { MouseEvent } from 'react';
+import { useApmPluginContext } from '../../../../hooks/useApmPluginContext';
 import { useUrlParams } from '../../../../hooks/useUrlParams';
 import { getAPMHref } from '../../../shared/Links/apm/APMLink';
 import { APMQueryParams } from '../../../shared/Links/url_helpers';
@@ -22,22 +23,24 @@ export function Buttons({
   onFocusClick = () => {},
   selectedNodeServiceName,
 }: ButtonsProps) {
+  const { core } = useApmPluginContext();
+  const { basePath } = core.http;
   // The params may contain the service name. We want to use the selected node's
   // service name in the button URLs, so make a copy and set the
   // `serviceName` property.
   const urlParams = { ...useUrlParams().urlParams } as APMQueryParams;
   urlParams.serviceName = selectedNodeServiceName;
 
-  const detailsUrl = getAPMHref(
-    `/services/${selectedNodeServiceName}/transactions`,
-    '',
-    urlParams
-  );
-  const focusUrl = getAPMHref(
-    `/services/${selectedNodeServiceName}/service-map`,
-    '',
-    urlParams
-  );
+  const detailsUrl = getAPMHref({
+    basePath,
+    path: `/services/${selectedNodeServiceName}/transactions`,
+    query: urlParams,
+  });
+  const focusUrl = getAPMHref({
+    basePath,
+    path: `/services/${selectedNodeServiceName}/service-map`,
+    query: urlParams,
+  });
 
   return (
     <>
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/index.test.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/index.test.tsx
index 4a56f75b05de9..f504ac1f68ce1 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/index.test.tsx
@@ -5,11 +5,17 @@
  */
 
 import { render } from '@testing-library/react';
+import { CoreStart } from 'kibana/public';
 import React, { ReactNode } from 'react';
+import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
 import { License } from '../../../../../licensing/common/license';
+import { MockApmPluginContextWrapper } from '../../../context/ApmPluginContext/MockApmPluginContext';
 import { LicenseContext } from '../../../context/LicenseContext';
 import { ServiceMap } from './';
-import { MockApmPluginContextWrapper } from '../../../context/ApmPluginContext/MockApmPluginContext';
+
+const KibanaReactContext = createKibanaReactContext({
+  usageCollection: { reportUiStats: () => {} },
+} as Partial<CoreStart>);
 
 const expiredLicense = new License({
   signature: 'test signature',
@@ -24,9 +30,11 @@ const expiredLicense = new License({
 
 function Wrapper({ children }: { children?: ReactNode }) {
   return (
-    <LicenseContext.Provider value={expiredLicense}>
-      <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>
-    </LicenseContext.Provider>
+    <KibanaReactContext.Provider>
+      <LicenseContext.Provider value={expiredLicense}>
+        <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>
+      </LicenseContext.Provider>
+    </KibanaReactContext.Provider>
   );
 }
 
diff --git a/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx b/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx
index 78d78c6909c57..78d75feb72f1f 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx
@@ -4,43 +4,49 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { ReactChild, FunctionComponent } from 'react';
 import { render, wait, waitForElement } from '@testing-library/react';
+import { CoreStart } from 'kibana/public';
+import React, { FunctionComponent, ReactChild } from 'react';
+import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
 import { ServiceOverview } from '..';
-import * as urlParamsHooks from '../../../../hooks/useUrlParams';
-import * as useLocalUIFilters from '../../../../hooks/useLocalUIFilters';
-import { FETCH_STATUS } from '../../../../hooks/useFetcher';
-import { SessionStorageMock } from '../../../../services/__test__/SessionStorageMock';
 import { ApmPluginContextValue } from '../../../../context/ApmPluginContext';
 import {
-  MockApmPluginContextWrapper,
   mockApmPluginContextValue,
+  MockApmPluginContextWrapper,
 } from '../../../../context/ApmPluginContext/MockApmPluginContext';
+import { FETCH_STATUS } from '../../../../hooks/useFetcher';
+import * as useLocalUIFilters from '../../../../hooks/useLocalUIFilters';
+import * as urlParamsHooks from '../../../../hooks/useUrlParams';
+import { SessionStorageMock } from '../../../../services/__test__/SessionStorageMock';
 
-jest.mock('ui/new_platform');
+const KibanaReactContext = createKibanaReactContext({
+  usageCollection: { reportUiStats: () => {} },
+} as Partial<CoreStart>);
 
 function wrapper({ children }: { children: ReactChild }) {
   return (
-    <MockApmPluginContextWrapper
-      value={
-        ({
-          ...mockApmPluginContextValue,
-          core: {
-            ...mockApmPluginContextValue.core,
-            http: { ...mockApmPluginContextValue.core.http, get: httpGet },
-            notifications: {
-              ...mockApmPluginContextValue.core.notifications,
-              toasts: {
-                ...mockApmPluginContextValue.core.notifications.toasts,
-                addWarning,
+    <KibanaReactContext.Provider>
+      <MockApmPluginContextWrapper
+        value={
+          ({
+            ...mockApmPluginContextValue,
+            core: {
+              ...mockApmPluginContextValue.core,
+              http: { ...mockApmPluginContextValue.core.http, get: httpGet },
+              notifications: {
+                ...mockApmPluginContextValue.core.notifications,
+                toasts: {
+                  ...mockApmPluginContextValue.core.notifications.toasts,
+                  addWarning,
+                },
               },
             },
-          },
-        } as unknown) as ApmPluginContextValue
-      }
-    >
-      {children}
-    </MockApmPluginContextWrapper>
+          } as unknown) as ApmPluginContextValue
+        }
+      >
+        {children}
+      </MockApmPluginContextWrapper>
+    </KibanaReactContext.Provider>
   );
 }
 
diff --git a/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap b/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
index 281acf824b5c3..6d447887627bf 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/ServiceOverview.test.tsx.snap
@@ -156,7 +156,7 @@ NodeList [
         >
           <a
             class="euiLink euiLink--primary c0"
-            href="#/services/My Go Service/transactions?"
+            href="/basepath/app/apm/services/My Go Service/transactions"
             rel="noreferrer"
           >
             My Go Service
@@ -262,7 +262,7 @@ NodeList [
         >
           <a
             class="euiLink euiLink--primary c0"
-            href="#/services/My Python Service/transactions?"
+            href="/basepath/app/apm/services/My Python Service/transactions"
             rel="noreferrer"
           >
             My Python Service
diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx
index e2609f893dfa0..54440559070ad 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx
@@ -5,37 +5,37 @@
  */
 
 import {
+  EuiBottomBar,
   EuiButton,
-  EuiForm,
-  EuiTitle,
-  EuiSpacer,
-  EuiPanel,
+  EuiButtonEmpty,
+  EuiCallOut,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiStat,
-  EuiBottomBar,
-  EuiText,
+  EuiForm,
   EuiHealth,
   EuiLoadingSpinner,
+  EuiPanel,
+  EuiSpacer,
+  EuiStat,
+  EuiText,
+  EuiTitle,
 } from '@elastic/eui';
-import React, { useState, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
-import { EuiButtonEmpty } from '@elastic/eui';
-import { EuiCallOut } from '@elastic/eui';
-import { FETCH_STATUS } from '../../../../../../hooks/useFetcher';
-import { AgentName } from '../../../../../../../typings/es_schemas/ui/fields/agent';
-import { history } from '../../../../../../utils/history';
+import React, { useMemo, useState } from 'react';
+import { useHistory } from 'react-router-dom';
+import { useUiTracker } from '../../../../../../../../observability/public';
+import { getOptionLabel } from '../../../../../../../common/agent_configuration/all_option';
 import { AgentConfigurationIntake } from '../../../../../../../common/agent_configuration/configuration_types';
 import {
   filterByAgent,
   settingDefinitions,
   validateSetting,
 } from '../../../../../../../common/agent_configuration/setting_definitions';
-import { saveConfig } from './saveConfig';
+import { AgentName } from '../../../../../../../typings/es_schemas/ui/fields/agent';
 import { useApmPluginContext } from '../../../../../../hooks/useApmPluginContext';
-import { useUiTracker } from '../../../../../../../../observability/public';
+import { FETCH_STATUS } from '../../../../../../hooks/useFetcher';
+import { saveConfig } from './saveConfig';
 import { SettingFormRow } from './SettingFormRow';
-import { getOptionLabel } from '../../../../../../../common/agent_configuration/all_option';
 
 function removeEmpty(obj: { [key: string]: any }) {
   return Object.fromEntries(
@@ -60,6 +60,7 @@ export function SettingsPage({
   isEditMode: boolean;
   onClickEdit: () => void;
 }) {
+  const history = useHistory();
   // get a telemetry UI event tracker
   const trackApmEvent = useUiTracker({ app: 'apm' });
   const { toasts } = useApmPluginContext().core.notifications;
diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
index 50eb85715969a..1c42f146b867a 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
@@ -4,19 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { isEmpty } from 'lodash';
-import { EuiTitle, EuiText, EuiSpacer } from '@elastic/eui';
-import React, { useState, useEffect, useCallback } from 'react';
+import { EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { FetcherResult } from '../../../../../hooks/useFetcher';
-import { history } from '../../../../../utils/history';
+import { History } from 'history';
+import { isEmpty } from 'lodash';
+import React, { useCallback, useEffect, useState } from 'react';
+import { useHistory } from 'react-router-dom';
 import {
-  AgentConfigurationIntake,
   AgentConfiguration,
+  AgentConfigurationIntake,
 } from '../../../../../../common/agent_configuration/configuration_types';
+import { FetcherResult } from '../../../../../hooks/useFetcher';
+import { fromQuery, toQuery } from '../../../../shared/Links/url_helpers';
 import { ServicePage } from './ServicePage/ServicePage';
 import { SettingsPage } from './SettingsPage/SettingsPage';
-import { fromQuery, toQuery } from '../../../../shared/Links/url_helpers';
 
 type PageStep = 'choose-service-step' | 'choose-settings-step' | 'review-step';
 
@@ -30,7 +31,7 @@ function getInitialNewConfig(
   };
 }
 
-function setPage(pageStep: PageStep) {
+function setPage(pageStep: PageStep, history: History) {
   history.push({
     ...history.location,
     search: fromQuery({
@@ -68,6 +69,7 @@ export function AgentConfigurationCreateEdit({
   pageStep: PageStep;
   existingConfigResult?: FetcherResult<AgentConfiguration>;
 }) {
+  const history = useHistory();
   const existingConfig = existingConfigResult?.data;
   const isEditMode = Boolean(existingConfigResult);
   const [newConfig, setNewConfig] = useState<AgentConfigurationIntake>(
@@ -90,7 +92,7 @@ export function AgentConfigurationCreateEdit({
   useEffect(() => {
     // the user tried to edit the service of an existing config
     if (pageStep === 'choose-service-step' && isEditMode) {
-      setPage('choose-settings-step');
+      setPage('choose-settings-step', history);
     }
 
     // the user skipped the first step (select service)
@@ -99,9 +101,9 @@ export function AgentConfigurationCreateEdit({
       !isEditMode &&
       isEmpty(newConfig.service)
     ) {
-      setPage('choose-service-step');
+      setPage('choose-service-step', history);
     }
-  }, [isEditMode, newConfig, pageStep]);
+  }, [history, isEditMode, newConfig, pageStep]);
 
   const unsavedChanges = getUnsavedChanges({ newConfig, existingConfig });
 
@@ -135,7 +137,7 @@ export function AgentConfigurationCreateEdit({
           setNewConfig={setNewConfig}
           onClickNext={() => {
             resetSettings();
-            setPage('choose-settings-step');
+            setPage('choose-settings-step', history);
           }}
         />
       )}
@@ -144,7 +146,7 @@ export function AgentConfigurationCreateEdit({
         <SettingsPage
           status={existingConfigResult?.status}
           unsavedChanges={unsavedChanges}
-          onClickEdit={() => setPage('choose-service-step')}
+          onClickEdit={() => setPage('choose-service-step', history)}
           newConfig={newConfig}
           setNewConfig={setNewConfig}
           resetSettings={resetSettings}
diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx
index ce325a57426f5..210b3c3da8d0b 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/List/index.tsx
@@ -4,30 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useState } from 'react';
-import { i18n } from '@kbn/i18n';
 import {
-  EuiEmptyPrompt,
   EuiButton,
   EuiButtonEmpty,
+  EuiButtonIcon,
+  EuiEmptyPrompt,
   EuiHealth,
   EuiToolTip,
-  EuiButtonIcon,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
-import { useTheme } from '../../../../../hooks/useTheme';
-import { FETCH_STATUS } from '../../../../../hooks/useFetcher';
-import { ITableColumn, ManagedTable } from '../../../../shared/ManagedTable';
-import { LoadingStatePrompt } from '../../../../shared/LoadingStatePrompt';
+import React, { useState } from 'react';
+import { getOptionLabel } from '../../../../../../common/agent_configuration/all_option';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { AgentConfigurationListAPIResponse } from '../../../../../../server/lib/settings/agent_configuration/list_configurations';
-import { TimestampTooltip } from '../../../../shared/TimestampTooltip';
+import { useApmPluginContext } from '../../../../../hooks/useApmPluginContext';
+import { FETCH_STATUS } from '../../../../../hooks/useFetcher';
+import { useLocation } from '../../../../../hooks/useLocation';
+import { useTheme } from '../../../../../hooks/useTheme';
 import { px, units } from '../../../../../style/variables';
-import { getOptionLabel } from '../../../../../../common/agent_configuration/all_option';
 import {
   createAgentConfigurationHref,
   editAgentConfigurationHref,
 } from '../../../../shared/Links/apm/agentConfigurationLinks';
+import { LoadingStatePrompt } from '../../../../shared/LoadingStatePrompt';
+import { ITableColumn, ManagedTable } from '../../../../shared/ManagedTable';
+import { TimestampTooltip } from '../../../../shared/TimestampTooltip';
 import { ConfirmDeleteModal } from './ConfirmDeleteModal';
 
 type Config = AgentConfigurationListAPIResponse[0];
@@ -39,6 +41,9 @@ interface Props {
 }
 
 export function AgentConfigurationList({ status, data, refetch }: Props) {
+  const { core } = useApmPluginContext();
+  const { basePath } = core.http;
+  const { search } = useLocation();
   const theme = useTheme();
   const [configToBeDeleted, setConfigToBeDeleted] = useState<Config | null>(
     null
@@ -69,7 +74,11 @@ export function AgentConfigurationList({ status, data, refetch }: Props) {
         </>
       }
       actions={
-        <EuiButton color="primary" fill href={createAgentConfigurationHref()}>
+        <EuiButton
+          color="primary"
+          fill
+          href={createAgentConfigurationHref(search, basePath)}
+        >
           {i18n.translate(
             'xpack.apm.agentConfig.configTable.createConfigButtonLabel',
             { defaultMessage: 'Create configuration' }
@@ -145,7 +154,7 @@ export function AgentConfigurationList({ status, data, refetch }: Props) {
           flush="left"
           size="s"
           color="primary"
-          href={editAgentConfigurationHref(config.service)}
+          href={editAgentConfigurationHref(config.service, search, basePath)}
         >
           {getOptionLabel(config.service.name)}
         </EuiButtonEmpty>
@@ -179,7 +188,7 @@ export function AgentConfigurationList({ status, data, refetch }: Props) {
         <EuiButtonIcon
           aria-label="Edit"
           iconType="pencil"
-          href={editAgentConfigurationHref(config.service)}
+          href={editAgentConfigurationHref(config.service, search, basePath)}
         />
       ),
     },
diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx
index 2f41b9fedd1d1..06d3f883e211a 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx
@@ -4,21 +4,23 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import { i18n } from '@kbn/i18n';
 import {
-  EuiTitle,
+  EuiButton,
   EuiFlexGroup,
   EuiFlexItem,
   EuiPanel,
   EuiSpacer,
-  EuiButton,
+  EuiTitle,
 } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
-import { useFetcher } from '../../../../hooks/useFetcher';
-import { AgentConfigurationList } from './List';
+import React from 'react';
 import { useTrackPageview } from '../../../../../../observability/public';
+import { useApmPluginContext } from '../../../../hooks/useApmPluginContext';
+import { useFetcher } from '../../../../hooks/useFetcher';
+import { useLocation } from '../../../../hooks/useLocation';
 import { createAgentConfigurationHref } from '../../../shared/Links/apm/agentConfigurationLinks';
+import { AgentConfigurationList } from './List';
 
 export function AgentConfigurations() {
   const { refetch, data = [], status } = useFetcher(
@@ -60,7 +62,10 @@ export function AgentConfigurations() {
 }
 
 function CreateConfigurationButton() {
-  const href = createAgentConfigurationHref();
+  const { core } = useApmPluginContext();
+  const { basePath } = core.http;
+  const { search } = useLocation();
+  const href = createAgentConfigurationHref(search, basePath);
   return (
     <EuiFlexItem>
       <EuiFlexGroup alignItems="center" justifyContent="flexEnd">
diff --git a/x-pack/plugins/apm/public/components/app/Settings/Settings.test.tsx b/x-pack/plugins/apm/public/components/app/Settings/Settings.test.tsx
new file mode 100644
index 0000000000000..0e0194cac848c
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/Settings/Settings.test.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { render } from '@testing-library/react';
+import { MockApmPluginContextWrapper } from '../../../context/ApmPluginContext/MockApmPluginContext';
+import React, { ReactNode } from 'react';
+import { Settings } from './';
+import { LocationContext } from '../../../context/LocationContext';
+import { createMemoryHistory } from 'history';
+
+function Wrapper({ children }: { children?: ReactNode }) {
+  const { location } = createMemoryHistory();
+  return (
+    <LocationContext.Provider value={location}>
+      <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>
+    </LocationContext.Provider>
+  );
+}
+
+describe('Settings', () => {
+  it('renders', async () => {
+    expect(() =>
+      render(
+        <Settings>
+          <div />
+        </Settings>,
+        { wrapper: Wrapper }
+      )
+    ).not.toThrowError();
+  });
+});
diff --git a/x-pack/plugins/apm/public/components/app/Settings/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/index.tsx
index cb4726244e50c..9ed3a85fe68b5 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/index.tsx
@@ -19,9 +19,15 @@ import { getAPMHref } from '../../shared/Links/apm/APMLink';
 import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
 
 export function Settings(props: { children: ReactNode }) {
-  const plugin = useApmPluginContext();
-  const canAccessML = !!plugin.core.application.capabilities.ml?.canAccessML;
+  const { core } = useApmPluginContext();
+  const { basePath } = core.http;
+  const canAccessML = !!core.application.capabilities.ml?.canAccessML;
   const { search, pathname } = useLocation();
+
+  function getSettingsHref(path: string) {
+    return getAPMHref({ basePath, path: `/settings${path}`, search });
+  }
+
   return (
     <>
       <HomeLink>
@@ -46,7 +52,7 @@ export function Settings(props: { children: ReactNode }) {
                       defaultMessage: 'Agent Configuration',
                     }),
                     id: '1',
-                    href: getAPMHref('/settings/agent-configuration', search),
+                    href: getSettingsHref('/agent-configuration'),
                     isSelected: pathname.startsWith(
                       '/settings/agent-configuration'
                     ),
@@ -61,10 +67,7 @@ export function Settings(props: { children: ReactNode }) {
                             }
                           ),
                           id: '4',
-                          href: getAPMHref(
-                            '/settings/anomaly-detection',
-                            search
-                          ),
+                          href: getSettingsHref('/anomaly-detection'),
                           isSelected:
                             pathname === '/settings/anomaly-detection',
                         },
@@ -75,7 +78,7 @@ export function Settings(props: { children: ReactNode }) {
                       defaultMessage: 'Customize app',
                     }),
                     id: '3',
-                    href: getAPMHref('/settings/customize-ui', search),
+                    href: getSettingsHref('/customize-ui'),
                     isSelected: pathname === '/settings/customize-ui',
                   },
                   {
@@ -83,7 +86,7 @@ export function Settings(props: { children: ReactNode }) {
                       defaultMessage: 'Indices',
                     }),
                     id: '2',
-                    href: getAPMHref('/settings/apm-indices', search),
+                    href: getSettingsHref('/apm-indices'),
                     isSelected: pathname === '/settings/apm-indices',
                   },
                 ],
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/index.tsx
index 90bbe0a5a2135..9b4f2175731dc 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/Distribution/index.tsx
@@ -9,13 +9,13 @@ import { i18n } from '@kbn/i18n';
 import d3 from 'd3';
 import { isEmpty } from 'lodash';
 import React, { useCallback } from 'react';
+import { useHistory } from 'react-router-dom';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { TransactionDistributionAPIResponse } from '../../../../../server/lib/transactions/distribution';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { IBucket } from '../../../../../server/lib/transactions/distribution/get_buckets/transform';
 import { IUrlParams } from '../../../../context/UrlParamsContext/types';
 import { getDurationFormatter } from '../../../../utils/formatters';
-import { history } from '../../../../utils/history';
 // @ts-ignore
 import Histogram from '../../../shared/charts/Histogram';
 import { EmptyMessage } from '../../../shared/EmptyMessage';
@@ -106,6 +106,7 @@ export function TransactionDistribution(props: Props) {
     isLoading,
     bucketIndex,
   } = props;
+  const history = useHistory();
 
   /* eslint-disable-next-line react-hooks/exhaustive-deps */
   const formatYShort = useCallback(getFormatYShort(transactionType), [
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx
index 15d0f08ae9933..48413d6207ee3 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/TransactionTabs.tsx
@@ -8,10 +8,10 @@ import { EuiSpacer, EuiTab, EuiTabs } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
 import { IUrlParams } from '../../../../context/UrlParamsContext/types';
 import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
-import { history } from '../../../../utils/history';
 import { TransactionMetadata } from '../../../shared/MetadataTable/TransactionMetadata';
 import { WaterfallContainer } from './WaterfallContainer';
 import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers';
@@ -45,6 +45,7 @@ export function TransactionTabs({
   waterfall,
   exceedsMax,
 }: Props) {
+  const history = useHistory();
   const tabs = [timelineTab, metadataTab];
   const currentTab =
     urlParams.detailTab === metadataTab.key ? metadataTab : timelineTab;
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx
index 7e1dbddf56025..ec752b5feeb61 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx
@@ -3,8 +3,9 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { Location } from 'history';
+import { History, Location } from 'history';
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import { SpanFlyout } from './SpanFlyout';
 import { TransactionFlyout } from './TransactionFlyout';
 import { IWaterfall } from './waterfall_helpers/waterfall_helpers';
@@ -13,7 +14,13 @@ interface Props {
   waterfallItemId?: string;
   waterfall: IWaterfall;
   location: Location;
-  toggleFlyout: ({ location }: { location: Location }) => void;
+  toggleFlyout: ({
+    history,
+    location,
+  }: {
+    history: History;
+    location: Location;
+  }) => void;
 }
 
 export function WaterfallFlyout({
@@ -22,6 +29,7 @@ export function WaterfallFlyout({
   location,
   toggleFlyout,
 }: Props) {
+  const history = useHistory();
   const currentItem = waterfall.items.find(
     (item) => item.id === waterfallItemId
   );
@@ -42,14 +50,14 @@ export function WaterfallFlyout({
           totalDuration={waterfall.duration}
           span={currentItem.doc}
           parentTransaction={parentTransaction}
-          onClose={() => toggleFlyout({ location })}
+          onClose={() => toggleFlyout({ history, location })}
         />
       );
     case 'transaction':
       return (
         <TransactionFlyout
           transaction={currentItem.doc}
-          onClose={() => toggleFlyout({ location })}
+          onClose={() => toggleFlyout({ history, location })}
           rootTransactionDuration={
             waterfall.rootTransaction?.transaction.duration.us
           }
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
index 7daf1b798749b..b2301298cbdfe 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
@@ -6,13 +6,13 @@
 
 import { EuiButtonEmpty, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Location } from 'history';
+import { History, Location } from 'history';
 import React, { useState } from 'react';
+import { useHistory } from 'react-router-dom';
 // @ts-ignore
 import { StickyContainer } from 'react-sticky';
 import styled from 'styled-components';
 import { px } from '../../../../../../style/variables';
-import { history } from '../../../../../../utils/history';
 import { Timeline } from '../../../../../shared/charts/Timeline';
 import { HeightRetainer } from '../../../../../shared/HeightRetainer';
 import { fromQuery, toQuery } from '../../../../../shared/Links/url_helpers';
@@ -39,9 +39,11 @@ const TIMELINE_MARGINS = {
 };
 
 const toggleFlyout = ({
+  history,
   item,
   location,
 }: {
+  history: History;
   item?: IWaterfallItem;
   location: Location;
 }) => {
@@ -74,6 +76,7 @@ export function Waterfall({
   waterfallItemId,
   location,
 }: Props) {
+  const history = useHistory();
   const [isAccordionOpen, setIsAccordionOpen] = useState(true);
   const itemContainerHeight = 58; // TODO: This is a nasty way to calculate the height of the svg element. A better approach should be found
   const waterfallHeight = itemContainerHeight * waterfall.items.length;
@@ -105,7 +108,7 @@ export function Waterfall({
         childrenByParentId={childrenByParentId}
         timelineMargins={TIMELINE_MARGINS}
         onClickWaterfallItem={(item: IWaterfallItem) =>
-          toggleFlyout({ item, location })
+          toggleFlyout({ history, item, location })
         }
       />
     );
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
index 392bd90ffbabc..0845e2c9b1412 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
@@ -16,10 +16,10 @@ import {
 import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
 import React, { useEffect, useState } from 'react';
+import { useHistory } from 'react-router-dom';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { IBucket } from '../../../../../server/lib/transactions/distribution/get_buckets/transform';
 import { IUrlParams } from '../../../../context/UrlParamsContext/types';
-import { history } from '../../../../utils/history';
 import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
 import { LoadingStatePrompt } from '../../../shared/LoadingStatePrompt';
 import { TransactionSummary } from '../../../shared/Summary/TransactionSummary';
@@ -45,6 +45,7 @@ export function WaterfallWithSummmary({
   isLoading,
   traceSamples,
 }: Props) {
+  const history = useHistory();
   const [sampleActivePage, setSampleActivePage] = useState(0);
 
   useEffect(() => {
diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/TransactionOverview.test.tsx b/x-pack/plugins/apm/public/components/app/TransactionOverview/TransactionOverview.test.tsx
index 28030dd509835..81fe9e2282667 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionOverview/TransactionOverview.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/TransactionOverview.test.tsx
@@ -10,22 +10,29 @@ import {
   queryByLabelText,
   render,
 } from '@testing-library/react';
+import { createMemoryHistory } from 'history';
+import { CoreStart } from 'kibana/public';
 import { omit } from 'lodash';
 import React from 'react';
 import { Router } from 'react-router-dom';
-import { TransactionOverview } from './';
+import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
 import { MockApmPluginContextWrapper } from '../../../context/ApmPluginContext/MockApmPluginContext';
 import { UrlParamsProvider } from '../../../context/UrlParamsContext';
 import { IUrlParams } from '../../../context/UrlParamsContext/types';
 import * as useFetcherHook from '../../../hooks/useFetcher';
 import * as useServiceTransactionTypesHook from '../../../hooks/useServiceTransactionTypes';
-import { history } from '../../../utils/history';
+import { disableConsoleWarning } from '../../../utils/testHelpers';
 import { fromQuery } from '../../shared/Links/url_helpers';
+import { TransactionOverview } from './';
 
+const KibanaReactContext = createKibanaReactContext({
+  usageCollection: { reportUiStats: () => {} },
+} as Partial<CoreStart>);
+
+const history = createMemoryHistory();
 jest.spyOn(history, 'push');
 jest.spyOn(history, 'replace');
 
-jest.mock('ui/new_platform');
 function setup({
   urlParams,
   serviceTransactionTypes,
@@ -49,17 +56,29 @@ function setup({
   jest.spyOn(useFetcherHook, 'useFetcher').mockReturnValue({} as any);
 
   return render(
-    <MockApmPluginContextWrapper>
-      <Router history={history}>
-        <UrlParamsProvider>
-          <TransactionOverview />
-        </UrlParamsProvider>
-      </Router>
-    </MockApmPluginContextWrapper>
+    <KibanaReactContext.Provider>
+      <MockApmPluginContextWrapper>
+        <Router history={history}>
+          <UrlParamsProvider>
+            <TransactionOverview />
+          </UrlParamsProvider>
+        </Router>
+      </MockApmPluginContextWrapper>
+    </KibanaReactContext.Provider>
   );
 }
 
 describe('TransactionOverview', () => {
+  let consoleMock: jest.SpyInstance;
+
+  beforeAll(() => {
+    consoleMock = disableConsoleWarning('Warning: componentWillReceiveProps');
+  });
+
+  afterAll(() => {
+    consoleMock.mockRestore();
+  });
+
   afterEach(() => {
     jest.clearAllMocks();
   });
diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx
index f6eb131a8a733..0757ae572152c 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx
@@ -5,40 +5,39 @@
  */
 
 import {
-  EuiPanel,
-  EuiSpacer,
-  EuiTitle,
+  EuiCallOut,
+  EuiCode,
+  EuiFlexGrid,
   EuiFlexGroup,
   EuiFlexItem,
   EuiHorizontalRule,
-  EuiCallOut,
-  EuiCode,
+  EuiPanel,
+  EuiSpacer,
+  EuiTitle,
 } from '@elastic/eui';
-import { Location } from 'history';
+import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { Location } from 'history';
 import { first } from 'lodash';
 import React, { useMemo } from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiFlexGrid } from '@elastic/eui';
-import { useTransactionList } from '../../../hooks/useTransactionList';
-import { useTransactionCharts } from '../../../hooks/useTransactionCharts';
+import { useTrackPageview } from '../../../../../observability/public';
+import { Projection } from '../../../../common/projections';
+import { ChartsSyncContextProvider } from '../../../context/ChartsSyncContext';
 import { IUrlParams } from '../../../context/UrlParamsContext/types';
-import { TransactionCharts } from '../../shared/charts/TransactionCharts';
+import { useLocation } from '../../../hooks/useLocation';
+import { useServiceTransactionTypes } from '../../../hooks/useServiceTransactionTypes';
+import { useTransactionCharts } from '../../../hooks/useTransactionCharts';
+import { useTransactionList } from '../../../hooks/useTransactionList';
+import { useUrlParams } from '../../../hooks/useUrlParams';
 import { ErroneousTransactionsRateChart } from '../../shared/charts/ErroneousTransactionsRateChart';
-import { TransactionBreakdown } from '../../shared/TransactionBreakdown';
-import { TransactionList } from './List';
+import { TransactionCharts } from '../../shared/charts/TransactionCharts';
 import { ElasticDocsLink } from '../../shared/Links/ElasticDocsLink';
-import { useRedirect } from './useRedirect';
-import { history } from '../../../utils/history';
-import { useLocation } from '../../../hooks/useLocation';
-import { ChartsSyncContextProvider } from '../../../context/ChartsSyncContext';
-import { useTrackPageview } from '../../../../../observability/public';
 import { fromQuery, toQuery } from '../../shared/Links/url_helpers';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
-import { Projection } from '../../../../common/projections';
-import { useUrlParams } from '../../../hooks/useUrlParams';
-import { useServiceTransactionTypes } from '../../../hooks/useServiceTransactionTypes';
 import { TransactionTypeFilter } from '../../shared/LocalUIFilters/TransactionTypeFilter';
+import { TransactionBreakdown } from '../../shared/TransactionBreakdown';
+import { TransactionList } from './List';
+import { useRedirect } from './useRedirect';
 
 function getRedirectLocation({
   urlParams,
@@ -73,7 +72,6 @@ export function TransactionOverview() {
 
   // redirect to first transaction type
   useRedirect(
-    history,
     getRedirectLocation({
       urlParams,
       location,
diff --git a/x-pack/plugins/apm/public/components/app/TransactionOverview/useRedirect.ts b/x-pack/plugins/apm/public/components/app/TransactionOverview/useRedirect.ts
index 653ea73c1fed8..b1bcca84e443e 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionOverview/useRedirect.ts
+++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/useRedirect.ts
@@ -4,13 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { History, Location } from 'history';
+import { Location } from 'history';
 import { useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
+
+export function useRedirect(redirectLocation?: Location) {
+  const history = useHistory();
 
-export function useRedirect(history: History, redirectLocation?: Location) {
   useEffect(() => {
     if (redirectLocation) {
       history.replace(redirectLocation);
     }
-  });
+  }, [history, redirectLocation]);
 }
diff --git a/x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx b/x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
index 7a63b9e767fe7..01b1628504b3b 100644
--- a/x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/DatePicker/__test__/DatePicker.test.tsx
@@ -4,21 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiSuperDatePicker } from '@elastic/eui';
+import { wait } from '@testing-library/react';
+import { mount } from 'enzyme';
+import { createMemoryHistory } from 'history';
 import React, { ReactNode } from 'react';
+import { Router } from 'react-router-dom';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 import { LocationProvider } from '../../../../context/LocationContext';
 import {
   UrlParamsContext,
   useUiFilters,
 } from '../../../../context/UrlParamsContext';
-import { DatePicker } from '../index';
 import { IUrlParams } from '../../../../context/UrlParamsContext/types';
-import { history } from '../../../../utils/history';
-import { mount } from 'enzyme';
-import { EuiSuperDatePicker } from '@elastic/eui';
-import { MemoryRouter } from 'react-router-dom';
-import { wait } from '@testing-library/react';
-import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
+import { DatePicker } from '../index';
 
+const history = createMemoryHistory();
 const mockHistoryPush = jest.spyOn(history, 'push');
 const mockHistoryReplace = jest.spyOn(history, 'replace');
 const mockRefreshTimeRange = jest.fn();
@@ -44,13 +45,13 @@ function MockUrlParamsProvider({
 function mountDatePicker(params?: IUrlParams) {
   return mount(
     <MockApmPluginContextWrapper>
-      <MemoryRouter initialEntries={[history.location]}>
+      <Router history={history}>
         <LocationProvider>
           <MockUrlParamsProvider params={params}>
             <DatePicker />
           </MockUrlParamsProvider>
         </LocationProvider>
-      </MemoryRouter>
+      </Router>
     </MockApmPluginContextWrapper>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx b/x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx
index 35b9525733e99..549ee228b7afe 100644
--- a/x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/DatePicker/index.tsx
@@ -5,15 +5,15 @@
  */
 
 import { EuiSuperDatePicker } from '@elastic/eui';
-import React from 'react';
 import { isEmpty, isEqual, pickBy } from 'lodash';
-import { fromQuery, toQuery } from '../Links/url_helpers';
-import { history } from '../../../utils/history';
+import React from 'react';
+import { useHistory } from 'react-router-dom';
+import { UI_SETTINGS } from '../../../../../../../src/plugins/data/common';
+import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
 import { useLocation } from '../../../hooks/useLocation';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { clearCache } from '../../../services/rest/callApi';
-import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
-import { UI_SETTINGS } from '../../../../../../../src/plugins/data/common';
+import { fromQuery, toQuery } from '../Links/url_helpers';
 import { TimePickerQuickRange, TimePickerTimeDefaults } from './typings';
 
 function removeUndefinedAndEmptyProps<T extends object>(obj: T): Partial<T> {
@@ -21,6 +21,7 @@ function removeUndefinedAndEmptyProps<T extends object>(obj: T): Partial<T> {
 }
 
 export function DatePicker() {
+  const history = useHistory();
   const location = useLocation();
   const { core } = useApmPluginContext();
 
diff --git a/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx b/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
index 24ebb6bc8bd5f..9a61e773d73bf 100644
--- a/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
@@ -6,18 +6,20 @@
 
 import { EuiSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { History } from 'history';
 import React from 'react';
-import { useLocation } from '../../../hooks/useLocation';
-import { useUrlParams } from '../../../hooks/useUrlParams';
-import { history } from '../../../utils/history';
-import { fromQuery, toQuery } from '../Links/url_helpers';
+import { useHistory } from 'react-router-dom';
 import {
   ENVIRONMENT_ALL,
   ENVIRONMENT_NOT_DEFINED,
 } from '../../../../common/environment_filter_values';
 import { useEnvironments } from '../../../hooks/useEnvironments';
+import { useLocation } from '../../../hooks/useLocation';
+import { useUrlParams } from '../../../hooks/useUrlParams';
+import { fromQuery, toQuery } from '../Links/url_helpers';
 
 function updateEnvironmentUrl(
+  history: History,
   location: ReturnType<typeof useLocation>,
   environment?: string
 ) {
@@ -59,6 +61,7 @@ function getOptions(environments: string[]) {
 }
 
 export function EnvironmentFilter() {
+  const history = useHistory();
   const location = useLocation();
   const { uiFilters, urlParams } = useUrlParams();
 
@@ -78,7 +81,7 @@ export function EnvironmentFilter() {
       options={getOptions(environments)}
       value={environment || ENVIRONMENT_ALL.value}
       onChange={(event) => {
-        updateEnvironmentUrl(location, event.target.value);
+        updateEnvironmentUrl(history, location, event.target.value);
       }}
       isLoading={status === 'loading'}
     />
diff --git a/x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx b/x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx
index 6c605886e6e00..a52676ee89590 100644
--- a/x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx
@@ -4,24 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { i18n } from '@kbn/i18n';
+import { startsWith, uniqueId } from 'lodash';
 import React, { useState } from 'react';
-import { uniqueId, startsWith } from 'lodash';
+import { useHistory } from 'react-router-dom';
 import styled from 'styled-components';
-import { i18n } from '@kbn/i18n';
-import { fromQuery, toQuery } from '../Links/url_helpers';
-// @ts-expect-error
-import { Typeahead } from './Typeahead';
-import { getBoolFilter } from './get_bool_filter';
-import { useLocation } from '../../../hooks/useLocation';
-import { useUrlParams } from '../../../hooks/useUrlParams';
-import { history } from '../../../utils/history';
-import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
-import { useDynamicIndexPattern } from '../../../hooks/useDynamicIndexPattern';
 import {
-  QuerySuggestion,
   esKuery,
   IIndexPattern,
+  QuerySuggestion,
 } from '../../../../../../../src/plugins/data/public';
+import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
+import { useDynamicIndexPattern } from '../../../hooks/useDynamicIndexPattern';
+import { useLocation } from '../../../hooks/useLocation';
+import { useUrlParams } from '../../../hooks/useUrlParams';
+import { fromQuery, toQuery } from '../Links/url_helpers';
+import { getBoolFilter } from './get_bool_filter';
+// @ts-expect-error
+import { Typeahead } from './Typeahead';
 
 const Container = styled.div`
   margin-bottom: 10px;
@@ -38,6 +38,7 @@ function convertKueryToEsQuery(kuery: string, indexPattern: IIndexPattern) {
 }
 
 export function KueryBar() {
+  const history = useHistory();
   const [state, setState] = useState<State>({
     suggestions: [],
     isLoadingSuggestions: false,
diff --git a/x-pack/plugins/apm/public/components/shared/Links/DiscoverLinks/DiscoverLink.tsx b/x-pack/plugins/apm/public/components/shared/Links/DiscoverLinks/DiscoverLink.tsx
index a375df7f0b0b9..d4b20782a5527 100644
--- a/x-pack/plugins/apm/public/components/shared/Links/DiscoverLinks/DiscoverLink.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Links/DiscoverLinks/DiscoverLink.tsx
@@ -6,14 +6,14 @@
 
 import { EuiLink } from '@elastic/eui';
 import { Location } from 'history';
+import { IBasePath } from 'kibana/public';
 import React from 'react';
-import url from 'url';
 import rison, { RisonValue } from 'rison-node';
-import { useLocation } from '../../../../hooks/useLocation';
-import { getTimepickerRisonData } from '../rison_helpers';
+import url from 'url';
 import { APM_STATIC_INDEX_PATTERN_ID } from '../../../../../../../../src/plugins/apm_oss/public';
 import { useApmPluginContext } from '../../../../hooks/useApmPluginContext';
-import { AppMountContextBasePath } from '../../../../context/ApmPluginContext';
+import { useLocation } from '../../../../hooks/useLocation';
+import { getTimepickerRisonData } from '../rison_helpers';
 
 interface Props {
   query: {
@@ -37,7 +37,7 @@ export const getDiscoverHref = ({
   location,
   query,
 }: {
-  basePath: AppMountContextBasePath;
+  basePath: IBasePath;
   location: Location;
   query: Props['query'];
 }) => {
diff --git a/x-pack/plugins/apm/public/components/shared/Links/InfraLink.tsx b/x-pack/plugins/apm/public/components/shared/Links/InfraLink.tsx
index f02bd921f40bf..630235e54c9fa 100644
--- a/x-pack/plugins/apm/public/components/shared/Links/InfraLink.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Links/InfraLink.tsx
@@ -5,12 +5,12 @@
  */
 
 import { EuiLink, EuiLinkAnchorProps } from '@elastic/eui';
+import { IBasePath } from 'kibana/public';
 import React from 'react';
 import url from 'url';
-import { fromQuery } from './url_helpers';
-import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
-import { AppMountContextBasePath } from '../../../context/ApmPluginContext';
 import { InfraAppId } from '../../../../../infra/public';
+import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
+import { fromQuery } from './url_helpers';
 
 interface InfraQueryParams {
   time?: number;
@@ -33,7 +33,7 @@ export const getInfraHref = ({
   path,
 }: {
   app: InfraAppId;
-  basePath: AppMountContextBasePath;
+  basePath: IBasePath;
   query: InfraQueryParams;
   path?: string;
 }) => {
diff --git a/x-pack/plugins/apm/public/components/shared/Links/apm/APMLink.test.tsx b/x-pack/plugins/apm/public/components/shared/Links/apm/APMLink.test.tsx
index 1e849e8865d0d..5ff1de304205c 100644
--- a/x-pack/plugins/apm/public/components/shared/Links/apm/APMLink.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Links/apm/APMLink.test.tsx
@@ -9,49 +9,51 @@ import React from 'react';
 import { getRenderedHref } from '../../../../utils/testHelpers';
 import { APMLink } from './APMLink';
 
-test('APMLink should produce the correct URL', async () => {
-  const href = await getRenderedHref(
-    () => <APMLink path="/some/path" query={{ transactionId: 'blah' }} />,
-    {
-      search:
-        '?rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0',
-    } as Location
-  );
+describe('APMLink', () => {
+  test('APMLink should produce the correct URL', async () => {
+    const href = await getRenderedHref(
+      () => <APMLink path="/some/path" query={{ transactionId: 'blah' }} />,
+      {
+        search:
+          '?rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0',
+      } as Location
+    );
 
-  expect(href).toMatchInlineSnapshot(
-    `"#/some/path?rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0&transactionId=blah"`
-  );
-});
+    expect(href).toMatchInlineSnapshot(
+      `"/basepath/app/apm/some/path?rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0&transactionId=blah"`
+    );
+  });
 
-test('APMLink should retain current kuery value if it exists', async () => {
-  const href = await getRenderedHref(
-    () => <APMLink path="/some/path" query={{ transactionId: 'blah' }} />,
-    {
-      search:
-        '?kuery=host.hostname~20~3A~20~22fakehostname~22&rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0',
-    } as Location
-  );
+  test('APMLink should retain current kuery value if it exists', async () => {
+    const href = await getRenderedHref(
+      () => <APMLink path="/some/path" query={{ transactionId: 'blah' }} />,
+      {
+        search:
+          '?kuery=host.hostname~20~3A~20~22fakehostname~22&rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0',
+      } as Location
+    );
 
-  expect(href).toMatchInlineSnapshot(
-    `"#/some/path?kuery=host.hostname~20~3A~20~22fakehostname~22&rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0&transactionId=blah"`
-  );
-});
+    expect(href).toMatchInlineSnapshot(
+      `"/basepath/app/apm/some/path?kuery=host.hostname~20~3A~20~22fakehostname~22&rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0&transactionId=blah"`
+    );
+  });
 
-test('APMLink should overwrite current kuery value if new kuery value is provided', async () => {
-  const href = await getRenderedHref(
-    () => (
-      <APMLink
-        path="/some/path"
-        query={{ kuery: 'host.os~20~3A~20~22linux~22' }}
-      />
-    ),
-    {
-      search:
-        '?kuery=host.hostname~20~3A~20~22fakehostname~22&rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0',
-    } as Location
-  );
+  test('APMLink should overwrite current kuery value if new kuery value is provided', async () => {
+    const href = await getRenderedHref(
+      () => (
+        <APMLink
+          path="/some/path"
+          query={{ kuery: 'host.os~20~3A~20~22linux~22' }}
+        />
+      ),
+      {
+        search:
+          '?kuery=host.hostname~20~3A~20~22fakehostname~22&rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0',
+      } as Location
+    );
 
-  expect(href).toMatchInlineSnapshot(
-    `"#/some/path?kuery=host.os~20~3A~20~22linux~22&rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0"`
-  );
+    expect(href).toMatchInlineSnapshot(
+      `"/basepath/app/apm/some/path?kuery=host.os~20~3A~20~22linux~22&rangeFrom=now-5h&rangeTo=now-2h&refreshPaused=true&refreshInterval=0"`
+    );
+  });
 });
diff --git a/x-pack/plugins/apm/public/components/shared/Links/apm/APMLink.tsx b/x-pack/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
index 353f476e3f993..cde2471cc4ce3 100644
--- a/x-pack/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Links/apm/APMLink.tsx
@@ -5,11 +5,13 @@
  */
 
 import { EuiLink, EuiLinkAnchorProps } from '@elastic/eui';
+import { IBasePath } from 'kibana/public';
+import { pick } from 'lodash';
 import React from 'react';
 import url from 'url';
-import { pick } from 'lodash';
+import { useApmPluginContext } from '../../../../hooks/useApmPluginContext';
 import { useLocation } from '../../../../hooks/useLocation';
-import { APMQueryParams, toQuery, fromQuery } from '../url_helpers';
+import { APMQueryParams, fromQuery, toQuery } from '../url_helpers';
 
 interface Props extends EuiLinkAnchorProps {
   path?: string;
@@ -28,12 +30,21 @@ export const PERSISTENT_APM_PARAMS = [
   'environment',
 ];
 
-export function getAPMHref(
-  path: string,
-  currentSearch: string,
-  query: APMQueryParams = {}
-) {
-  const currentQuery = toQuery(currentSearch);
+/**
+ * Get an APM link for a path.
+ */
+export function getAPMHref({
+  basePath,
+  path = '',
+  search,
+  query = {},
+}: {
+  basePath: IBasePath;
+  path?: string;
+  search?: string;
+  query?: APMQueryParams;
+}) {
+  const currentQuery = toQuery(search);
   const nextQuery = {
     ...pick(currentQuery, PERSISTENT_APM_PARAMS),
     ...query,
@@ -41,13 +52,16 @@ export function getAPMHref(
   const nextSearch = fromQuery(nextQuery);
 
   return url.format({
-    pathname: '',
-    hash: `${path}?${nextSearch}`,
+    pathname: basePath.prepend(`/app/apm${path}`),
+    search: nextSearch,
   });
 }
 
 export function APMLink({ path = '', query, ...rest }: Props) {
+  const { core } = useApmPluginContext();
   const { search } = useLocation();
-  const href = getAPMHref(path, search, query);
+  const { basePath } = core.http;
+  const href = getAPMHref({ basePath, path, search, query });
+
   return <EuiLink {...rest} href={href} />;
 }
diff --git a/x-pack/plugins/apm/public/components/shared/Links/apm/agentConfigurationLinks.tsx b/x-pack/plugins/apm/public/components/shared/Links/apm/agentConfigurationLinks.tsx
index 11ce8fb911a20..05af4436ac5ad 100644
--- a/x-pack/plugins/apm/public/components/shared/Links/apm/agentConfigurationLinks.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Links/apm/agentConfigurationLinks.tsx
@@ -4,23 +4,35 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getAPMHref } from './APMLink';
+import { IBasePath } from 'kibana/public';
 import { AgentConfigurationIntake } from '../../../../../common/agent_configuration/configuration_types';
-import { history } from '../../../../utils/history';
+import { getAPMHref } from './APMLink';
 
 export function editAgentConfigurationHref(
-  configService: AgentConfigurationIntake['service']
+  configService: AgentConfigurationIntake['service'],
+  search: string,
+  basePath: IBasePath
 ) {
-  const { search } = history.location;
-  return getAPMHref('/settings/agent-configuration/edit', search, {
-    // ignoring because `name` has not been added to url params. Related: https://github.com/elastic/kibana/issues/51963
-    // @ts-ignore
-    name: configService.name,
-    environment: configService.environment,
+  return getAPMHref({
+    basePath,
+    path: '/settings/agent-configuration/edit',
+    search,
+    query: {
+      // ignoring because `name` has not been added to url params. Related: https://github.com/elastic/kibana/issues/51963
+      // @ts-expect-error
+      name: configService.name,
+      environment: configService.environment,
+    },
   });
 }
 
-export function createAgentConfigurationHref() {
-  const { search } = history.location;
-  return getAPMHref('/settings/agent-configuration/create', search);
+export function createAgentConfigurationHref(
+  search: string,
+  basePath: IBasePath
+) {
+  return getAPMHref({
+    basePath,
+    path: '/settings/agent-configuration/create',
+    search,
+  });
 }
diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/ServiceNameFilter/index.tsx b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/ServiceNameFilter/index.tsx
index 99656b05db450..3deba69a25df2 100644
--- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/ServiceNameFilter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/ServiceNameFilter/index.tsx
@@ -4,16 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useEffect } from 'react';
 import {
-  EuiTitle,
   EuiHorizontalRule,
-  EuiSpacer,
   EuiSelect,
+  EuiSpacer,
+  EuiTitle,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import React, { useEffect, useCallback } from 'react';
+import { useHistory } from 'react-router-dom';
 import { useUrlParams } from '../../../../hooks/useUrlParams';
-import { history } from '../../../../utils/history';
 import { fromQuery, toQuery } from '../../Links/url_helpers';
 
 interface Props {
@@ -22,6 +22,7 @@ interface Props {
 }
 
 function ServiceNameFilter({ loading, serviceNames }: Props) {
+  const history = useHistory();
   const {
     urlParams: { serviceName },
   } = useUrlParams();
@@ -31,22 +32,25 @@ function ServiceNameFilter({ loading, serviceNames }: Props) {
     value: type,
   }));
 
-  const updateServiceName = (serviceN: string) => {
-    const newLocation = {
-      ...history.location,
-      search: fromQuery({
-        ...toQuery(history.location.search),
-        serviceName: serviceN,
-      }),
-    };
-    history.push(newLocation);
-  };
+  const updateServiceName = useCallback(
+    (serviceN: string) => {
+      const newLocation = {
+        ...history.location,
+        search: fromQuery({
+          ...toQuery(history.location.search),
+          serviceName: serviceN,
+        }),
+      };
+      history.push(newLocation);
+    },
+    [history]
+  );
 
   useEffect(() => {
     if (!serviceName && serviceNames.length > 0) {
       updateServiceName(serviceNames[0]);
     }
-  }, [serviceNames, serviceName]);
+  }, [serviceNames, serviceName, updateServiceName]);
 
   return (
     <>
diff --git a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx
index 54a08e9d45af5..e6d266091ae52 100644
--- a/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/LocalUIFilters/TransactionTypeFilter/index.tsx
@@ -4,16 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
 import {
-  EuiTitle,
   EuiHorizontalRule,
-  EuiSpacer,
   EuiRadioGroup,
+  EuiSpacer,
+  EuiTitle,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { useHistory } from 'react-router-dom';
 import { useUrlParams } from '../../../../hooks/useUrlParams';
-import { history } from '../../../../utils/history';
 import { fromQuery, toQuery } from '../../Links/url_helpers';
 
 interface Props {
@@ -21,6 +21,7 @@ interface Props {
 }
 
 function TransactionTypeFilter({ transactionTypes }: Props) {
+  const history = useHistory();
   const {
     urlParams: { transactionType },
   } = useUrlParams();
diff --git a/x-pack/plugins/apm/public/components/shared/ManagedTable/index.tsx b/x-pack/plugins/apm/public/components/shared/ManagedTable/index.tsx
index 50d46844f0adb..9fe52aab83641 100644
--- a/x-pack/plugins/apm/public/components/shared/ManagedTable/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/ManagedTable/index.tsx
@@ -6,9 +6,9 @@
 
 import { EuiBasicTable, EuiBasicTableColumn } from '@elastic/eui';
 import { orderBy } from 'lodash';
-import React, { useMemo, useCallback, ReactNode } from 'react';
+import React, { ReactNode, useCallback, useMemo } from 'react';
+import { useHistory } from 'react-router-dom';
 import { useUrlParams } from '../../../hooks/useUrlParams';
-import { history } from '../../../utils/history';
 import { fromQuery, toQuery } from '../Links/url_helpers';
 
 // TODO: this should really be imported from EUI
@@ -37,6 +37,7 @@ interface Props<T> {
 }
 
 function UnoptimizedManagedTable<T>(props: Props<T>) {
+  const history = useHistory();
   const {
     items,
     columns,
@@ -92,7 +93,7 @@ function UnoptimizedManagedTable<T>(props: Props<T>) {
         }),
       });
     },
-    []
+    [history]
   );
 
   const paginationProps = useMemo(() => {
diff --git a/x-pack/plugins/apm/public/components/shared/MetadataTable/index.tsx b/x-pack/plugins/apm/public/components/shared/MetadataTable/index.tsx
index 8dfb1e0ce960d..a8990e70150d1 100644
--- a/x-pack/plugins/apm/public/components/shared/MetadataTable/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/MetadataTable/index.tsx
@@ -5,31 +5,32 @@
  */
 
 import {
+  EuiFieldSearch,
   EuiFlexGroup,
   EuiFlexItem,
   EuiIcon,
   EuiSpacer,
+  EuiText,
   EuiTitle,
-  EuiFieldSearch,
 } from '@elastic/eui';
-import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { isEmpty } from 'lodash';
-import { EuiText } from '@elastic/eui';
+import React, { useCallback } from 'react';
+import { useHistory } from 'react-router-dom';
+import { useLocation } from '../../../hooks/useLocation';
+import { useUrlParams } from '../../../hooks/useUrlParams';
 import { ElasticDocsLink } from '../../shared/Links/ElasticDocsLink';
 import { HeightRetainer } from '../HeightRetainer';
-import { Section } from './Section';
-import { history } from '../../../utils/history';
 import { fromQuery, toQuery } from '../Links/url_helpers';
-import { useLocation } from '../../../hooks/useLocation';
-import { useUrlParams } from '../../../hooks/useUrlParams';
-import { SectionsWithRows, filterSectionsByTerm } from './helper';
+import { filterSectionsByTerm, SectionsWithRows } from './helper';
+import { Section } from './Section';
 
 interface Props {
   sections: SectionsWithRows;
 }
 
 export function MetadataTable({ sections }: Props) {
+  const history = useHistory();
   const location = useLocation();
   const { urlParams } = useUrlParams();
   const { searchTerm = '' } = urlParams;
@@ -47,7 +48,7 @@ export function MetadataTable({ sections }: Props) {
         }),
       });
     },
-    [location]
+    [history, location]
   );
   const noResultFound = Boolean(searchTerm) && isEmpty(filteredSections);
   return (
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx
index e78b7bfc6c301..0f42d8f9beb46 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/CustomLinkPopover.test.tsx
@@ -3,12 +3,17 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React from 'react';
-import { render, act, fireEvent } from '@testing-library/react';
+import { act, fireEvent, render } from '@testing-library/react';
+import React, { ReactNode } from 'react';
+import { CustomLink } from '../../../../../common/custom_link/custom_link_types';
 import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
-import { CustomLinkPopover } from './CustomLinkPopover';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 import { expectTextsInDocument } from '../../../../utils/testHelpers';
-import { CustomLink } from '../../../../../common/custom_link/custom_link_types';
+import { CustomLinkPopover } from './CustomLinkPopover';
+
+function Wrapper({ children }: { children?: ReactNode }) {
+  return <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>;
+}
 
 describe('CustomLinkPopover', () => {
   const customLinks = [
@@ -29,7 +34,8 @@ describe('CustomLinkPopover', () => {
         transaction={transaction}
         onCreateCustomLinkClick={jest.fn()}
         onClose={jest.fn()}
-      />
+      />,
+      { wrapper: Wrapper }
     );
     expectTextsInDocument(component, ['CUSTOM LINKS', 'Create', 'foo', 'bar']);
   });
@@ -42,7 +48,8 @@ describe('CustomLinkPopover', () => {
         transaction={transaction}
         onCreateCustomLinkClick={jest.fn()}
         onClose={handleCloseMock}
-      />
+      />,
+      { wrapper: Wrapper }
     );
     expect(handleCloseMock).not.toHaveBeenCalled();
     act(() => {
@@ -59,7 +66,8 @@ describe('CustomLinkPopover', () => {
         transaction={transaction}
         onCreateCustomLinkClick={handleCreateCustomLinkClickMock}
         onClose={jest.fn()}
-      />
+      />,
+      { wrapper: Wrapper }
     );
     expect(handleCreateCustomLinkClickMock).not.toHaveBeenCalled();
     act(() => {
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.test.tsx b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.test.tsx
index 74b8100c0915a..a2a2a211a48b1 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/ManageCustomLink.test.tsx
@@ -4,18 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { render, act, fireEvent } from '@testing-library/react';
 import { ManageCustomLink } from './ManageCustomLink';
 import {
   expectTextsInDocument,
   expectTextsNotInDocument,
 } from '../../../../utils/testHelpers';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
+
+function Wrapper({ children }: { children?: ReactNode }) {
+  return <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>;
+}
 
 describe('ManageCustomLink', () => {
   it('renders with create button', () => {
     const component = render(
-      <ManageCustomLink onCreateCustomLinkClick={jest.fn()} />
+      <ManageCustomLink onCreateCustomLinkClick={jest.fn()} />,
+      { wrapper: Wrapper }
     );
     expect(
       component.getByLabelText('Custom links settings page')
@@ -27,7 +33,8 @@ describe('ManageCustomLink', () => {
       <ManageCustomLink
         onCreateCustomLinkClick={jest.fn()}
         showCreateCustomLinkButton={false}
-      />
+      />,
+      { wrapper: Wrapper }
     );
     expect(
       component.getByLabelText('Custom links settings page')
@@ -39,7 +46,8 @@ describe('ManageCustomLink', () => {
     const { getByText } = render(
       <ManageCustomLink
         onCreateCustomLinkClick={handleCreateCustomLinkClickMock}
-      />
+      />,
+      { wrapper: Wrapper }
     );
     expect(handleCreateCustomLinkClickMock).not.toHaveBeenCalled();
     act(() => {
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx
index bc6c9dcebe794..055fcc0955c68 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/CustomLink/index.test.tsx
@@ -4,16 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import { render, act, fireEvent } from '@testing-library/react';
+import { act, fireEvent, render } from '@testing-library/react';
+import React, { ReactNode } from 'react';
 import { CustomLink } from '.';
+import { CustomLink as CustomLinkType } from '../../../../../common/custom_link/custom_link_types';
 import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
 import { FETCH_STATUS } from '../../../../hooks/useFetcher';
 import {
   expectTextsInDocument,
   expectTextsNotInDocument,
 } from '../../../../utils/testHelpers';
-import { CustomLink as CustomLinkType } from '../../../../../common/custom_link/custom_link_types';
+
+function Wrapper({ children }: { children?: ReactNode }) {
+  return <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>;
+}
 
 describe('Custom links', () => {
   it('shows empty message when no custom link is available', () => {
@@ -24,7 +29,8 @@ describe('Custom links', () => {
         onCreateCustomLinkClick={jest.fn()}
         onSeeMoreClick={jest.fn()}
         status={FETCH_STATUS.SUCCESS}
-      />
+      />,
+      { wrapper: Wrapper }
     );
 
     expectTextsInDocument(component, [
@@ -41,7 +47,8 @@ describe('Custom links', () => {
         onCreateCustomLinkClick={jest.fn()}
         onSeeMoreClick={jest.fn()}
         status={FETCH_STATUS.LOADING}
-      />
+      />,
+      { wrapper: Wrapper }
     );
     expect(getByTestId('loading-spinner')).toBeInTheDocument();
   });
@@ -60,7 +67,8 @@ describe('Custom links', () => {
         onCreateCustomLinkClick={jest.fn()}
         onSeeMoreClick={jest.fn()}
         status={FETCH_STATUS.SUCCESS}
-      />
+      />,
+      { wrapper: Wrapper }
     );
     expectTextsInDocument(component, ['foo', 'bar', 'baz']);
     expectTextsNotInDocument(component, ['qux']);
@@ -81,7 +89,8 @@ describe('Custom links', () => {
         onCreateCustomLinkClick={jest.fn()}
         onSeeMoreClick={onSeeMoreClickMock}
         status={FETCH_STATUS.SUCCESS}
-      />
+      />,
+      { wrapper: Wrapper }
     );
     expect(onSeeMoreClickMock).not.toHaveBeenCalled();
     act(() => {
@@ -99,7 +108,8 @@ describe('Custom links', () => {
           onCreateCustomLinkClick={jest.fn()}
           onSeeMoreClick={jest.fn()}
           status={FETCH_STATUS.SUCCESS}
-        />
+        />,
+        { wrapper: Wrapper }
       );
 
       expectTextsInDocument(component, ['Create custom link']);
@@ -119,7 +129,8 @@ describe('Custom links', () => {
           onCreateCustomLinkClick={jest.fn()}
           onSeeMoreClick={jest.fn()}
           status={FETCH_STATUS.SUCCESS}
-        />
+        />,
+        { wrapper: Wrapper }
       );
       expectTextsInDocument(component, ['Create']);
       expectTextsNotInDocument(component, ['Create custom link']);
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
index 77d70c626183f..c7ce83053db5c 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx
@@ -6,8 +6,7 @@
 
 import { EuiButtonEmpty } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import React, { MouseEvent, useMemo, useState } from 'react';
-import url from 'url';
+import React, { useMemo, useState } from 'react';
 import {
   ActionMenu,
   ActionMenuDivider,
@@ -84,40 +83,7 @@ export function TransactionActionMenu({ transaction }: Props) {
     basePath: core.http.basePath,
     location,
     urlParams,
-  }).map((sectionList) =>
-    sectionList.map((section) => ({
-      ...section,
-      actions: section.actions.map((action) => {
-        const { href } = action;
-
-        // use navigateToApp as a temporary workaround for faster navigation between observability apps.
-        // see https://github.com/elastic/kibana/issues/65682
-
-        return {
-          ...action,
-          onClick: (event: MouseEvent) => {
-            const parsed = url.parse(href);
-
-            const appPathname = core.http.basePath.remove(
-              parsed.pathname ?? ''
-            );
-
-            const [, , app, ...rest] = appPathname.split('/');
-
-            if (app === 'uptime' || app === 'metrics' || app === 'logs') {
-              event.preventDefault();
-              const search = parsed.search || '';
-
-              const path = `${rest.join('/')}${search}`;
-              core.application.navigateToApp(app, {
-                path,
-              });
-            }
-          },
-        };
-      }),
-    }))
-  );
+  });
 
   const closePopover = () => {
     setIsActionPopoverOpen(false);
@@ -186,7 +152,6 @@ export function TransactionActionMenu({ transaction }: Props) {
                               key={action.key}
                               label={action.label}
                               href={action.href}
-                              onClick={action.onClick}
                             />
                           ))}
                         </SectionLinks>
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
index 0a2cb90fdd5da..e45df2feff771 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
@@ -4,54 +4,27 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { act, fireEvent, render } from '@testing-library/react';
 import React from 'react';
-import { render, fireEvent, act } from '@testing-library/react';
-import { merge, tail } from 'lodash';
-import { TransactionActionMenu } from '../TransactionActionMenu';
+import { License } from '../../../../../../licensing/common/license';
 import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
-import * as Transactions from './mockData';
+import { MockApmPluginContextWrapper } from '../../../../context/ApmPluginContext/MockApmPluginContext';
+import { LicenseContext } from '../../../../context/LicenseContext';
+import * as hooks from '../../../../hooks/useFetcher';
+import * as apmApi from '../../../../services/rest/createCallApmApi';
 import {
-  expectTextsNotInDocument,
   expectTextsInDocument,
+  expectTextsNotInDocument,
 } from '../../../../utils/testHelpers';
-import * as hooks from '../../../../hooks/useFetcher';
-import { LicenseContext } from '../../../../context/LicenseContext';
-import { License } from '../../../../../../licensing/common/license';
-import {
-  MockApmPluginContextWrapper,
-  mockApmPluginContextValue,
-} from '../../../../context/ApmPluginContext/MockApmPluginContext';
-import * as apmApi from '../../../../services/rest/createCallApmApi';
-import { ApmPluginContextValue } from '../../../../context/ApmPluginContext';
-
-const getMock = () => {
-  return (merge({}, mockApmPluginContextValue, {
-    core: {
-      application: {
-        navigateToApp: jest.fn(),
-      },
-      http: {
-        basePath: {
-          remove: jest.fn((path: string) => {
-            return tail(path.split('/')).join('/');
-          }),
-        },
-      },
-    },
-  }) as unknown) as ApmPluginContextValue;
-};
+import { TransactionActionMenu } from '../TransactionActionMenu';
+import * as Transactions from './mockData';
 
-const renderTransaction = async (
-  transaction: Record<string, any>,
-  mock: ApmPluginContextValue = getMock()
-) => {
+const renderTransaction = async (transaction: Record<string, any>) => {
   const rendered = render(
     <TransactionActionMenu transaction={transaction as Transaction} />,
     {
       wrapper: ({ children }: { children?: React.ReactNode }) => (
-        <MockApmPluginContextWrapper value={mock}>
-          {children}
-        </MockApmPluginContextWrapper>
+        <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>
       ),
     }
   );
@@ -80,138 +53,148 @@ describe('TransactionActionMenu component', () => {
     expect(queryByText('View sample document')).not.toBeNull();
   });
 
-  it('should always render the trace logs link', async () => {
-    const mock = getMock();
-
-    const { queryByText, getByText } = await renderTransaction(
-      Transactions.transactionWithMinimalData,
-      mock
+  it('always renders the trace logs link', async () => {
+    const { getByText } = await renderTransaction(
+      Transactions.transactionWithMinimalData
     );
 
-    expect(queryByText('Trace logs')).not.toBeNull();
+    expect(
+      (getByText('Trace logs').parentElement as HTMLAnchorElement).href
+    ).toEqual(
+      'http://localhost/basepath/app/logs/link-to/logs?time=1545092070952&filter=trace.id:%228b60bd32ecc6e1506735a8b6cfcf175c%22%20OR%20%228b60bd32ecc6e1506735a8b6cfcf175c%22'
+    );
+  });
 
-    fireEvent.click(getByText('Trace logs'));
+  describe('when there is no pod id', () => {
+    it('does not render the Pod logs link', async () => {
+      const { queryByText } = await renderTransaction(
+        Transactions.transactionWithMinimalData
+      );
 
-    expect(mock.core.application.navigateToApp).toHaveBeenCalledWith('logs', {
-      path:
-        'link-to/logs?time=1545092070952&filter=trace.id:%228b60bd32ecc6e1506735a8b6cfcf175c%22%20OR%20%228b60bd32ecc6e1506735a8b6cfcf175c%22',
+      expect(queryByText('Pod logs')).toBeNull();
     });
-  });
 
-  it('should not render the pod links when there is no pod id', async () => {
-    const { queryByText } = await renderTransaction(
-      Transactions.transactionWithMinimalData
-    );
+    it('does not render the Pod metrics link', async () => {
+      const { queryByText } = await renderTransaction(
+        Transactions.transactionWithMinimalData
+      );
 
-    expect(queryByText('Pod logs')).toBeNull();
-    expect(queryByText('Pod metrics')).toBeNull();
+      expect(queryByText('Pod metrics')).toBeNull();
+    });
   });
 
-  it('should render the pod links when there is a pod id', async () => {
-    const mock = getMock();
-
-    const { queryByText, getByText } = await renderTransaction(
-      Transactions.transactionWithKubernetesData,
-      mock
-    );
-
-    expect(queryByText('Pod logs')).not.toBeNull();
-    expect(queryByText('Pod metrics')).not.toBeNull();
-
-    fireEvent.click(getByText('Pod logs'));
+  describe('when there is a pod id', () => {
+    it('renders the pod logs link', async () => {
+      const { getByText } = await renderTransaction(
+        Transactions.transactionWithKubernetesData
+      );
 
-    expect(mock.core.application.navigateToApp).toHaveBeenCalledWith('logs', {
-      path: 'link-to/pod-logs/pod123456abcdef?time=1545092070952',
+      expect(
+        (getByText('Pod logs').parentElement as HTMLAnchorElement).href
+      ).toEqual(
+        'http://localhost/basepath/app/logs/link-to/pod-logs/pod123456abcdef?time=1545092070952'
+      );
     });
 
-    (mock.core.application.navigateToApp as jest.Mock).mockClear();
-
-    fireEvent.click(getByText('Pod metrics'));
+    it('renders the pod metrics link', async () => {
+      const { getByText } = await renderTransaction(
+        Transactions.transactionWithKubernetesData
+      );
 
-    expect(mock.core.application.navigateToApp).toHaveBeenCalledWith(
-      'metrics',
-      {
-        path:
-          'link-to/pod-detail/pod123456abcdef?from=1545091770952&to=1545092370952',
-      }
-    );
+      expect(
+        (getByText('Pod metrics').parentElement as HTMLAnchorElement).href
+      ).toEqual(
+        'http://localhost/basepath/app/metrics/link-to/pod-detail/pod123456abcdef?from=1545091770952&to=1545092370952'
+      );
+    });
   });
 
-  it('should not render the container links when there is no container id', async () => {
-    const { queryByText } = await renderTransaction(
-      Transactions.transactionWithMinimalData
-    );
-
-    expect(queryByText('Container logs')).toBeNull();
-    expect(queryByText('Container metrics')).toBeNull();
-  });
+  describe('when there is no container id', () => {
+    it('does not render the Container logs link', async () => {
+      const { queryByText } = await renderTransaction(
+        Transactions.transactionWithMinimalData
+      );
 
-  it('should render the container links when there is a container id', async () => {
-    const mock = getMock();
+      expect(queryByText('Container logs')).toBeNull();
+    });
 
-    const { queryByText, getByText } = await renderTransaction(
-      Transactions.transactionWithContainerData,
-      mock
-    );
+    it('does not render the Container metrics link', async () => {
+      const { queryByText } = await renderTransaction(
+        Transactions.transactionWithMinimalData
+      );
 
-    expect(queryByText('Container logs')).not.toBeNull();
-    expect(queryByText('Container metrics')).not.toBeNull();
+      expect(queryByText('Container metrics')).toBeNull();
+    });
+  });
 
-    fireEvent.click(getByText('Container logs'));
+  describe('when there is a container id', () => {
+    it('renders the Container logs link', async () => {
+      const { getByText } = await renderTransaction(
+        Transactions.transactionWithContainerData
+      );
 
-    expect(mock.core.application.navigateToApp).toHaveBeenCalledWith('logs', {
-      path: 'link-to/container-logs/container123456abcdef?time=1545092070952',
+      expect(
+        (getByText('Container logs').parentElement as HTMLAnchorElement).href
+      ).toEqual(
+        'http://localhost/basepath/app/logs/link-to/container-logs/container123456abcdef?time=1545092070952'
+      );
     });
 
-    (mock.core.application.navigateToApp as jest.Mock).mockClear();
-
-    fireEvent.click(getByText('Container metrics'));
+    it('renders the Container metrics link', async () => {
+      const { getByText } = await renderTransaction(
+        Transactions.transactionWithContainerData
+      );
 
-    expect(mock.core.application.navigateToApp).toHaveBeenCalledWith(
-      'metrics',
-      {
-        path:
-          'link-to/container-detail/container123456abcdef?from=1545091770952&to=1545092370952',
-      }
-    );
+      expect(
+        (getByText('Container metrics').parentElement as HTMLAnchorElement).href
+      ).toEqual(
+        'http://localhost/basepath/app/metrics/link-to/container-detail/container123456abcdef?from=1545091770952&to=1545092370952'
+      );
+    });
   });
 
-  it('should not render the host links when there is no hostname', async () => {
-    const { queryByText } = await renderTransaction(
-      Transactions.transactionWithMinimalData
-    );
+  describe('when there is no hostname', () => {
+    it('does not render the Host logs link', async () => {
+      const { queryByText } = await renderTransaction(
+        Transactions.transactionWithMinimalData
+      );
 
-    expect(queryByText('Host logs')).toBeNull();
-    expect(queryByText('Host metrics')).toBeNull();
-  });
+      expect(queryByText('Host logs')).toBeNull();
+    });
 
-  it('should render the host links when there is a hostname', async () => {
-    const mock = getMock();
-    const { queryByText, getByText } = await renderTransaction(
-      Transactions.transactionWithHostData,
-      mock
-    );
+    it('does not render the Host metrics link', async () => {
+      const { queryByText } = await renderTransaction(
+        Transactions.transactionWithMinimalData
+      );
 
-    expect(queryByText('Host logs')).not.toBeNull();
-    expect(queryByText('Host metrics')).not.toBeNull();
+      expect(queryByText('Host metrics')).toBeNull();
+    });
+  });
 
-    fireEvent.click(getByText('Host logs'));
+  describe('when there is a hostname', () => {
+    it('renders the Host logs link', async () => {
+      const { getByText } = await renderTransaction(
+        Transactions.transactionWithHostData
+      );
 
-    expect(mock.core.application.navigateToApp).toHaveBeenCalledWith('logs', {
-      path: 'link-to/host-logs/227453131a17?time=1545092070952',
+      expect(
+        (getByText('Host logs').parentElement as HTMLAnchorElement).href
+      ).toEqual(
+        'http://localhost/basepath/app/logs/link-to/host-logs/227453131a17?time=1545092070952'
+      );
     });
 
-    (mock.core.application.navigateToApp as jest.Mock).mockClear();
-
-    fireEvent.click(getByText('Host metrics'));
+    it('renders the Host metrics link', async () => {
+      const { getByText } = await renderTransaction(
+        Transactions.transactionWithHostData
+      );
 
-    expect(mock.core.application.navigateToApp).toHaveBeenCalledWith(
-      'metrics',
-      {
-        path:
-          'link-to/host-detail/227453131a17?from=1545091770952&to=1545092370952',
-      }
-    );
+      expect(
+        (getByText('Host metrics').parentElement as HTMLAnchorElement).href
+      ).toEqual(
+        'http://localhost/basepath/app/metrics/link-to/host-detail/227453131a17?from=1545091770952&to=1545092370952'
+      );
+    });
   });
 
   it('should not render the uptime link if there is no url available', async () => {
@@ -230,24 +213,21 @@ describe('TransactionActionMenu component', () => {
     expect(queryByText('Status')).toBeNull();
   });
 
-  it('should render the uptime link if there is a url with a domain', async () => {
-    const mock = getMock();
-
-    const { queryByText, getByText } = await renderTransaction(
-      Transactions.transactionWithUrlAndDomain,
-      mock
-    );
-
-    expect(queryByText('Status')).not.toBeNull();
-
-    fireEvent.click(getByText('Status'));
+  describe('when there is a url with a domain', () => {
+    it('renders the uptime link', async () => {
+      const { getByText } = await renderTransaction(
+        Transactions.transactionWithUrlAndDomain
+      );
 
-    expect(mock.core.application.navigateToApp).toHaveBeenCalledWith('uptime', {
-      path: '?search=url.domain:%22example.com%22',
+      expect(
+        (getByText('Status').parentElement as HTMLAnchorElement).href
+      ).toEqual(
+        'http://localhost/basepath/app/uptime?search=url.domain:%22example.com%22'
+      );
     });
   });
 
-  it('should match the snapshot', async () => {
+  it('matches the snapshot', async () => {
     const { container } = await renderTransaction(
       Transactions.transactionWithAllData
     );
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
index 30c65e71f8019..77f4828364966 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`TransactionActionMenu component should match the snapshot 1`] = `
+exports[`TransactionActionMenu component matches the snapshot 1`] = `
 <div>
   <div
     class="euiPopover euiPopover--anchorDownRight"
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/sections.test.ts b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/sections.test.ts
index e057e9c034615..048ae9474c403 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/sections.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/sections.test.ts
@@ -4,16 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { Location } from 'history';
-import { getSections } from '../sections';
+import { IBasePath } from 'kibana/public';
 import { Transaction } from '../../../../../typings/es_schemas/ui/transaction';
-import { AppMountContextBasePath } from '../../../../context/ApmPluginContext';
+import { getSections } from '../sections';
 
 describe('Transaction action menu', () => {
   const basePath = ({
     prepend: (url: string) => {
       return `some-basepath${url}`;
     },
-  } as unknown) as AppMountContextBasePath;
+  } as unknown) as IBasePath;
   const date = '2020-02-06T11:00:00.000Z';
   const timestamp = { us: new Date(date).getTime() };
 
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts
index 5ca0285eb4eeb..4433865b44991 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts
@@ -5,7 +5,8 @@
  */
 import { i18n } from '@kbn/i18n';
 import { Location } from 'history';
-import { pickBy, isEmpty } from 'lodash';
+import { IBasePath } from 'kibana/public';
+import { isEmpty, pickBy } from 'lodash';
 import moment from 'moment';
 import url from 'url';
 import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
@@ -14,7 +15,6 @@ import { getDiscoverHref } from '../Links/DiscoverLinks/DiscoverLink';
 import { getDiscoverQuery } from '../Links/DiscoverLinks/DiscoverTransactionLink';
 import { getInfraHref } from '../Links/InfraLink';
 import { fromQuery } from '../Links/url_helpers';
-import { AppMountContextBasePath } from '../../../context/ApmPluginContext';
 
 function getInfraMetricsQuery(transaction: Transaction) {
   const timestamp = new Date(transaction['@timestamp']).getTime();
@@ -49,7 +49,7 @@ export const getSections = ({
   urlParams,
 }: {
   transaction: Transaction;
-  basePath: AppMountContextBasePath;
+  basePath: IBasePath;
   location: Location;
   urlParams: IUrlParams;
 }) => {
diff --git a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/CustomPlot.test.js b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/CustomPlot.test.js
index d2e237b086bbc..9d127c06e0c14 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/CustomPlot.test.js
+++ b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/test/CustomPlot.test.js
@@ -6,7 +6,11 @@
 
 import moment from 'moment';
 import React from 'react';
-import { toJson, mountWithTheme } from '../../../../../utils/testHelpers';
+import {
+  disableConsoleWarning,
+  toJson,
+  mountWithTheme,
+} from '../../../../../utils/testHelpers';
 import { InnerCustomPlot } from '../index';
 import responseWithData from './responseWithData.json';
 import VoronoiPlot from '../VoronoiPlot';
@@ -19,11 +23,20 @@ function getXValueByIndex(index) {
 }
 
 describe('when response has data', () => {
+  let consoleMock;
   let wrapper;
   let onHover;
   let onMouseLeave;
   let onSelectionEnd;
 
+  beforeAll(() => {
+    consoleMock = disableConsoleWarning('Warning: componentWillReceiveProps');
+  });
+
+  afterAll(() => {
+    consoleMock.mockRestore();
+  });
+
   beforeEach(() => {
     const series = getResponseTimeSeries({ apmTimeseries: responseWithData });
     onHover = jest.fn();
diff --git a/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/Histogram.test.js b/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/Histogram.test.js
index 41f835fbd5b1a..ebb10f6676c55 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/Histogram.test.js
+++ b/x-pack/plugins/apm/public/components/shared/charts/Histogram/__test__/Histogram.test.js
@@ -13,13 +13,27 @@ import {
   getDurationFormatter,
   asInteger,
 } from '../../../../../utils/formatters';
-import { toJson, mountWithTheme } from '../../../../../utils/testHelpers';
+import {
+  disableConsoleWarning,
+  toJson,
+  mountWithTheme,
+} from '../../../../../utils/testHelpers';
 import { getFormattedBuckets } from '../../../../app/TransactionDetails/Distribution/index';
 
 describe('Histogram', () => {
+  let mockConsole;
   let wrapper;
+
   const onClick = jest.fn();
 
+  beforeAll(() => {
+    mockConsole = disableConsoleWarning('Warning: componentWillReceiveProps');
+  });
+
+  afterAll(() => {
+    mockConsole.mockRestore();
+  });
+
   beforeEach(() => {
     const buckets = getFormattedBuckets(response.buckets, response.bucketSize);
     const xMax = d3.max(buckets, (d) => d.x);
diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.test.tsx
index 7a5d0dd5ce877..6a5ab344d2ba0 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Marker/ErrorMarker.test.tsx
@@ -4,15 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-import { ErrorMarker } from './ErrorMarker';
-import { ErrorMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks';
 import { fireEvent } from '@testing-library/react';
 import { act } from '@testing-library/react-hooks';
+import React, { ReactNode } from 'react';
+import { MockApmPluginContextWrapper } from '../../../../../context/ApmPluginContext/MockApmPluginContext';
 import {
   expectTextsInDocument,
   renderWithTheme,
 } from '../../../../../utils/testHelpers';
+import { ErrorMark } from '../../../../app/TransactionDetails/WaterfallWithSummmary/WaterfallContainer/Marks/get_error_marks';
+import { ErrorMarker } from './ErrorMarker';
+
+function Wrapper({ children }: { children?: ReactNode }) {
+  return <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>;
+}
 
 describe('ErrorMarker', () => {
   const mark = ({
@@ -36,7 +41,9 @@ describe('ErrorMarker', () => {
   } as unknown) as ErrorMark;
 
   function openPopover(errorMark: ErrorMark) {
-    const component = renderWithTheme(<ErrorMarker mark={errorMark} />);
+    const component = renderWithTheme(<ErrorMarker mark={errorMark} />, {
+      wrapper: Wrapper,
+    });
     act(() => {
       fireEvent.click(component.getByTestId('popover'));
     });
@@ -51,7 +58,8 @@ describe('ErrorMarker', () => {
   it('renders link with trace and transaction', () => {
     const component = openPopover(mark);
     const errorLink = component.getByTestId('errorLink') as HTMLAnchorElement;
-    expect(getKueryDecoded(errorLink.hash)).toEqual(
+
+    expect(getKueryDecoded(errorLink.search)).toEqual(
       'kuery=trace.id : "123" and transaction.id : "456"'
     );
   });
@@ -63,7 +71,7 @@ describe('ErrorMarker', () => {
     } as ErrorMark;
     const component = openPopover(newMark);
     const errorLink = component.getByTestId('errorLink') as HTMLAnchorElement;
-    expect(getKueryDecoded(errorLink.hash)).toEqual('kuery=trace.id : "123"');
+    expect(getKueryDecoded(errorLink.search)).toEqual('kuery=trace.id : "123"');
   });
   it('renders link with transaction', () => {
     const { trace, ...withoutTrace } = mark.error;
@@ -73,7 +81,7 @@ describe('ErrorMarker', () => {
     } as ErrorMark;
     const component = openPopover(newMark);
     const errorLink = component.getByTestId('errorLink') as HTMLAnchorElement;
-    expect(getKueryDecoded(errorLink.hash)).toEqual(
+    expect(getKueryDecoded(errorLink.search)).toEqual(
       'kuery=transaction.id : "456"'
     );
   });
@@ -85,7 +93,7 @@ describe('ErrorMarker', () => {
     } as ErrorMark;
     const component = openPopover(newMark);
     const errorLink = component.getByTestId('errorLink') as HTMLAnchorElement;
-    expect(getKueryDecoded(errorLink.hash)).toEqual('kuery=');
+    expect(getKueryDecoded(errorLink.search)).toEqual('kuery=');
   });
   it('truncates the error message text', () => {
     const { trace, transaction, ...withoutTraceAndTransaction } = mark.error;
diff --git a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Timeline.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Timeline.test.tsx
index 03ddc3f656821..ec9f887916f5e 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/Timeline/Timeline.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/Timeline/Timeline.test.tsx
@@ -7,6 +7,7 @@
 import React from 'react';
 import { StickyContainer } from 'react-sticky';
 import {
+  disableConsoleWarning,
   mountWithTheme,
   mockMoment,
   toJson,
@@ -14,8 +15,15 @@ import {
 import { Timeline } from '.';
 
 describe('Timeline', () => {
+  let consoleMock: jest.SpyInstance;
+
   beforeAll(() => {
     mockMoment();
+    consoleMock = disableConsoleWarning('Warning: componentWill');
+  });
+
+  afterAll(() => {
+    consoleMock.mockRestore();
   });
 
   it('should render with data', () => {
diff --git a/x-pack/plugins/apm/public/context/ApmPluginContext/MockApmPluginContext.tsx b/x-pack/plugins/apm/public/context/ApmPluginContext/MockApmPluginContext.tsx
index 8c38cdcda958d..8334efffbd511 100644
--- a/x-pack/plugins/apm/public/context/ApmPluginContext/MockApmPluginContext.tsx
+++ b/x-pack/plugins/apm/public/context/ApmPluginContext/MockApmPluginContext.tsx
@@ -3,11 +3,12 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import React from 'react';
+import React, { ReactNode } from 'react';
+import { Observable, of } from 'rxjs';
 import { ApmPluginContext, ApmPluginContextValue } from '.';
-import { createCallApmApi } from '../../services/rest/createCallApmApi';
 import { ConfigSchema } from '../..';
 import { UI_SETTINGS } from '../../../../../../src/plugins/data/common';
+import { createCallApmApi } from '../../services/rest/createCallApmApi';
 
 const uiSettings: Record<string, unknown> = {
   [UI_SETTINGS.TIMEPICKER_QUICK_RANGES]: [
@@ -33,8 +34,17 @@ const uiSettings: Record<string, unknown> = {
 };
 
 const mockCore = {
+  application: {
+    capabilities: {
+      apm: {},
+    },
+    currentAppId$: new Observable(),
+  },
   chrome: {
+    docTitle: { change: () => {} },
     setBreadcrumbs: () => {},
+    setHelpExtension: () => {},
+    setBadge: () => {},
   },
   docLinks: {
     DOC_LINK_VERSION: '0',
@@ -45,6 +55,9 @@ const mockCore = {
       prepend: (path: string) => `/basepath${path}`,
     },
   },
+  i18n: {
+    Context: ({ children }: { children: ReactNode }) => children,
+  },
   notifications: {
     toasts: {
       addWarning: () => {},
@@ -53,6 +66,7 @@ const mockCore = {
   },
   uiSettings: {
     get: (key: string) => uiSettings[key],
+    get$: (key: string) => of(mockCore.uiSettings.get(key)),
   },
 };
 
diff --git a/x-pack/plugins/apm/public/context/ApmPluginContext/index.tsx b/x-pack/plugins/apm/public/context/ApmPluginContext/index.tsx
index 37304d292540d..39d961f6a8164 100644
--- a/x-pack/plugins/apm/public/context/ApmPluginContext/index.tsx
+++ b/x-pack/plugins/apm/public/context/ApmPluginContext/index.tsx
@@ -4,16 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { CoreStart } from 'kibana/public';
 import { createContext } from 'react';
-import { AppMountContext } from 'kibana/public';
-import { ConfigSchema } from '../..';
+import { ConfigSchema } from '../../';
 import { ApmPluginSetupDeps } from '../../plugin';
 
-export type AppMountContextBasePath = AppMountContext['core']['http']['basePath'];
-
 export interface ApmPluginContextValue {
   config: ConfigSchema;
-  core: AppMountContext['core'];
+  core: CoreStart;
   plugins: ApmPluginSetupDeps;
 }
 
diff --git a/x-pack/plugins/apm/public/context/ChartsSyncContext.tsx b/x-pack/plugins/apm/public/context/ChartsSyncContext.tsx
index f93b69a877057..801c1d7e53f2e 100644
--- a/x-pack/plugins/apm/public/context/ChartsSyncContext.tsx
+++ b/x-pack/plugins/apm/public/context/ChartsSyncContext.tsx
@@ -5,10 +5,10 @@
  */
 
 import React, { ReactNode, useMemo, useState } from 'react';
-import { toQuery, fromQuery } from '../components/shared/Links/url_helpers';
-import { history } from '../utils/history';
-import { useUrlParams } from '../hooks/useUrlParams';
+import { useHistory } from 'react-router-dom';
+import { fromQuery, toQuery } from '../components/shared/Links/url_helpers';
 import { useFetcher } from '../hooks/useFetcher';
+import { useUrlParams } from '../hooks/useUrlParams';
 
 const ChartsSyncContext = React.createContext<{
   hoverX: number | null;
@@ -18,6 +18,7 @@ const ChartsSyncContext = React.createContext<{
 } | null>(null);
 
 function ChartsSyncContextProvider({ children }: { children: ReactNode }) {
+  const history = useHistory();
   const [time, setTime] = useState<number | null>(null);
   const { urlParams, uiFilters } = useUrlParams();
 
@@ -75,7 +76,7 @@ function ChartsSyncContextProvider({ children }: { children: ReactNode }) {
     };
 
     return { ...hoverXHandlers };
-  }, [time, data.annotations]);
+  }, [history, time, data.annotations]);
 
   return <ChartsSyncContext.Provider value={value} children={children} />;
 }
diff --git a/x-pack/plugins/apm/public/hooks/useLocalUIFilters.ts b/x-pack/plugins/apm/public/hooks/useLocalUIFilters.ts
index 45ede7e7f2607..0ed26fe089487 100644
--- a/x-pack/plugins/apm/public/hooks/useLocalUIFilters.ts
+++ b/x-pack/plugins/apm/public/hooks/useLocalUIFilters.ts
@@ -5,21 +5,21 @@
  */
 
 import { omit } from 'lodash';
-import { useFetcher } from './useFetcher';
+import { useHistory } from 'react-router-dom';
+import { Projection } from '../../common/projections';
+import { pickKeys } from '../../common/utils/pick_keys';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { LocalUIFiltersAPIResponse } from '../../server/lib/ui_filters/local_ui_filters';
-import { useUrlParams } from './useUrlParams';
 import {
   LocalUIFilterName,
   localUIFilters,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../server/lib/ui_filters/local_ui_filters/config';
-import { history } from '../utils/history';
-import { toQuery, fromQuery } from '../components/shared/Links/url_helpers';
+import { fromQuery, toQuery } from '../components/shared/Links/url_helpers';
 import { removeUndefinedProps } from '../context/UrlParamsContext/helpers';
-import { Projection } from '../../common/projections';
-import { pickKeys } from '../../common/utils/pick_keys';
 import { useCallApi } from './useCallApi';
+import { useFetcher } from './useFetcher';
+import { useUrlParams } from './useUrlParams';
 
 const getInitialData = (
   filterNames: LocalUIFilterName[]
@@ -39,6 +39,7 @@ export function useLocalUIFilters({
   filterNames: LocalUIFilterName[];
   params?: Record<string, string | number | boolean | undefined>;
 }) {
+  const history = useHistory();
   const { uiFilters, urlParams } = useUrlParams();
   const callApi = useCallApi();
 
diff --git a/x-pack/plugins/apm/public/utils/history.ts b/x-pack/plugins/apm/public/utils/history.ts
deleted file mode 100644
index bd2203fe92066..0000000000000
--- a/x-pack/plugins/apm/public/utils/history.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { createHashHistory } from 'history';
-
-// Make history singleton available across APM project
-// TODO: Explore using React context or hook instead?
-let history = createHashHistory();
-
-export const resetHistory = () => {
-  history = createHashHistory();
-};
-
-export { history };
diff --git a/x-pack/plugins/apm/public/utils/testHelpers.tsx b/x-pack/plugins/apm/public/utils/testHelpers.tsx
index a750a9ea7af67..037da01c74464 100644
--- a/x-pack/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/plugins/apm/public/utils/testHelpers.tsx
@@ -26,6 +26,20 @@ import {
 } from '../../typings/elasticsearch';
 import { MockApmPluginContextWrapper } from '../context/ApmPluginContext/MockApmPluginContext';
 
+const originalConsoleWarn = console.warn; // eslint-disable-line no-console
+/**
+ *  A dependency we're using is using deprecated react methods. Override the
+ * console to hide the warnings. These should go away when we switch to
+ * Elastic Charts
+ */
+export function disableConsoleWarning(messageToDisable: string) {
+  return jest.spyOn(console, 'warn').mockImplementation((message) => {
+    if (!message.startsWith(messageToDisable)) {
+      originalConsoleWarn(message);
+    }
+  });
+}
+
 export function toJson(wrapper: ReactWrapper) {
   return enzymeToJson(wrapper, {
     noKey: true,
diff --git a/x-pack/plugins/observability/public/application/application.test.tsx b/x-pack/plugins/observability/public/application/application.test.tsx
index db7fca140be89..19995ed233e8d 100644
--- a/x-pack/plugins/observability/public/application/application.test.tsx
+++ b/x-pack/plugins/observability/public/application/application.test.tsx
@@ -4,10 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { createMemoryHistory } from 'history';
 import React from 'react';
-import { renderApp } from './';
 import { Observable } from 'rxjs';
-import { CoreStart, AppMountParameters } from 'src/core/public';
+import { AppMountParameters, CoreStart } from 'src/core/public';
+import { renderApp } from './';
 
 describe('renderApp', () => {
   it('renders', () => {
@@ -19,6 +20,7 @@ describe('renderApp', () => {
     } as unknown) as CoreStart;
     const params = ({
       element: window.document.createElement('div'),
+      history: createMemoryHistory(),
     } as unknown) as AppMountParameters;
 
     expect(() => {
diff --git a/x-pack/plugins/observability/public/application/index.tsx b/x-pack/plugins/observability/public/application/index.tsx
index 4c0147dc3cd51..fa691a7f41ddb 100644
--- a/x-pack/plugins/observability/public/application/index.tsx
+++ b/x-pack/plugins/observability/public/application/index.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
-import { createHashHistory } from 'history';
 import React, { useEffect } from 'react';
 import ReactDOM from 'react-dom';
 import { Route, Router, Switch } from 'react-router-dom';
@@ -52,10 +51,10 @@ function App() {
   );
 }
 
-export const renderApp = (core: CoreStart, { element }: AppMountParameters) => {
+export const renderApp = (core: CoreStart, { element, history }: AppMountParameters) => {
   const i18nCore = core.i18n;
   const isDarkMode = core.uiSettings.get('theme:darkMode');
-  const history = createHashHistory();
+
   ReactDOM.render(
     <PluginContext.Provider value={{ core }}>
       <Router history={history}>

From 137aadb830f4434cb10316b70c7c64cef0f701ff Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Mon, 31 Aug 2020 09:52:37 -0500
Subject: [PATCH 132/148] [Enterprise Search] Upgrade to Kea 2.2-rc.4 (#76206)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add Kea 2.20.rc.3

* Remove Kea declarations

* Convert AppLogic files to use new syntax

- Utilizes MakeLogicType to type the logic file and remove bespoke typings
- Use object syntax for actions and reducers, instead of functions
- Add return types to actions in interface
- Remove interfaces from component (Kea does this automagically now)

- Also renamed IAppLogic* to IApp*

* Convert Workplace Search Overview files to use new syntax

- Utilizes MakeLogicType to type the logic file and remove bespoke typings
- Use object syntax for actions and reducers, instead of functions
- Add return types to actions in interface
- Remove interfaces from component (Kea does this automagically now)

- Also renamed mockLogic* to mockApp*

* Convert HttpLogic files to use new syntax

- Utilizes MakeLogicType to type the logic file and remove bespoke typings
- Use object syntax for actions and reducers, instead of functions
- Add return types to actions in interface
- Remove interfaces from component (Kea does this automagically now)

- Also renamed IHttpLogic* to IHttp*

* Convert FlashMessages files to use new syntax

- Utilizes MakeLogicType to type the logic file and remove bespoke typings
- Use object syntax for actions and reducers, instead of functions
- Add return types to actions in interface
- Remove interfaces from component (Kea does this automagically now)

* Remove hand-rolled Kea types

Bye-bye pretty code

* Upgrade to rc4 per author

From Kea author: “I’d suggest upgrading to rc.4 before merging though, as I seem to have committed some optional chaining operators ("?.") into the compiled JS output, which will cause errors if anyone is using an older browser. You can also wait for 2.2.0 final, but that might still be a week or more away…”

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 x-pack/package.json                           |  2 +-
 .../applications/app_search/app_logic.ts      | 19 +++---
 .../public/applications/app_search/index.tsx  | 10 ++--
 .../public/applications/kea.d.ts              | 13 ----
 .../shared/flash_messages/flash_messages.tsx  |  4 +-
 .../flash_messages/flash_messages_logic.ts    | 29 ++++-----
 .../flash_messages_provider.tsx               | 10 +---
 .../applications/shared/http/http_logic.ts    | 35 +++++------
 .../shared/http/http_provider.tsx             |  4 +-
 .../public/applications/shared/http/index.ts  |  2 +-
 .../public/applications/shared/types.ts       | 60 -------------------
 .../workplace_search/app_logic.ts             | 15 +++--
 .../applications/workplace_search/index.tsx   | 10 ++--
 .../views/overview/__mocks__/index.ts         |  2 +-
 .../overview/__mocks__/overview_logic.mock.ts | 10 ++--
 .../views/overview/onboarding_steps.tsx       |  4 +-
 .../views/overview/organization_stats.tsx     |  4 +-
 .../views/overview/overview.test.tsx          |  4 +-
 .../views/overview/overview.tsx               |  6 +-
 .../views/overview/overview_logic.test.ts     |  4 +-
 .../views/overview/overview_logic.ts          | 19 +++---
 .../views/overview/recent_activity.tsx        |  4 +-
 yarn.lock                                     |  8 +--
 23 files changed, 97 insertions(+), 181 deletions(-)
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/kea.d.ts

diff --git a/x-pack/package.json b/x-pack/package.json
index c2fc16153290e..d49188b29481b 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -195,7 +195,7 @@
     "jsdom": "13.1.0",
     "jsondiffpatch": "0.4.1",
     "jsts": "^1.6.2",
-    "kea": "^2.0.1",
+    "kea": "2.2.0-rc.4",
     "loader-utils": "^1.2.3",
     "lz-string": "^1.4.4",
     "madge": "3.4.4",
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/app_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/app_logic.ts
index 0fb3bb8080d82..3f71759390879 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/app_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/app_logic.ts
@@ -4,28 +4,27 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { kea } from 'kea';
+import { kea, MakeLogicType } from 'kea';
 
 import { IInitialAppData } from '../../../common/types';
-import { IKeaLogic } from '../shared/types';
 
-export interface IAppLogicValues {
+export interface IAppValues {
   hasInitialized: boolean;
 }
-export interface IAppLogicActions {
+export interface IAppActions {
   initializeAppData(props: IInitialAppData): void;
 }
 
-export const AppLogic = kea({
-  actions: (): IAppLogicActions => ({
+export const AppLogic = kea<MakeLogicType<IAppValues, IAppActions>>({
+  actions: {
     initializeAppData: (props) => props,
-  }),
-  reducers: () => ({
+  },
+  reducers: {
     hasInitialized: [
       false,
       {
         initializeAppData: () => true,
       },
     ],
-  }),
-}) as IKeaLogic<IAppLogicValues, IAppLogicActions>;
+  },
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
index 234201a157ec9..6575e44f509eb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
@@ -11,8 +11,8 @@ import { useActions, useValues } from 'kea';
 import { i18n } from '@kbn/i18n';
 
 import { KibanaContext, IKibanaContext } from '../index';
-import { HttpLogic, IHttpLogicValues } from '../shared/http';
-import { AppLogic, IAppLogicActions, IAppLogicValues } from './app_logic';
+import { HttpLogic } from '../shared/http';
+import { AppLogic } from './app_logic';
 import { IInitialAppData } from '../../../common/types';
 
 import { APP_SEARCH_PLUGIN } from '../../../common/constants';
@@ -48,9 +48,9 @@ export const AppSearchUnconfigured: React.FC = () => (
 );
 
 export const AppSearchConfigured: React.FC<IInitialAppData> = (props) => {
-  const { hasInitialized } = useValues(AppLogic) as IAppLogicValues;
-  const { initializeAppData } = useActions(AppLogic) as IAppLogicActions;
-  const { errorConnecting } = useValues(HttpLogic) as IHttpLogicValues;
+  const { hasInitialized } = useValues(AppLogic);
+  const { initializeAppData } = useActions(AppLogic);
+  const { errorConnecting } = useValues(HttpLogic);
 
   useEffect(() => {
     if (!hasInitialized) initializeAppData(props);
diff --git a/x-pack/plugins/enterprise_search/public/applications/kea.d.ts b/x-pack/plugins/enterprise_search/public/applications/kea.d.ts
deleted file mode 100644
index 961d93ccc12e6..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/kea.d.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-declare module 'kea' {
-  export function useValues(logic?: object): object;
-  export function useActions(logic?: object): object;
-  export function getContext(): { store: object };
-  export function resetContext(context: object): object;
-  export function kea(logic: object): object;
-}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.tsx
index 5a909a287795c..d184eb4dcd644 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.tsx
@@ -8,7 +8,7 @@ import React, { Fragment } from 'react';
 import { useValues } from 'kea';
 import { EuiCallOut, EuiCallOutProps, EuiSpacer } from '@elastic/eui';
 
-import { FlashMessagesLogic, IFlashMessagesValues } from './flash_messages_logic';
+import { FlashMessagesLogic } from './flash_messages_logic';
 
 const FLASH_MESSAGE_TYPES = {
   success: { color: 'success' as EuiCallOutProps['color'], icon: 'check' },
@@ -18,7 +18,7 @@ const FLASH_MESSAGE_TYPES = {
 };
 
 export const FlashMessages: React.FC = ({ children }) => {
-  const { messages } = useValues(FlashMessagesLogic) as IFlashMessagesValues;
+  const { messages } = useValues(FlashMessagesLogic);
 
   // If we have no messages to display, do not render the element at all
   if (!messages.length) return null;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.ts
index 96c7817832c52..3ae48f352b2c1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.ts
@@ -4,12 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { kea } from 'kea';
+import { kea, MakeLogicType } from 'kea';
 import { ReactNode } from 'react';
 import { History } from 'history';
 
-import { IKeaLogic, TKeaReducers, IKeaParams } from '../types';
-
 export interface IFlashMessage {
   type: 'success' | 'info' | 'warning' | 'error';
   message: ReactNode;
@@ -22,27 +20,27 @@ export interface IFlashMessagesValues {
   historyListener: Function | null;
 }
 export interface IFlashMessagesActions {
-  setFlashMessages(messages: IFlashMessage | IFlashMessage[]): void;
+  setFlashMessages(messages: IFlashMessage | IFlashMessage[]): { messages: IFlashMessage[] };
   clearFlashMessages(): void;
-  setQueuedMessages(messages: IFlashMessage | IFlashMessage[]): void;
+  setQueuedMessages(messages: IFlashMessage | IFlashMessage[]): { messages: IFlashMessage[] };
   clearQueuedMessages(): void;
-  listenToHistory(history: History): void;
-  setHistoryListener(historyListener: Function): void;
+  listenToHistory(history: History): History;
+  setHistoryListener(historyListener: Function): { historyListener: Function };
 }
 
 const convertToArray = (messages: IFlashMessage | IFlashMessage[]) =>
   !Array.isArray(messages) ? [messages] : messages;
 
-export const FlashMessagesLogic = kea({
-  actions: (): IFlashMessagesActions => ({
+export const FlashMessagesLogic = kea<MakeLogicType<IFlashMessagesValues, IFlashMessagesActions>>({
+  actions: {
     setFlashMessages: (messages) => ({ messages: convertToArray(messages) }),
     clearFlashMessages: () => null,
     setQueuedMessages: (messages) => ({ messages: convertToArray(messages) }),
     clearQueuedMessages: () => null,
     listenToHistory: (history) => history,
     setHistoryListener: (historyListener) => ({ historyListener }),
-  }),
-  reducers: (): TKeaReducers<IFlashMessagesValues, IFlashMessagesActions> => ({
+  },
+  reducers: {
     messages: [
       [],
       {
@@ -63,8 +61,8 @@ export const FlashMessagesLogic = kea({
         setHistoryListener: (_, { historyListener }) => historyListener,
       },
     ],
-  }),
-  listeners: ({ values, actions }): Partial<IFlashMessagesActions> => ({
+  },
+  listeners: ({ values, actions }) => ({
     listenToHistory: (history) => {
       // On React Router navigation, clear previous flash messages and load any queued messages
       const unlisten = history.listen(() => {
@@ -81,7 +79,4 @@ export const FlashMessagesLogic = kea({
       if (removeHistoryListener) removeHistoryListener();
     },
   }),
-} as IKeaParams<IFlashMessagesValues, IFlashMessagesActions>) as IKeaLogic<
-  IFlashMessagesValues,
-  IFlashMessagesActions
->;
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.tsx
index 584124468a91f..a3ceabcf6ac8a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_provider.tsx
@@ -8,19 +8,15 @@ import React, { useEffect } from 'react';
 import { useValues, useActions } from 'kea';
 import { History } from 'history';
 
-import {
-  FlashMessagesLogic,
-  IFlashMessagesValues,
-  IFlashMessagesActions,
-} from './flash_messages_logic';
+import { FlashMessagesLogic } from './flash_messages_logic';
 
 interface IFlashMessagesProviderProps {
   history: History;
 }
 
 export const FlashMessagesProvider: React.FC<IFlashMessagesProviderProps> = ({ history }) => {
-  const { historyListener } = useValues(FlashMessagesLogic) as IFlashMessagesValues;
-  const { listenToHistory } = useActions(FlashMessagesLogic) as IFlashMessagesActions;
+  const { historyListener } = useValues(FlashMessagesLogic);
+  const { listenToHistory } = useActions(FlashMessagesLogic);
 
   useEffect(() => {
     if (!historyListener) listenToHistory(history);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
index 7bf7a19ed451f..fb2d9b1061723 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_logic.ts
@@ -4,32 +4,36 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { kea } from 'kea';
+import { kea, MakeLogicType } from 'kea';
 
 import { HttpSetup } from 'src/core/public';
 
-import { IKeaLogic, IKeaParams, TKeaReducers } from '../../shared/types';
-
-export interface IHttpLogicValues {
+export interface IHttpValues {
   http: HttpSetup;
   httpInterceptors: Function[];
   errorConnecting: boolean;
 }
-export interface IHttpLogicActions {
-  initializeHttp({ http, errorConnecting }: { http: HttpSetup; errorConnecting?: boolean }): void;
+export interface IHttpActions {
+  initializeHttp({
+    http,
+    errorConnecting,
+  }: {
+    http: HttpSetup;
+    errorConnecting?: boolean;
+  }): { http: HttpSetup; errorConnecting?: boolean };
   initializeHttpInterceptors(): void;
-  setHttpInterceptors(httpInterceptors: Function[]): void;
-  setErrorConnecting(errorConnecting: boolean): void;
+  setHttpInterceptors(httpInterceptors: Function[]): { httpInterceptors: Function[] };
+  setErrorConnecting(errorConnecting: boolean): { errorConnecting: boolean };
 }
 
-export const HttpLogic = kea({
-  actions: (): IHttpLogicActions => ({
+export const HttpLogic = kea<MakeLogicType<IHttpValues, IHttpActions>>({
+  actions: {
     initializeHttp: ({ http, errorConnecting }) => ({ http, errorConnecting }),
     initializeHttpInterceptors: () => null,
     setHttpInterceptors: (httpInterceptors) => ({ httpInterceptors }),
     setErrorConnecting: (errorConnecting) => ({ errorConnecting }),
-  }),
-  reducers: (): TKeaReducers<IHttpLogicValues, IHttpLogicActions> => ({
+  },
+  reducers: {
     http: [
       (null as unknown) as HttpSetup,
       {
@@ -49,7 +53,7 @@ export const HttpLogic = kea({
         setErrorConnecting: (_, { errorConnecting }) => errorConnecting,
       },
     ],
-  }),
+  },
   listeners: ({ values, actions }) => ({
     initializeHttpInterceptors: () => {
       const httpInterceptors = [];
@@ -80,7 +84,4 @@ export const HttpLogic = kea({
       });
     },
   }),
-} as IKeaParams<IHttpLogicValues, IHttpLogicActions>) as IKeaLogic<
-  IHttpLogicValues,
-  IHttpLogicActions
->;
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.tsx
index 6febc1869054f..4c2160195a1af 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/http_provider.tsx
@@ -9,7 +9,7 @@ import { useActions } from 'kea';
 
 import { HttpSetup } from 'src/core/public';
 
-import { HttpLogic, IHttpLogicActions } from './http_logic';
+import { HttpLogic } from './http_logic';
 
 interface IHttpProviderProps {
   http: HttpSetup;
@@ -17,7 +17,7 @@ interface IHttpProviderProps {
 }
 
 export const HttpProvider: React.FC<IHttpProviderProps> = (props) => {
-  const { initializeHttp, initializeHttpInterceptors } = useActions(HttpLogic) as IHttpLogicActions;
+  const { initializeHttp, initializeHttpInterceptors } = useActions(HttpLogic);
 
   useEffect(() => {
     initializeHttp(props);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/http/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/http/index.ts
index 449ff9d56debf..db65e80ca25c2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/http/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/http/index.ts
@@ -4,5 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { HttpLogic, IHttpLogicValues, IHttpLogicActions } from './http_logic';
+export { HttpLogic, IHttpValues, IHttpActions } from './http_logic';
 export { HttpProvider } from './http_provider';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
index 561016d36921d..3fd1dcad0066e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
@@ -5,63 +5,3 @@
  */
 
 export { IFlashMessage } from './flash_messages';
-
-export interface IKeaLogic<IKeaValues, IKeaActions> {
-  mount(): Function;
-  values: IKeaValues;
-  actions: IKeaActions;
-}
-
-/**
- * This reusable interface mostly saves us a few characters / allows us to skip
- * defining params inline. Unfortunately, the return values *do not work* as
- * expected (hence the voids).  While I can tell selectors to use TKeaSelectors,
- * the return value is *not* properly type checked if it's not declared inline. :/
- *
- * Also note that if you switch to Kea 2.1's plain object notation -
- * `selectors: {}` vs. `selectors: () => ({})`
- * - type checking also stops working and type errors become significantly less
- * helpful - showing less specific error messages and highlighting. 👎
- */
-export interface IKeaParams<IKeaValues, IKeaActions> {
-  selectors?(params: { selectors: IKeaValues }): void;
-  listeners?(params: { actions: IKeaActions; values: IKeaValues }): void;
-  events?(params: { actions: IKeaActions; values: IKeaValues }): void;
-}
-
-/**
- * This reducers() type checks that:
- *
- * 1. The value object keys are defined within IKeaValues
- * 2. The default state (array[0]) matches the type definition within IKeaValues
- * 3. The action object keys (array[1]) are defined within IKeaActions
- * 3. The new state returned by the action matches the type definition within IKeaValues
- */
-export type TKeaReducers<IKeaValues, IKeaActions> = {
-  [Value in keyof IKeaValues]?: [
-    IKeaValues[Value],
-    {
-      [Action in keyof IKeaActions]?: (
-        state: IKeaValues[Value],
-        payload: IKeaValues
-      ) => IKeaValues[Value];
-    }
-  ];
-};
-
-/**
- * This selectors() type checks that:
- *
- * 1. The object keys are defined within IKeaValues
- * 2. The selected values are defined within IKeaValues
- * 3. The returned value match the type definition within IKeaValues
- *
- * The unknown[] and any[] are unfortunately because I have no idea how to
- * assert for arbitrary type/values as an array
- */
-export type TKeaSelectors<IKeaValues> = {
-  [Value in keyof IKeaValues]?: [
-    (selectors: IKeaValues) => unknown[],
-    (...args: any[]) => IKeaValues[Value] // eslint-disable-line @typescript-eslint/no-explicit-any
-  ];
-};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts
index b7116f02663c1..5bf2b41cfc264 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.ts
@@ -4,11 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { kea } from 'kea';
+import { kea, MakeLogicType } from 'kea';
 
 import { IInitialAppData } from '../../../common/types';
 import { IWorkplaceSearchInitialData } from '../../../common/types/workplace_search';
-import { IKeaLogic } from '../shared/types';
 
 export interface IAppValues extends IWorkplaceSearchInitialData {
   hasInitialized: boolean;
@@ -17,16 +16,16 @@ export interface IAppActions {
   initializeAppData(props: IInitialAppData): void;
 }
 
-export const AppLogic = kea({
-  actions: (): IAppActions => ({
+export const AppLogic = kea<MakeLogicType<IAppValues, IAppActions>>({
+  actions: {
     initializeAppData: ({ workplaceSearch }) => workplaceSearch,
-  }),
-  reducers: () => ({
+  },
+  reducers: {
     hasInitialized: [
       false,
       {
         initializeAppData: () => true,
       },
     ],
-  }),
-}) as IKeaLogic<IAppValues, IAppActions>;
+  },
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
index c0a51d5670a14..23e24e343937d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
@@ -10,8 +10,8 @@ import { useActions, useValues } from 'kea';
 
 import { IInitialAppData } from '../../../common/types';
 import { KibanaContext, IKibanaContext } from '../index';
-import { HttpLogic, IHttpLogicValues } from '../shared/http';
-import { AppLogic, IAppActions, IAppValues } from './app_logic';
+import { HttpLogic } from '../shared/http';
+import { AppLogic } from './app_logic';
 import { Layout } from '../shared/layout';
 import { WorkplaceSearchNav } from './components/layout/nav';
 
@@ -27,9 +27,9 @@ export const WorkplaceSearch: React.FC<IInitialAppData> = (props) => {
 };
 
 export const WorkplaceSearchConfigured: React.FC<IInitialAppData> = (props) => {
-  const { hasInitialized } = useValues(AppLogic) as IAppValues;
-  const { initializeAppData } = useActions(AppLogic) as IAppActions;
-  const { errorConnecting } = useValues(HttpLogic) as IHttpLogicValues;
+  const { hasInitialized } = useValues(AppLogic);
+  const { initializeAppData } = useActions(AppLogic);
+  const { errorConnecting } = useValues(HttpLogic);
 
   useEffect(() => {
     if (!hasInitialized) initializeAppData(props);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/index.ts
index e5169a51ce522..9e86993a5289d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { setMockValues, mockLogicValues, mockLogicActions } from './overview_logic.mock';
+export { setMockValues, mockValues, mockActions } from './overview_logic.mock';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
index 05715c648e5dc..9ce3021917a21 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
@@ -7,7 +7,7 @@
 import { IOverviewValues } from '../overview_logic';
 import { IAccount, IOrganization } from '../../../types';
 
-export const mockLogicValues = {
+export const mockValues = {
   accountsCount: 0,
   activityFeed: [],
   canCreateContentSources: false,
@@ -24,21 +24,21 @@ export const mockLogicValues = {
   dataLoading: true,
 } as IOverviewValues;
 
-export const mockLogicActions = {
+export const mockActions = {
   initializeOverview: jest.fn(() => ({})),
 };
 
 jest.mock('kea', () => ({
   ...(jest.requireActual('kea') as object),
-  useActions: jest.fn(() => ({ ...mockLogicActions })),
-  useValues: jest.fn(() => ({ ...mockLogicValues })),
+  useActions: jest.fn(() => ({ ...mockActions })),
+  useValues: jest.fn(() => ({ ...mockValues })),
 }));
 
 import { useValues } from 'kea';
 
 export const setMockValues = (values: object) => {
   (useValues as jest.Mock).mockImplementationOnce(() => ({
-    ...mockLogicValues,
+    ...mockValues,
     ...values,
   }));
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx
index fa4decccb34b1..5598123f1c286 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.tsx
@@ -28,7 +28,7 @@ import { ORG_SOURCES_PATH, USERS_PATH, ORG_SETTINGS_PATH } from '../../routes';
 
 import { ContentSection } from '../../components/shared/content_section';
 
-import { OverviewLogic, IOverviewValues } from './overview_logic';
+import { OverviewLogic } from './overview_logic';
 
 import { OnboardingCard } from './onboarding_card';
 
@@ -68,7 +68,7 @@ export const OnboardingSteps: React.FC = () => {
     fpAccount: { isCurated },
     organization: { name, defaultOrgName },
     isFederatedAuth,
-  } = useValues(OverviewLogic) as IOverviewValues;
+  } = useValues(OverviewLogic);
 
   const accountsPath =
     !isFederatedAuth && (canCreateInvitations || isCurated) ? USERS_PATH : undefined;
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx
index 53549cfcdbce7..4dc762e29deba 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/organization_stats.tsx
@@ -14,7 +14,7 @@ import { i18n } from '@kbn/i18n';
 import { ContentSection } from '../../components/shared/content_section';
 import { ORG_SOURCES_PATH, USERS_PATH } from '../../routes';
 
-import { OverviewLogic, IOverviewValues } from './overview_logic';
+import { OverviewLogic } from './overview_logic';
 
 import { StatisticCard } from './statistic_card';
 
@@ -25,7 +25,7 @@ export const OrganizationStats: React.FC = () => {
     accountsCount,
     personalSourcesCount,
     isFederatedAuth,
-  } = useValues(OverviewLogic) as IOverviewValues;
+  } = useValues(OverviewLogic);
 
   return (
     <ContentSection
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx
index e4531ff03587b..c7bab66490f44 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx
@@ -6,7 +6,7 @@
 
 import '../../../__mocks__/react_router_history.mock';
 import './__mocks__/overview_logic.mock';
-import { mockLogicActions, setMockValues } from './__mocks__';
+import { mockActions, setMockValues } from './__mocks__';
 
 import React from 'react';
 import { shallow, mount } from 'enzyme';
@@ -32,7 +32,7 @@ describe('Overview', () => {
     it('calls initialize function', async () => {
       mount(<Overview />);
 
-      expect(mockLogicActions.initializeOverview).toHaveBeenCalled();
+      expect(mockActions.initializeOverview).toHaveBeenCalled();
     });
 
     it('renders onboarding state', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.tsx
index 134fc9389694d..dbc007c2aa97d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.tsx
@@ -14,7 +14,7 @@ import { useActions, useValues } from 'kea';
 import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
 
-import { OverviewLogic, IOverviewActions, IOverviewValues } from './overview_logic';
+import { OverviewLogic } from './overview_logic';
 
 import { Loading } from '../../components/shared/loading';
 import { ProductButton } from '../../components/shared/product_button';
@@ -44,7 +44,7 @@ const HEADER_DESCRIPTION = i18n.translate(
 );
 
 export const Overview: React.FC = () => {
-  const { initializeOverview } = useActions(OverviewLogic) as IOverviewActions;
+  const { initializeOverview } = useActions(OverviewLogic);
 
   const {
     dataLoading,
@@ -52,7 +52,7 @@ export const Overview: React.FC = () => {
     hasOrgSources,
     isOldAccount,
     organization: { name: orgName, defaultOrgName },
-  } = useValues(OverviewLogic) as IOverviewValues;
+  } = useValues(OverviewLogic);
 
   useEffect(() => {
     initializeOverview();
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
index 61108d7cb1f2f..6989635064ca9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
@@ -9,7 +9,7 @@ import { resetContext } from 'kea';
 jest.mock('../../../shared/http', () => ({ HttpLogic: { values: { http: { get: jest.fn() } } } }));
 import { HttpLogic } from '../../../shared/http';
 
-import { mockLogicValues } from './__mocks__';
+import { mockValues } from './__mocks__';
 import { OverviewLogic } from './overview_logic';
 
 describe('OverviewLogic', () => {
@@ -20,7 +20,7 @@ describe('OverviewLogic', () => {
   });
 
   it('has expected default values', () => {
-    expect(OverviewLogic.values).toEqual(mockLogicValues);
+    expect(OverviewLogic.values).toEqual(mockValues);
   });
 
   describe('setServerData', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.ts
index 6606e5b55cb33..2c6846b6db7db 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.ts
@@ -4,11 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { kea } from 'kea';
+import { kea, MakeLogicType } from 'kea';
 import { HttpLogic } from '../../../shared/http';
 
 import { IAccount, IOrganization } from '../../types';
-import { IKeaLogic, TKeaReducers, IKeaParams } from '../../../shared/types';
 
 import { IFeedActivity } from './recent_activity';
 
@@ -29,7 +28,7 @@ export interface IOverviewServerData {
 }
 
 export interface IOverviewActions {
-  setServerData(serverData: IOverviewServerData): void;
+  setServerData(serverData: IOverviewServerData): IOverviewServerData;
   initializeOverview(): void;
 }
 
@@ -37,12 +36,12 @@ export interface IOverviewValues extends IOverviewServerData {
   dataLoading: boolean;
 }
 
-export const OverviewLogic = kea({
-  actions: (): IOverviewActions => ({
+export const OverviewLogic = kea<MakeLogicType<IOverviewValues, IOverviewActions>>({
+  actions: {
     setServerData: (serverData) => serverData,
     initializeOverview: () => null,
-  }),
-  reducers: (): TKeaReducers<IOverviewValues, IOverviewActions> => ({
+  },
+  reducers: {
     organization: [
       {} as IOrganization,
       {
@@ -127,11 +126,11 @@ export const OverviewLogic = kea({
         setServerData: () => false,
       },
     ],
-  }),
-  listeners: ({ actions }): Partial<IOverviewActions> => ({
+  },
+  listeners: ({ actions }) => ({
     initializeOverview: async () => {
       const response = await HttpLogic.values.http.get('/api/workplace_search/overview');
       actions.setServerData(response);
     },
   }),
-} as IKeaParams<IOverviewValues, IOverviewActions>) as IKeaLogic<IOverviewValues, IOverviewActions>;
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.tsx
index ada89c33be7e2..3c476be8d10e6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.tsx
@@ -17,7 +17,7 @@ import { sendTelemetry } from '../../../shared/telemetry';
 import { KibanaContext, IKibanaContext } from '../../../index';
 import { getSourcePath } from '../../routes';
 
-import { OverviewLogic, IOverviewValues } from './overview_logic';
+import { OverviewLogic } from './overview_logic';
 
 import './recent_activity.scss';
 
@@ -33,7 +33,7 @@ export const RecentActivity: React.FC = () => {
   const {
     organization: { name, defaultOrgName },
     activityFeed,
-  } = useValues(OverviewLogic) as IOverviewValues;
+  } = useValues(OverviewLogic);
 
   return (
     <ContentSection
diff --git a/yarn.lock b/yarn.lock
index 496331aba0485..c8b94d122ba7e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18099,10 +18099,10 @@ kdbush@^3.0.0:
   resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0"
   integrity sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==
 
-kea@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/kea/-/kea-2.1.1.tgz#6e3c65c4873b67d270a2ec7bf73b0d178937234c"
-  integrity sha512-W9o4lHLOcEDIu3ASHPrWJJJzL1bMkGyxaHn9kuaDgI96ztBShVrf52R0QPGlQ2k9ca3XnkB/dnVHio1UB8kGWA==
+kea@2.2.0-rc.4:
+  version "2.2.0-rc.4"
+  resolved "https://registry.yarnpkg.com/kea/-/kea-2.2.0-rc.4.tgz#cc0376950530a6751f73387c4b25a39efa1faa77"
+  integrity sha512-pYuwaCiJkBvHZShi8kqhk8dC4DjeELdK51Lw7Pn0tNdJgZJDF6COhsUiF/yrh9d7woNYDxKfuxH+QWZFfo8PkA==
 
 kew@~0.1.7:
   version "0.1.7"

From dc37cca082ed5423f715769ea26c741033039cc5 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Mon, 31 Aug 2020 16:59:24 +0200
Subject: [PATCH 133/148] remove legacy uiSettings mixin (#76255)

* remove legacy uiSettings mixin

* adapt ui_render mixin to use core APIs
---
 .../integration_tests/lib/servers.ts          |   6 +-
 src/legacy/server/kbn_server.d.ts             |   2 -
 src/legacy/ui/ui_mixin.js                     |   2 -
 src/legacy/ui/ui_render/ui_render_mixin.js    |   6 +-
 src/legacy/ui/ui_settings/index.js            |  20 --
 .../ui_settings_mixin.test.ts                 | 179 ------------------
 .../ui/ui_settings/ui_exports_consumer.js     |  62 ------
 .../ui/ui_settings/ui_settings_mixin.js       |  55 ------
 .../ui_settings_service_factory.ts            |  36 ----
 .../ui_settings_service_for_request.ts        |  42 ----
 10 files changed, 8 insertions(+), 402 deletions(-)
 delete mode 100644 src/legacy/ui/ui_settings/index.js
 delete mode 100644 src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts
 delete mode 100644 src/legacy/ui/ui_settings/ui_exports_consumer.js
 delete mode 100644 src/legacy/ui/ui_settings/ui_settings_mixin.js
 delete mode 100644 src/legacy/ui/ui_settings/ui_settings_service_factory.ts
 delete mode 100644 src/legacy/ui/ui_settings/ui_settings_service_for_request.ts

diff --git a/src/core/server/ui_settings/integration_tests/lib/servers.ts b/src/core/server/ui_settings/integration_tests/lib/servers.ts
index b4cfc3c1efe8b..04979b69b32b9 100644
--- a/src/core/server/ui_settings/integration_tests/lib/servers.ts
+++ b/src/core/server/ui_settings/integration_tests/lib/servers.ts
@@ -73,9 +73,9 @@ export function getServices() {
     httpServerMock.createKibanaRequest()
   );
 
-  const uiSettings = kbnServer.server.uiSettingsServiceFactory({
-    savedObjectsClient,
-  });
+  const uiSettings = kbnServer.newPlatform.start.core.uiSettings.asScopedToClient(
+    savedObjectsClient
+  );
 
   services = {
     kbnServer,
diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
index 9bb091383ab13..1a1f43b93f26e 100644
--- a/src/legacy/server/kbn_server.d.ts
+++ b/src/legacy/server/kbn_server.d.ts
@@ -45,7 +45,6 @@ import { LegacyConfig, ILegacyService, ILegacyInternals } from '../../core/serve
 import { UiPlugins } from '../../core/server/plugins';
 import { CallClusterWithRequest, ElasticsearchPlugin } from '../core_plugins/elasticsearch';
 import { UsageCollectionSetup } from '../../plugins/usage_collection/server';
-import { UiSettingsServiceFactoryOptions } from '../../legacy/ui/ui_settings/ui_settings_service_factory';
 import { HomeServerPluginSetup } from '../../plugins/home/server';
 
 // lot of legacy code was assuming this type only had these two methods
@@ -78,7 +77,6 @@ declare module 'hapi' {
       name: string,
       factoryFn: (request: Request) => Record<string, any>
     ) => void;
-    uiSettingsServiceFactory: (options?: UiSettingsServiceFactoryOptions) => IUiSettingsClient;
     logWithMetadata: (tags: string[], message: string, meta: Record<string, any>) => void;
     newPlatform: KbnServer['newPlatform'];
   }
diff --git a/src/legacy/ui/ui_mixin.js b/src/legacy/ui/ui_mixin.js
index 432c4f02bc3e6..54da001d20669 100644
--- a/src/legacy/ui/ui_mixin.js
+++ b/src/legacy/ui/ui_mixin.js
@@ -19,10 +19,8 @@
 
 import { uiAppsMixin } from './ui_apps';
 import { uiRenderMixin } from './ui_render';
-import { uiSettingsMixin } from './ui_settings';
 
 export async function uiMixin(kbnServer) {
   await kbnServer.mixin(uiAppsMixin);
-  await kbnServer.mixin(uiSettingsMixin);
   await kbnServer.mixin(uiRenderMixin);
 }
diff --git a/src/legacy/ui/ui_render/ui_render_mixin.js b/src/legacy/ui/ui_render/ui_render_mixin.js
index 23fb6028f84db..8cc2cd1321a62 100644
--- a/src/legacy/ui/ui_render/ui_render_mixin.js
+++ b/src/legacy/ui/ui_render/ui_render_mixin.js
@@ -21,6 +21,7 @@ import { createHash } from 'crypto';
 import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
 import * as UiSharedDeps from '@kbn/ui-shared-deps';
+import { KibanaRequest } from '../../../core/server';
 import { AppBootstrap } from './bootstrap';
 import { getApmConfig } from '../apm';
 
@@ -79,7 +80,10 @@ export function uiRenderMixin(kbnServer, server, config) {
         auth: authEnabled ? { mode: 'try' } : false,
       },
       async handler(request, h) {
-        const uiSettings = request.getUiSettingsService();
+        const soClient = kbnServer.newPlatform.start.core.savedObjects.getScopedClient(
+          KibanaRequest.from(request)
+        );
+        const uiSettings = kbnServer.newPlatform.start.core.uiSettings.asScopedToClient(soClient);
 
         const darkMode =
           !authEnabled || request.auth.isAuthenticated
diff --git a/src/legacy/ui/ui_settings/index.js b/src/legacy/ui/ui_settings/index.js
deleted file mode 100644
index ec3122c4e390e..0000000000000
--- a/src/legacy/ui/ui_settings/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export { uiSettingsMixin } from './ui_settings_mixin';
diff --git a/src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts b/src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts
deleted file mode 100644
index 84a64d3f46f11..0000000000000
--- a/src/legacy/ui/ui_settings/integration_tests/ui_settings_mixin.test.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-
-import { savedObjectsClientMock } from '../../../../core/server/mocks';
-import * as uiSettingsServiceFactoryNS from '../ui_settings_service_factory';
-import * as getUiSettingsServiceForRequestNS from '../ui_settings_service_for_request';
-// @ts-ignore
-import { uiSettingsMixin } from '../ui_settings_mixin';
-
-interface Decorators {
-  server: { [name: string]: any };
-  request: { [name: string]: any };
-}
-
-const uiSettingDefaults = {
-  application: {
-    defaultProperty1: 'value1',
-  },
-};
-
-describe('uiSettingsMixin()', () => {
-  const sandbox = sinon.createSandbox();
-
-  function setup() {
-    // maps of decorations passed to `server.decorate()`
-    const decorations: Decorators = {
-      server: {},
-      request: {},
-    };
-
-    // mock hapi server
-    const server = {
-      log: sinon.stub(),
-      route: sinon.stub(),
-      addMemoizedFactoryToRequest(name: string, factory: (...args: any[]) => any) {
-        this.decorate('request', name, function (this: typeof server) {
-          return factory(this);
-        });
-      },
-      decorate: sinon.spy((type: keyof Decorators, name: string, value: any) => {
-        decorations[type][name] = value;
-      }),
-      newPlatform: {
-        setup: {
-          core: {
-            uiSettings: {
-              register: sinon.stub(),
-            },
-          },
-        },
-      },
-    };
-
-    // "promise" returned from kbnServer.ready()
-    const readyPromise = {
-      then: sinon.stub(),
-    };
-
-    const kbnServer = {
-      server,
-      uiExports: { uiSettingDefaults },
-      ready: sinon.stub().returns(readyPromise),
-    };
-
-    uiSettingsMixin(kbnServer, server);
-
-    return {
-      kbnServer,
-      server,
-      decorations,
-      readyPromise,
-    };
-  }
-
-  afterEach(() => sandbox.restore());
-
-  it('passes uiSettingsDefaults to the new platform', () => {
-    const { server } = setup();
-    sinon.assert.calledOnce(server.newPlatform.setup.core.uiSettings.register);
-    sinon.assert.calledWithExactly(
-      server.newPlatform.setup.core.uiSettings.register,
-      uiSettingDefaults
-    );
-  });
-
-  describe('server.uiSettingsServiceFactory()', () => {
-    it('decorates server with "uiSettingsServiceFactory"', () => {
-      const { decorations } = setup();
-      expect(decorations.server).to.have.property('uiSettingsServiceFactory').a('function');
-
-      const uiSettingsServiceFactoryStub = sandbox.stub(
-        uiSettingsServiceFactoryNS,
-        'uiSettingsServiceFactory'
-      );
-      sinon.assert.notCalled(uiSettingsServiceFactoryStub);
-      decorations.server.uiSettingsServiceFactory();
-      sinon.assert.calledOnce(uiSettingsServiceFactoryStub);
-    });
-
-    it('passes `server` and `options` argument to factory', () => {
-      const { decorations, server } = setup();
-      expect(decorations.server).to.have.property('uiSettingsServiceFactory').a('function');
-
-      const uiSettingsServiceFactoryStub = sandbox.stub(
-        uiSettingsServiceFactoryNS,
-        'uiSettingsServiceFactory'
-      );
-
-      sinon.assert.notCalled(uiSettingsServiceFactoryStub);
-
-      const savedObjectsClient = savedObjectsClientMock.create();
-      decorations.server.uiSettingsServiceFactory({
-        savedObjectsClient,
-      });
-      sinon.assert.calledOnce(uiSettingsServiceFactoryStub);
-      sinon.assert.calledWithExactly(uiSettingsServiceFactoryStub, server as any, {
-        savedObjectsClient,
-      });
-    });
-  });
-
-  describe('request.getUiSettingsService()', () => {
-    it('exposes "getUiSettingsService" on requests', () => {
-      const { decorations } = setup();
-      expect(decorations.request).to.have.property('getUiSettingsService').a('function');
-
-      const getUiSettingsServiceForRequestStub = sandbox.stub(
-        getUiSettingsServiceForRequestNS,
-        'getUiSettingsServiceForRequest'
-      );
-      sinon.assert.notCalled(getUiSettingsServiceForRequestStub);
-      decorations.request.getUiSettingsService();
-      sinon.assert.calledOnce(getUiSettingsServiceForRequestStub);
-    });
-
-    it('passes request to getUiSettingsServiceForRequest', () => {
-      const { server, decorations } = setup();
-      expect(decorations.request).to.have.property('getUiSettingsService').a('function');
-
-      const getUiSettingsServiceForRequestStub = sandbox.stub(
-        getUiSettingsServiceForRequestNS,
-        'getUiSettingsServiceForRequest'
-      );
-      sinon.assert.notCalled(getUiSettingsServiceForRequestStub);
-      const request = {};
-      decorations.request.getUiSettingsService.call(request);
-      sinon.assert.calledWith(getUiSettingsServiceForRequestStub, server as any, request as any);
-    });
-  });
-
-  describe('server.uiSettings()', () => {
-    it('throws an error, links to pr', () => {
-      const { decorations } = setup();
-      expect(decorations.server).to.have.property('uiSettings').a('function');
-      expect(() => {
-        decorations.server.uiSettings();
-      }).to.throwError('http://github.com' as any); // incorrect typings
-    });
-  });
-});
diff --git a/src/legacy/ui/ui_settings/ui_exports_consumer.js b/src/legacy/ui/ui_settings/ui_exports_consumer.js
deleted file mode 100644
index d2bb3a00ce0ed..0000000000000
--- a/src/legacy/ui/ui_settings/ui_exports_consumer.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- *  The UiExports class accepts consumer objects that it consults while
- *  trying to consume all of the `uiExport` declarations provided by
- *  plugins.
- *
- *  UiExportConsumer is instantiated and passed to UiExports, then for
- *  every `uiExport` declaration the `exportConsumer(type)` method is
- *  with the key of the declaration. If this consumer knows how to handle
- *  that key we return a function that will be called with the plugins
- *  and values of all declarations using that key.
- *
- *  With this, the consumer merges all of the declarations into the
- *  _uiSettingDefaults map, ensuring that there are not collisions along
- *  the way.
- *
- *  @class UiExportsConsumer
- */
-export class UiExportsConsumer {
-  _uiSettingDefaults = {};
-
-  exportConsumer(type) {
-    switch (type) {
-      case 'uiSettingDefaults':
-        return (plugin, settingDefinitions) => {
-          Object.keys(settingDefinitions).forEach((key) => {
-            if (key in this._uiSettingDefaults) {
-              throw new Error(`uiSettingDefaults for key "${key}" are already defined`);
-            }
-
-            this._uiSettingDefaults[key] = settingDefinitions[key];
-          });
-        };
-    }
-  }
-
-  /**
-   *  Get the map of uiSettingNames to "default" specifications
-   *  @return {Object<String,UiSettingsDefault>}
-   */
-  getUiSettingDefaults() {
-    return this._uiSettingDefaults;
-  }
-}
diff --git a/src/legacy/ui/ui_settings/ui_settings_mixin.js b/src/legacy/ui/ui_settings/ui_settings_mixin.js
deleted file mode 100644
index 8190b67732dac..0000000000000
--- a/src/legacy/ui/ui_settings/ui_settings_mixin.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { uiSettingsServiceFactory } from './ui_settings_service_factory';
-import { getUiSettingsServiceForRequest } from './ui_settings_service_for_request';
-
-export function uiSettingsMixin(kbnServer, server) {
-  const { uiSettingDefaults = {} } = kbnServer.uiExports;
-  const mergedUiSettingDefaults = Object.keys(uiSettingDefaults).reduce((acc, currentKey) => {
-    const defaultSetting = uiSettingDefaults[currentKey];
-    const updatedDefaultSetting = {
-      ...defaultSetting,
-    };
-    if (typeof defaultSetting.options === 'function') {
-      updatedDefaultSetting.options = defaultSetting.options(server);
-    }
-    if (typeof defaultSetting.value === 'function') {
-      updatedDefaultSetting.value = defaultSetting.value(server);
-    }
-    acc[currentKey] = updatedDefaultSetting;
-    return acc;
-  }, {});
-
-  server.newPlatform.setup.core.uiSettings.register(mergedUiSettingDefaults);
-
-  server.decorate('server', 'uiSettingsServiceFactory', (options = {}) => {
-    return uiSettingsServiceFactory(server, options);
-  });
-
-  server.addMemoizedFactoryToRequest('getUiSettingsService', (request) => {
-    return getUiSettingsServiceForRequest(server, request);
-  });
-
-  server.decorate('server', 'uiSettings', () => {
-    throw new Error(`
-      server.uiSettings has been removed, see https://github.com/elastic/kibana/pull/12243.
-    `);
-  });
-}
diff --git a/src/legacy/ui/ui_settings/ui_settings_service_factory.ts b/src/legacy/ui/ui_settings/ui_settings_service_factory.ts
deleted file mode 100644
index 6c3c50d175dc5..0000000000000
--- a/src/legacy/ui/ui_settings/ui_settings_service_factory.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { Legacy } from 'kibana';
-import { IUiSettingsClient, SavedObjectsClientContract } from 'src/core/server';
-
-export interface UiSettingsServiceFactoryOptions {
-  savedObjectsClient: SavedObjectsClientContract;
-}
-/**
- *  Create an instance of UiSettingsClient that will use the
- *  passed `savedObjectsClient` to communicate with elasticsearch
- *
- *  @return {IUiSettingsClient}
- */
-export function uiSettingsServiceFactory(
-  server: Legacy.Server,
-  options: UiSettingsServiceFactoryOptions
-): IUiSettingsClient {
-  return server.newPlatform.start.core.uiSettings.asScopedToClient(options.savedObjectsClient);
-}
diff --git a/src/legacy/ui/ui_settings/ui_settings_service_for_request.ts b/src/legacy/ui/ui_settings/ui_settings_service_for_request.ts
deleted file mode 100644
index 057fc64c9ebd7..0000000000000
--- a/src/legacy/ui/ui_settings/ui_settings_service_for_request.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { Legacy } from 'kibana';
-import { IUiSettingsClient } from 'src/core/server';
-import { uiSettingsServiceFactory } from './ui_settings_service_factory';
-
-/**
- *  Get/create an instance of UiSettingsService bound to a specific request.
- *  Each call is cached (keyed on the request object itself) and subsequent
- *  requests will get the first UiSettingsService instance even if the `options`
- *  have changed.
- *
- *  @param {Hapi.Server} server
- *  @param {Hapi.Request} request
- *  @param {Object} [options={}]
-
- *  @return {IUiSettingsClient}
- */
-export function getUiSettingsServiceForRequest(
-  server: Legacy.Server,
-  request: Legacy.Request
-): IUiSettingsClient {
-  const savedObjectsClient = request.getSavedObjectsClient();
-  return uiSettingsServiceFactory(server, { savedObjectsClient });
-}

From e7951eb83ab1c0b50057ae50a75ae6c3bb201beb Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Mon, 31 Aug 2020 10:11:15 -0500
Subject: [PATCH 134/148] remove force refresh on index pattern class init
 (#76248)

---
 ...a-plugin-plugins-data-public.indexpattern.init.md |  9 +--------
 ...kibana-plugin-plugins-data-public.indexpattern.md |  2 +-
 .../index_patterns/index_patterns/index_pattern.ts   | 12 ++++++------
 src/plugins/data/public/public.api.md                |  2 +-
 .../edit_index_pattern/edit_index_pattern.tsx        |  2 +-
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md
index ce401bec87dbb..595992dc82b74 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.init.md
@@ -7,15 +7,8 @@
 <b>Signature:</b>
 
 ```typescript
-init(forceFieldRefresh?: boolean): Promise<this>;
+init(): Promise<this>;
 ```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  forceFieldRefresh | <code>boolean</code> |  |
-
 <b>Returns:</b>
 
 `Promise<this>`
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index c15cb3358f689..37db063e284ec 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -50,7 +50,7 @@ export declare class IndexPattern implements IIndexPattern
 |  [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) |  |  |
 |  [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) |  |  |
 |  [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) |  |  |
-|  [init(forceFieldRefresh)](./kibana-plugin-plugins-data-public.indexpattern.init.md) |  |  |
+|  [init()](./kibana-plugin-plugins-data-public.indexpattern.init.md) |  |  |
 |  [initFromSpec(spec)](./kibana-plugin-plugins-data-public.indexpattern.initfromspec.md) |  |  |
 |  [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) |  |  |
 |  [isTimeBasedWildcard()](./kibana-plugin-plugins-data-public.indexpattern.istimebasedwildcard.md) |  |  |
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 5d6ae61a77e00..ea91a9bb14e1f 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -172,12 +172,12 @@ export class IndexPattern implements IIndexPattern {
     });
   }
 
-  private async indexFields(forceFieldRefresh: boolean = false, specs?: FieldSpec[]) {
+  private async indexFields(specs?: FieldSpec[]) {
     if (!this.id) {
       return;
     }
 
-    if (forceFieldRefresh || this.isFieldRefreshRequired(specs)) {
+    if (this.isFieldRefreshRequired(specs)) {
       await this.refreshFields();
     } else {
       if (specs) {
@@ -213,7 +213,7 @@ export class IndexPattern implements IIndexPattern {
     return this;
   }
 
-  private updateFromElasticSearch(response: any, forceFieldRefresh: boolean = false) {
+  private updateFromElasticSearch(response: any) {
     if (!response.found) {
       throw new SavedObjectNotFound(savedObjectType, this.id, 'management/kibana/indexPatterns');
     }
@@ -239,7 +239,7 @@ export class IndexPattern implements IIndexPattern {
     }
     this.version = response.version;
 
-    return this.indexFields(forceFieldRefresh, response.fields);
+    return this.indexFields(response.fields);
   }
 
   getComputedFields() {
@@ -283,7 +283,7 @@ export class IndexPattern implements IIndexPattern {
     };
   }
 
-  async init(forceFieldRefresh = false) {
+  async init() {
     if (!this.id) {
       return this; // no id === no elasticsearch document
     }
@@ -307,7 +307,7 @@ export class IndexPattern implements IIndexPattern {
     };
     // Do this before we attempt to update from ES since that call can potentially perform a save
     this.originalBody = this.prepBody();
-    await this.updateFromElasticSearch(response, forceFieldRefresh);
+    await this.updateFromElasticSearch(response);
     // Do it after to ensure we have the most up to date information
     this.originalBody = this.prepBody();
 
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index de4ec58dfdab3..ba40dece25df9 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1006,7 +1006,7 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     id?: string;
     // (undocumented)
-    init(forceFieldRefresh?: boolean): Promise<this>;
+    init(): Promise<this>;
     // Warning: (ae-forgotten-export) The symbol "IndexPatternSpec" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
index 987e8f0dae3a0..a0eecef66ff93 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx
@@ -121,7 +121,7 @@ export const EditIndexPattern = withRouter(
     const refreshFields = () => {
       overlays.openConfirm(confirmMessage, confirmModalOptionsRefresh).then(async (isConfirmed) => {
         if (isConfirmed) {
-          await indexPattern.init(true);
+          await indexPattern.refreshFields();
           setFields(indexPattern.getNonScriptedFields());
         }
       });

From b21071e54b2d84d981cf7b915aea7f7afbb29a7d Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Mon, 31 Aug 2020 17:28:14 +0200
Subject: [PATCH 135/148] Bump bl sub-dependency (#76260)

---
 packages/kbn-es/package.json                  |   2 +-
 packages/kbn-plugin-helpers/package.json      |   4 +-
 .../src/integration_tests/build.test.ts       |   4 +-
 packages/kbn-test/package.json                |   2 +-
 yarn.lock                                     | 242 ++++--------------
 5 files changed, 53 insertions(+), 201 deletions(-)

diff --git a/packages/kbn-es/package.json b/packages/kbn-es/package.json
index c3670f648d309..dabf11fdd0b66 100644
--- a/packages/kbn-es/package.json
+++ b/packages/kbn-es/package.json
@@ -16,7 +16,7 @@
     "glob": "^7.1.2",
     "node-fetch": "^2.6.0",
     "simple-git": "^1.91.0",
-    "tar-fs": "^1.16.3",
+    "tar-fs": "^2.1.0",
     "tree-kill": "^1.2.2",
     "yauzl": "^2.10.0"
   }
diff --git a/packages/kbn-plugin-helpers/package.json b/packages/kbn-plugin-helpers/package.json
index 129c58a4b4174..f292387c12521 100644
--- a/packages/kbn-plugin-helpers/package.json
+++ b/packages/kbn-plugin-helpers/package.json
@@ -23,10 +23,10 @@
     "vinyl-fs": "^3.0.3"
   },
   "devDependencies": {
-    "@types/decompress": "^4.2.3",
+    "@types/extract-zip": "^1.6.2",
     "@types/gulp-zip": "^4.0.1",
     "@types/inquirer": "^6.5.0",
-    "decompress": "^4.2.1",
+    "extract-zip": "^2.0.1",
     "typescript": "4.0.2"
   }
 }
diff --git a/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts b/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
index 62f83cd672f3d..be23d8dbde646 100644
--- a/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
+++ b/packages/kbn-plugin-helpers/src/integration_tests/build.test.ts
@@ -22,7 +22,7 @@ import Fs from 'fs';
 
 import execa from 'execa';
 import { createStripAnsiSerializer, REPO_ROOT, createReplaceSerializer } from '@kbn/dev-utils';
-import decompress from 'decompress';
+import extract from 'extract-zip';
 import del from 'del';
 import globby from 'globby';
 import loadJsonFile from 'load-json-file';
@@ -81,7 +81,7 @@ it('builds a generated plugin into a viable archive', async () => {
      info compressing plugin into [fooTestPlugin-7.5.0.zip]"
   `);
 
-  await decompress(PLUGIN_ARCHIVE, TMP_DIR);
+  await extract(PLUGIN_ARCHIVE, { dir: TMP_DIR });
 
   const files = await globby(['**/*'], { cwd: TMP_DIR });
   files.sort((a, b) => a.localeCompare(b));
diff --git a/packages/kbn-test/package.json b/packages/kbn-test/package.json
index 24655f8e57026..c84b0a93311bb 100644
--- a/packages/kbn-test/package.json
+++ b/packages/kbn-test/package.json
@@ -32,7 +32,7 @@
     "parse-link-header": "^1.0.1",
     "rxjs": "^6.5.5",
     "strip-ansi": "^5.2.0",
-    "tar-fs": "^1.16.3",
+    "tar-fs": "^2.1.0",
     "tmp": "^0.1.0",
     "xml2js": "^0.4.22",
     "zlib": "^1.0.5"
diff --git a/yarn.lock b/yarn.lock
index c8b94d122ba7e..0d8ae918f27dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3643,13 +3643,6 @@
   resolved "https://registry.yarnpkg.com/@types/d3/-/d3-3.5.43.tgz#e9b4992817e0b6c5efaa7d6e5bb2cee4d73eab58"
   integrity sha512-t9ZmXOcpVxywRw86YtIC54g7M9puRh8hFedRvVfHKf5YyOP6pSxA0TvpXpfseXSCInoW4P7bggTrSDiUOs4g5w==
 
-"@types/decompress@^4.2.3":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/@types/decompress/-/decompress-4.2.3.tgz#98eed48af80001038aa05690b2094915f296fe65"
-  integrity sha512-W24e3Ycz1UZPgr1ZEDHlK4XnvOr+CpJH3qNsFeqXwwlW/9END9gxn3oJSsp7gYdiQxrXUHwUUd3xuzVz37MrZQ==
-  dependencies:
-    "@types/node" "*"
-
 "@types/dedent@^0.7.0":
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/@types/dedent/-/dedent-0.7.0.tgz#155f339ca404e6dd90b9ce46a3f78fd69ca9b050"
@@ -3716,6 +3709,11 @@
   resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
   integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
 
+"@types/extract-zip@^1.6.2":
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/@types/extract-zip/-/extract-zip-1.6.2.tgz#5c7eb441c41136167a42b88b64051e6260c29e86"
+  integrity sha1-XH60QcQRNhZ6QriLZAUeYmDCnoY=
+
 "@types/fancy-log@^1.3.1":
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/@types/fancy-log/-/fancy-log-1.3.1.tgz#dd94fbc8c2e2ab8ab402ca8d04bb8c34965f0696"
@@ -7343,19 +7341,14 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
-bl@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.1.tgz#cac328f7bee45730d404b692203fcb590e172d5e"
-  integrity sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=
-  dependencies:
-    readable-stream "^2.0.5"
-
-bl@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz#3611ec00579fd18561754360b21e9f784500ff88"
-  integrity sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==
+bl@^4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
+  integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
   dependencies:
-    readable-stream "^3.0.1"
+    buffer "^5.5.0"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
 
 block-stream@*:
   version "0.0.9"
@@ -7717,19 +7710,6 @@ btoa-lite@^1.0.0:
   resolved "https://registry.yarnpkg.com/btoa-lite/-/btoa-lite-1.0.0.tgz#337766da15801210fdd956c22e9c6891ab9d0337"
   integrity sha1-M3dm2hWAEhD92VbCLpxokaudAzc=
 
-buffer-alloc-unsafe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
-  integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-
-buffer-alloc@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
-  integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
-  dependencies:
-    buffer-alloc-unsafe "^1.1.0"
-    buffer-fill "^1.0.0"
-
 buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
@@ -7750,11 +7730,6 @@ buffer-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
   integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
 
-buffer-fill@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
-  integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
-
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -7787,7 +7762,7 @@ buffer@^5.1.0, buffer@^5.2.0:
     base64-js "^1.0.2"
     ieee754 "^1.1.4"
 
-buffer@^5.2.1:
+buffer@^5.5.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
   integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
@@ -8450,7 +8425,7 @@ chokidar@^3.2.2, chokidar@^3.4.0:
   optionalDependencies:
     fsevents "~2.1.2"
 
-chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.2:
+chownr@^1.1.1, chownr@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
@@ -10334,59 +10309,6 @@ decompress-response@^5.0.0:
   dependencies:
     mimic-response "^2.0.0"
 
-decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1"
-  integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==
-  dependencies:
-    file-type "^5.2.0"
-    is-stream "^1.1.0"
-    tar-stream "^1.5.2"
-
-decompress-tarbz2@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b"
-  integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==
-  dependencies:
-    decompress-tar "^4.1.0"
-    file-type "^6.1.0"
-    is-stream "^1.1.0"
-    seek-bzip "^1.0.5"
-    unbzip2-stream "^1.0.9"
-
-decompress-targz@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee"
-  integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==
-  dependencies:
-    decompress-tar "^4.1.1"
-    file-type "^5.2.0"
-    is-stream "^1.1.0"
-
-decompress-unzip@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69"
-  integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k=
-  dependencies:
-    file-type "^3.8.0"
-    get-stream "^2.2.0"
-    pify "^2.3.0"
-    yauzl "^2.4.2"
-
-decompress@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.1.tgz#007f55cc6a62c055afa37c07eb6a4ee1b773f118"
-  integrity sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==
-  dependencies:
-    decompress-tar "^4.0.0"
-    decompress-tarbz2 "^4.0.0"
-    decompress-targz "^4.0.0"
-    decompress-unzip "^4.0.1"
-    graceful-fs "^4.1.10"
-    make-dir "^1.0.0"
-    pify "^2.3.0"
-    strip-dirs "^2.0.0"
-
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -12698,6 +12620,17 @@ extract-zip@^2.0.0:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
+extract-zip@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
+  dependencies:
+    debug "^4.1.1"
+    get-stream "^5.1.0"
+    yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
+
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -12958,21 +12891,6 @@ file-type@^10.9.0:
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.9.0.tgz#f6c12c7cb9e6b8aeefd6917555fd4f9eadf31891"
   integrity sha512-9C5qtGR/fNibHC5gzuMmmgnjH3QDDLKMa8lYe9CiZVmAnI4aUaoMh40QyUPzzs0RYo837SOBKh7TYwle4G8E4w==
 
-file-type@^3.8.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
-  integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=
-
-file-type@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
-  integrity sha1-LdvqfHP/42No365J3DOMBYwritY=
-
-file-type@^6.1.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919"
-  integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==
-
 file-type@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz#a68d5ad07f486414dfb2c8866f73161946714a18"
@@ -13778,14 +13696,6 @@ get-stream@3.0.0, get-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
-get-stream@^2.2.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
-  integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=
-  dependencies:
-    object-assign "^4.0.1"
-    pinkie-promise "^2.0.0"
-
 get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -14394,7 +14304,7 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
+graceful-fs@4.X, graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@@ -16483,11 +16393,6 @@ is-native@^1.0.1:
     is-nil "^1.0.0"
     to-source-code "^1.0.0"
 
-is-natural-number@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
-  integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=
-
 is-negated-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
@@ -19900,6 +19805,11 @@ mixin-object@^2.0.1:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
+mkdirp-classic@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
+  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
+
 mkdirp@0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -22823,14 +22733,6 @@ puid@1.0.7:
   resolved "https://registry.yarnpkg.com/puid/-/puid-1.0.7.tgz#fa638a737d7b20419059d93965aed36ca20e1c84"
   integrity sha1-+mOKc317IEGQWdk5Za7TbKIOHIQ=
 
-pump@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz#5dfe8311c33bbf6fc18261f9f34702c47c08a954"
-  integrity sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
 pump@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
@@ -24064,7 +23966,7 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@1 || 2", readable-stream@^2.3.0, readable-stream@^2.3.7, readable-stream@~2.3.3:
+"readable-stream@1 || 2", readable-stream@^2.3.7, readable-stream@~2.3.3:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -24087,7 +23989,7 @@ readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0":
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-"readable-stream@2 || 3", readable-stream@^3.0.1, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0:
+"readable-stream@2 || 3", readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
   integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
@@ -25446,13 +25348,6 @@ seedrandom@^3.0.5:
   resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7"
   integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==
 
-seek-bzip@^1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4"
-  integrity sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ==
-  dependencies:
-    commander "^2.8.1"
-
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -26824,13 +26719,6 @@ strip-bom@^4.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
-strip-dirs@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5"
-  integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==
-  dependencies:
-    is-natural-number "^4.0.1"
-
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -27286,45 +27174,22 @@ tape@^5.0.1:
     string.prototype.trim "^1.2.1"
     through "^2.3.8"
 
-tar-fs@^1.16.3:
-  version "1.16.3"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
-  integrity sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==
-  dependencies:
-    chownr "^1.0.1"
-    mkdirp "^0.5.1"
-    pump "^1.0.0"
-    tar-stream "^1.1.2"
-
-tar-stream@^1.1.2:
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55"
-  integrity sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==
-  dependencies:
-    bl "^1.0.0"
-    end-of-stream "^1.0.0"
-    readable-stream "^2.0.0"
-    xtend "^4.0.0"
-
-tar-stream@^1.5.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
-  integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
+tar-fs@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.0.tgz#d1cdd121ab465ee0eb9ccde2d35049d3f3daf0d5"
+  integrity sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==
   dependencies:
-    bl "^1.0.0"
-    buffer-alloc "^1.2.0"
-    end-of-stream "^1.0.0"
-    fs-constants "^1.0.0"
-    readable-stream "^2.3.0"
-    to-buffer "^1.1.1"
-    xtend "^4.0.0"
+    chownr "^1.1.1"
+    mkdirp-classic "^0.5.2"
+    pump "^3.0.0"
+    tar-stream "^2.0.0"
 
-tar-stream@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"
-  integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==
+tar-stream@^2.0.0, tar-stream@^2.1.0:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.3.tgz#1e2022559221b7866161660f118255e20fa79e41"
+  integrity sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA==
   dependencies:
-    bl "^3.0.0"
+    bl "^4.0.1"
     end-of-stream "^1.4.1"
     fs-constants "^1.0.0"
     inherits "^2.0.3"
@@ -27748,11 +27613,6 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
-to-buffer@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
-  integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
-
 to-camel-case@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/to-camel-case/-/to-camel-case-1.0.0.tgz#1a56054b2f9d696298ce66a60897322b6f423e46"
@@ -28301,14 +28161,6 @@ uid-safe@2.1.5:
   dependencies:
     random-bytes "~1.0.0"
 
-unbzip2-stream@^1.0.9:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
-  integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
-  dependencies:
-    buffer "^5.2.1"
-    through "^2.3.8"
-
 unc-path-regex@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
@@ -30598,7 +30450,7 @@ yargs@~3.10.0:
     decamelize "^1.0.0"
     window-size "0.1.0"
 
-yauzl@2.10.0, yauzl@^2.10.0, yauzl@^2.4.2:
+yauzl@2.10.0, yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
   integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=

From 54926523e8d0ca5beedf4208576d31792a545053 Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Mon, 31 Aug 2020 11:42:17 -0400
Subject: [PATCH 136/148] Convert to using new status, and remove legacy plugin
 (#75806)

* Convert to using new status, and remove legacy plugin

* PR feedback

* Fix test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .github/CODEOWNERS                            |   1 -
 x-pack/.i18nrc.json                           |   2 +-
 x-pack/index.js                               |   3 +-
 x-pack/legacy/plugins/monitoring/README.md    |  89 ------------
 x-pack/legacy/plugins/monitoring/config.ts    | 129 ------------------
 x-pack/legacy/plugins/monitoring/index.ts     |  37 -----
 .../server/kibana_monitoring/bulk_uploader.js |  29 ++--
 .../plugins/monitoring/server/plugin.test.ts  |  23 ++--
 x-pack/plugins/monitoring/server/plugin.ts    |  12 +-
 x-pack/plugins/monitoring/server/types.ts     |   5 -
 10 files changed, 32 insertions(+), 298 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/monitoring/README.md
 delete mode 100644 x-pack/legacy/plugins/monitoring/config.ts
 delete mode 100644 x-pack/legacy/plugins/monitoring/index.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 66fb31cc91d5a..1d0f6fc50ee9b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -85,7 +85,6 @@
 /x-pack/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/legacy/plugins/ingest_manager/ @elastic/ingest-management
 /x-pack/plugins/observability/ @elastic/observability-ui
-/x-pack/legacy/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/monitoring/ @elastic/stack-monitoring-ui
 /x-pack/plugins/uptime @elastic/uptime
 
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index 69ad9ad33bf72..7d21f958bb80b 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -35,7 +35,7 @@
     "xpack.main": "legacy/plugins/xpack_main",
     "xpack.maps": ["plugins/maps", "legacy/plugins/maps"],
     "xpack.ml": ["plugins/ml", "legacy/plugins/ml"],
-    "xpack.monitoring": ["plugins/monitoring", "legacy/plugins/monitoring"],
+    "xpack.monitoring": ["plugins/monitoring"],
     "xpack.remoteClusters": "plugins/remote_clusters",
     "xpack.painlessLab": "plugins/painless_lab",
     "xpack.reporting": ["plugins/reporting"],
diff --git a/x-pack/index.js b/x-pack/index.js
index b984782df3986..074b8e6859dc2 100644
--- a/x-pack/index.js
+++ b/x-pack/index.js
@@ -5,10 +5,9 @@
  */
 
 import { xpackMain } from './legacy/plugins/xpack_main';
-import { monitoring } from './legacy/plugins/monitoring';
 import { security } from './legacy/plugins/security';
 import { spaces } from './legacy/plugins/spaces';
 
 module.exports = function (kibana) {
-  return [xpackMain(kibana), monitoring(kibana), spaces(kibana), security(kibana)];
+  return [xpackMain(kibana), spaces(kibana), security(kibana)];
 };
diff --git a/x-pack/legacy/plugins/monitoring/README.md b/x-pack/legacy/plugins/monitoring/README.md
deleted file mode 100644
index 0222f06e7ae91..0000000000000
--- a/x-pack/legacy/plugins/monitoring/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-## Using Monitoring
-
-The easiest way to get to know the new Monitoring is probably by [reading the
-docs](https://github.com/elastic/x-plugins/blob/master/docs/public/marvel/index.asciidoc).
-
-Install the distribution the way a customer would is pending the first release
-of Unified X-Pack plugins.
-
-## Developing
-
-You will need to get Elasticsearch and X-Pack plugins for ES that match the
-version of the UI. The best way to do this is to run `gradle run` from a clone
-of the x-plugins repository.
-
-To set up Monitoring and automatic file syncing code changes into Kibana's plugin
-directory, clone the kibana and x-plugins repos in the same directory and from
-`x-plugins/kibana/monitoring`, run `yarn start`.
-
-Once the syncing process has run at least once, start the Kibana server in
-development mode. It will handle restarting the server and re-optimizing the
-bundles as-needed. Go to https://localhost:5601 and click Monitoring from the App
-Drawer.
-
-## Running tests
-
-- Run the command:
-  ```
-  yarn test
-  ```
-
-- Debug tests
-Add a `debugger` line to create a breakpoint, and then:
-
-  ```
-  gulp sync && mocha debug --compilers js:@babel/register /pathto/kibana/plugins/monitoring/pathto/__tests__/testfile.js
-  ```
-
-## Multicluster Setup for Development
-
-To run the UI with multiple clusters, the easiest way is to run 2 nodes out of
-the same Elasticsearch directory, but use different start up commands for each one. One
-node will be assigned to the "monitoring" cluster and the other will be for the "production"
-cluster.
-
-1. Add the Security users:
-  ```
-  % ./bin/x-pack/users useradd -r remote_monitoring_agent -p notsecure remote
-  % ./bin/x-pack/users useradd -r monitoring_user -p notsecure monitoring_user
-  ```
-
-1. Start up the Monitoring cluster:
-  ```
-  % ./bin/elasticsearch \
-  -Ehttp.port=9210 \
-  -Ecluster.name=monitoring \
-  -Epath.data=monitoring-data \
-  -Enode.name=monitor1node1
-  ```
-
-1. Start up the Production cluster:
-  ```
-  % ./bin/elasticsearch \
-  -Expack.monitoring.exporters.id2.type=http \
-  -Expack.monitoring.exporters.id2.host=http://127.0.0.1:9210 \
-  -Expack.monitoring.exporters.id2.auth.username=remote \
-  -Expack.monitoring.exporters.id2.auth.password=notsecure \
-  -Ecluster.name=production \
-  -Enode.name=prod1node1 \
-  -Epath.data=production-data
-  ```
-
-1. Set the Kibana config:
-  ```
-  % cat config/kibana.dev.yml
-  monitoring.ui.elasticsearch:
-    hosts: "http://localhost:9210"
-    username: "kibana_system"
-    password: "changeme"
-  ```
-
-1. Start another Kibana instance:
-  ```
-  % yarn start
-  ```
-
-1. Start a Kibana instance connected to the Monitoring cluster (for running queries in Sense on Monitoring data):
-  ```
-  % ./bin/kibana --config config/kibana.dev.yml --elasticsearch.hosts http://localhost:9210 --server.name monitoring-kibana --server.port 5611
-  ```
diff --git a/x-pack/legacy/plugins/monitoring/config.ts b/x-pack/legacy/plugins/monitoring/config.ts
deleted file mode 100644
index 52f4b866dd7b2..0000000000000
--- a/x-pack/legacy/plugins/monitoring/config.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-/**
- * User-configurable settings for xpack.monitoring via configuration schema
- * @param {Object} Joi - HapiJS Joi module that allows for schema validation
- * @return {Object} config schema
- */
-export const config = (Joi: any) => {
-  const DEFAULT_REQUEST_HEADERS = ['authorization'];
-
-  return Joi.object({
-    enabled: Joi.boolean().default(true),
-    ui: Joi.object({
-      enabled: Joi.boolean().default(true),
-      logs: Joi.object({
-        index: Joi.string().default('filebeat-*'),
-      }).default(),
-      ccs: Joi.object({
-        enabled: Joi.boolean().default(true),
-      }).default(),
-      container: Joi.object({
-        elasticsearch: Joi.object({
-          enabled: Joi.boolean().default(false),
-        }).default(),
-        logstash: Joi.object({
-          enabled: Joi.boolean().default(false),
-        }).default(),
-      }).default(),
-      max_bucket_size: Joi.number().default(10000),
-      min_interval_seconds: Joi.number().default(10),
-      show_license_expiration: Joi.boolean().default(true),
-      elasticsearch: Joi.object({
-        customHeaders: Joi.object().default({}),
-        logQueries: Joi.boolean().default(false),
-        requestHeadersWhitelist: Joi.array().items().single().default(DEFAULT_REQUEST_HEADERS),
-        sniffOnStart: Joi.boolean().default(false),
-        sniffInterval: Joi.number().allow(false).default(false),
-        sniffOnConnectionFault: Joi.boolean().default(false),
-        hosts: Joi.array()
-          .items(Joi.string().uri({ scheme: ['http', 'https'] }))
-          .single(), // if empty, use Kibana's connection config
-        username: Joi.string(),
-        password: Joi.string(),
-        requestTimeout: Joi.number().default(30000),
-        pingTimeout: Joi.number().default(30000),
-        ssl: Joi.object({
-          verificationMode: Joi.string().valid('none', 'certificate', 'full').default('full'),
-          certificateAuthorities: Joi.array().single().items(Joi.string()),
-          certificate: Joi.string(),
-          key: Joi.string(),
-          keyPassphrase: Joi.string(),
-          keystore: Joi.object({
-            path: Joi.string(),
-            password: Joi.string(),
-          }).default(),
-          truststore: Joi.object({
-            path: Joi.string(),
-            password: Joi.string(),
-          }).default(),
-          alwaysPresentCertificate: Joi.boolean().default(false),
-        }).default(),
-        apiVersion: Joi.string().default('master'),
-        logFetchCount: Joi.number().default(10),
-      }).default(),
-    }).default(),
-    kibana: Joi.object({
-      collection: Joi.object({
-        enabled: Joi.boolean().default(true),
-        interval: Joi.number().default(10000), // op status metrics get buffered at `ops.interval` and flushed to the bulk endpoint at this interval
-      }).default(),
-    }).default(),
-    elasticsearch: Joi.object({
-      customHeaders: Joi.object().default({}),
-      logQueries: Joi.boolean().default(false),
-      requestHeadersWhitelist: Joi.array().items().single().default(DEFAULT_REQUEST_HEADERS),
-      sniffOnStart: Joi.boolean().default(false),
-      sniffInterval: Joi.number().allow(false).default(false),
-      sniffOnConnectionFault: Joi.boolean().default(false),
-      hosts: Joi.array()
-        .items(Joi.string().uri({ scheme: ['http', 'https'] }))
-        .single(), // if empty, use Kibana's connection config
-      username: Joi.string(),
-      password: Joi.string(),
-      requestTimeout: Joi.number().default(30000),
-      pingTimeout: Joi.number().default(30000),
-      ssl: Joi.object({
-        verificationMode: Joi.string().valid('none', 'certificate', 'full').default('full'),
-        certificateAuthorities: Joi.array().single().items(Joi.string()),
-        certificate: Joi.string(),
-        key: Joi.string(),
-        keyPassphrase: Joi.string(),
-        keystore: Joi.object({
-          path: Joi.string(),
-          password: Joi.string(),
-        }).default(),
-        truststore: Joi.object({
-          path: Joi.string(),
-          password: Joi.string(),
-        }).default(),
-        alwaysPresentCertificate: Joi.boolean().default(false),
-      }).default(),
-      apiVersion: Joi.string().default('master'),
-    }).default(),
-    cluster_alerts: Joi.object({
-      enabled: Joi.boolean().default(true),
-      email_notifications: Joi.object({
-        enabled: Joi.boolean().default(true),
-        email_address: Joi.string().email(),
-      }).default(),
-    }).default(),
-    licensing: Joi.object({
-      api_polling_frequency: Joi.number().default(30001),
-    }),
-    agent: Joi.object({
-      interval: Joi.string()
-        .regex(/[\d\.]+[yMwdhms]/)
-        .default('10s'),
-    }).default(),
-    tests: Joi.object({
-      cloud_detector: Joi.object({
-        enabled: Joi.boolean().default(true),
-      }).default(),
-    }).default(),
-  }).default();
-};
diff --git a/x-pack/legacy/plugins/monitoring/index.ts b/x-pack/legacy/plugins/monitoring/index.ts
deleted file mode 100644
index f03e1ebc009f5..0000000000000
--- a/x-pack/legacy/plugins/monitoring/index.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import Hapi from 'hapi';
-import { config } from './config';
-
-/**
- * Invokes plugin modules to instantiate the Monitoring plugin for Kibana
- * @param kibana {Object} Kibana plugin instance
- * @return {Object} Monitoring UI Kibana plugin object
- */
-const deps = ['kibana', 'elasticsearch', 'xpack_main'];
-export const monitoring = (kibana: any) => {
-  return new kibana.Plugin({
-    require: deps,
-    id: 'monitoring',
-    configPrefix: 'monitoring',
-    init(server: Hapi.Server) {
-      const npMonitoring = server.newPlatform.setup.plugins.monitoring as object & {
-        registerLegacyAPI: (api: unknown) => void;
-      };
-      if (npMonitoring) {
-        const kbnServerStatus = this.kbnServer.status;
-        npMonitoring.registerLegacyAPI({
-          getServerStatus: () => {
-            const status = kbnServerStatus.toJSON();
-            return status?.overall?.state;
-          },
-        });
-      }
-    },
-    config,
-  });
-};
diff --git a/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
index b23b4fc888120..5d8af8d71b7fc 100644
--- a/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
+++ b/x-pack/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
@@ -5,7 +5,7 @@
  */
 
 import { defaultsDeep, uniq, compact } from 'lodash';
-
+import { ServiceStatusLevels } from '../../../../../src/core/server';
 import {
   TELEMETRY_COLLECTION_INTERVAL,
   KIBANA_STATS_TYPE_MONITORING,
@@ -30,7 +30,7 @@ import { sendBulkPayload, monitoringBulk } from './lib';
  * @param {Object} xpackInfo server.plugins.xpack_main.info object
  */
 export class BulkUploader {
-  constructor({ log, interval, elasticsearch, kibanaStats }) {
+  constructor({ log, interval, elasticsearch, statusGetter$, kibanaStats }) {
     if (typeof interval !== 'number') {
       throw new Error('interval number of milliseconds is required');
     }
@@ -52,11 +52,11 @@ export class BulkUploader {
     });
 
     this.kibanaStats = kibanaStats;
-    this.kibanaStatusGetter = null;
-  }
 
-  setKibanaStatusGetter(getter) {
-    this.kibanaStatusGetter = getter;
+    this.kibanaStatus = null;
+    this.kibanaStatusGetter$ = statusGetter$.subscribe((nextStatus) => {
+      this.kibanaStatus = nextStatus.level;
+    });
   }
 
   filterCollectorSet(usageCollection) {
@@ -128,7 +128,7 @@ export class BulkUploader {
   async _fetchAndUpload(usageCollection) {
     const collectorsReady = await usageCollection.areAllCollectorsReady();
     const hasUsageCollectors = usageCollection.some(usageCollection.isUsageCollector);
-    if (!collectorsReady || typeof this.kibanaStatusGetter !== 'function') {
+    if (!collectorsReady) {
       this._log.debug('Skipping bulk uploading because not all collectors are ready');
       if (hasUsageCollectors) {
         this._lastFetchUsageTime = null;
@@ -172,10 +172,23 @@ export class BulkUploader {
     return await sendBulkPayload(this._cluster, this._interval, payload, this._log);
   }
 
+  getConvertedKibanaStatuss() {
+    if (this.kibanaStatus === ServiceStatusLevels.available) {
+      return 'green';
+    }
+    if (this.kibanaStatus === ServiceStatusLevels.critical) {
+      return 'red';
+    }
+    if (this.kibanaStatus === ServiceStatusLevels.degraded) {
+      return 'yellow';
+    }
+    return 'unknown';
+  }
+
   getKibanaStats(type) {
     const stats = {
       ...this.kibanaStats,
-      status: this.kibanaStatusGetter(),
+      status: this.getConvertedKibanaStatuss(),
     };
 
     if (type === KIBANA_STATS_TYPE_MONITORING) {
diff --git a/x-pack/plugins/monitoring/server/plugin.test.ts b/x-pack/plugins/monitoring/server/plugin.test.ts
index 8bd43b6be0a8d..a2520593c436d 100644
--- a/x-pack/plugins/monitoring/server/plugin.test.ts
+++ b/x-pack/plugins/monitoring/server/plugin.test.ts
@@ -5,8 +5,6 @@
  */
 import { Plugin } from './plugin';
 import { combineLatest } from 'rxjs';
-// @ts-ignore
-import { initBulkUploader } from './kibana_monitoring';
 import { AlertsFactory } from './alerts';
 
 jest.mock('rxjs', () => ({
@@ -27,10 +25,6 @@ jest.mock('./license_service', () => ({
   })),
 }));
 
-jest.mock('./kibana_monitoring', () => ({
-  initBulkUploader: jest.fn(),
-}));
-
 describe('Monitoring plugin', () => {
   const initializerContext = {
     logger: {
@@ -71,6 +65,11 @@ describe('Monitoring plugin', () => {
         createClient: jest.fn(),
       },
     },
+    status: {
+      overall$: {
+        subscribe: jest.fn(),
+      },
+    },
   };
 
   const setupPlugins = {
@@ -113,19 +112,13 @@ describe('Monitoring plugin', () => {
 
   afterEach(() => {
     (setupPlugins.alerts.registerType as jest.Mock).mockReset();
+    (coreSetup.status.overall$.subscribe as jest.Mock).mockReset();
   });
 
   it('always create the bulk uploader', async () => {
-    const setKibanaStatusGetter = jest.fn();
-    (initBulkUploader as jest.Mock).mockImplementation(() => {
-      return {
-        setKibanaStatusGetter,
-      };
-    });
     const plugin = new Plugin(initializerContext as any);
-    const contract = await plugin.setup(coreSetup as any, setupPlugins as any);
-    contract.registerLegacyAPI(null as any);
-    expect(setKibanaStatusGetter).toHaveBeenCalled();
+    await plugin.setup(coreSetup as any, setupPlugins as any);
+    expect(coreSetup.status.overall$.subscribe).toHaveBeenCalled();
   });
 
   it('should register all alerts', async () => {
diff --git a/x-pack/plugins/monitoring/server/plugin.ts b/x-pack/plugins/monitoring/server/plugin.ts
index 501c96b12fde8..f5cbadb523a81 100644
--- a/x-pack/plugins/monitoring/server/plugin.ts
+++ b/x-pack/plugins/monitoring/server/plugin.ts
@@ -46,7 +46,6 @@ import {
   IBulkUploader,
   PluginsSetup,
   PluginsStart,
-  LegacyAPI,
   LegacyRequest,
 } from './types';
 
@@ -158,6 +157,7 @@ export class Plugin {
       elasticsearch: core.elasticsearch,
       config,
       log: kibanaMonitoringLog,
+      statusGetter$: core.status.overall$,
       kibanaStats: {
         uuid: this.initializerContext.env.instanceUuid,
         name: serverInfo.name,
@@ -221,11 +221,6 @@ export class Plugin {
     }
 
     return {
-      // The legacy plugin calls this to register certain legacy dependencies
-      // that are necessary for the plugin to properly run
-      registerLegacyAPI: (legacyAPI: LegacyAPI) => {
-        this.setupLegacy(legacyAPI);
-      },
       // OSS stats api needs to call this in order to centralize how
       // we fetch kibana specific stats
       getKibanaStats: () => this.bulkUploader.getKibanaStats(),
@@ -280,11 +275,6 @@ export class Plugin {
     });
   }
 
-  async setupLegacy(legacyAPI: LegacyAPI) {
-    // Set the stats getter
-    this.bulkUploader.setKibanaStatusGetter(() => legacyAPI.getServerStatus());
-  }
-
   getLegacyShim(
     config: MonitoringConfig,
     legacyConfig: any,
diff --git a/x-pack/plugins/monitoring/server/types.ts b/x-pack/plugins/monitoring/server/types.ts
index a0ef6d3e2d984..e6a4b174df55d 100644
--- a/x-pack/plugins/monitoring/server/types.ts
+++ b/x-pack/plugins/monitoring/server/types.ts
@@ -33,10 +33,6 @@ export interface MonitoringElasticsearchConfig {
   hosts: string[];
 }
 
-export interface LegacyAPI {
-  getServerStatus: () => string;
-}
-
 export interface PluginsSetup {
   encryptedSavedObjects: EncryptedSavedObjectsPluginSetup;
   telemetryCollectionManager?: TelemetryCollectionManagerPluginSetup;
@@ -77,7 +73,6 @@ export interface LegacyShimDependencies {
 }
 
 export interface IBulkUploader {
-  setKibanaStatusGetter: (getter: () => string | undefined) => void;
   getKibanaStats: () => any;
 }
 

From 304670c3a8ded9fac85bf36ba90632360f6365e1 Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Mon, 31 Aug 2020 11:50:35 -0400
Subject: [PATCH 137/148] [SECURITY SOLUTION] two bugs fix for threat hunting
 (#76060)

* fix read only issue with timeline

* fix no feeds url for kibana setting + remove the no-index-laert index from the timeline query so you do not have to add permissions to it

* Add test + add logic to not show advance settings if user does not have access

* remove no alert indices from the timeline query

* review I

* no needs of that

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../components/news_feed/no_news/index.tsx    |  39 ++++---
 .../components/news_feed/translations.ts      |  11 +-
 .../timeline/properties/helpers.tsx           |   5 +-
 .../timeline/properties/properties_right.tsx  |  19 ++--
 .../public/timelines/containers/api.test.ts   | 103 ++++++++++++++++++
 .../public/timelines/containers/api.ts        |  88 +++++++++------
 .../public/timelines/pages/timelines_page.tsx |  12 +-
 7 files changed, 205 insertions(+), 72 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/common/components/news_feed/no_news/index.tsx b/x-pack/plugins/security_solution/public/common/components/news_feed/no_news/index.tsx
index d626433de1b63..c2ef6b9b192c7 100644
--- a/x-pack/plugins/security_solution/public/common/components/news_feed/no_news/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/news_feed/no_news/index.tsx
@@ -4,24 +4,37 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiLink, EuiText } from '@elastic/eui';
-import React from 'react';
+import { EuiText } from '@elastic/eui';
+import React, { useCallback } from 'react';
 
 import * as i18n from '../translations';
-import { useBasePath } from '../../../lib/kibana';
+import { useKibana } from '../../../lib/kibana';
+import { LinkAnchor } from '../../links';
 
 export const NoNews = React.memo(() => {
-  const basePath = useBasePath();
+  const { getUrlForApp, navigateToApp, capabilities } = useKibana().services.application;
+  const canSeeAdvancedSettings = capabilities.management.kibana.settings ?? false;
+  const goToKibanaSettings = useCallback(
+    () => navigateToApp('management', { path: '/kibana/settings' }),
+    [navigateToApp]
+  );
+
   return (
-    <>
-      <EuiText color="subdued" size="s">
-        {i18n.NO_NEWS_MESSAGE}{' '}
-        <EuiLink href={`${basePath}/app/management/kibana/settings`}>
-          {i18n.ADVANCED_SETTINGS_LINK_TITLE}
-        </EuiLink>
-        {'.'}
-      </EuiText>
-    </>
+    <EuiText color="subdued" size="s">
+      {canSeeAdvancedSettings ? i18n.NO_NEWS_MESSAGE_ADMIN : i18n.NO_NEWS_MESSAGE}
+      {canSeeAdvancedSettings && (
+        <>
+          {' '}
+          <LinkAnchor
+            onClick={goToKibanaSettings}
+            href={`${getUrlForApp('management', { path: '/kibana/settings' })}`}
+          >
+            {i18n.ADVANCED_SETTINGS_LINK_TITLE}
+          </LinkAnchor>
+          {'.'}
+        </>
+      )}
+    </EuiText>
   );
 });
 
diff --git a/x-pack/plugins/security_solution/public/common/components/news_feed/translations.ts b/x-pack/plugins/security_solution/public/common/components/news_feed/translations.ts
index b0f9507266e52..dabaa38178884 100644
--- a/x-pack/plugins/security_solution/public/common/components/news_feed/translations.ts
+++ b/x-pack/plugins/security_solution/public/common/components/news_feed/translations.ts
@@ -7,10 +7,17 @@
 import { i18n } from '@kbn/i18n';
 
 export const NO_NEWS_MESSAGE = i18n.translate('xpack.securitySolution.newsFeed.noNewsMessage', {
-  defaultMessage:
-    'Your current news feed URL returned no recent news. You may update the URL or disable security news via',
+  defaultMessage: 'Your current news feed URL returned no recent news.',
 });
 
+export const NO_NEWS_MESSAGE_ADMIN = i18n.translate(
+  'xpack.securitySolution.newsFeed.noNewsMessageForAdmin',
+  {
+    defaultMessage:
+      'Your current news feed URL returned no recent news. You may update the URL or disable security news via',
+  }
+);
+
 export const ADVANCED_SETTINGS_LINK_TITLE = i18n.translate(
   'xpack.securitySolution.newsFeed.advancedSettingsLinkTitle',
   {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
index 86334308558b8..8f18a173f3bed 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/helpers.tsx
@@ -272,9 +272,6 @@ export interface NewTimelineProps {
 
 export const NewTimeline = React.memo<NewTimelineProps>(
   ({ closeGearMenu, outline = false, timelineId, title = i18n.NEW_TIMELINE }) => {
-    const uiCapabilities = useKibana().services.application.capabilities;
-    const capabilitiesCanUserCRUD: boolean = !!uiCapabilities.siem.crud;
-
     const { getButton } = useCreateTimelineButton({
       timelineId,
       timelineType: TimelineType.default,
@@ -282,7 +279,7 @@ export const NewTimeline = React.memo<NewTimelineProps>(
     });
     const button = getButton({ outline, title });
 
-    return capabilitiesCanUserCRUD ? button : null;
+    return button;
   }
 );
 NewTimeline.displayName = 'NewTimeline';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.tsx
index 70257c97a6887..12eab4942128f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/properties_right.tsx
@@ -22,7 +22,6 @@ import {
   TimelineType,
 } from '../../../../../common/types/timeline';
 import { InspectButton, InspectButtonContainer } from '../../../../common/components/inspect';
-import { useKibana } from '../../../../common/lib/kibana';
 import { Note } from '../../../../common/lib/note';
 
 import { AssociateNote } from '../../notes/helpers';
@@ -121,8 +120,6 @@ const PropertiesRightComponent: React.FC<PropertiesRightComponentProps> = ({
   updateNote,
   usersViewing,
 }) => {
-  const uiCapabilities = useKibana().services.application.capabilities;
-  const capabilitiesCanUserCRUD: boolean = !!uiCapabilities.siem.crud;
   return (
     <PropertiesRightStyle alignItems="flexStart" data-test-subj="properties-right" gutterSize="s">
       <EuiFlexItem grow={false}>
@@ -143,15 +140,13 @@ const PropertiesRightComponent: React.FC<PropertiesRightComponentProps> = ({
             repositionOnScroll
           >
             <EuiFlexGroup alignItems="flexStart" direction="column" gutterSize="none">
-              {capabilitiesCanUserCRUD && (
-                <EuiFlexItem grow={false}>
-                  <NewTimeline
-                    timelineId={timelineId}
-                    title={i18n.NEW_TIMELINE}
-                    closeGearMenu={onClosePopover}
-                  />
-                </EuiFlexItem>
-              )}
+              <EuiFlexItem grow={false}>
+                <NewTimeline
+                  timelineId={timelineId}
+                  title={i18n.NEW_TIMELINE}
+                  closeGearMenu={onClosePopover}
+                />
+              </EuiFlexItem>
 
               <EuiFlexItem grow={false}>
                 <NewTemplateTimeline
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts b/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts
index 42c01da7e23c9..8ef740f7bc1d7 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/api.test.ts
@@ -220,6 +220,109 @@ describe('persistTimeline', () => {
     });
   });
 
+  describe('create draft timeline in read-only permission', () => {
+    const timelineId = null;
+    const initialDraftTimeline = {
+      columns: [
+        {
+          columnHeaderType: 'not-filtered',
+          id: '@timestamp',
+        },
+        {
+          columnHeaderType: 'not-filtered',
+          id: 'message',
+        },
+        {
+          columnHeaderType: 'not-filtered',
+          id: 'event.category',
+        },
+        {
+          columnHeaderType: 'not-filtered',
+          id: 'event.action',
+        },
+        {
+          columnHeaderType: 'not-filtered',
+          id: 'host.name',
+        },
+        {
+          columnHeaderType: 'not-filtered',
+          id: 'source.ip',
+        },
+        {
+          columnHeaderType: 'not-filtered',
+          id: 'destination.ip',
+        },
+        {
+          columnHeaderType: 'not-filtered',
+          id: 'user.name',
+        },
+      ],
+      dataProviders: [],
+      description: 'x',
+      eventType: 'all',
+      filters: [],
+      kqlMode: 'filter',
+      kqlQuery: {
+        filterQuery: null,
+      },
+      title: '',
+      timelineType: TimelineType.default,
+      templateTimelineVersion: null,
+      templateTimelineId: null,
+      dateRange: {
+        start: 1590998565409,
+        end: 1591084965409,
+      },
+      savedQueryId: null,
+      sort: {
+        columnId: '@timestamp',
+        sortDirection: 'desc',
+      },
+      status: TimelineStatus.draft,
+    };
+
+    const version = null;
+    const fetchMock = jest.fn();
+    const postMock = jest.fn();
+    const patchMock = jest.fn();
+
+    beforeAll(() => {
+      jest.resetAllMocks();
+      jest.resetModules();
+
+      (KibanaServices.get as jest.Mock).mockReturnValue({
+        http: {
+          fetch: fetchMock.mockRejectedValue({
+            body: { status_code: 403, message: 'you do not have the permission' },
+          }),
+          post: postMock.mockRejectedValue({
+            body: { status_code: 403, message: 'you do not have the permission' },
+          }),
+          patch: patchMock.mockRejectedValue({
+            body: { status_code: 403, message: 'you do not have the permission' },
+          }),
+        },
+      });
+    });
+
+    test('it should return your request timeline with code and message', async () => {
+      const persist = await api.persistTimeline({
+        timelineId,
+        timeline: initialDraftTimeline,
+        version,
+      });
+      expect(persist).toEqual({
+        data: {
+          persistTimeline: {
+            code: 403,
+            message: 'you do not have the permission',
+            timeline: { ...initialDraftTimeline, savedObjectId: '', version: '' },
+          },
+        },
+      });
+    });
+  });
+
   describe('create active timeline (import)', () => {
     const timelineId = null;
     const importTimeline = {
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/api.ts b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
index e08d52066ebdc..c6794d125368e 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/api.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
@@ -6,6 +6,7 @@
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
+import isEmpty from 'lodash/isEmpty';
 
 import { throwErrors } from '../../../../case/common/api';
 import {
@@ -99,44 +100,63 @@ export const persistTimeline = async ({
   timeline,
   version,
 }: RequestPersistTimeline): Promise<TimelineResponse | TimelineErrorResponse> => {
-  if (timelineId == null && timeline.status === TimelineStatus.draft && timeline) {
-    const draftTimeline = await cleanDraftTimeline({
-      timelineType: timeline.timelineType!,
-      templateTimelineId: timeline.templateTimelineId ?? undefined,
-      templateTimelineVersion: timeline.templateTimelineVersion ?? undefined,
-    });
-
-    const templateTimelineInfo =
-      timeline.timelineType! === TimelineType.template
-        ? {
-            templateTimelineId:
-              draftTimeline.data.persistTimeline.timeline.templateTimelineId ??
-              timeline.templateTimelineId,
-            templateTimelineVersion:
-              draftTimeline.data.persistTimeline.timeline.templateTimelineVersion ??
-              timeline.templateTimelineVersion,
-          }
-        : {};
+  try {
+    if (isEmpty(timelineId) && timeline.status === TimelineStatus.draft && timeline) {
+      const draftTimeline = await cleanDraftTimeline({
+        timelineType: timeline.timelineType!,
+        templateTimelineId: timeline.templateTimelineId ?? undefined,
+        templateTimelineVersion: timeline.templateTimelineVersion ?? undefined,
+      });
+
+      const templateTimelineInfo =
+        timeline.timelineType! === TimelineType.template
+          ? {
+              templateTimelineId:
+                draftTimeline.data.persistTimeline.timeline.templateTimelineId ??
+                timeline.templateTimelineId,
+              templateTimelineVersion:
+                draftTimeline.data.persistTimeline.timeline.templateTimelineVersion ??
+                timeline.templateTimelineVersion,
+            }
+          : {};
+
+      return patchTimeline({
+        timelineId: draftTimeline.data.persistTimeline.timeline.savedObjectId,
+        timeline: {
+          ...timeline,
+          ...templateTimelineInfo,
+        },
+        version: draftTimeline.data.persistTimeline.timeline.version ?? '',
+      });
+    }
+
+    if (isEmpty(timelineId)) {
+      return postTimeline({ timeline });
+    }
 
     return patchTimeline({
-      timelineId: draftTimeline.data.persistTimeline.timeline.savedObjectId,
-      timeline: {
-        ...timeline,
-        ...templateTimelineInfo,
-      },
-      version: draftTimeline.data.persistTimeline.timeline.version ?? '',
+      timelineId: timelineId ?? '-1',
+      timeline,
+      version: version ?? '',
     });
+  } catch (err) {
+    if (err.status_code === 403 || err.body.status_code === 403) {
+      return Promise.resolve({
+        data: {
+          persistTimeline: {
+            code: 403,
+            message: err.message || err.body.message,
+            timeline: {
+              ...timeline,
+              savedObjectId: '',
+              version: '',
+            },
+          },
+        },
+      });
+    }
+    return Promise.resolve(err);
   }
-
-  if (timelineId == null) {
-    return postTimeline({ timeline });
-  }
-
-  return patchTimeline({
-    timelineId,
-    timeline,
-    version: version ?? '',
-  });
 };
 
 export const importTimelines = async ({
diff --git a/x-pack/plugins/security_solution/public/timelines/pages/timelines_page.tsx b/x-pack/plugins/security_solution/public/timelines/pages/timelines_page.tsx
index c22acf6ba7cc1..1d2e16b3fe5b8 100644
--- a/x-pack/plugins/security_solution/public/timelines/pages/timelines_page.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/pages/timelines_page.tsx
@@ -64,13 +64,11 @@ export const TimelinesPageComponent: React.FC = () => {
                 </EuiFlexItem>
                 {tabName === TimelineType.default ? (
                   <EuiFlexItem>
-                    {capabilitiesCanUserCRUD && (
-                      <NewTimeline
-                        timelineId="timeline-1"
-                        outline={true}
-                        data-test-subj="create-default-btn"
-                      />
-                    )}
+                    <NewTimeline
+                      timelineId="timeline-1"
+                      outline={true}
+                      data-test-subj="create-default-btn"
+                    />
                   </EuiFlexItem>
                 ) : (
                   <EuiFlexItem>

From 4f23f0ac7aa8ea6ef2ec1e4ddcd45908d00ada45 Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Mon, 31 Aug 2020 11:53:34 -0400
Subject: [PATCH 138/148] [Uptime] Fix alerting false positives (#75577)

* Add test and modify code to account for complex filter input.

* Avoid unnecessary nesting.

* Simplify filtering code.

* Use `must` instead of `should`.

* Fix types.

* Refresh snapshots.

* Use `filter` instead of `must`.

* Refactor to improve readability.

* Resolve filtering issue for availability query.

* Add test covering filter fix.

* Removed unused var.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../get_monitor_availability.test.ts          | 159 ++++++++-
 .../__tests__/get_monitor_status.test.ts      | 322 +++++++++++++++++-
 .../lib/requests/get_monitor_availability.ts  |  12 +-
 .../server/lib/requests/get_monitor_status.ts |   6 +-
 4 files changed, 462 insertions(+), 37 deletions(-)

diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_availability.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_availability.test.ts
index f0222de02697d..015d9a4925f3e 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_availability.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_availability.test.ts
@@ -203,28 +203,32 @@ describe('monitor availability', () => {
                       },
                     },
                   },
-                ],
-                "minimum_should_match": 1,
-                "should": Array [
                   Object {
                     "bool": Object {
                       "minimum_should_match": 1,
                       "should": Array [
                         Object {
-                          "match_phrase": Object {
-                            "monitor.id": "apm-dev",
+                          "bool": Object {
+                            "minimum_should_match": 1,
+                            "should": Array [
+                              Object {
+                                "match_phrase": Object {
+                                  "monitor.id": "apm-dev",
+                                },
+                              },
+                            ],
                           },
                         },
-                      ],
-                    },
-                  },
-                  Object {
-                    "bool": Object {
-                      "minimum_should_match": 1,
-                      "should": Array [
                         Object {
-                          "match_phrase": Object {
-                            "monitor.id": "auto-http-0X8D6082B94BBE3B8A",
+                          "bool": Object {
+                            "minimum_should_match": 1,
+                            "should": Array [
+                              Object {
+                                "match_phrase": Object {
+                                  "monitor.id": "auto-http-0X8D6082B94BBE3B8A",
+                                },
+                              },
+                            ],
                           },
                         },
                       ],
@@ -797,6 +801,133 @@ describe('monitor availability', () => {
         ]
       `);
     });
+
+    it('does not overwrite filters', async () => {
+      const [callES, esMock] = setupMockEsCompositeQuery<
+        AvailabilityKey,
+        GetMonitorAvailabilityResult,
+        AvailabilityDoc
+      >(
+        [
+          {
+            bucketCriteria: [],
+          },
+        ],
+        genBucketItem
+      );
+      await getMonitorAvailability({
+        callES,
+        dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
+        range: 3,
+        rangeUnit: 's',
+        threshold: '99',
+        filters: JSON.stringify({ bool: { filter: [{ term: { 'monitor.id': 'foo' } }] } }),
+      });
+      const [, params] = esMock.callAsCurrentUser.mock.calls[0];
+      expect(params).toMatchInlineSnapshot(`
+        Object {
+          "body": Object {
+            "aggs": Object {
+              "monitors": Object {
+                "aggs": Object {
+                  "down_sum": Object {
+                    "sum": Object {
+                      "field": "summary.down",
+                      "missing": 0,
+                    },
+                  },
+                  "fields": Object {
+                    "top_hits": Object {
+                      "size": 1,
+                      "sort": Array [
+                        Object {
+                          "@timestamp": Object {
+                            "order": "desc",
+                          },
+                        },
+                      ],
+                    },
+                  },
+                  "filtered": Object {
+                    "bucket_selector": Object {
+                      "buckets_path": Object {
+                        "threshold": "ratio.value",
+                      },
+                      "script": "params.threshold < 0.99",
+                    },
+                  },
+                  "ratio": Object {
+                    "bucket_script": Object {
+                      "buckets_path": Object {
+                        "downTotal": "down_sum",
+                        "upTotal": "up_sum",
+                      },
+                      "script": "
+                        if (params.upTotal + params.downTotal > 0) {
+                          return params.upTotal / (params.upTotal + params.downTotal);
+                        } return null;",
+                    },
+                  },
+                  "up_sum": Object {
+                    "sum": Object {
+                      "field": "summary.up",
+                      "missing": 0,
+                    },
+                  },
+                },
+                "composite": Object {
+                  "size": 2000,
+                  "sources": Array [
+                    Object {
+                      "monitorId": Object {
+                        "terms": Object {
+                          "field": "monitor.id",
+                        },
+                      },
+                    },
+                    Object {
+                      "location": Object {
+                        "terms": Object {
+                          "field": "observer.geo.name",
+                          "missing_bucket": true,
+                        },
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+            "query": Object {
+              "bool": Object {
+                "filter": Array [
+                  Object {
+                    "range": Object {
+                      "@timestamp": Object {
+                        "gte": "now-3s",
+                        "lte": "now",
+                      },
+                    },
+                  },
+                  Object {
+                    "bool": Object {
+                      "filter": Array [
+                        Object {
+                          "term": Object {
+                            "monitor.id": "foo",
+                          },
+                        },
+                      ],
+                    },
+                  },
+                ],
+              },
+            },
+            "size": 0,
+          },
+          "index": "heartbeat-8*",
+        }
+      `);
+    });
   });
 
   describe('formatBuckets', () => {
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts
index 7dba71a8126e2..e61d736e37106 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_status.test.ts
@@ -148,28 +148,32 @@ describe('getMonitorStatus', () => {
                     },
                   },
                 },
-              ],
-              "minimum_should_match": 1,
-              "should": Array [
                 Object {
                   "bool": Object {
                     "minimum_should_match": 1,
                     "should": Array [
                       Object {
-                        "match_phrase": Object {
-                          "monitor.id": "apm-dev",
+                        "bool": Object {
+                          "minimum_should_match": 1,
+                          "should": Array [
+                            Object {
+                              "match_phrase": Object {
+                                "monitor.id": "apm-dev",
+                              },
+                            },
+                          ],
                         },
                       },
-                    ],
-                  },
-                },
-                Object {
-                  "bool": Object {
-                    "minimum_should_match": 1,
-                    "should": Array [
                       Object {
-                        "match_phrase": Object {
-                          "monitor.id": "auto-http-0X8D6082B94BBE3B8A",
+                        "bool": Object {
+                          "minimum_should_match": 1,
+                          "should": Array [
+                            Object {
+                              "match_phrase": Object {
+                                "monitor.id": "auto-http-0X8D6082B94BBE3B8A",
+                              },
+                            },
+                          ],
                         },
                       },
                     ],
@@ -286,6 +290,296 @@ describe('getMonitorStatus', () => {
     `);
   });
 
+  it('properly assigns filters for complex kuery filters', async () => {
+    const [callES, esMock] = setupMockEsCompositeQuery<BucketKey, BucketItemCriteria, BucketItem>(
+      [{ bucketCriteria: [] }],
+      genBucketItem
+    );
+    const clientParameters = {
+      timerange: {
+        from: 'now-15m',
+        to: 'now',
+      },
+      numTimes: 5,
+      locations: [],
+      filters: {
+        bool: {
+          filter: [
+            {
+              bool: {
+                should: [
+                  {
+                    match_phrase: {
+                      tags: 'org:google',
+                    },
+                  },
+                ],
+                minimum_should_match: 1,
+              },
+            },
+            {
+              bool: {
+                should: [
+                  {
+                    bool: {
+                      should: [
+                        {
+                          match_phrase: {
+                            'monitor.type': 'http',
+                          },
+                        },
+                      ],
+                      minimum_should_match: 1,
+                    },
+                  },
+                  {
+                    bool: {
+                      should: [
+                        {
+                          match_phrase: {
+                            'monitor.type': 'tcp',
+                          },
+                        },
+                      ],
+                      minimum_should_match: 1,
+                    },
+                  },
+                ],
+                minimum_should_match: 1,
+              },
+            },
+          ],
+        },
+      },
+    };
+    await getMonitorStatus({
+      callES,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
+      ...clientParameters,
+    });
+    expect(esMock.callAsCurrentUser).toHaveBeenCalledTimes(1);
+    const [, params] = esMock.callAsCurrentUser.mock.calls[0];
+    expect(params).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {
+          "aggs": Object {
+            "monitors": Object {
+              "aggs": Object {
+                "fields": Object {
+                  "top_hits": Object {
+                    "size": 1,
+                  },
+                },
+              },
+              "composite": Object {
+                "size": 2000,
+                "sources": Array [
+                  Object {
+                    "monitorId": Object {
+                      "terms": Object {
+                        "field": "monitor.id",
+                      },
+                    },
+                  },
+                  Object {
+                    "status": Object {
+                      "terms": Object {
+                        "field": "monitor.status",
+                      },
+                    },
+                  },
+                  Object {
+                    "location": Object {
+                      "terms": Object {
+                        "field": "observer.geo.name",
+                        "missing_bucket": true,
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+          "query": Object {
+            "bool": Object {
+              "filter": Array [
+                Object {
+                  "term": Object {
+                    "monitor.status": "down",
+                  },
+                },
+                Object {
+                  "range": Object {
+                    "@timestamp": Object {
+                      "gte": "now-15m",
+                      "lte": "now",
+                    },
+                  },
+                },
+                Object {
+                  "bool": Object {
+                    "filter": Array [
+                      Object {
+                        "bool": Object {
+                          "minimum_should_match": 1,
+                          "should": Array [
+                            Object {
+                              "match_phrase": Object {
+                                "tags": "org:google",
+                              },
+                            },
+                          ],
+                        },
+                      },
+                      Object {
+                        "bool": Object {
+                          "minimum_should_match": 1,
+                          "should": Array [
+                            Object {
+                              "bool": Object {
+                                "minimum_should_match": 1,
+                                "should": Array [
+                                  Object {
+                                    "match_phrase": Object {
+                                      "monitor.type": "http",
+                                    },
+                                  },
+                                ],
+                              },
+                            },
+                            Object {
+                              "bool": Object {
+                                "minimum_should_match": 1,
+                                "should": Array [
+                                  Object {
+                                    "match_phrase": Object {
+                                      "monitor.type": "tcp",
+                                    },
+                                  },
+                                ],
+                              },
+                            },
+                          ],
+                        },
+                      },
+                    ],
+                  },
+                },
+              ],
+            },
+          },
+          "size": 0,
+        },
+        "index": "heartbeat-8*",
+      }
+    `);
+  });
+
+  it('properly assigns filters for complex kuery filters object', async () => {
+    const [callES, esMock] = setupMockEsCompositeQuery<BucketKey, BucketItemCriteria, BucketItem>(
+      [{ bucketCriteria: [] }],
+      genBucketItem
+    );
+    const clientParameters = {
+      timerange: {
+        from: 'now-15m',
+        to: 'now',
+      },
+      numTimes: 5,
+      locations: [],
+      filters: {
+        bool: {
+          filter: {
+            exists: {
+              field: 'monitor.status',
+            },
+          },
+        },
+      },
+    };
+    await getMonitorStatus({
+      callES,
+      dynamicSettings: DYNAMIC_SETTINGS_DEFAULTS,
+      ...clientParameters,
+    });
+    expect(esMock.callAsCurrentUser).toHaveBeenCalledTimes(1);
+    const [, params] = esMock.callAsCurrentUser.mock.calls[0];
+    expect(params).toMatchInlineSnapshot(`
+      Object {
+        "body": Object {
+          "aggs": Object {
+            "monitors": Object {
+              "aggs": Object {
+                "fields": Object {
+                  "top_hits": Object {
+                    "size": 1,
+                  },
+                },
+              },
+              "composite": Object {
+                "size": 2000,
+                "sources": Array [
+                  Object {
+                    "monitorId": Object {
+                      "terms": Object {
+                        "field": "monitor.id",
+                      },
+                    },
+                  },
+                  Object {
+                    "status": Object {
+                      "terms": Object {
+                        "field": "monitor.status",
+                      },
+                    },
+                  },
+                  Object {
+                    "location": Object {
+                      "terms": Object {
+                        "field": "observer.geo.name",
+                        "missing_bucket": true,
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+          "query": Object {
+            "bool": Object {
+              "filter": Array [
+                Object {
+                  "term": Object {
+                    "monitor.status": "down",
+                  },
+                },
+                Object {
+                  "range": Object {
+                    "@timestamp": Object {
+                      "gte": "now-15m",
+                      "lte": "now",
+                    },
+                  },
+                },
+                Object {
+                  "bool": Object {
+                    "filter": Object {
+                      "exists": Object {
+                        "field": "monitor.status",
+                      },
+                    },
+                  },
+                },
+              ],
+            },
+          },
+          "size": 0,
+        },
+        "index": "heartbeat-8*",
+      }
+    `);
+  });
+
   it('fetches single page of results', async () => {
     const [callES, esMock] = setupMockEsCompositeQuery<BucketKey, BucketItemCriteria, BucketItem>(
       [
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts
index 0801fc5769363..f78048100b998 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_availability.ts
@@ -47,6 +47,11 @@ export const getMonitorAvailability: UMElasticsearchQueryFn<
 
   const gte = `now-${range}${rangeUnit}`;
 
+  let parsedFilters: any;
+  if (filters) {
+    parsedFilters = JSON.parse(filters);
+  }
+
   do {
     const esParams: any = {
       index: dynamicSettings.heartbeatIndices,
@@ -62,6 +67,8 @@ export const getMonitorAvailability: UMElasticsearchQueryFn<
                   },
                 },
               },
+              // append user filters, if defined
+              ...(parsedFilters?.bool ? [parsedFilters] : []),
             ],
           },
         },
@@ -139,11 +146,6 @@ export const getMonitorAvailability: UMElasticsearchQueryFn<
       },
     };
 
-    if (filters) {
-      const parsedFilter = JSON.parse(filters);
-      esParams.body.query.bool = { ...esParams.body.query.bool, ...parsedFilter.bool };
-    }
-
     if (afterKey) {
       esParams.body.aggs.monitors.composite.after = afterKey;
     }
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
index beed8e8335314..caf505610e991 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
@@ -71,6 +71,8 @@ export const getMonitorStatus: UMElasticsearchQueryFn<
                   },
                 },
               },
+              // append user filters, if defined
+              ...(filters?.bool ? [filters] : []),
             ],
           },
         },
@@ -116,10 +118,6 @@ export const getMonitorStatus: UMElasticsearchQueryFn<
       },
     };
 
-    if (filters?.bool) {
-      esParams.body.query.bool = Object.assign({}, esParams.body.query.bool, filters.bool);
-    }
-
     /**
      * Perform a logical `and` against the selected location filters.
      */

From 2486a71522782d63d1691e04b96ca08a8acc3753 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Mon, 31 Aug 2020 10:59:02 -0500
Subject: [PATCH 139/148] [APM] Language-specific stacktrace formatting
 (#75924)

* [APM] Language-specific stacktrace formatting

* Add todos

* more

* add at prefix for java

* [APM] Fix overlapping transaction names

...in the table and the header. Did this by adding `word-break: break-all` to them.

Also:

* Rename List to TransactionList
* Add stories for TransactionList and ApmHeader
* Add missing type information to transactions based on sample transaction
*
Fixes #73960.
---
 .../ExceptionStacktrace.stories.tsx           | 807 ++++++++++++++++++
 .../shared/Stacktrace/CauseStacktrace.tsx     |   4 +-
 .../components/shared/Stacktrace/Context.tsx  |   8 +-
 .../shared/Stacktrace/FrameHeading.test.tsx   | 252 ++++++
 .../shared/Stacktrace/FrameHeading.tsx        |  55 +-
 .../Stacktrace/LibraryStacktrace.test.tsx     |  16 +-
 .../shared/Stacktrace/LibraryStacktrace.tsx   |  37 +-
 .../shared/Stacktrace/Stackframe.tsx          |  34 +-
 .../shared/Stacktrace/Variables.tsx           |   4 +-
 .../Stacktrace/__test__/Stackframe.test.tsx   |  14 +-
 .../__snapshots__/Stackframe.test.tsx.snap    | 192 +++--
 .../shared/Stacktrace/__test__/index.test.ts  |  14 +-
 .../c_sharp_frame_heading_renderer.tsx        |  42 +
 .../default_frame_heading_renderer.tsx        |  31 +
 .../frame_heading_renderers/index.ts          |  19 +
 .../java_frame_heading_renderer.tsx           |  27 +
 .../java_script_frame_heading_renderer.tsx    |  34 +
 .../ruby_frame_heading_renderer.tsx           |  27 +
 .../components/shared/Stacktrace/index.tsx    |  17 +-
 .../apm/typings/es_schemas/raw/error_raw.ts   |  10 +-
 .../es_schemas/raw/fields/stackframe.ts       |  36 +-
 .../apm/typings/es_schemas/raw/span_raw.ts    |   4 +-
 22 files changed, 1515 insertions(+), 169 deletions(-)
 create mode 100644 x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.stories.tsx
 create mode 100644 x-pack/plugins/apm/public/components/shared/Stacktrace/FrameHeading.test.tsx
 create mode 100644 x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx
 create mode 100644 x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx
 create mode 100644 x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/index.ts
 create mode 100644 x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx
 create mode 100644 x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx
 create mode 100644 x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx

diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.stories.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.stories.tsx
new file mode 100644
index 0000000000000..5ad6fd547169d
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/ExceptionStacktrace.stories.tsx
@@ -0,0 +1,807 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { storiesOf } from '@storybook/react';
+import React from 'react';
+import { EuiThemeProvider } from '../../../../../../observability/public';
+import { Exception } from '../../../../../typings/es_schemas/raw/error_raw';
+import { ExceptionStacktrace } from './ExceptionStacktrace';
+
+storiesOf('app/ErrorGroupDetails/DetailView/ExceptionStacktrace', module)
+  .addDecorator((storyFn) => {
+    return <EuiThemeProvider>{storyFn()}</EuiThemeProvider>;
+  })
+  .add('JavaScript with some context', () => {
+    const exceptions: Exception[] = [
+      {
+        code: '503',
+        stacktrace: [
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'node_modules/elastic-apm-http-client/index.js',
+            abs_path: '/app/node_modules/elastic-apm-http-client/index.js',
+            line: {
+              number: 711,
+              context:
+                "  const err = new Error('Unexpected APM Server response when polling config')",
+            },
+            function: 'processConfigErrorResponse',
+            context: {
+              pre: ['', 'function processConfigErrorResponse (res, buf) {'],
+              post: ['', '  err.code = res.statusCode'],
+            },
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'node_modules/elastic-apm-http-client/index.js',
+            abs_path: '/app/node_modules/elastic-apm-http-client/index.js',
+            line: {
+              number: 196,
+              context:
+                '        res.destroy(processConfigErrorResponse(res, buf))',
+            },
+            function: '<anonymous>',
+            context: {
+              pre: ['        }', '      } else {'],
+              post: ['      }', '    })'],
+            },
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'node_modules/fast-stream-to-buffer/index.js',
+            abs_path: '/app/node_modules/fast-stream-to-buffer/index.js',
+            line: {
+              number: 20,
+              context: '        cb(err, buffers[0], stream)',
+            },
+            function: 'IncomingMessage.<anonymous>',
+            context: {
+              pre: ['        break', '      case 1:'],
+              post: ['        break', '      default:'],
+            },
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'node_modules/once/once.js',
+            abs_path: '/app/node_modules/once/once.js',
+            line: {
+              number: 25,
+              context: '    return f.value = fn.apply(this, arguments)',
+            },
+            function: 'f',
+            context: {
+              pre: ['    if (f.called) return f.value', '    f.called = true'],
+              post: ['  }', '  f.called = false'],
+            },
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'node_modules/end-of-stream/index.js',
+            abs_path: '/app/node_modules/end-of-stream/index.js',
+            line: {
+              number: 36,
+              context: '\t\tif (!writable) callback.call(stream);',
+            },
+            function: 'onend',
+            context: {
+              pre: ['\tvar onend = function() {', '\t\treadable = false;'],
+              post: ['\t};', ''],
+            },
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            abs_path: 'events.js',
+            filename: 'events.js',
+            line: {
+              number: 327,
+            },
+            function: 'emit',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: '_stream_readable.js',
+            abs_path: '_stream_readable.js',
+            line: {
+              number: 1220,
+            },
+            function: 'endReadableNT',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'internal/process/task_queues.js',
+            abs_path: 'internal/process/task_queues.js',
+            line: {
+              number: 84,
+            },
+            function: 'processTicksAndRejections',
+          },
+        ],
+        module: 'elastic-apm-http-client',
+        handled: false,
+        attributes: {
+          response:
+            '<html>\r\n<head><title>503 Service Temporarily Unavailable</title></head>\r\n<body>\r\n<center><h1>503 Service Temporarily Unavailable</h1></center>\r\n<hr><center>nginx/1.17.7</center>\r\n</body>\r\n</html>\r\n',
+        },
+        type: 'Error',
+        message: 'Unexpected APM Server response when polling config',
+      },
+    ];
+
+    return (
+      <ExceptionStacktrace codeLanguage="javascript" exceptions={exceptions} />
+    );
+  })
+  .add('Ruby with context and library frames', () => {
+    const exceptions: Exception[] = [
+      {
+        stacktrace: [
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'active_record/core.rb',
+            abs_path:
+              '/usr/local/bundle/gems/activerecord-5.2.4.1/lib/active_record/core.rb',
+            line: {
+              number: 177,
+            },
+            function: 'find',
+          },
+          {
+            library_frame: false,
+            exclude_from_grouping: false,
+            filename: 'api/orders_controller.rb',
+            abs_path: '/app/app/controllers/api/orders_controller.rb',
+            line: {
+              number: 23,
+              context: '      render json: Order.find(params[:id])\n',
+            },
+            function: 'show',
+            context: {
+              pre: ['\n', '    def show\n'],
+              post: ['    end\n', '  end\n'],
+            },
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_controller/metal/basic_implicit_render.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_controller/metal/basic_implicit_render.rb',
+            line: {
+              number: 6,
+            },
+            function: 'send_action',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'abstract_controller/base.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/abstract_controller/base.rb',
+            line: {
+              number: 194,
+            },
+            function: 'process_action',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_controller/metal/rendering.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_controller/metal/rendering.rb',
+            line: {
+              number: 30,
+            },
+            function: 'process_action',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'abstract_controller/callbacks.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/abstract_controller/callbacks.rb',
+            line: {
+              number: 42,
+            },
+            function: 'block in process_action',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'active_support/callbacks.rb',
+            abs_path:
+              '/usr/local/bundle/gems/activesupport-5.2.4.1/lib/active_support/callbacks.rb',
+            line: {
+              number: 132,
+            },
+            function: 'run_callbacks',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'abstract_controller/callbacks.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/abstract_controller/callbacks.rb',
+            line: {
+              number: 41,
+            },
+            function: 'process_action',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_controller/metal/rescue.rb',
+            filename: 'action_controller/metal/rescue.rb',
+            line: {
+              number: 22,
+            },
+            function: 'process_action',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_controller/metal/instrumentation.rb',
+            filename: 'action_controller/metal/instrumentation.rb',
+            line: {
+              number: 34,
+            },
+            function: 'block in process_action',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'active_support/notifications.rb',
+            abs_path:
+              '/usr/local/bundle/gems/activesupport-5.2.4.1/lib/active_support/notifications.rb',
+            line: {
+              number: 168,
+            },
+            function: 'block in instrument',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'active_support/notifications/instrumenter.rb',
+            abs_path:
+              '/usr/local/bundle/gems/activesupport-5.2.4.1/lib/active_support/notifications/instrumenter.rb',
+            line: {
+              number: 23,
+            },
+            function: 'instrument',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'active_support/notifications.rb',
+            abs_path:
+              '/usr/local/bundle/gems/activesupport-5.2.4.1/lib/active_support/notifications.rb',
+            line: {
+              number: 168,
+            },
+            function: 'instrument',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_controller/metal/instrumentation.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_controller/metal/instrumentation.rb',
+            line: {
+              number: 32,
+            },
+            function: 'process_action',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_controller/metal/params_wrapper.rb',
+            filename: 'action_controller/metal/params_wrapper.rb',
+            line: {
+              number: 256,
+            },
+            function: 'process_action',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'active_record/railties/controller_runtime.rb',
+            abs_path:
+              '/usr/local/bundle/gems/activerecord-5.2.4.1/lib/active_record/railties/controller_runtime.rb',
+            line: {
+              number: 24,
+            },
+            function: 'process_action',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'abstract_controller/base.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/abstract_controller/base.rb',
+            line: {
+              number: 134,
+            },
+            function: 'process',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_view/rendering.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionview-5.2.4.1/lib/action_view/rendering.rb',
+            line: {
+              number: 32,
+            },
+            function: 'process',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_controller/metal.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_controller/metal.rb',
+            line: {
+              number: 191,
+            },
+            function: 'dispatch',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_controller/metal.rb',
+            filename: 'action_controller/metal.rb',
+            line: {
+              number: 252,
+            },
+            function: 'dispatch',
+          },
+          {
+            exclude_from_grouping: false,
+            library_frame: true,
+            filename: 'action_dispatch/routing/route_set.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/routing/route_set.rb',
+            line: {
+              number: 52,
+            },
+            function: 'dispatch',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/routing/route_set.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/routing/route_set.rb',
+            line: {
+              number: 34,
+            },
+            function: 'serve',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/journey/router.rb',
+            filename: 'action_dispatch/journey/router.rb',
+            line: {
+              number: 52,
+            },
+            function: 'block in serve',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/journey/router.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/journey/router.rb',
+            line: {
+              number: 35,
+            },
+            function: 'each',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/journey/router.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/journey/router.rb',
+            line: {
+              number: 35,
+            },
+            function: 'serve',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/routing/route_set.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/routing/route_set.rb',
+            line: {
+              number: 840,
+            },
+            function: 'call',
+          },
+          {
+            exclude_from_grouping: false,
+            library_frame: true,
+            filename: 'rack/static.rb',
+            abs_path: '/usr/local/bundle/gems/rack-2.2.3/lib/rack/static.rb',
+            line: {
+              number: 161,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'rack/tempfile_reaper.rb',
+            abs_path:
+              '/usr/local/bundle/gems/rack-2.2.3/lib/rack/tempfile_reaper.rb',
+            line: {
+              number: 15,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'rack/etag.rb',
+            abs_path: '/usr/local/bundle/gems/rack-2.2.3/lib/rack/etag.rb',
+            line: {
+              number: 27,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'rack/conditional_get.rb',
+            abs_path:
+              '/usr/local/bundle/gems/rack-2.2.3/lib/rack/conditional_get.rb',
+            line: {
+              number: 27,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'rack/head.rb',
+            abs_path: '/usr/local/bundle/gems/rack-2.2.3/lib/rack/head.rb',
+            line: {
+              number: 12,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/http/content_security_policy.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/http/content_security_policy.rb',
+            line: {
+              number: 18,
+            },
+            function: 'call',
+          },
+          {
+            exclude_from_grouping: false,
+            library_frame: true,
+            filename: 'rack/session/abstract/id.rb',
+            abs_path:
+              '/usr/local/bundle/gems/rack-2.2.3/lib/rack/session/abstract/id.rb',
+            line: {
+              number: 266,
+            },
+            function: 'context',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'rack/session/abstract/id.rb',
+            abs_path:
+              '/usr/local/bundle/gems/rack-2.2.3/lib/rack/session/abstract/id.rb',
+            line: {
+              number: 260,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/middleware/cookies.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/middleware/cookies.rb',
+            line: {
+              number: 670,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/middleware/callbacks.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/middleware/callbacks.rb',
+            line: {
+              number: 28,
+            },
+            function: 'block in call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'active_support/callbacks.rb',
+            abs_path:
+              '/usr/local/bundle/gems/activesupport-5.2.4.1/lib/active_support/callbacks.rb',
+            line: {
+              number: 98,
+            },
+            function: 'run_callbacks',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/middleware/callbacks.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/middleware/callbacks.rb',
+            line: {
+              number: 26,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/middleware/debug_exceptions.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/middleware/debug_exceptions.rb',
+            line: {
+              number: 61,
+            },
+            function: 'call',
+          },
+          {
+            exclude_from_grouping: false,
+            library_frame: true,
+            filename: 'action_dispatch/middleware/show_exceptions.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/middleware/show_exceptions.rb',
+            line: {
+              number: 33,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'lograge/rails_ext/rack/logger.rb',
+            abs_path:
+              '/usr/local/bundle/gems/lograge-0.11.2/lib/lograge/rails_ext/rack/logger.rb',
+            line: {
+              number: 15,
+            },
+            function: 'call_app',
+          },
+          {
+            exclude_from_grouping: false,
+            library_frame: true,
+            filename: 'rails/rack/logger.rb',
+            abs_path:
+              '/usr/local/bundle/gems/railties-5.2.4.1/lib/rails/rack/logger.rb',
+            line: {
+              number: 28,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/middleware/remote_ip.rb',
+            filename: 'action_dispatch/middleware/remote_ip.rb',
+            line: {
+              number: 81,
+            },
+            function: 'call',
+          },
+          {
+            exclude_from_grouping: false,
+            library_frame: true,
+            filename: 'request_store/middleware.rb',
+            abs_path:
+              '/usr/local/bundle/gems/request_store-1.5.0/lib/request_store/middleware.rb',
+            line: {
+              number: 19,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/middleware/request_id.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/middleware/request_id.rb',
+            line: {
+              number: 27,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'rack/method_override.rb',
+            abs_path:
+              '/usr/local/bundle/gems/rack-2.2.3/lib/rack/method_override.rb',
+            line: {
+              number: 24,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'rack/runtime.rb',
+            abs_path: '/usr/local/bundle/gems/rack-2.2.3/lib/rack/runtime.rb',
+            line: {
+              number: 22,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'active_support/cache/strategy/local_cache_middleware.rb',
+            abs_path:
+              '/usr/local/bundle/gems/activesupport-5.2.4.1/lib/active_support/cache/strategy/local_cache_middleware.rb',
+            line: {
+              number: 29,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/middleware/executor.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/middleware/executor.rb',
+            line: {
+              number: 14,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'action_dispatch/middleware/static.rb',
+            abs_path:
+              '/usr/local/bundle/gems/actionpack-5.2.4.1/lib/action_dispatch/middleware/static.rb',
+            line: {
+              number: 127,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'rack/sendfile.rb',
+            abs_path: '/usr/local/bundle/gems/rack-2.2.3/lib/rack/sendfile.rb',
+            line: {
+              number: 110,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: false,
+            exclude_from_grouping: false,
+            filename: 'opbeans_shuffle.rb',
+            abs_path: '/app/lib/opbeans_shuffle.rb',
+            line: {
+              number: 32,
+              context: '      @app.call(env)\n',
+            },
+            function: 'call',
+            context: {
+              pre: ['      end\n', '    else\n'],
+              post: ['    end\n', '  rescue Timeout::Error\n'],
+            },
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'elastic_apm/middleware.rb',
+            abs_path:
+              '/usr/local/bundle/gems/elastic-apm-3.8.0/lib/elastic_apm/middleware.rb',
+            line: {
+              number: 36,
+            },
+            function: 'call',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'rails/engine.rb',
+            abs_path:
+              '/usr/local/bundle/gems/railties-5.2.4.1/lib/rails/engine.rb',
+            line: {
+              number: 524,
+            },
+            function: 'call',
+          },
+          {
+            exclude_from_grouping: false,
+            library_frame: true,
+            filename: 'puma/configuration.rb',
+            abs_path:
+              '/usr/local/bundle/gems/puma-4.3.5/lib/puma/configuration.rb',
+            line: {
+              number: 228,
+            },
+            function: 'call',
+          },
+          {
+            exclude_from_grouping: false,
+            library_frame: true,
+            filename: 'puma/server.rb',
+            abs_path: '/usr/local/bundle/gems/puma-4.3.5/lib/puma/server.rb',
+            line: {
+              number: 713,
+            },
+            function: 'handle_request',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'puma/server.rb',
+            abs_path: '/usr/local/bundle/gems/puma-4.3.5/lib/puma/server.rb',
+            line: {
+              number: 472,
+            },
+            function: 'process_client',
+          },
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'puma/server.rb',
+            abs_path: '/usr/local/bundle/gems/puma-4.3.5/lib/puma/server.rb',
+            line: {
+              number: 328,
+            },
+            function: 'block in run',
+          },
+          {
+            exclude_from_grouping: false,
+            library_frame: true,
+            filename: 'puma/thread_pool.rb',
+            abs_path:
+              '/usr/local/bundle/gems/puma-4.3.5/lib/puma/thread_pool.rb',
+            line: {
+              number: 134,
+            },
+            function: 'block in spawn_thread',
+          },
+        ],
+        handled: false,
+        module: 'ActiveRecord',
+        message: "Couldn't find Order with 'id'=956",
+        type: 'ActiveRecord::RecordNotFound',
+      },
+    ];
+
+    return <ExceptionStacktrace codeLanguage="ruby" exceptions={exceptions} />;
+  });
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx
index c70467c6d031f..977bf2dd09cc0 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiAccordion, EuiTitle } from '@elastic/eui';
 import { px, unit } from '../../../style/variables';
 import { Stacktrace } from '.';
-import { IStackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
+import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 
 // @ts-ignore Styled Components has trouble inferring the types of the default props here.
 const Accordion = styled(EuiAccordion)`
@@ -55,7 +55,7 @@ interface CauseStacktraceProps {
   codeLanguage?: string;
   id: string;
   message?: string;
-  stackframes?: IStackframe[];
+  stackframes?: Stackframe[];
 }
 
 export function CauseStacktrace({
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/Context.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/Context.tsx
index edada6012d2e2..72fdc93de9545 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/Context.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/Context.tsx
@@ -21,7 +21,7 @@ import { registerLanguage } from 'react-syntax-highlighter/dist/light';
 // @ts-ignore
 import { xcode } from 'react-syntax-highlighter/dist/styles';
 import styled from 'styled-components';
-import { IStackframeWithLineContext } from '../../../../typings/es_schemas/raw/fields/stackframe';
+import { StackframeWithLineContext } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import { borderRadius, px, unit, units } from '../../../style/variables';
 
 registerLanguage('javascript', javascript);
@@ -102,20 +102,20 @@ const Code = styled.code`
   z-index: 2;
 `;
 
-function getStackframeLines(stackframe: IStackframeWithLineContext) {
+function getStackframeLines(stackframe: StackframeWithLineContext) {
   const line = stackframe.line.context;
   const preLines = stackframe.context?.pre || [];
   const postLines = stackframe.context?.post || [];
   return [...preLines, line, ...postLines];
 }
 
-function getStartLineNumber(stackframe: IStackframeWithLineContext) {
+function getStartLineNumber(stackframe: StackframeWithLineContext) {
   const preLines = size(stackframe.context?.pre || []);
   return stackframe.line.number - preLines;
 }
 
 interface Props {
-  stackframe: IStackframeWithLineContext;
+  stackframe: StackframeWithLineContext;
   codeLanguage?: string;
   isLibraryFrame: boolean;
 }
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/FrameHeading.test.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/FrameHeading.test.tsx
new file mode 100644
index 0000000000000..908399c414cf5
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/FrameHeading.test.tsx
@@ -0,0 +1,252 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
+import { renderWithTheme } from '../../../utils/testHelpers';
+import { FrameHeading } from './FrameHeading';
+
+function getRenderedStackframeText(
+  stackframe: Stackframe,
+  codeLanguage: string
+) {
+  const result = renderWithTheme(
+    <FrameHeading
+      codeLanguage={codeLanguage}
+      isLibraryFrame={false}
+      stackframe={stackframe}
+    />
+  );
+
+  return result.getByTestId('FrameHeading').textContent;
+}
+
+describe('FrameHeading', () => {
+  describe('with a Go stackframe', () => {
+    it('renders', () => {
+      expect(
+        getRenderedStackframeText(
+          {
+            exclude_from_grouping: false,
+            filename: 'main.go',
+            abs_path: '/src/opbeans-go/main.go',
+            line: { number: 196 },
+            function: 'Main.func2',
+            module: 'main',
+          },
+          'go'
+        )
+      ).toEqual('main.go in Main.func2 at line 196');
+    });
+  });
+
+  describe('with a Java stackframe', () => {
+    it('renders', () => {
+      expect(
+        getRenderedStackframeText(
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'OutputBuffer.java',
+            classname: 'org.apache.catalina.connector.OutputBuffer',
+            line: { number: 825 },
+            module: 'org.apache.catalina.connector',
+            function: 'flushByteBuffer',
+          },
+          'Java'
+        )
+      ).toEqual(
+        'at org.apache.catalina.connector.OutputBuffer.flushByteBuffer(OutputBuffer.java:825)'
+      );
+    });
+  });
+
+  describe('with a .NET stackframe', () => {
+    describe('with a classname', () => {
+      it('renders', () => {
+        expect(
+          getRenderedStackframeText(
+            {
+              classname: 'OpbeansDotnet.Controllers.CustomersController',
+              exclude_from_grouping: false,
+              filename:
+                '/src/opbeans-dotnet/Controllers/CustomersController.cs',
+              abs_path:
+                '/src/opbeans-dotnet/Controllers/CustomersController.cs',
+              line: { number: 23 },
+              module:
+                'opbeans-dotnet, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null',
+              function: 'Get',
+            },
+            'C#'
+          )
+        ).toEqual(
+          'OpbeansDotnet.Controllers.CustomersController in Get in /src/opbeans-dotnet/Controllers/CustomersController.cs at line 23'
+        );
+      });
+    });
+
+    describe('with no classname', () => {
+      it('renders', () => {
+        expect(
+          getRenderedStackframeText(
+            {
+              exclude_from_grouping: false,
+              filename:
+                'Microsoft.EntityFrameworkCore.Query.Internal.LinqOperatorProvider+ResultEnumerable`1',
+              line: { number: 0 },
+              function: 'GetEnumerator',
+              module:
+                'Microsoft.EntityFrameworkCore, Version=2.2.6.0, Culture=neutral, PublicKeyToken=adb9793829ddae60',
+            },
+            'C#'
+          )
+        ).toEqual(
+          'Microsoft.EntityFrameworkCore.Query.Internal.LinqOperatorProvider+ResultEnumerable`1 in GetEnumerator'
+        );
+      });
+    });
+  });
+
+  describe('with a Node stackframe', () => {
+    it('renders', () => {
+      expect(
+        getRenderedStackframeText(
+          {
+            library_frame: true,
+            exclude_from_grouping: false,
+            filename: 'internal/async_hooks.js',
+            abs_path: 'internal/async_hooks.js',
+            line: { number: 120 },
+            function: 'callbackTrampoline',
+          },
+          'javascript'
+        )
+      ).toEqual('at callbackTrampoline (internal/async_hooks.js:120)');
+    });
+
+    describe('with a classname', () => {
+      it('renders', () => {
+        expect(
+          getRenderedStackframeText(
+            {
+              classname: 'TCPConnectWrap',
+              exclude_from_grouping: false,
+              library_frame: true,
+              filename: 'internal/stream_base_commons.js',
+              abs_path: 'internal/stream_base_commons.js',
+              line: { number: 205 },
+              function: 'onStreamRead',
+            },
+            'javascript'
+          )
+        ).toEqual(
+          'at TCPConnectWrap.onStreamRead (internal/stream_base_commons.js:205)'
+        );
+      });
+    });
+
+    describe('with no classname and no function', () => {
+      it('renders', () => {
+        expect(
+          getRenderedStackframeText(
+            {
+              exclude_from_grouping: false,
+              library_frame: true,
+              filename: 'internal/stream_base_commons.js',
+              abs_path: 'internal/stream_base_commons.js',
+              line: { number: 205 },
+            },
+            'javascript'
+          )
+        ).toEqual('at  (internal/stream_base_commons.js:205)');
+      });
+    });
+  });
+
+  describe('with a Python stackframe', () => {
+    it('renders', () => {
+      expect(
+        getRenderedStackframeText(
+          {
+            exclude_from_grouping: false,
+            library_frame: false,
+            filename: 'opbeans/views.py',
+            abs_path: '/app/opbeans/views.py',
+            line: {
+              number: 190,
+              context: '        return post_order(request)',
+            },
+            module: 'opbeans.views',
+            function: 'orders',
+            context: {
+              pre: [
+                '        # set transaction name to post_order',
+                "        elasticapm.set_transaction_name('POST opbeans.views.post_order')",
+              ],
+              post: [
+                '    order_list = list(m.Order.objects.values(',
+                "        'id', 'customer_id', 'customer__full_name', 'created_at'",
+              ],
+            },
+            vars: { request: "<WSGIRequest: POST '/api/orders'>" },
+          },
+          'python'
+        )
+      ).toEqual('opbeans/views.py in orders at line 190');
+    });
+  });
+
+  describe('with a Ruby stackframe', () => {
+    it('renders', () => {
+      expect(
+        getRenderedStackframeText(
+          {
+            library_frame: false,
+            exclude_from_grouping: false,
+            abs_path: '/app/app/controllers/api/customers_controller.rb',
+            filename: 'api/customers_controller.rb',
+            line: {
+              number: 15,
+              context: '      render json: Customer.find(params[:id])\n',
+            },
+            function: 'show',
+            context: {
+              pre: ['\n', '    def show\n'],
+              post: ['    end\n', '  end\n'],
+            },
+          },
+          'ruby'
+        )
+      ).toEqual("api/customers_controller.rb:15 in `show'");
+    });
+  });
+
+  describe('with a RUM stackframe', () => {
+    it('renders', () => {
+      expect(
+        getRenderedStackframeText(
+          {
+            library_frame: false,
+            exclude_from_grouping: false,
+            filename: 'static/js/main.616809fb.js',
+            abs_path: 'http://opbeans-frontend:3000/static/js/main.616809fb.js',
+            sourcemap: {
+              error:
+                'No Sourcemap available for ServiceName opbeans-rum, ServiceVersion 2020-08-25 02:09:37, Path http://opbeans-frontend:3000/static/js/main.616809fb.js.',
+              updated: false,
+            },
+            line: { number: 319, column: 3842 },
+            function: 'unstable_runWithPriority',
+          },
+          'javascript'
+        )
+      ).toEqual(
+        'at unstable_runWithPriority (static/js/main.616809fb.js:319:3842)'
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx
index 5891895629318..dfeb537b04865 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/FrameHeading.tsx
@@ -4,14 +4,23 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment } from 'react';
+import React, { ComponentType } from 'react';
 import styled from 'styled-components';
-import { IStackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
+import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import { fontFamilyCode, fontSize, px, units } from '../../../style/variables';
+import {
+  CSharpFrameHeadingRenderer,
+  DefaultFrameHeadingRenderer,
+  FrameHeadingRendererProps,
+  JavaFrameHeadingRenderer,
+  JavaScriptFrameHeadingRenderer,
+  RubyFrameHeadingRenderer,
+} from './frame_heading_renderers';
 
 const FileDetails = styled.div`
   color: ${({ theme }) => theme.eui.euiColorDarkShade};
-  padding: ${px(units.half)} 0;
+  line-height: 1.5; /* matches the line-hight of the accordion container button */
+  padding: ${px(units.eighth)} 0;
   font-family: ${fontFamilyCode};
   font-size: ${fontSize};
 `;
@@ -25,29 +34,37 @@ const AppFrameFileDetail = styled.span`
 `;
 
 interface Props {
-  stackframe: IStackframe;
+  codeLanguage?: string;
+  stackframe: Stackframe;
   isLibraryFrame: boolean;
 }
 
-function FrameHeading({ stackframe, isLibraryFrame }: Props) {
-  const FileDetail = isLibraryFrame
+function FrameHeading({ codeLanguage, stackframe, isLibraryFrame }: Props) {
+  const FileDetail: ComponentType = isLibraryFrame
     ? LibraryFrameFileDetail
     : AppFrameFileDetail;
-  const lineNumber = stackframe.line?.number ?? 0;
-
-  const name =
-    'filename' in stackframe ? stackframe.filename : stackframe.classname;
+  let Renderer: ComponentType<FrameHeadingRendererProps>;
+  switch (codeLanguage?.toString().toLowerCase()) {
+    case 'c#':
+      Renderer = CSharpFrameHeadingRenderer;
+      break;
+    case 'java':
+      Renderer = JavaFrameHeadingRenderer;
+      break;
+    case 'javascript':
+      Renderer = JavaScriptFrameHeadingRenderer;
+      break;
+    case 'ruby':
+      Renderer = RubyFrameHeadingRenderer;
+      break;
+    default:
+      Renderer = DefaultFrameHeadingRenderer;
+      break;
+  }
 
   return (
-    <FileDetails>
-      <FileDetail>{name}</FileDetail> in{' '}
-      <FileDetail>{stackframe.function}</FileDetail>
-      {lineNumber > 0 && (
-        <Fragment>
-          {' at '}
-          <FileDetail>line {lineNumber}</FileDetail>
-        </Fragment>
-      )}
+    <FileDetails data-test-subj="FrameHeading">
+      <Renderer fileDetailComponent={FileDetail} stackframe={stackframe} />
     </FileDetails>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.test.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.test.tsx
index a83fb44e6aa37..7d22b56714f7e 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.test.tsx
@@ -5,7 +5,7 @@
  */
 
 import React from 'react';
-import { shallow } from 'enzyme';
+import { renderWithTheme } from '../../../utils/testHelpers';
 import { LibraryStacktrace } from './LibraryStacktrace';
 
 describe('LibraryStacktrace', () => {
@@ -13,8 +13,13 @@ describe('LibraryStacktrace', () => {
     describe('with no stack frames', () => {
       it('renders null', () => {
         const props = { id: 'testId', stackframes: [] };
+        const { queryByTestId } = renderWithTheme(
+          <LibraryStacktrace {...props} />
+        );
 
-        expect(shallow(<LibraryStacktrace {...props} />).html()).toBeNull();
+        expect(
+          queryByTestId('LibraryStacktraceAccordion')
+        ).not.toBeInTheDocument();
       });
     });
 
@@ -24,10 +29,11 @@ describe('LibraryStacktrace', () => {
           id: 'testId',
           stackframes: [{ filename: 'testFilename', line: { number: 1 } }],
         };
+        const { queryByTestId } = renderWithTheme(
+          <LibraryStacktrace {...props} />
+        );
 
-        expect(
-          shallow(<LibraryStacktrace {...props} />).find('EuiAccordion')
-        ).toHaveLength(1);
+        expect(queryByTestId('LibraryStacktraceAccordion')).toBeInTheDocument();
       });
     });
   });
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.tsx
index 703ade3b049ac..32180cd90f783 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/LibraryStacktrace.tsx
@@ -8,17 +8,17 @@ import { EuiAccordion } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import styled from 'styled-components';
-import { IStackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
-import { Stackframe } from './Stackframe';
-import { px, unit } from '../../../style/variables';
+import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
+import { px, units } from '../../../style/variables';
+import { Stackframe as StackframeComponent } from './Stackframe';
 
-const FramesContainer = styled('div')`
-  padding-left: ${px(unit)};
+const LibraryStacktraceAccordion = styled(EuiAccordion)`
+  margin: ${px(units.quarter)} 0;
 `;
 
 interface Props {
   codeLanguage?: string;
-  stackframes: IStackframe[];
+  stackframes: Stackframe[];
   id: string;
 }
 
@@ -28,7 +28,7 @@ export function LibraryStacktrace({ codeLanguage, id, stackframes }: Props) {
   }
 
   return (
-    <EuiAccordion
+    <LibraryStacktraceAccordion
       buttonContent={i18n.translate(
         'xpack.apm.stacktraceTab.libraryFramesToogleButtonLabel',
         {
@@ -37,19 +37,18 @@ export function LibraryStacktrace({ codeLanguage, id, stackframes }: Props) {
           values: { count: stackframes.length },
         }
       )}
+      data-test-subj="LibraryStacktraceAccordion"
       id={id}
     >
-      <FramesContainer>
-        {stackframes.map((stackframe, i) => (
-          <Stackframe
-            key={i}
-            id={i.toString(10)}
-            isLibraryFrame
-            codeLanguage={codeLanguage}
-            stackframe={stackframe}
-          />
-        ))}
-      </FramesContainer>
-    </EuiAccordion>
+      {stackframes.map((stackframe, i) => (
+        <StackframeComponent
+          key={i}
+          id={i.toString(10)}
+          isLibraryFrame
+          codeLanguage={codeLanguage}
+          stackframe={stackframe}
+        />
+      ))}
+    </LibraryStacktraceAccordion>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx
index 0c60a9aaace07..a552491297d55 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx
@@ -4,21 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiAccordion } from '@elastic/eui';
 import React from 'react';
 import styled from 'styled-components';
-import { EuiAccordion } from '@elastic/eui';
 import {
-  IStackframe,
-  IStackframeWithLineContext,
+  Stackframe as StackframeType,
+  StackframeWithLineContext,
 } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import {
   borderRadius,
   fontFamilyCode,
   fontSize,
 } from '../../../style/variables';
-import { FrameHeading } from './FrameHeading';
 import { Context } from './Context';
+import { FrameHeading } from './FrameHeading';
 import { Variables } from './Variables';
+import { px, units } from '../../../style/variables';
 
 const ContextContainer = styled.div<{ isLibraryFrame: boolean }>`
   position: relative;
@@ -32,8 +33,13 @@ const ContextContainer = styled.div<{ isLibraryFrame: boolean }>`
       : theme.eui.euiColorLightestShade};
 `;
 
+// Indent the non-context frames the same amount as the accordion control
+const NoContextFrameHeadingWrapper = styled.div`
+  margin-left: ${px(units.unit + units.half + units.eighth)};
+`;
+
 interface Props {
-  stackframe: IStackframe;
+  stackframe: StackframeType;
   codeLanguage?: string;
   id: string;
   initialIsOpen?: boolean;
@@ -49,14 +55,24 @@ export function Stackframe({
 }: Props) {
   if (!hasLineContext(stackframe)) {
     return (
-      <FrameHeading stackframe={stackframe} isLibraryFrame={isLibraryFrame} />
+      <NoContextFrameHeadingWrapper>
+        <FrameHeading
+          codeLanguage={codeLanguage}
+          stackframe={stackframe}
+          isLibraryFrame={isLibraryFrame}
+        />
+      </NoContextFrameHeadingWrapper>
     );
   }
 
   return (
     <EuiAccordion
       buttonContent={
-        <FrameHeading stackframe={stackframe} isLibraryFrame={isLibraryFrame} />
+        <FrameHeading
+          codeLanguage={codeLanguage}
+          stackframe={stackframe}
+          isLibraryFrame={isLibraryFrame}
+        />
       }
       id={id}
       initialIsOpen={initialIsOpen}
@@ -74,7 +90,7 @@ export function Stackframe({
 }
 
 function hasLineContext(
-  stackframe: IStackframe
-): stackframe is IStackframeWithLineContext {
+  stackframe: StackframeType
+): stackframe is StackframeWithLineContext {
   return stackframe.line?.hasOwnProperty('context') || false;
 }
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/Variables.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/Variables.tsx
index 07b5ed6868df5..04c49a60a0436 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/Variables.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/Variables.tsx
@@ -9,7 +9,7 @@ import { EuiAccordion } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { borderRadius, px, unit, units } from '../../../style/variables';
-import { IStackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
+import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import { KeyValueTable } from '../KeyValueTable';
 import { flattenObject } from '../../../utils/flattenObject';
 
@@ -20,7 +20,7 @@ const VariablesContainer = styled.div`
 `;
 
 interface Props {
-  vars: IStackframe['vars'];
+  vars: Stackframe['vars'];
 }
 
 export function Variables({ vars }: Props) {
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx
index 1c5db4e82f069..c502237235578 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/Stackframe.test.tsx
@@ -6,9 +6,9 @@
 
 import React from 'react';
 import { ReactWrapper, shallow } from 'enzyme';
-import { IStackframe } from '../../../../../typings/es_schemas/raw/fields/stackframe';
+import { Stackframe } from '../../../../../typings/es_schemas/raw/fields/stackframe';
 import { mountWithTheme } from '../../../../utils/testHelpers';
-import { Stackframe } from '../Stackframe';
+import { Stackframe as StackframeComponent } from '../Stackframe';
 import stacktracesMock from './stacktraces.json';
 
 describe('Stackframe', () => {
@@ -17,7 +17,7 @@ describe('Stackframe', () => {
     beforeEach(() => {
       const stackframe = stacktracesMock[0];
       wrapper = mountWithTheme(
-        <Stackframe id="test" stackframe={stackframe} />
+        <StackframeComponent id="test" stackframe={stackframe} />
       );
     });
 
@@ -39,9 +39,9 @@ describe('Stackframe', () => {
   describe('when stackframe does not have source lines', () => {
     let wrapper: ReactWrapper;
     beforeEach(() => {
-      const stackframe = { line: {} } as IStackframe;
+      const stackframe = { line: {} } as Stackframe;
       wrapper = mountWithTheme(
-        <Stackframe id="test" stackframe={stackframe} />
+        <StackframeComponent id="test" stackframe={stackframe} />
       );
     });
 
@@ -57,9 +57,9 @@ describe('Stackframe', () => {
   });
 
   it('should respect isLibraryFrame', () => {
-    const stackframe = { line: {} } as IStackframe;
+    const stackframe = { line: {} } as Stackframe;
     const wrapper = shallow(
-      <Stackframe id="test" stackframe={stackframe} isLibraryFrame />
+      <StackframeComponent id="test" stackframe={stackframe} isLibraryFrame />
     );
     expect(wrapper.find('FrameHeading').prop('isLibraryFrame')).toBe(true);
   });
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap b/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
index 86e6b188ef2a9..1bfeb020a2ab5 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
@@ -1,17 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Stackframe when stackframe has source lines should render correctly 1`] = `
-.c0 {
-  color: #69707d;
-  padding: 8px 0;
-  font-family: "Roboto Mono",Consolas,Menlo,Courier,monospace;
-  font-size: 14px;
-}
-
-.c1 {
-  color: #000000;
-}
-
 .c3 {
   position: relative;
   border-radius: 4px;
@@ -95,6 +84,18 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
   z-index: 2;
 }
 
+.c0 {
+  color: #69707d;
+  line-height: 1.5;
+  padding: 2px 0;
+  font-family: "Roboto Mono",Consolas,Menlo,Courier,monospace;
+  font-size: 14px;
+}
+
+.c1 {
+  color: #000000;
+}
+
 .c2 {
   position: relative;
   font-family: "Roboto Mono",Consolas,Menlo,Courier,monospace;
@@ -221,35 +222,92 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                 }
               }
             >
-              <styled.div>
+              <styled.div
+                data-test-subj="FrameHeading"
+              >
                 <div
                   className="c0"
+                  data-test-subj="FrameHeading"
                 >
-                  <styled.span>
-                    <span
-                      className="c1"
-                    >
-                      server/routes.js
-                    </span>
-                  </styled.span>
-                   in
-                   
-                  <styled.span>
-                    <span
-                      className="c1"
-                    >
-                      &lt;anonymous&gt;
-                    </span>
-                  </styled.span>
-                   at 
-                  <styled.span>
-                    <span
-                      className="c1"
-                    >
-                      line 
-                      307
-                    </span>
-                  </styled.span>
+                  <DefaultFrameHeadingRenderer
+                    fileDetailComponent={
+                      Object {
+                        "$$typeof": Symbol(react.forward_ref),
+                        "attrs": Array [],
+                        "componentStyle": ComponentStyle {
+                          "baseHash": -2021127760,
+                          "componentId": "sc-fzoLsD",
+                          "isStatic": false,
+                          "rules": Array [
+                            "
+  color: ",
+                            [Function],
+                            ";
+",
+                          ],
+                          "staticRulesId": "",
+                        },
+                        "displayName": "styled.span",
+                        "foldedComponentIds": Array [],
+                        "render": [Function],
+                        "shouldForwardProp": undefined,
+                        "styledComponentId": "sc-fzoLsD",
+                        "target": "span",
+                        "toString": [Function],
+                        "warnTooManyClasses": [Function],
+                        "withComponent": [Function],
+                      }
+                    }
+                    stackframe={
+                      Object {
+                        "abs_path": "/app/server/routes.js",
+                        "context": Object {
+                          "post": Array [
+                            "    req.body.lines.forEach(function (line) {",
+                            "      client.query('SELECT id FROM products WHERE id=$1', [line.id], next())",
+                          ],
+                          "pre": Array [
+                            "    })",
+                            "",
+                          ],
+                        },
+                        "exclude_from_grouping": false,
+                        "filename": "server/routes.js",
+                        "function": "<anonymous>",
+                        "library_frame": false,
+                        "line": Object {
+                          "context": "    client.query('SELECT id FROM customers WHERE id=$1', [req.body.customer_id], next())",
+                          "number": 307,
+                        },
+                      }
+                    }
+                  >
+                    <styled.span>
+                      <span
+                        className="c1"
+                      >
+                        server/routes.js
+                      </span>
+                    </styled.span>
+                     in
+                     
+                    <styled.span>
+                      <span
+                        className="c1"
+                      >
+                        &lt;anonymous&gt;
+                      </span>
+                    </styled.span>
+                     at 
+                    <styled.span>
+                      <span
+                        className="c1"
+                      >
+                        line 
+                        307
+                      </span>
+                    </styled.span>
+                  </DefaultFrameHeadingRenderer>
                 </div>
               </styled.div>
             </FrameHeading>
@@ -383,8 +441,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "$$typeof": Symbol(react.forward_ref),
                                   "attrs": Array [],
                                   "componentStyle": ComponentStyle {
-                                    "baseHash": -2021127760,
-                                    "componentId": "sc-fzoLsD",
+                                    "baseHash": -1474970742,
+                                    "componentId": "sc-Axmtr",
                                     "isStatic": false,
                                     "rules": Array [
                                       "
@@ -401,7 +459,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "foldedComponentIds": Array [],
                                   "render": [Function],
                                   "shouldForwardProp": undefined,
-                                  "styledComponentId": "sc-fzoLsD",
+                                  "styledComponentId": "sc-Axmtr",
                                   "target": "code",
                                   "toString": [Function],
                                   "warnTooManyClasses": [Function],
@@ -413,8 +471,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "$$typeof": Symbol(react.forward_ref),
                                   "attrs": Array [],
                                   "componentStyle": ComponentStyle {
-                                    "baseHash": 1280172402,
-                                    "componentId": "sc-fzozJi",
+                                    "baseHash": 1882630949,
+                                    "componentId": "sc-AxheI",
                                     "isStatic": false,
                                     "rules": Array [
                                       "
@@ -439,7 +497,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "foldedComponentIds": Array [],
                                   "render": [Function],
                                   "shouldForwardProp": undefined,
-                                  "styledComponentId": "sc-fzozJi",
+                                  "styledComponentId": "sc-AxheI",
                                   "target": "pre",
                                   "toString": [Function],
                                   "warnTooManyClasses": [Function],
@@ -608,8 +666,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "$$typeof": Symbol(react.forward_ref),
                                   "attrs": Array [],
                                   "componentStyle": ComponentStyle {
-                                    "baseHash": -2021127760,
-                                    "componentId": "sc-fzoLsD",
+                                    "baseHash": -1474970742,
+                                    "componentId": "sc-Axmtr",
                                     "isStatic": false,
                                     "rules": Array [
                                       "
@@ -626,7 +684,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "foldedComponentIds": Array [],
                                   "render": [Function],
                                   "shouldForwardProp": undefined,
-                                  "styledComponentId": "sc-fzoLsD",
+                                  "styledComponentId": "sc-Axmtr",
                                   "target": "code",
                                   "toString": [Function],
                                   "warnTooManyClasses": [Function],
@@ -638,8 +696,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "$$typeof": Symbol(react.forward_ref),
                                   "attrs": Array [],
                                   "componentStyle": ComponentStyle {
-                                    "baseHash": 1280172402,
-                                    "componentId": "sc-fzozJi",
+                                    "baseHash": 1882630949,
+                                    "componentId": "sc-AxheI",
                                     "isStatic": false,
                                     "rules": Array [
                                       "
@@ -664,7 +722,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "foldedComponentIds": Array [],
                                   "render": [Function],
                                   "shouldForwardProp": undefined,
-                                  "styledComponentId": "sc-fzozJi",
+                                  "styledComponentId": "sc-AxheI",
                                   "target": "pre",
                                   "toString": [Function],
                                   "warnTooManyClasses": [Function],
@@ -834,8 +892,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "$$typeof": Symbol(react.forward_ref),
                                   "attrs": Array [],
                                   "componentStyle": ComponentStyle {
-                                    "baseHash": -2021127760,
-                                    "componentId": "sc-fzoLsD",
+                                    "baseHash": -1474970742,
+                                    "componentId": "sc-Axmtr",
                                     "isStatic": false,
                                     "rules": Array [
                                       "
@@ -852,7 +910,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "foldedComponentIds": Array [],
                                   "render": [Function],
                                   "shouldForwardProp": undefined,
-                                  "styledComponentId": "sc-fzoLsD",
+                                  "styledComponentId": "sc-Axmtr",
                                   "target": "code",
                                   "toString": [Function],
                                   "warnTooManyClasses": [Function],
@@ -864,8 +922,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "$$typeof": Symbol(react.forward_ref),
                                   "attrs": Array [],
                                   "componentStyle": ComponentStyle {
-                                    "baseHash": 1280172402,
-                                    "componentId": "sc-fzozJi",
+                                    "baseHash": 1882630949,
+                                    "componentId": "sc-AxheI",
                                     "isStatic": false,
                                     "rules": Array [
                                       "
@@ -890,7 +948,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "foldedComponentIds": Array [],
                                   "render": [Function],
                                   "shouldForwardProp": undefined,
-                                  "styledComponentId": "sc-fzozJi",
+                                  "styledComponentId": "sc-AxheI",
                                   "target": "pre",
                                   "toString": [Function],
                                   "warnTooManyClasses": [Function],
@@ -1070,8 +1128,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "$$typeof": Symbol(react.forward_ref),
                                   "attrs": Array [],
                                   "componentStyle": ComponentStyle {
-                                    "baseHash": -2021127760,
-                                    "componentId": "sc-fzoLsD",
+                                    "baseHash": -1474970742,
+                                    "componentId": "sc-Axmtr",
                                     "isStatic": false,
                                     "rules": Array [
                                       "
@@ -1088,7 +1146,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "foldedComponentIds": Array [],
                                   "render": [Function],
                                   "shouldForwardProp": undefined,
-                                  "styledComponentId": "sc-fzoLsD",
+                                  "styledComponentId": "sc-Axmtr",
                                   "target": "code",
                                   "toString": [Function],
                                   "warnTooManyClasses": [Function],
@@ -1100,8 +1158,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "$$typeof": Symbol(react.forward_ref),
                                   "attrs": Array [],
                                   "componentStyle": ComponentStyle {
-                                    "baseHash": 1280172402,
-                                    "componentId": "sc-fzozJi",
+                                    "baseHash": 1882630949,
+                                    "componentId": "sc-AxheI",
                                     "isStatic": false,
                                     "rules": Array [
                                       "
@@ -1126,7 +1184,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "foldedComponentIds": Array [],
                                   "render": [Function],
                                   "shouldForwardProp": undefined,
-                                  "styledComponentId": "sc-fzozJi",
+                                  "styledComponentId": "sc-AxheI",
                                   "target": "pre",
                                   "toString": [Function],
                                   "warnTooManyClasses": [Function],
@@ -1323,8 +1381,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "$$typeof": Symbol(react.forward_ref),
                                   "attrs": Array [],
                                   "componentStyle": ComponentStyle {
-                                    "baseHash": -2021127760,
-                                    "componentId": "sc-fzoLsD",
+                                    "baseHash": -1474970742,
+                                    "componentId": "sc-Axmtr",
                                     "isStatic": false,
                                     "rules": Array [
                                       "
@@ -1341,7 +1399,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "foldedComponentIds": Array [],
                                   "render": [Function],
                                   "shouldForwardProp": undefined,
-                                  "styledComponentId": "sc-fzoLsD",
+                                  "styledComponentId": "sc-Axmtr",
                                   "target": "code",
                                   "toString": [Function],
                                   "warnTooManyClasses": [Function],
@@ -1353,8 +1411,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "$$typeof": Symbol(react.forward_ref),
                                   "attrs": Array [],
                                   "componentStyle": ComponentStyle {
-                                    "baseHash": 1280172402,
-                                    "componentId": "sc-fzozJi",
+                                    "baseHash": 1882630949,
+                                    "componentId": "sc-AxheI",
                                     "isStatic": false,
                                     "rules": Array [
                                       "
@@ -1379,7 +1437,7 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
                                   "foldedComponentIds": Array [],
                                   "render": [Function],
                                   "shouldForwardProp": undefined,
-                                  "styledComponentId": "sc-fzozJi",
+                                  "styledComponentId": "sc-AxheI",
                                   "target": "pre",
                                   "toString": [Function],
                                   "warnTooManyClasses": [Function],
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/index.test.ts b/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/index.test.ts
index d268e0e6cee9e..cd8bf90301836 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/index.test.ts
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/index.test.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IStackframe } from '../../../../../typings/es_schemas/raw/fields/stackframe';
+import { Stackframe } from '../../../../../typings/es_schemas/raw/fields/stackframe';
 import { getGroupedStackframes } from '../index';
 import stacktracesMock from './stacktraces.json';
 
 describe('Stacktrace/index', () => {
   describe('getGroupedStackframes', () => {
     it('should collapse the library frames into a set of grouped stackframes', () => {
-      const result = getGroupedStackframes(stacktracesMock as IStackframe[]);
+      const result = getGroupedStackframes(stacktracesMock as Stackframe[]);
       expect(result).toMatchSnapshot();
     });
 
@@ -37,7 +37,7 @@ describe('Stacktrace/index', () => {
           exclude_from_grouping: false,
           filename: 'file-d.txt',
         },
-      ] as IStackframe[];
+      ] as Stackframe[];
 
       const result = getGroupedStackframes(stackframes);
 
@@ -89,7 +89,7 @@ describe('Stacktrace/index', () => {
           exclude_from_grouping: false,
           filename: 'file-b.txt',
         },
-      ] as IStackframe[];
+      ] as Stackframe[];
       const result = getGroupedStackframes(stackframes);
       expect(result).toEqual([
         {
@@ -129,7 +129,7 @@ describe('Stacktrace/index', () => {
           exclude_from_grouping: true,
           filename: 'file-b.txt',
         },
-      ] as IStackframe[];
+      ] as Stackframe[];
       const result = getGroupedStackframes(stackframes);
       expect(result).toEqual([
         {
@@ -158,14 +158,14 @@ describe('Stacktrace/index', () => {
     });
 
     it('should handle empty stackframes', () => {
-      const result = getGroupedStackframes([] as IStackframe[]);
+      const result = getGroupedStackframes([] as Stackframe[]);
       expect(result).toHaveLength(0);
     });
 
     it('should handle one stackframe', () => {
       const result = getGroupedStackframes([
         stacktracesMock[0],
-      ] as IStackframe[]);
+      ] as Stackframe[]);
       expect(result).toHaveLength(1);
       expect(result[0].stackframes).toHaveLength(1);
     });
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx
new file mode 100644
index 0000000000000..ed0dd6b42afe1
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { FrameHeadingRendererProps } from './';
+import { DefaultFrameHeadingRenderer } from './default_frame_heading_renderer';
+
+export function CSharpFrameHeadingRenderer({
+  stackframe,
+  fileDetailComponent: FileDetail,
+}: FrameHeadingRendererProps) {
+  const { classname, filename, function: fn } = stackframe;
+  const lineNumber = stackframe.line?.number ?? 0;
+
+  if (classname) {
+    return (
+      <>
+        <FileDetail>{classname}</FileDetail>
+        {' in '}
+        <FileDetail>{fn}</FileDetail>
+        {' in '}
+        <FileDetail>{filename}</FileDetail>
+        {lineNumber > 0 && (
+          <>
+            {' at '}
+            <FileDetail>line {lineNumber}</FileDetail>
+          </>
+        )}
+      </>
+    );
+  } else {
+    return (
+      <DefaultFrameHeadingRenderer
+        fileDetailComponent={FileDetail}
+        stackframe={stackframe}
+      />
+    );
+  }
+}
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx
new file mode 100644
index 0000000000000..7e70a5e849525
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { FrameHeadingRendererProps } from './';
+
+export function DefaultFrameHeadingRenderer({
+  stackframe,
+  fileDetailComponent: FileDetail,
+}: FrameHeadingRendererProps) {
+  const lineNumber = stackframe.line?.number ?? 0;
+
+  const name =
+    'filename' in stackframe ? stackframe.filename : stackframe.classname;
+
+  return (
+    <>
+      <FileDetail>{name}</FileDetail> in{' '}
+      <FileDetail>{stackframe.function}</FileDetail>
+      {lineNumber > 0 && (
+        <>
+          {' at '}
+          <FileDetail>line {lineNumber}</FileDetail>
+        </>
+      )}
+    </>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/index.ts b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/index.ts
new file mode 100644
index 0000000000000..d81d178abfcb9
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ComponentType } from 'react';
+import { Stackframe } from '../../../../../typings/es_schemas/raw/fields/stackframe';
+
+export interface FrameHeadingRendererProps {
+  fileDetailComponent: ComponentType;
+  stackframe: Stackframe;
+}
+
+export { CSharpFrameHeadingRenderer } from './c_sharp_frame_heading_renderer';
+export { DefaultFrameHeadingRenderer } from './default_frame_heading_renderer';
+export { JavaFrameHeadingRenderer } from './java_frame_heading_renderer';
+export { JavaScriptFrameHeadingRenderer } from './java_script_frame_heading_renderer';
+export { RubyFrameHeadingRenderer } from './ruby_frame_heading_renderer';
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx
new file mode 100644
index 0000000000000..7ded2e5263fda
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { FrameHeadingRendererProps } from './';
+
+export function JavaFrameHeadingRenderer({
+  stackframe,
+  fileDetailComponent: FileDetail,
+}: FrameHeadingRendererProps) {
+  const { classname, filename, function: fn } = stackframe;
+  const lineNumber = stackframe.line?.number ?? 0;
+
+  return (
+    <>
+      at <FileDetail>{[classname, fn].join('.')}</FileDetail>(
+      <FileDetail>
+        {filename}
+        {lineNumber > 0 && `:${lineNumber}`}
+      </FileDetail>
+      )
+    </>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx
new file mode 100644
index 0000000000000..b0ee158be75a2
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { FrameHeadingRendererProps } from './';
+
+export function JavaScriptFrameHeadingRenderer({
+  stackframe,
+  fileDetailComponent: FileDetail,
+}: FrameHeadingRendererProps) {
+  const { classname, filename, function: fn } = stackframe;
+  const lineNumber = stackframe.line?.number ?? 0;
+  const columnNumber = stackframe.line?.column ?? 0;
+
+  return (
+    <>
+      at{' '}
+      <FileDetail>
+        {classname && `${classname}.`}
+        {fn}
+      </FileDetail>{' '}
+      (
+      <FileDetail>
+        {filename}
+        {lineNumber > 0 && `:${lineNumber}`}
+        {lineNumber > 0 && columnNumber > 0 && `:${columnNumber}`}
+      </FileDetail>
+      )
+    </>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx
new file mode 100644
index 0000000000000..2220a91f25c04
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import { FrameHeadingRendererProps } from './';
+
+export function RubyFrameHeadingRenderer({
+  stackframe,
+  fileDetailComponent: FileDetail,
+}: FrameHeadingRendererProps) {
+  const { filename, function: fn } = stackframe;
+  const lineNumber = stackframe.line?.number ?? 0;
+
+  return (
+    <>
+      <FileDetail>
+        {filename}
+        {lineNumber > 0 && `:${lineNumber}`}
+      </FileDetail>
+      {' in '}
+      <FileDetail>`{fn}&#39;</FileDetail>
+    </>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/index.tsx b/x-pack/plugins/apm/public/components/shared/Stacktrace/index.tsx
index b37146f3b3be5..b9c4986220fad 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/index.tsx
@@ -4,17 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { isEmpty, last } from 'lodash';
 import React, { Fragment } from 'react';
-import { IStackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
+import { Stackframe } from '../../../../typings/es_schemas/raw/fields/stackframe';
 import { EmptyMessage } from '../../shared/EmptyMessage';
 import { LibraryStacktrace } from './LibraryStacktrace';
-import { Stackframe } from './Stackframe';
+import { Stackframe as StackframeComponent } from './Stackframe';
 
 interface Props {
-  stackframes?: IStackframe[];
+  stackframes?: Stackframe[];
   codeLanguage?: string;
 }
 
@@ -42,13 +41,11 @@ export function Stacktrace({ stackframes = [], codeLanguage }: Props) {
         if (group.isLibraryFrame && groups.length > 1) {
           return (
             <Fragment key={i}>
-              <EuiSpacer size="m" />
               <LibraryStacktrace
                 id={i.toString()}
                 stackframes={group.stackframes}
                 codeLanguage={codeLanguage}
               />
-              <EuiSpacer size="m" />
             </Fragment>
           );
         }
@@ -56,8 +53,7 @@ export function Stacktrace({ stackframes = [], codeLanguage }: Props) {
         // non-library frame
         return group.stackframes.map((stackframe, idx) => (
           <Fragment key={`${i}-${idx}`}>
-            {idx > 0 && <EuiSpacer size="m" />}
-            <Stackframe
+            <StackframeComponent
               codeLanguage={codeLanguage}
               id={`${i}-${idx}`}
               initialIsOpen={i === 0 && groups.length > 1}
@@ -66,7 +62,6 @@ export function Stacktrace({ stackframes = [], codeLanguage }: Props) {
           </Fragment>
         ));
       })}
-      <EuiSpacer size="m" />
     </Fragment>
   );
 }
@@ -74,10 +69,10 @@ export function Stacktrace({ stackframes = [], codeLanguage }: Props) {
 interface StackframesGroup {
   isLibraryFrame: boolean;
   excludeFromGrouping: boolean;
-  stackframes: IStackframe[];
+  stackframes: Stackframe[];
 }
 
-export function getGroupedStackframes(stackframes: IStackframe[]) {
+export function getGroupedStackframes(stackframes: Stackframe[]) {
   return stackframes.reduce((acc, stackframe) => {
     const prevGroup = last(acc);
     const shouldAppend =
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
index 8e49d02beb908..b8eb79aabdcc5 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts
@@ -12,7 +12,7 @@ import { Kubernetes } from './fields/kubernetes';
 import { Page } from './fields/page';
 import { Process } from './fields/process';
 import { Service } from './fields/service';
-import { IStackframe } from './fields/stackframe';
+import { Stackframe } from './fields/stackframe';
 import { Url } from './fields/url';
 import { User } from './fields/user';
 import { Observer } from './fields/observer';
@@ -23,16 +23,20 @@ interface Processor {
 }
 
 export interface Exception {
+  attributes?: {
+    response?: string;
+  };
+  code?: string;
   message?: string; // either message or type are given
   type?: string;
   module?: string;
   handled?: boolean;
-  stacktrace?: IStackframe[];
+  stacktrace?: Stackframe[];
 }
 
 interface Log {
   message: string;
-  stacktrace?: IStackframe[];
+  stacktrace?: Stackframe[];
 }
 
 export interface ErrorRaw extends APMBaseDoc {
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/stackframe.ts b/x-pack/plugins/apm/typings/es_schemas/raw/fields/stackframe.ts
index 05b0eb88da40b..901b02814371a 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/fields/stackframe.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/fields/stackframe.ts
@@ -4,27 +4,39 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-type IStackframeBase = {
-  function?: string;
-  library_frame?: boolean;
-  exclude_from_grouping?: boolean;
+interface Line {
+  column?: number;
+  number: number;
+}
+
+interface Sourcemap {
+  error?: string;
+  updated?: boolean;
+}
+
+interface StackframeBase {
+  abs_path?: string;
+  classname?: string;
   context?: {
     post?: string[];
     pre?: string[];
   };
+  exclude_from_grouping?: boolean;
+  filename?: string;
+  function?: string;
+  module?: string;
+  library_frame?: boolean;
+  line?: Line;
+  sourcemap?: Sourcemap;
   vars?: {
     [key: string]: unknown;
   };
-  line?: {
-    number: number;
-  };
-} & ({ classname: string } | { filename: string });
+}
 
-export type IStackframeWithLineContext = IStackframeBase & {
-  line: {
-    number: number;
+export type StackframeWithLineContext = StackframeBase & {
+  line: Line & {
     context: string;
   };
 };
 
-export type IStackframe = IStackframeBase | IStackframeWithLineContext;
+export type Stackframe = StackframeBase | StackframeWithLineContext;
diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts b/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
index f6c4fce76f134..5c2e391059783 100644
--- a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
+++ b/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts
@@ -5,7 +5,7 @@
  */
 
 import { APMBaseDoc } from './apm_base_doc';
-import { IStackframe } from './fields/stackframe';
+import { Stackframe } from './fields/stackframe';
 import { Observer } from './fields/observer';
 
 interface Processor {
@@ -24,7 +24,7 @@ export interface SpanRaw extends APMBaseDoc {
     duration: { us: number };
     id: string;
     name: string;
-    stacktrace?: IStackframe[];
+    stacktrace?: Stackframe[];
     subtype?: string;
     sync?: boolean;
     type: string;

From 85429442d99b1acabc6574a7678386cd3f3ba615 Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Mon, 31 Aug 2020 10:30:13 -0600
Subject: [PATCH 140/148] [Maps] fix Hotlink for EMS-add-data card do not
 working (#76110)

* [Maps] fix Hotlink for EMS-add-data card do not working

* remove duplicate typing

* update ConfigSchema usage in region_map plugin

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/plugins/maps_legacy/config.ts                 |  2 +-
 src/plugins/maps_legacy/public/index.ts           | 12 ------------
 src/plugins/maps_legacy/public/plugin.ts          | 12 ++++++------
 src/plugins/maps_legacy/server/index.ts           | 10 +++++-----
 src/plugins/region_map/public/plugin.ts           |  4 ++--
 src/plugins/vis_type_vega/public/services.ts      |  4 ++--
 x-pack/plugins/maps/public/kibana_services.ts     |  7 +++----
 x-pack/plugins/maps/public/plugin.ts              |  4 ++--
 x-pack/plugins/maps/server/plugin.ts              |  7 ++++---
 x-pack/plugins/maps/server/tutorials/ems/index.ts |  2 +-
 10 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/plugins/maps_legacy/config.ts b/src/plugins/maps_legacy/config.ts
index 67e46d2270583..46d4a8fb6cb90 100644
--- a/src/plugins/maps_legacy/config.ts
+++ b/src/plugins/maps_legacy/config.ts
@@ -40,4 +40,4 @@ export const configSchema = schema.object({
   }),
 });
 
-export type ConfigSchema = TypeOf<typeof configSchema>;
+export type MapsLegacyConfig = TypeOf<typeof configSchema>;
diff --git a/src/plugins/maps_legacy/public/index.ts b/src/plugins/maps_legacy/public/index.ts
index 14612ab1b2a57..8f14cd1b15e2c 100644
--- a/src/plugins/maps_legacy/public/index.ts
+++ b/src/plugins/maps_legacy/public/index.ts
@@ -42,18 +42,6 @@ import { mapTooltipProvider } from './tooltip_provider';
 
 import './map/index.scss';
 
-export interface MapsLegacyConfigType {
-  regionmap: any;
-  emsTileLayerId: string;
-  includeElasticMapsService: boolean;
-  proxyElasticMapsServiceInMaps: boolean;
-  tilemap: any;
-  emsFontLibraryUrl: string;
-  emsFileApiUrl: string;
-  emsTileApiUrl: string;
-  emsLandingPageUrl: string;
-}
-
 export function plugin(initializerContext: PluginInitializerContext) {
   return new MapsLegacyPlugin(initializerContext);
 }
diff --git a/src/plugins/maps_legacy/public/plugin.ts b/src/plugins/maps_legacy/public/plugin.ts
index 6b4e06fec9ccc..8c9f1e9cef194 100644
--- a/src/plugins/maps_legacy/public/plugin.ts
+++ b/src/plugins/maps_legacy/public/plugin.ts
@@ -27,8 +27,8 @@ import { ServiceSettings } from './map/service_settings';
 import { getPrecision, getZoomPrecision } from './map/precision';
 // @ts-ignore
 import { KibanaMap } from './map/kibana_map';
-import { MapsLegacyConfigType, MapsLegacyPluginSetup, MapsLegacyPluginStart } from './index';
-import { ConfigSchema } from '../config';
+import { MapsLegacyPluginSetup, MapsLegacyPluginStart } from './index';
+import { MapsLegacyConfig } from '../config';
 // @ts-ignore
 import { BaseMapsVisualizationProvider } from './map/base_maps_visualization';
 
@@ -40,7 +40,7 @@ import { BaseMapsVisualizationProvider } from './map/base_maps_visualization';
 
 export const bindSetupCoreAndPlugins = (
   core: CoreSetup,
-  config: MapsLegacyConfigType,
+  config: MapsLegacyConfig,
   kibanaVersion: string
 ) => {
   setToasts(core.notifications.toasts);
@@ -55,14 +55,14 @@ export interface MapsLegacySetupDependencies {}
 export interface MapsLegacyStartDependencies {}
 
 export class MapsLegacyPlugin implements Plugin<MapsLegacyPluginSetup, MapsLegacyPluginStart> {
-  readonly _initializerContext: PluginInitializerContext<ConfigSchema>;
+  readonly _initializerContext: PluginInitializerContext<MapsLegacyConfig>;
 
-  constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
+  constructor(initializerContext: PluginInitializerContext<MapsLegacyConfig>) {
     this._initializerContext = initializerContext;
   }
 
   public setup(core: CoreSetup, plugins: MapsLegacySetupDependencies) {
-    const config = this._initializerContext.config.get<MapsLegacyConfigType>();
+    const config = this._initializerContext.config.get<MapsLegacyConfig>();
     const kibanaVersion = this._initializerContext.env.packageInfo.version;
 
     bindSetupCoreAndPlugins(core, config, kibanaVersion);
diff --git a/src/plugins/maps_legacy/server/index.ts b/src/plugins/maps_legacy/server/index.ts
index 79ecbb238314a..665b3b8986ef0 100644
--- a/src/plugins/maps_legacy/server/index.ts
+++ b/src/plugins/maps_legacy/server/index.ts
@@ -20,10 +20,10 @@
 import { Plugin, PluginConfigDescriptor } from 'kibana/server';
 import { CoreSetup, PluginInitializerContext } from 'src/core/server';
 import { Observable } from 'rxjs';
-import { configSchema, ConfigSchema } from '../config';
+import { configSchema, MapsLegacyConfig } from '../config';
 import { getUiSettings } from './ui_settings';
 
-export const config: PluginConfigDescriptor<ConfigSchema> = {
+export const config: PluginConfigDescriptor<MapsLegacyConfig> = {
   exposeToBrowser: {
     includeElasticMapsService: true,
     proxyElasticMapsServiceInMaps: true,
@@ -40,13 +40,13 @@ export const config: PluginConfigDescriptor<ConfigSchema> = {
 };
 
 export interface MapsLegacyPluginSetup {
-  config$: Observable<ConfigSchema>;
+  config$: Observable<MapsLegacyConfig>;
 }
 
 export class MapsLegacyPlugin implements Plugin<MapsLegacyPluginSetup> {
-  readonly _initializerContext: PluginInitializerContext<ConfigSchema>;
+  readonly _initializerContext: PluginInitializerContext<MapsLegacyConfig>;
 
-  constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
+  constructor(initializerContext: PluginInitializerContext<MapsLegacyConfig>) {
     this._initializerContext = initializerContext;
   }
 
diff --git a/src/plugins/region_map/public/plugin.ts b/src/plugins/region_map/public/plugin.ts
index 04a2ba2f23f4e..ec9ee94310578 100644
--- a/src/plugins/region_map/public/plugin.ts
+++ b/src/plugins/region_map/public/plugin.ts
@@ -34,7 +34,7 @@ import { IServiceSettings, MapsLegacyPluginSetup } from '../../maps_legacy/publi
 import { setFormatService, setNotifications, setKibanaLegacy } from './kibana_services';
 import { DataPublicPluginStart } from '../../data/public';
 import { RegionMapsConfigType } from './index';
-import { ConfigSchema } from '../../maps_legacy/config';
+import { MapsLegacyConfig } from '../../maps_legacy/config';
 import { KibanaLegacyStart } from '../../kibana_legacy/public';
 
 /** @private */
@@ -73,7 +73,7 @@ export interface RegionMapPluginStart {}
 
 /** @internal */
 export class RegionMapPlugin implements Plugin<RegionMapPluginSetup, RegionMapPluginStart> {
-  readonly _initializerContext: PluginInitializerContext<ConfigSchema>;
+  readonly _initializerContext: PluginInitializerContext<MapsLegacyConfig>;
 
   constructor(initializerContext: PluginInitializerContext) {
     this._initializerContext = initializerContext;
diff --git a/src/plugins/vis_type_vega/public/services.ts b/src/plugins/vis_type_vega/public/services.ts
index 7d988d464b52b..acd02a6dd42f8 100644
--- a/src/plugins/vis_type_vega/public/services.ts
+++ b/src/plugins/vis_type_vega/public/services.ts
@@ -26,7 +26,7 @@ import {
 
 import { DataPublicPluginStart } from '../../data/public';
 import { createGetterSetter } from '../../kibana_utils/public';
-import { MapsLegacyConfigType } from '../../maps_legacy/public';
+import { MapsLegacyConfig } from '../../maps_legacy/config';
 
 export const [getData, setData] = createGetterSetter<DataPublicPluginStart>('Data');
 
@@ -53,7 +53,7 @@ export const [getInjectedVars, setInjectedVars] = createGetterSetter<{
   emsTileLayerId: unknown;
 }>('InjectedVars');
 
-export const [getMapsLegacyConfig, setMapsLegacyConfig] = createGetterSetter<MapsLegacyConfigType>(
+export const [getMapsLegacyConfig, setMapsLegacyConfig] = createGetterSetter<MapsLegacyConfig>(
   'MapsLegacyConfig'
 );
 
diff --git a/x-pack/plugins/maps/public/kibana_services.ts b/x-pack/plugins/maps/public/kibana_services.ts
index 239a2898a06fc..c1dfb61e9f3b6 100644
--- a/x-pack/plugins/maps/public/kibana_services.ts
+++ b/x-pack/plugins/maps/public/kibana_services.ts
@@ -5,7 +5,7 @@
  */
 
 import _ from 'lodash';
-import { MapsLegacyConfigType } from '../../../../src/plugins/maps_legacy/public';
+import { MapsLegacyConfig } from '../../../../src/plugins/maps_legacy/config';
 import { MapsConfigType } from '../config';
 import { MapsPluginStartDependencies } from './plugin';
 import { CoreStart } from '../../../../src/core/public';
@@ -64,9 +64,8 @@ export const getShowMapsInspectorAdapter = () => getMapAppConfig().showMapsInspe
 export const getPreserveDrawingBuffer = () => getMapAppConfig().preserveDrawingBuffer;
 
 // map.* kibana.yml settings from maps_legacy plugin that are shared between OSS map visualizations and maps app
-let kibanaCommonConfig: MapsLegacyConfigType;
-export const setKibanaCommonConfig = (config: MapsLegacyConfigType) =>
-  (kibanaCommonConfig = config);
+let kibanaCommonConfig: MapsLegacyConfig;
+export const setKibanaCommonConfig = (config: MapsLegacyConfig) => (kibanaCommonConfig = config);
 export const getKibanaCommonConfig = () => kibanaCommonConfig;
 
 export const getIsEmsEnabled = () => getKibanaCommonConfig().includeElasticMapsService;
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index e03a085e9bc88..b08135b4e486c 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -44,7 +44,7 @@ import { MapsStartApi } from './api';
 import { createSecurityLayerDescriptors, registerLayerWizard, registerSource } from './api';
 import { SharePluginSetup, SharePluginStart } from '../../../../src/plugins/share/public';
 import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import { MapsLegacyConfigType } from '../../../../src/plugins/maps_legacy/public';
+import { MapsLegacyConfig } from '../../../../src/plugins/maps_legacy/config';
 import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
 import { LicensingPluginStart } from '../../licensing/public';
 import { StartContract as FileUploadStartContract } from '../../file_upload/public';
@@ -54,7 +54,7 @@ export interface MapsPluginSetupDependencies {
   home?: HomePublicPluginSetup;
   visualizations: VisualizationsSetup;
   embeddable: EmbeddableSetup;
-  mapsLegacy: { config: MapsLegacyConfigType };
+  mapsLegacy: { config: MapsLegacyConfig };
   share: SharePluginSetup;
 }
 
diff --git a/x-pack/plugins/maps/server/plugin.ts b/x-pack/plugins/maps/server/plugin.ts
index 7d091099c1aaa..6862e7536b07f 100644
--- a/x-pack/plugins/maps/server/plugin.ts
+++ b/x-pack/plugins/maps/server/plugin.ts
@@ -27,6 +27,7 @@ import { ILicense } from '../../licensing/common/types';
 import { LicensingPluginSetup } from '../../licensing/server';
 import { HomeServerPluginSetup } from '../../../../src/plugins/home/server';
 import { MapsLegacyPluginSetup } from '../../../../src/plugins/maps_legacy/server';
+import { MapsLegacyConfig } from '../../../../src/plugins/maps_legacy/config';
 
 interface SetupDeps {
   features: FeaturesPluginSetupContract;
@@ -50,7 +51,7 @@ export class MapsPlugin implements Plugin {
   _initHomeData(
     home: HomeServerPluginSetup,
     prependBasePath: (path: string) => string,
-    mapConfig: any
+    mapsLegacyConfig: MapsLegacyConfig
   ) {
     const sampleDataLinkLabel = i18n.translate('xpack.maps.sampleDataLinkLabel', {
       defaultMessage: 'Map',
@@ -123,7 +124,7 @@ export class MapsPlugin implements Plugin {
       home.tutorials.registerTutorial(
         emsBoundariesSpecProvider({
           prependBasePath,
-          emsLandingPageUrl: mapConfig.emsLandingPageUrl,
+          emsLandingPageUrl: mapsLegacyConfig.emsLandingPageUrl,
         })
       );
     }
@@ -160,7 +161,7 @@ export class MapsPlugin implements Plugin {
       }
     });
 
-    this._initHomeData(home, core.http.basePath.prepend, currentConfig);
+    this._initHomeData(home, core.http.basePath.prepend, mapsLegacyConfig);
 
     features.registerFeature({
       id: APP_ID,
diff --git a/x-pack/plugins/maps/server/tutorials/ems/index.ts b/x-pack/plugins/maps/server/tutorials/ems/index.ts
index be15120cb19e1..867daddfd7b03 100644
--- a/x-pack/plugins/maps/server/tutorials/ems/index.ts
+++ b/x-pack/plugins/maps/server/tutorials/ems/index.ts
@@ -60,7 +60,7 @@ Indexing EMS administrative boundaries in Elasticsearch allows for search on bou
                   }),
                   textPre: i18n.translate('xpack.maps.tutorials.ems.uploadStepText', {
                     defaultMessage:
-                      '1. Open [Elastic Maps]({newMapUrl}).\n\
+                      '1. Open [Maps]({newMapUrl}).\n\
 2. Click `Add layer`, then select `Upload GeoJSON`.\n\
 3. Upload the GeoJSON file and click `Import file`.',
                     values: {

From 877600af1f5763dc4dd35f9f66e81e822c5703d0 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Mon, 31 Aug 2020 09:35:29 -0700
Subject: [PATCH 141/148] [ML] Remove "Are you sure" from data frame analytics
 models (#76215)

---
 .../components/models_management/delete_models_modal.tsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/delete_models_modal.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/delete_models_modal.tsx
index 83010c684473e..3c2ba13a1db26 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/delete_models_modal.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/models_management/delete_models_modal.tsx
@@ -15,7 +15,6 @@ import {
   EuiModalFooter,
   EuiButtonEmpty,
   EuiButton,
-  EuiSpacer,
   EuiCallOut,
 } from '@elastic/eui';
 import { ModelItemFull } from './models_list';
@@ -37,7 +36,7 @@ export const DeleteModelsModal: FC<DeleteModelsModalProps> = ({ models, onClose
           <EuiModalHeaderTitle>
             <FormattedMessage
               id="xpack.ml.inference.modelsList.deleteModal.header"
-              defaultMessage="Delete {modelsCount, plural, one {{modelId}} other {# models}}"
+              defaultMessage="Delete {modelsCount, plural, one {{modelId}} other {# models}}?"
               values={{
                 modelId: models[0].model_id,
                 modelsCount: models.length,
@@ -47,12 +46,6 @@ export const DeleteModelsModal: FC<DeleteModelsModalProps> = ({ models, onClose
         </EuiModalHeader>
 
         <EuiModalBody>
-          <FormattedMessage
-            id="xpack.ml.inference.modelsList.deleteModal.warningMessage"
-            defaultMessage="Are you sure you want to delete {modelsCount, plural, one{this model} other {these models}}?"
-            values={{ modelsCount: models.length }}
-          />
-          <EuiSpacer size="m" />
           {modelsWithPipelines.length > 0 && (
             <EuiCallOut
               data-test-subj="modelsWithPipelinesWarning"

From 4379ca8cbf79b5d66a5669bdc821dcf814553221 Mon Sep 17 00:00:00 2001
From: Dan Panzarella <pzl@users.noreply.github.com>
Date: Mon, 31 Aug 2020 12:55:56 -0400
Subject: [PATCH 142/148] [Security Solution] Filter Default policy details
 (#76112)

---
 .../server/endpoint/routes/policy/index.ts    |  2 ++
 .../endpoint/routes/policy/service.test.ts    | 19 +++++++++++++++++++
 .../server/endpoint/routes/policy/service.ts  | 14 ++++++++++++--
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts
index b233ff1af30fc..5993b0b0e752e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/index.ts
@@ -11,6 +11,8 @@ import { getHostPolicyResponseHandler } from './handlers';
 
 export const BASE_POLICY_RESPONSE_ROUTE = `/api/endpoint/policy_response`;
 
+export const INITIAL_POLICY_ID = '00000000-0000-0000-0000-000000000000';
+
 export function registerPolicyRoutes(router: IRouter, endpointAppContext: EndpointAppContext) {
   router.get(
     {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.test.ts
index 7c8d006687a6b..f05d9ef5b821a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.test.ts
@@ -5,6 +5,7 @@
  */
 
 import { GetPolicyResponseSchema } from '../../../../common/endpoint/schema/policy';
+import { getESQueryPolicyResponseByHostID } from './service';
 
 describe('test policy handlers schema', () => {
   it('validate that get policy response query schema', async () => {
@@ -17,3 +18,21 @@ describe('test policy handlers schema', () => {
     expect(() => GetPolicyResponseSchema.query.validate({})).toThrowError();
   });
 });
+
+describe('test policy query', () => {
+  it('queries for the correct host', async () => {
+    const hostID = 'f757d3c0-e874-11ea-9ad9-015510b487f4';
+    const query = getESQueryPolicyResponseByHostID(hostID, 'anyindex');
+    expect(query.body.query.bool.filter.term).toEqual({ 'host.id': hostID });
+  });
+
+  it('filters out initial policy by ID', async () => {
+    const query = getESQueryPolicyResponseByHostID(
+      'f757d3c0-e874-11ea-9ad9-015510b487f4',
+      'anyindex'
+    );
+    expect(query.body.query.bool.must_not.term).toEqual({
+      'Endpoint.policy.applied.id': '00000000-0000-0000-0000-000000000000',
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
index 703c46b05f766..1b3d232f9421c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/policy/service.ts
@@ -7,13 +7,23 @@
 import { SearchResponse } from 'elasticsearch';
 import { ILegacyScopedClusterClient } from 'kibana/server';
 import { GetHostPolicyResponse, HostPolicyResponse } from '../../../../common/endpoint/types';
+import { INITIAL_POLICY_ID } from './index';
 
 export function getESQueryPolicyResponseByHostID(hostID: string, index: string) {
   return {
     body: {
       query: {
-        match: {
-          'host.id': hostID,
+        bool: {
+          filter: {
+            term: {
+              'host.id': hostID,
+            },
+          },
+          must_not: {
+            term: {
+              'Endpoint.policy.applied.id': INITIAL_POLICY_ID,
+            },
+          },
         },
       },
       sort: [

From 50ce6349aa01a54b65b795102fb367fda4e0991e Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Mon, 31 Aug 2020 12:58:17 -0400
Subject: [PATCH 143/148] Reduce mappings (#76008)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../es_archives/monitoring/apm/mappings.json  |  960 +++-----
 .../monitoring/basic_6.3.x/mappings.json      | 1065 ++-------
 .../mappings.json                             | 1804 ++++-----------
 .../monitoring/beats/mappings.json            | 1674 +++-----------
 .../es_archives/monitoring/ccr/mappings.json  |  881 ++------
 .../es_archives/monitoring/logs/data.json.gz  |  Bin 33096 -> 30798 bytes
 .../es_archives/monitoring/logs/mappings.json |  507 -----
 .../logs_multiple_clusters/mappings.json      |  510 -----
 .../logstash-pipelines/mappings.json          | 1308 +++--------
 .../logstash/changing_pipelines/mappings.json |  724 +-----
 .../mappings.json                             |  724 +-----
 .../monitoring/multi-basic/mappings.json      | 1585 ++++----------
 .../monitoring/multicluster/mappings.json     | 1516 +++----------
 .../collection/detect_beats/data.json.gz      |  Bin 25512 -> 23820 bytes
 .../collection/detect_beats/mappings.json     | 1159 +---------
 .../es_and_kibana_exclusive_mb/mappings.json  | 1271 +----------
 .../collection/es_and_kibana_mb/mappings.json | 1943 +----------------
 .../kibana_exclusive_mb/mappings.json         | 1846 +---------------
 .../setup/collection/kibana_mb/mappings.json  | 1412 +-----------
 .../singlecluster-basic-beats/mappings.json   | 1658 +++-----------
 .../singlecluster-green-gold/mappings.json    | 1501 +++----------
 .../mappings.json                             | 1702 +++------------
 .../mappings.json                             | 1041 ++-------
 .../singlecluster-red-platinum/mappings.json  | 1189 +++-------
 .../mappings.json                             | 1587 ++++----------
 .../singlecluster-yellow-basic/mappings.json  |  908 ++------
 .../mappings.json                             | 1189 +++-------
 .../mappings.json                             | 1189 +++-------
 .../singlecluster_lots_of_nodes/mappings.json |  510 -----
 .../standalone_cluster/mappings.json          | 1760 ++++-----------
 30 files changed, 5660 insertions(+), 29463 deletions(-)

diff --git a/x-pack/test/functional/es_archives/monitoring/apm/mappings.json b/x-pack/test/functional/es_archives/monitoring/apm/mappings.json
index d5f68e6642a2d..df00072edd669 100644
--- a/x-pack/test/functional/es_archives/monitoring/apm/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/apm/mappings.json
@@ -1,719 +1,311 @@
 {
-    "type": "index",
-    "value": {
-        "aliases": {},
-        "index": ".monitoring-beats-6-2018.08.31",
-        "mappings": {
-            "dynamic": false,
-            "properties": {
-                "beats_state": {
-                    "properties": {
-                        "beat": {
-                            "properties": {
-                                "host": {
-                                    "type": "keyword"
+  "type": "index",
+  "value": {
+    "aliases": {
+    },
+    "index": ".monitoring-beats-6-2018.08.31",
+    "mappings": {
+      "dynamic": false,
+      "properties": {
+        "beats_state": {
+          "properties": {
+            "timestamp": {
+              "format": "date_time",
+              "type": "date"
+            }
+          }
+        },
+        "beats_stats": {
+          "properties": {
+            "beat": {
+              "properties": {
+                "type": {
+                  "type": "keyword"
+                },
+                "uuid": {
+                  "type": "keyword"
+                },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "metrics": {
+              "properties": {
+                "apm-server": {
+                  "properties": {
+                    "processor": {
+                      "properties": {
+                        "error": {
+                          "properties": {
+                            "transformations": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "metric": {
+                          "properties": {
+                            "transformations": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "span": {
+                          "properties": {
+                            "transformations": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "transaction": {
+                          "properties": {
+                            "transformations": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "server": {
+                      "properties": {
+                        "request": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "response": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            },
+                            "errors": {
+                              "properties": {
+                                "closed": {
+                                  "type": "long"
                                 },
-                                "name": {
-                                    "type": "keyword"
+                                "concurrency": {
+                                  "type": "long"
                                 },
-                                "type": {
-                                    "type": "keyword"
+                                "decode": {
+                                  "type": "long"
                                 },
-                                "uuid": {
-                                    "type": "keyword"
+                                "forbidden": {
+                                  "type": "long"
                                 },
-                                "version": {
-                                    "type": "keyword"
-                                }
-                            }
-                        },
-                        "state": {
-                            "properties": {
-                                "beat": {
-                                    "properties": {
-                                        "name": {
-                                            "type": "keyword"
-                                        }
-                                    }
+                                "internal": {
+                                  "type": "long"
+                                },
+                                "method": {
+                                  "type": "long"
                                 },
-                                "host": {
-                                    "properties": {
-                                        "architecture": {
-                                            "type": "keyword"
-                                        },
-                                        "name": {
-                                            "type": "keyword"
-                                        },
-                                        "hostname": {
-                                            "type": "keyword"
-                                        },
-                                        "os": {
-                                            "properties": {
-                                                "build": {
-                                                    "type": "keyword"
-                                                },
-                                                "family": {
-                                                    "type": "keyword"
-                                                },
-                                                "platform": {
-                                                    "type": "keyword"
-                                                },
-                                                "version": {
-                                                    "type": "keyword"
-                                                }
-                                            }
-                                        }
-                                    }
+                                "queue": {
+                                  "type": "long"
                                 },
-                                "input": {
-                                    "properties": {
-                                        "count": {
-                                            "type": "long"
-                                        },
-                                        "names": {
-                                            "type": "keyword"
-                                        }
-                                    }
+                                "ratelimit": {
+                                  "type": "long"
                                 },
-                                "module": {
-                                    "properties": {
-                                        "count": {
-                                            "type": "long"
-                                        },
-                                        "names": {
-                                            "type": "keyword"
-                                        }
-                                    }
+                                "toolarge": {
+                                  "type": "long"
                                 },
-                                "output": {
-                                    "properties": {
-                                        "name": {
-                                            "type": "keyword"
-                                        }
-                                    }
+                                "unauthorized": {
+                                  "type": "long"
                                 },
-                                "service": {
-                                    "properties": {
-                                        "id": {
-                                            "type": "keyword"
-                                        },
-                                        "name": {
-                                            "type": "keyword"
-                                        },
-                                        "version": {
-                                            "type": "keyword"
-                                        }
-                                    }
+                                "validate": {
+                                  "type": "long"
                                 }
+                              }
+                            },
+                            "valid": {
+                              "properties": {
+                                "accepted": {
+                                  "type": "long"
+                                },
+                                "ok": {
+                                  "type": "long"
+                                }
+                              }
                             }
-                        },
-                        "timestamp": {
-                            "format": "date_time",
-                            "type": "date"
+                          }
                         }
+                      }
                     }
+                  }
                 },
-                "beats_stats": {
-                    "properties": {
-                        "beat": {
-                            "properties": {
-                                "host": {
-                                    "type": "keyword"
-                                },
-                                "name": {
-                                    "type": "keyword"
-                                },
-                                "type": {
-                                    "type": "keyword"
-                                },
-                                "uuid": {
-                                    "type": "keyword"
-                                },
-                                "version": {
-                                    "type": "keyword"
-                                }
+                "beat": {
+                  "properties": {
+                    "cpu": {
+                      "properties": {
+                        "total": {
+                          "properties": {
+                            "value": {
+                              "type": "long"
                             }
+                          }
+                        }
+                      }
+                    },
+                    "handles": {
+                      "properties": {
+                        "open": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "info": {
+                      "properties": {
+                        "ephemeral_id": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "memstats": {
+                      "properties": {
+                        "gc_next": {
+                          "type": "long"
                         },
-                        "metrics": {
-                            "properties": {
-                                "beat": {
-                                    "properties": {
-                                        "cpu": {
-                                            "properties": {
-                                                "system": {
-                                                    "properties": {
-                                                        "ticks": {
-                                                            "type": "long"
-                                                        },
-                                                        "time": {
-                                                            "properties": {
-                                                                "ms": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                },
-                                                "total": {
-                                                    "properties": {
-                                                        "value": {
-                                                            "type": "long"
-                                                        },
-                                                        "ticks": {
-                                                            "type": "long"
-                                                        },
-                                                        "time": {
-                                                            "properties": {
-                                                                "ms": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                },
-                                                "user": {
-                                                    "properties": {
-                                                        "ticks": {
-                                                            "type": "long"
-                                                        },
-                                                        "time": {
-                                                            "properties": {
-                                                                "ms": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        },
-                                        "info": {
-                                            "properties": {
-                                                "ephemeral_id": {
-                                                    "type": "keyword"
-                                                },
-                                                "uptime": {
-                                                    "properties": {
-                                                        "ms": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        },
-                                        "memstats": {
-                                            "properties": {
-                                                "gc_next": {
-                                                    "type": "long"
-                                                },
-                                                "memory_alloc": {
-                                                    "type": "long"
-                                                },
-                                                "memory_total": {
-                                                    "type": "long"
-                                                },
-                                                "rss": {
-                                                    "type": "long"
-                                                }
-                                            }
-                                        },
-                                        "handles": {
-                                            "properties": {
-                                                "open": {
-                                                    "type": "long"
-                                                },
-                                                "limit": {
-                                                    "properties": {
-                                                        "hard": {
-                                                            "type": "long"
-                                                        },
-                                                        "soft": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                },
-                                "apm-server": {
-                                    "properties": {
-                                        "server": {
-                                            "properties": {
-                                                "request": {
-                                                    "properties": {
-                                                        "count": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "concurrent": {
-                                                    "properties": {
-                                                        "wait": {
-                                                            "properties": {
-                                                                "ms": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                },
-                                                "response": {
-                                                    "properties": {
-                                                        "count": {
-                                                            "type": "long"
-                                                        },
-                                                        "errors": {
-                                                            "properties": {
-                                                                "count": {
-                                                                    "type": "long"
-                                                                },
-                                                                "toolarge": {
-                                                                    "type": "long"
-                                                                },
-                                                                "validate": {
-                                                                    "type": "long"
-                                                                },
-                                                                "ratelimit": {
-                                                                    "type": "long"
-                                                                },
-                                                                "queue": {
-                                                                    "type": "long"
-                                                                },
-                                                                "closed": {
-                                                                    "type": "long"
-                                                                },
-                                                                "forbidden": {
-                                                                    "type": "long"
-                                                                },
-                                                                "concurrency": {
-                                                                    "type": "long"
-                                                                },
-                                                                "unauthorized": {
-                                                                    "type": "long"
-                                                                },
-                                                                "internal": {
-                                                                    "type": "long"
-                                                                },
-                                                                "decode": {
-                                                                    "type": "long"
-                                                                },
-                                                                "method": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        },
-                                                        "valid": {
-                                                            "properties": {
-                                                                "ok": {
-                                                                    "type": "long"
-                                                                },
-                                                                "accepted": {
-                                                                    "type": "long"
-                                                                },
-                                                                "count": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        },
-                                        "decoder": {
-                                            "properties": {
-                                                "deflate": {
-                                                    "properties": {
-                                                        "content-length": {
-                                                            "type": "long"
-                                                        },
-                                                        "count": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "gzip": {
-                                                    "properties": {
-                                                        "content-length": {
-                                                            "type": "long"
-                                                        },
-                                                        "count": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "uncompressed": {
-                                                    "properties": {
-                                                        "content-length": {
-                                                            "type": "long"
-                                                        },
-                                                        "count": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "reader": {
-                                                    "properties": {
-                                                        "size": {
-                                                            "type": "long"
-                                                        },
-                                                        "count": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "missing-content-length": {
-                                                    "properties": {
-                                                        "count": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        },
-                                        "processor": {
-                                            "properties": {
-                                                "metric": {
-                                                    "properties": {
-                                                        "decoding": {
-                                                            "properties": {
-                                                                "errors": {
-                                                                    "type": "long"
-                                                                },
-                                                                "count": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        },
-                                                        "validation": {
-                                                            "properties": {
-                                                                "errors": {
-                                                                    "type": "long"
-                                                                },
-                                                                "count": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        },
-                                                        "transformations": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "sourcemap": {
-                                                    "properties": {
-                                                        "counter": {
-                                                            "type": "long"
-                                                        },
-                                                        "decoding": {
-                                                            "properties": {
-                                                                "errors": {
-                                                                    "type": "long"
-                                                                },
-                                                                "count": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        },
-                                                        "validation": {
-                                                            "properties": {
-                                                                "errors": {
-                                                                    "type": "long"
-                                                                },
-                                                                "count": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        }
-                                                    }
-                                                },
-                                                "transaction": {
-                                                    "properties": {
-                                                        "decoding": {
-                                                            "properties": {
-                                                                "errors": {
-                                                                    "type": "long"
-                                                                },
-                                                                "count": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        },
-                                                        "validation": {
-                                                            "properties": {
-                                                                "errors": {
-                                                                    "type": "long"
-                                                                },
-                                                                "count": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        },
-                                                        "transformations": {
-                                                            "type": "long"
-                                                        },
-                                                        "transactions": {
-                                                            "type": "long"
-                                                        },
-                                                        "spans": {
-                                                            "type": "long"
-                                                        },
-                                                        "stacktraces": {
-                                                            "type": "long"
-                                                        },
-                                                        "frames": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "error": {
-                                                    "properties": {
-                                                        "decoding": {
-                                                            "properties": {
-                                                                "errors": {
-                                                                    "type": "long"
-                                                                },
-                                                                "count": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        },
-                                                        "validation": {
-                                                            "properties": {
-                                                                "errors": {
-                                                                    "type": "long"
-                                                                },
-                                                                "count": {
-                                                                    "type": "long"
-                                                                }
-                                                            }
-                                                        },
-                                                        "transformations": {
-                                                            "type": "long"
-                                                        },
-                                                        "errors": {
-                                                            "type": "long"
-                                                        },
-                                                        "stacktraces": {
-                                                            "type": "long"
-                                                        },
-                                                        "frames": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "span": {
-                                                    "properties": {
-                                                        "transformations": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                },
-                                "libbeat": {
-                                    "properties": {
-                                        "config": {
-                                            "properties": {
-                                                "module": {
-                                                    "properties": {
-                                                        "running": {
-                                                            "type": "long"
-                                                        },
-                                                        "starts": {
-                                                            "type": "long"
-                                                        },
-                                                        "stops": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "reloads": {
-                                                    "type": "long"
-                                                }
-                                            }
-                                        },
-                                        "output": {
-                                            "properties": {
-                                                "events": {
-                                                    "properties": {
-                                                        "acked": {
-                                                            "type": "long"
-                                                        },
-                                                        "active": {
-                                                            "type": "long"
-                                                        },
-                                                        "batches": {
-                                                            "type": "long"
-                                                        },
-                                                        "dropped": {
-                                                            "type": "long"
-                                                        },
-                                                        "duplicates": {
-                                                            "type": "long"
-                                                        },
-                                                        "failed": {
-                                                            "type": "long"
-                                                        },
-                                                        "total": {
-                                                            "type": "long"
-                                                        },
-                                                        "toomany": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "read": {
-                                                    "properties": {
-                                                        "bytes": {
-                                                            "type": "long"
-                                                        },
-                                                        "errors": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "type": {
-                                                    "type": "keyword"
-                                                },
-                                                "write": {
-                                                    "properties": {
-                                                        "bytes": {
-                                                            "type": "long"
-                                                        },
-                                                        "errors": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        },
-                                        "pipeline": {
-                                            "properties": {
-                                                "clients": {
-                                                    "type": "long"
-                                                },
-                                                "events": {
-                                                    "properties": {
-                                                        "active": {
-                                                            "type": "long"
-                                                        },
-                                                        "dropped": {
-                                                            "type": "long"
-                                                        },
-                                                        "failed": {
-                                                            "type": "long"
-                                                        },
-                                                        "filtered": {
-                                                            "type": "long"
-                                                        },
-                                                        "published": {
-                                                            "type": "long"
-                                                        },
-                                                        "retry": {
-                                                            "type": "long"
-                                                        },
-                                                        "total": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                },
-                                                "queue": {
-                                                    "properties": {
-                                                        "acked": {
-                                                            "type": "long"
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                },
-                                "system": {
-                                    "properties": {
-                                        "load": {
-                                            "properties": {
-                                                "1": {
-                                                    "type": "double"
-                                                },
-                                                "5": {
-                                                    "type": "double"
-                                                },
-                                                "15": {
-                                                    "type": "double"
-                                                },
-                                                "norm": {
-                                                    "properties": {
-                                                        "1": {
-                                                            "type": "double"
-                                                        },
-                                                        "5": {
-                                                            "type": "double"
-                                                        },
-                                                        "15": {
-                                                            "type": "double"
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
+                        "memory_alloc": {
+                          "type": "long"
                         },
-                        "tags": {
-                            "type": "keyword"
+                        "memory_total": {
+                          "type": "long"
                         },
-                        "timestamp": {
-                            "format": "date_time",
-                            "type": "date"
+                        "rss": {
+                          "type": "long"
                         }
+                      }
                     }
+                  }
                 },
-                "cluster_uuid": {
-                    "type": "keyword"
-                },
-                "interval_ms": {
-                    "type": "long"
-                },
-                "source_node": {
-                    "properties": {
-                        "host": {
-                            "type": "keyword"
+                "libbeat": {
+                  "properties": {
+                    "output": {
+                      "properties": {
+                        "events": {
+                          "properties": {
+                            "acked": {
+                              "type": "long"
+                            },
+                            "active": {
+                              "type": "long"
+                            },
+                            "dropped": {
+                              "type": "long"
+                            },
+                            "failed": {
+                              "type": "long"
+                            },
+                            "total": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "ip": {
-                            "type": "keyword"
+                        "read": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            },
+                            "errors": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "name": {
-                            "type": "keyword"
+                        "write": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            },
+                            "errors": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "pipeline": {
+                      "properties": {
+                        "events": {
+                          "properties": {
+                            "dropped": {
+                              "type": "long"
+                            },
+                            "failed": {
+                              "type": "long"
+                            },
+                            "published": {
+                              "type": "long"
+                            },
+                            "retry": {
+                              "type": "long"
+                            },
+                            "total": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "system": {
+                  "properties": {
+                    "load": {
+                      "properties": {
+                        "1": {
+                          "type": "double"
                         },
-                        "transport_address": {
-                            "type": "keyword"
+                        "15": {
+                          "type": "double"
                         },
-                        "uuid": {
-                            "type": "keyword"
+                        "5": {
+                          "type": "double"
                         }
+                      }
                     }
-                },
-                "timestamp": {
-                    "format": "date_time",
-                    "type": "date"
-                },
-                "type": {
-                    "type": "keyword"
+                  }
                 }
+              }
+            },
+            "timestamp": {
+              "format": "date_time",
+              "type": "date"
             }
+          }
+        },
+        "cluster_uuid": {
+          "type": "keyword"
         },
-        "settings": {
-            "index": {
-                "auto_expand_replicas": "0-1",
-                "codec": "best_compression",
-                "format": "6",
-                "number_of_replicas": "0",
-                "number_of_shards": "1"
+        "metricset": {
+          "properties": {
+            "name": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
+          }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "codec": "best_compression",
+        "format": "6",
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
     }
+  }
 }
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/monitoring/basic_6.3.x/mappings.json b/x-pack/test/functional/es_archives/monitoring/basic_6.3.x/mappings.json
index 9abc5c6381e45..4909b73909186 100644
--- a/x-pack/test/functional/es_archives/monitoring/basic_6.3.x/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/basic_6.3.x/mappings.json
@@ -1,7 +1,8 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-kibana-6-2018.07.23",
     "mappings": {
       "dynamic": false,
@@ -9,95 +10,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -105,47 +32,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -155,36 +63,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -192,9 +73,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -208,10 +86,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -230,121 +122,54 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-es-6-2018.07.23",
     "mappings": {
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -359,125 +184,43 @@
                     }
                   }
                 },
-                "fielddata": {
+                "indexing": {
                   "properties": {
-                    "memory_size_in_bytes": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "evictions": {
+                    "index_total": {
+                      "type": "long"
+                    },
+                    "throttle_time_in_millis": {
                       "type": "long"
                     }
                   }
                 },
-                "store": {
+                "merges": {
                   "properties": {
-                    "size_in_bytes": {
+                    "total_size_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "indexing": {
+                "refresh": {
                   "properties": {
-                    "index_total": {
-                      "type": "long"
-                    },
-                    "index_time_in_millis": {
-                      "type": "long"
-                    },
-                    "throttle_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
                 },
-                "merges": {
+                "segments": {
                   "properties": {
-                    "total_size_in_bytes": {
-                      "type": "long"
+                    "count": {
+                      "type": "integer"
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "segments": {
-                  "properties": {
-                    "count": {
-                      "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -486,36 +229,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -534,14 +260,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -550,24 +274,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -577,41 +292,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -620,68 +335,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -702,15 +441,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -718,15 +448,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -745,116 +466,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -870,16 +572,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -891,12 +587,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -906,12 +596,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -921,71 +605,10 @@
                 }
               }
             },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
             "thread_pool": {
               "properties": {
                 "bulk": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -996,9 +619,6 @@
                 },
                 "get": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1009,22 +629,6 @@
                 },
                 "index": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1035,22 +639,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1073,246 +661,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/beats-with-restarted-instance/mappings.json b/x-pack/test/functional/es_archives/monitoring/beats-with-restarted-instance/mappings.json
index f616ffc1d3aec..a8017ee6631b0 100644
--- a/x-pack/test/functional/es_archives/monitoring/beats-with-restarted-instance/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/beats-with-restarted-instance/mappings.json
@@ -7,105 +7,6 @@
       "properties": {
         "beats_state": {
           "properties": {
-            "beat": {
-              "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "properties": {
-                "beat": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "hostname": {
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "build": {
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "input": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "module": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "output": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "service": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -116,12 +17,6 @@
           "properties": {
             "beat": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
                 "type": {
                   "type": "keyword"
                 },
@@ -135,108 +30,40 @@
             },
             "metrics": {
               "properties": {
-                "beat": {
+                "apm-server": {
                   "properties": {
-                    "cpu": {
+                    "processor": {
                       "properties": {
-                        "system": {
+                        "error": {
                           "properties": {
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
-                        "total": {
+                        "metric": {
                           "properties": {
-                            "value": {
-                              "type": "long"
-                            },
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
-                        "user": {
+                        "span": {
                           "properties": {
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
-                        }
-                      }
-                    },
-                    "info": {
-                      "properties": {
-                        "ephemeral_id": {
-                          "type": "keyword"
                         },
-                        "uptime": {
+                        "transaction": {
                           "properties": {
-                            "ms": {
+                            "transformations": {
                               "type": "long"
                             }
                           }
                         }
                       }
                     },
-                    "memstats": {
-                      "properties": {
-                        "gc_next": {
-                          "type": "long"
-                        },
-                        "memory_alloc": {
-                          "type": "long"
-                        },
-                        "memory_total": {
-                          "type": "long"
-                        },
-                        "rss": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "handles": {
-                      "properties": {
-                        "open": {
-                          "type": "long"
-                        },
-                        "limit": {
-                          "properties": {
-                            "hard": {
-                              "type": "long"
-                            },
-                            "soft": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "apm-server": {
-                  "properties": {
                     "server": {
                       "properties": {
                         "request": {
@@ -246,17 +73,6 @@
                             }
                           }
                         },
-                        "concurrent": {
-                          "properties": {
-                            "wait": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "response": {
                           "properties": {
                             "count": {
@@ -264,53 +80,47 @@
                             },
                             "errors": {
                               "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "toolarge": {
+                                "closed": {
                                   "type": "long"
                                 },
-                                "validate": {
+                                "concurrency": {
                                   "type": "long"
                                 },
-                                "ratelimit": {
+                                "decode": {
                                   "type": "long"
                                 },
-                                "queue": {
+                                "forbidden": {
                                   "type": "long"
                                 },
-                                "closed": {
+                                "internal": {
                                   "type": "long"
                                 },
-                                "forbidden": {
+                                "method": {
                                   "type": "long"
                                 },
-                                "concurrency": {
+                                "queue": {
                                   "type": "long"
                                 },
-                                "unauthorized": {
+                                "ratelimit": {
                                   "type": "long"
                                 },
-                                "internal": {
+                                "toolarge": {
                                   "type": "long"
                                 },
-                                "decode": {
+                                "unauthorized": {
                                   "type": "long"
                                 },
-                                "method": {
+                                "validate": {
                                   "type": "long"
                                 }
                               }
                             },
                             "valid": {
                               "properties": {
-                                "ok": {
-                                  "type": "long"
-                                },
                                 "accepted": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "ok": {
                                   "type": "long"
                                 }
                               }
@@ -318,296 +128,109 @@
                           }
                         }
                       }
-                    },
-                    "decoder": {
+                    }
+                  }
+                },
+                "beat": {
+                  "properties": {
+                    "cpu": {
                       "properties": {
-                        "deflate": {
+                        "total": {
                           "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
+                            "value": {
                               "type": "long"
                             }
                           }
+                        }
+                      }
+                    },
+                    "handles": {
+                      "properties": {
+                        "open": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "info": {
+                      "properties": {
+                        "ephemeral_id": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "memstats": {
+                      "properties": {
+                        "gc_next": {
+                          "type": "long"
+                        },
+                        "memory_alloc": {
+                          "type": "long"
+                        },
+                        "memory_total": {
+                          "type": "long"
                         },
-                        "gzip": {
+                        "rss": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "libbeat": {
+                  "properties": {
+                    "output": {
+                      "properties": {
+                        "events": {
                           "properties": {
-                            "content-length": {
+                            "acked": {
                               "type": "long"
                             },
-                            "count": {
+                            "active": {
                               "type": "long"
-                            }
-                          }
-                        },
-                        "uncompressed": {
-                          "properties": {
-                            "content-length": {
+                            },
+                            "dropped": {
                               "type": "long"
                             },
-                            "count": {
+                            "failed": {
+                              "type": "long"
+                            },
+                            "total": {
                               "type": "long"
                             }
                           }
                         },
-                        "reader": {
+                        "read": {
                           "properties": {
-                            "size": {
+                            "bytes": {
                               "type": "long"
                             },
-                            "count": {
+                            "errors": {
                               "type": "long"
                             }
                           }
                         },
-                        "missing-content-length": {
+                        "write": {
                           "properties": {
-                            "count": {
+                            "bytes": {
+                              "type": "long"
+                            },
+                            "errors": {
                               "type": "long"
                             }
                           }
                         }
                       }
                     },
-                    "processor": {
+                    "pipeline": {
                       "properties": {
-                        "metric": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "sourcemap": {
-                          "properties": {
-                            "counter": {
-                              "type": "long"
-                            },
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "transaction": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            },
-                            "transactions": {
-                              "type": "long"
-                            },
-                            "spans": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "error": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            },
-                            "errors": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "span": {
-                          "properties": {
-                            "transformations": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "libbeat": {
-                  "properties": {
-                    "config": {
-                      "properties": {
-                        "module": {
-                          "properties": {
-                            "running": {
-                              "type": "long"
-                            },
-                            "starts": {
-                              "type": "long"
-                            },
-                            "stops": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reloads": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "output": {
-                      "properties": {
-                        "events": {
-                          "properties": {
-                            "acked": {
-                              "type": "long"
-                            },
-                            "active": {
-                              "type": "long"
-                            },
-                            "batches": {
-                              "type": "long"
-                            },
-                            "dropped": {
-                              "type": "long"
-                            },
-                            "duplicates": {
-                              "type": "long"
-                            },
-                            "failed": {
-                              "type": "long"
-                            },
-                            "total": {
-                              "type": "long"
-                            },
-                            "toomany": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "read": {
-                          "properties": {
-                            "bytes": {
-                              "type": "long"
-                            },
-                            "errors": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "type": {
-                          "type": "keyword"
-                        },
-                        "write": {
-                          "properties": {
-                            "bytes": {
-                              "type": "long"
-                            },
-                            "errors": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "pipeline": {
-                      "properties": {
-                        "clients": {
-                          "type": "long"
-                        },
                         "events": {
                           "properties": {
-                            "active": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
                             "failed": {
                               "type": "long"
                             },
-                            "filtered": {
-                              "type": "long"
-                            },
                             "published": {
                               "type": "long"
                             },
@@ -618,13 +241,6 @@
                               "type": "long"
                             }
                           }
-                        },
-                        "queue": {
-                          "properties": {
-                            "acked": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     }
@@ -637,24 +253,11 @@
                         "1": {
                           "type": "double"
                         },
-                        "5": {
-                          "type": "double"
-                        },
                         "15": {
                           "type": "double"
                         },
-                        "norm": {
-                          "properties": {
-                            "1": {
-                              "type": "double"
-                            },
-                            "5": {
-                              "type": "double"
-                            },
-                            "15": {
-                              "type": "double"
-                            }
-                          }
+                        "5": {
+                          "type": "double"
                         }
                       }
                     }
@@ -662,9 +265,6 @@
                 }
               }
             },
-            "tags": {
-              "type": "keyword"
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -674,25 +274,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
@@ -725,115 +316,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -848,29 +371,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -885,44 +391,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -931,42 +402,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -975,36 +416,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -1023,14 +447,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -1039,24 +461,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -1066,41 +479,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -1109,68 +522,92 @@
             }
           }
         },
-        "cluster_stats": {
-          "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
-            }
-          }
-        },
-        "cluster_state": {
-          "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
-            }
-          }
-        },
-        "node_stats": {
+        "indices_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "_all": {
               "properties": {
-                "docs": {
+                "primaries": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "job_stats": {
+          "properties": {
+            "job_id": {
+              "type": "keyword"
+            }
+          }
+        },
+        "node_stats": {
+          "properties": {
+            "fs": {
+              "properties": {
+                "io_stats": {
+                  "properties": {
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1191,15 +628,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1207,15 +635,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1234,116 +653,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1359,16 +759,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -1380,12 +774,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -1395,12 +783,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -1410,398 +792,97 @@
                 }
               }
             },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "thread_pool": {
-              "properties": {
-                "bulk": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "get": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "index": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "write": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "index_recovery": {
-          "type": "object"
-        },
-        "shard": {
-          "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
-            "index": {
-              "type": "keyword"
-            },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
-            "node": {
-              "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
-            },
-            "state": {
-              "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "ccr_stats": {
-          "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
-              "type": "keyword"
-            },
-            "follower_index": {
-              "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
+            "thread_pool": {
               "properties": {
-                "from_seq_no": {
-                  "type": "long"
+                "bulk": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 },
-                "retries": {
-                  "type": "integer"
+                "get": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 },
-                "exception": {
-                  "type": "object",
+                "index": {
                   "properties": {
-                    "type": {
-                      "type": "keyword"
+                    "queue": {
+                      "type": "integer"
                     },
-                    "reason": {
-                      "type": "text"
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "search": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
                     }
                   }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
                 },
-                "reason": {
-                  "type": "text"
+                "write": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 }
               }
             }
           }
         },
-        "ccr_auto_follow_stats": {
+        "shard": {
           "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
+            "index": {
+              "type": "keyword"
             },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
+            "node": {
+              "type": "keyword"
             },
-            "number_of_successful_follow_indices": {
-              "type": "long"
+            "primary": {
+              "type": "boolean"
             },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
+            "state": {
+              "type": "keyword"
+            }
+          }
+        },
+        "source_node": {
+          "properties": {
+            "name": {
+              "type": "keyword"
             },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
+            "uuid": {
+              "type": "keyword"
             }
           }
+        },
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1824,24 +905,9 @@
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -1863,6 +929,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
@@ -1888,95 +969,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -1984,47 +991,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -2034,36 +1022,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -2071,9 +1032,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -2087,10 +1045,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/beats/mappings.json b/x-pack/test/functional/es_archives/monitoring/beats/mappings.json
index e9e03d6ff2a16..2ea26547e767b 100644
--- a/x-pack/test/functional/es_archives/monitoring/beats/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/beats/mappings.json
@@ -6,115 +6,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -129,29 +61,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -166,44 +81,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -212,42 +92,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -256,36 +106,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -304,14 +137,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -320,24 +151,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -347,41 +169,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -390,68 +212,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -472,15 +318,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -488,15 +325,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -515,116 +343,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -640,16 +449,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -661,12 +464,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -676,12 +473,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -691,110 +482,30 @@
                 }
               }
             },
-            "jvm": {
+            "thread_pool": {
               "properties": {
-                "mem": {
+                "bulk": {
                   "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
+                    "queue": {
+                      "type": "integer"
                     },
-                    "heap_used_percent": {
-                      "type": "half_float"
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "get": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
                     },
-                    "heap_max_in_bytes": {
+                    "rejected": {
                       "type": "long"
                     }
                   }
                 },
-                "gc": {
+                "index": {
                   "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "thread_pool": {
-              "properties": {
-                "bulk": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "get": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "index": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -805,22 +516,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -843,368 +538,64 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
-          "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
-              "type": "keyword"
-            },
-            "follower_index": {
-              "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
-            }
-          }
-        },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "codec": "best_compression",
-        "format": "6",
-        "number_of_replicas": "1",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
-{
-  "type": "index",
-  "value": {
-    "index": ".monitoring-beats-6-2017.12.19",
-    "mappings": {
-      "dynamic": false,
-      "properties": {
-        "beats_state": {
+        "source_node": {
           "properties": {
-            "beat": {
-              "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "properties": {
-                "beat": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "hostname": {
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "build": {
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "input": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "module": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "output": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "service": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
+            "name": {
+              "type": "keyword"
             },
+            "uuid": {
+              "type": "keyword"
+            }
+          }
+        },
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "codec": "best_compression",
+        "format": "6",
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
+
+{
+  "type": "index",
+  "value": {
+    "index": ".monitoring-beats-6-2017.12.19",
+    "mappings": {
+      "dynamic": false,
+      "properties": {
+        "beats_state": {
+          "properties": {
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -1215,12 +606,6 @@
           "properties": {
             "beat": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
                 "type": {
                   "type": "keyword"
                 },
@@ -1234,108 +619,40 @@
             },
             "metrics": {
               "properties": {
-                "beat": {
+                "apm-server": {
                   "properties": {
-                    "cpu": {
+                    "processor": {
                       "properties": {
-                        "system": {
+                        "error": {
                           "properties": {
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
-                        "total": {
+                        "metric": {
                           "properties": {
-                            "value": {
-                              "type": "long"
-                            },
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
-                        "user": {
+                        "span": {
                           "properties": {
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
-                        }
-                      }
-                    },
-                    "info": {
-                      "properties": {
-                        "ephemeral_id": {
-                          "type": "keyword"
                         },
-                        "uptime": {
+                        "transaction": {
                           "properties": {
-                            "ms": {
+                            "transformations": {
                               "type": "long"
                             }
                           }
                         }
                       }
                     },
-                    "memstats": {
-                      "properties": {
-                        "gc_next": {
-                          "type": "long"
-                        },
-                        "memory_alloc": {
-                          "type": "long"
-                        },
-                        "memory_total": {
-                          "type": "long"
-                        },
-                        "rss": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "handles": {
-                      "properties": {
-                        "open": {
-                          "type": "long"
-                        },
-                        "limit": {
-                          "properties": {
-                            "hard": {
-                              "type": "long"
-                            },
-                            "soft": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "apm-server": {
-                  "properties": {
                     "server": {
                       "properties": {
                         "request": {
@@ -1345,17 +662,6 @@
                             }
                           }
                         },
-                        "concurrent": {
-                          "properties": {
-                            "wait": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "response": {
                           "properties": {
                             "count": {
@@ -1363,247 +669,50 @@
                             },
                             "errors": {
                               "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "toolarge": {
-                                  "type": "long"
-                                },
-                                "validate": {
-                                  "type": "long"
-                                },
-                                "ratelimit": {
-                                  "type": "long"
-                                },
-                                "queue": {
-                                  "type": "long"
-                                },
                                 "closed": {
                                   "type": "long"
                                 },
-                                "forbidden": {
-                                  "type": "long"
-                                },
                                 "concurrency": {
                                   "type": "long"
                                 },
-                                "unauthorized": {
-                                  "type": "long"
-                                },
-                                "internal": {
-                                  "type": "long"
-                                },
                                 "decode": {
                                   "type": "long"
                                 },
-                                "method": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "valid": {
-                              "properties": {
-                                "ok": {
-                                  "type": "long"
-                                },
-                                "accepted": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "decoder": {
-                      "properties": {
-                        "deflate": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "gzip": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "uncompressed": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reader": {
-                          "properties": {
-                            "size": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "missing-content-length": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "processor": {
-                      "properties": {
-                        "metric": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
+                                "forbidden": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "sourcemap": {
-                          "properties": {
-                            "counter": {
-                              "type": "long"
-                            },
-                            "decoding": {
-                              "properties": {
-                                "errors": {
+                                "internal": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
+                                "method": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "transaction": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
+                                "queue": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
+                                "ratelimit": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "toolarge": {
                                   "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            },
-                            "transactions": {
-                              "type": "long"
-                            },
-                            "spans": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "error": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
+                                },
+                                "unauthorized": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "validate": {
                                   "type": "long"
                                 }
                               }
                             },
-                            "validation": {
+                            "valid": {
                               "properties": {
-                                "errors": {
+                                "accepted": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "ok": {
                                   "type": "long"
                                 }
                               }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            },
-                            "errors": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "span": {
-                          "properties": {
-                            "transformations": {
-                              "type": "long"
                             }
                           }
                         }
@@ -1611,28 +720,53 @@
                     }
                   }
                 },
-                "libbeat": {
+                "beat": {
                   "properties": {
-                    "config": {
+                    "cpu": {
                       "properties": {
-                        "module": {
+                        "total": {
                           "properties": {
-                            "running": {
-                              "type": "long"
-                            },
-                            "starts": {
-                              "type": "long"
-                            },
-                            "stops": {
+                            "value": {
                               "type": "long"
                             }
                           }
-                        },
-                        "reloads": {
+                        }
+                      }
+                    },
+                    "handles": {
+                      "properties": {
+                        "open": {
                           "type": "long"
                         }
                       }
                     },
+                    "info": {
+                      "properties": {
+                        "ephemeral_id": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "memstats": {
+                      "properties": {
+                        "gc_next": {
+                          "type": "long"
+                        },
+                        "memory_alloc": {
+                          "type": "long"
+                        },
+                        "memory_total": {
+                          "type": "long"
+                        },
+                        "rss": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "libbeat": {
+                  "properties": {
                     "output": {
                       "properties": {
                         "events": {
@@ -1643,23 +777,14 @@
                             "active": {
                               "type": "long"
                             },
-                            "batches": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
-                            "duplicates": {
-                              "type": "long"
-                            },
                             "failed": {
                               "type": "long"
                             },
                             "total": {
                               "type": "long"
-                            },
-                            "toomany": {
-                              "type": "long"
                             }
                           }
                         },
@@ -1673,9 +798,6 @@
                             }
                           }
                         },
-                        "type": {
-                          "type": "keyword"
-                        },
                         "write": {
                           "properties": {
                             "bytes": {
@@ -1690,23 +812,14 @@
                     },
                     "pipeline": {
                       "properties": {
-                        "clients": {
-                          "type": "long"
-                        },
                         "events": {
                           "properties": {
-                            "active": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
                             "failed": {
                               "type": "long"
                             },
-                            "filtered": {
-                              "type": "long"
-                            },
                             "published": {
                               "type": "long"
                             },
@@ -1717,13 +830,6 @@
                               "type": "long"
                             }
                           }
-                        },
-                        "queue": {
-                          "properties": {
-                            "acked": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     }
@@ -1736,24 +842,11 @@
                         "1": {
                           "type": "double"
                         },
-                        "5": {
-                          "type": "double"
-                        },
                         "15": {
                           "type": "double"
                         },
-                        "norm": {
-                          "properties": {
-                            "1": {
-                              "type": "double"
-                            },
-                            "5": {
-                              "type": "double"
-                            },
-                            "15": {
-                              "type": "double"
-                            }
-                          }
+                        "5": {
+                          "type": "double"
                         }
                       }
                     }
@@ -1761,9 +854,6 @@
                 }
               }
             },
-            "tags": {
-              "type": "keyword"
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -1773,25 +863,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
@@ -1823,95 +904,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -1919,47 +926,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -1969,36 +957,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -2006,9 +967,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -2022,10 +980,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/ccr/mappings.json b/x-pack/test/functional/es_archives/monitoring/ccr/mappings.json
index c034852554a44..4a941d9bd0d77 100644
--- a/x-pack/test/functional/es_archives/monitoring/ccr/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/ccr/mappings.json
@@ -1,121 +1,54 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-es-6-2018.09.19",
     "mappings": {
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -130,29 +63,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -167,44 +83,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -213,42 +94,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -257,36 +108,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -305,14 +139,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -321,24 +153,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -348,41 +171,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -391,68 +214,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -473,15 +320,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -489,15 +327,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -516,116 +345,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -641,16 +451,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -662,12 +466,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -677,12 +475,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -692,71 +484,10 @@
                 }
               }
             },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
             "thread_pool": {
               "properties": {
                 "bulk": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -767,9 +498,6 @@
                 },
                 "get": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -780,22 +508,6 @@
                 },
                 "index": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -806,22 +518,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -844,246 +540,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/logs/data.json.gz b/x-pack/test/functional/es_archives/monitoring/logs/data.json.gz
index 7f48fca2ea8a829adf46141984e809865a13ea25..851db319e9ecf34442252e31f4882333dbb8c94a 100644
GIT binary patch
literal 30798
zcmb^2V|U$+-tX<$wr$&uZQFLzm`&2ywr$(CZ8dJp#@%Uqo(uQ2*0uM8d%lAI7!zY2
z<MaLDheH7TdI2Gyb$Z69i_h^s|MY^w9qdA^H=~6e#LZrL%(QL)^w80?KEH`Ky)v82
zUqZ4g>f3rZ2$wzm1quNvkIpy1cC(TDvi(zDPFx;SHhFy=mCx(kiBmo}zDu@i8}ama
zUa2oFteG572jI`>chwIRty~-`6?{M4f8GOmwK;-}H(cOt`TV?fpZ2NLmLA>>%<uAm
ztmfV5RJNVI$ogS-mV1)sKLTS1#(cL70yZ6Z^kq%pM%oqRGJg2MEXztvSHC?T55`kd
z4#jsCy?|H#rYRR4d`S`SF8pA?0K{Ja$E?n~D~6Zbr{m4-KKXHZ$933M*7@W#`}Spi
zOWx{E)n6kd4H)pv>@#gfT5rkK73wa8U9B6H<*`S;)BcFRy!8qA!vqYT{2oP!!LA?x
z?lcqe-LwDG{Km>>C|HN5fNyrOn1#4{x|!PAnVn}-^l#c-DqN;d#L$;)_k9$t$RV0~
z{69fOC~dMmMp?})qRpZ(MVl5qU7vHa#V=5>MIK;?R!vWg;^0@23-IKtd>?R*r%4N|
zf$wj}VEs;ly3mDz9a*6CF{<u<Zp47(uJHWaO1K^pBg8Boq#>N%IiRs1dlR&ogGVvV
zoNm|E#wOtk{PO%XKCSoVsg~7*`dFULNbT+z;y&t4P#d%r3NH<6Di#Qbegv>eRlBmO
zO4aqclQnfSLo|({)#KP3xcU33%RTAOEQXgXLKa}FHm}wW4c>Vu=91i@Ty9g-B@-JP
z3C$qtPM4DA$|k|{2@0q)0~`an5#!I#%=2k$bT|_`6H+R5&@4HaZI%E!bRh~IdtY{*
zW^ldkgACZXuUvj~S!~|fpu?u_^*EU$>0DMdytH~~p+75e_yg97t?Gw$y*#|{U$%$O
zqwm;SceW)g9`EUt)@zQbYjs1pzP<($m_4w9DKTf{wTtx1gQC6}C7dhhd`fSQR?;8?
z46wbPqlFP%cbsLF=(%g<pzfD3Bb_5&?<-C{nDhb{O@%2eMP1w8?QsF`54LuJ?3VAM
z@sK<tb5YfNLZ$q~ONnl?I5&(fKqAH!d;At*a~vURYWyuau(>I*L$n17Z#6@<_&w*9
z7hr^`vD}VPxH)H<Gcdqa{0rW`o#F*ud)l37%SfD~rPxBS;ufHlX)xhEW^8bRvwPz6
z1!2ZS4mRtPTNbOhj3-Akvk0b%06i=Ix-1*N8#-TY(GPnTjJ#M#17SCg=b%Dv#Q}^B
zP?tP{N7$7RLM!z4T+Se1<|rQHR4@_qGr*f*iZFujmhSx8^eM4Jf^*~Fp7Dq*3W_|Q
zQV9k5SkOw5Vr&80$dbA_U`+kB%yYT>v5aC_$aysYa%d(uoM26h<UE+X9ZW!g(lt3}
zj4+a7CDI}6Apy2zksz~o)n<|lb!w3v!6nhZ7!siKZ`UGsNiswSPJvn;0W~`2);W&x
zH@?kDpHoM5Dz`OpaR_V0Z-`_=j5<|`;>s+FwBlLr?IdYXPlUMlj<_(h4>)Fme|>a}
z0Zg$;?ODk0sSuQWhCsjh46yJSV>S0+lgvE6#^kH1S1{czpi$qa!%7S8!x;@sNnu}v
z(q$5v0T?DCvT`VT$&e@UFyHh96ydPLO$HbhpfqcMSgO6{bxb;AOOLmKHL~gS)hHu!
zcx7iH6_|~)xQKofvP1AsW+HA9%d9H2;aTj_LdGJ{=OP-6P7=t*MO4D`0BNPXWnil)
zWXoL%9wf)Mywnn0ZTtQ@0FtsNb+gvH)31JAjz^8?I?uXyr;F`AuF9>hmSUMw`}h4h
zx69mPZ_P8f?xRlUS>QznJyX#1`~#dyrfamMv+uwKTkGZHbn`jdN@fAj`P}p^xiZfd
zC{GDiltQ(JAXo5Arn6rZy}vr+i6(9lpJc>?vCr(^0K<PiNAR=F!=E-U8?_cqy-F#P
ztOF8O`66n4EVPdh-$Eb}3;l&~silIsq_S+Rq?00Moz4^NYtO6TsJ5+uvqPernP%qg
z_|!J)EfO#nh6ucWk})MurJwl1=ppy@z|h3_y=A&J9pcPXbZCX;wYTu$vIH<7rJfjo
z6=)N_$vmp3zNmz7e~%CpB`Kk<1SMpfqS9$eP*XWM@0ZVB)uAkYyJ6@OeDWv?iy)8`
zQWt(N2R0xEi2h$~)x$Um@##eOK1F*}4IP4<w?aGz6;unOCA(G-SUlsE`Jte0%G*Z0
z;zZ*ik86QWkU`!YE<mGfQDa*gJ2A$Fy({lJri@T_1yXMt;c?-l<=RvRh}0`AOADJ!
z)Gjcy%3O@DiC>%y$sd<~t$^{PfT0Dv5@%#pwBC&QCRwBhmU)4(+Pc4MG!IFrP&y}1
zFw|M;>l+j5|LFlib_>>vS<rHKE*}*-V}hGrOmSoX8-$i|id3f4*90fLA7zO5;uJsi
zag4Wb!FA9C?aK4yJySr6_)PdZo<&OKnsI>!A3hly;DMpkjL{!4=YpLb?4_FUMo{op
z@v#bp^>;zsD^$5K8Sxj*ABZ8)>+uouq2*2jjAk&n2`nKq(;#5IzZQN^ZmT(WLuRSj
zedv0euy{W<PKqWZ0Yhs87B(0K1dn@G4u(&m;?mPm7lY`Fz|K9<S7?FcR_=#dqUmQH
zuxfRTp3ct(K^)cvpbbD$M!W@sNIUYM7j0$^aF)f3;tj~PU<pJj&`qOnqoP3r$HumU
z766r|o$}?>JJrVNc>!r8OeHew$mxp5Bp5aH(K1hH?+iF<&w63FHT)(;lif82A&x(N
zcisyt{P^{;+NL)WA3gfad@tBqklGr*RZt@b9$rKwR_=>w?95^uqi+#2v8M*59A3m3
zL8A+N!xh6VF7<E(N|dZu&*r@gus<P8hrR13F5>xZ9XpA;Czs&8lkJuEQyLbtsU;61
z>Zqe0W05g(K!L#;`WMpca4*j0S`J~>BI@}ONK7MUQ{BSR74ruhA%H`Iz}$X@Vm`L)
zD3SG-{LLpcclH?_?5*RO*U43c`|%3~mV6F^X_4`CLbE82%h=)XgYQ><ZZ?)%rkX)|
z&);KH4VG)o*f_B=9f@DV&?68qVoV_R3?PsnL_0j#0|9yQ$F~_q?+B{tn6+aWpV6Ey
zmowx=g9IY3-K|nDDlso=eTKL6j`YNYtb95>Juh{Teyn#>T~_}j&@$Rqx}?<RAS2~h
zVMh{dJa;uUmNA&&aS)m^ReuDzW9^cJ9(l07jLjAw^`#X44nZu^m?hGC-0R;<#7JOG
z7!?D@eS&Je9G!ni&yRmsv<u${(m;-!7v0L7dhGa=e51#QZJZzlMwsu#I_dnmHO5X}
zeZz|OpriRb;g(Gme0~SrAQf!<QNwG!UkaFr4pX5nmYOLDo{*j+6K8<ID9JU<j2SRC
zC8te1CSHYSek7deZnDM<^0biplI17`Z!$o9gkeotT%?S=kPe%M6Vp9(m5QBApKV};
zU7%jXThyBKXAjqkRndLZe6c&16Jk|bu~2g=Xt<e%3ptvFZ6P&Yf-v4R=4{HPVJ=B_
z<~L?jW^E1O%D8u)95cD^QUvTM0<jIOsoa#r)e1nCBF~hKp9$5Z$})hNhwE*b;?!@5
zn7Dc;P$=1T3s{pMK6|)Tu@X*JoVp#F>k}=GByHA~g2e%XdTS`5=rEGVl=gG0J*39P
zZH?5$Aa6<PVR(xPR$=D})YYWDON@q57uBJHPR0d;cO7x2d=*3oYZ4hqPigR{@YS2$
zAam~x#4!Ool-6HxF#GtP#?!=NI;~$g&_3#Rb62)<cPseZRVM@8vUTJ4_wJ24Vz;z{
z>Q$-8J-ol#^Q;DNf-$U5)^Q1;rKg5r>X?9su}GD!_aU81LGsYbc%ysY{3Nt7Pmz*{
zBn4v-*org?U8qPGWn$v66j&)!O&Qh|dX?VAgrmgkU;+kVn6%Z1e4uSH3@v#h;i77V
zEagbDkVPLER*X5~GihWRYmxqO@bpqo_l0rQ{A;H~QcxvjT^V%?`X2LzJc#^Z;3@=i
zvNWb?ONr6qS@oO~JHrlag~OmG_2)G4Jb|^FJvZcsreHdRkg#Dk*t?#4ZQgx{g8H0U
zX>{tQtVzF}v(4agAFyP#BlMLCA)xiWfrA2dsR4zGbU;#J6)pMPtm1)luIAG_i2`w%
z36FE7?gzWwcvzu00?2z>FAwk-5!>C=LquPr<}0Qhuq^DyV#A$4RyS@Aj=CxeO{Kaj
zEF|^=Yo#hjr7l;cuE!TFXj?}3i2dDe&6^P*!dEq@s77p{fM8T05?pn3er9MP`jBdK
z6n{c1+&d|5tTLilkTZ%{VROdtfK(wM%@KlBfdJ(If$<5cH#P1s=>*0)Xr;AwLw_=?
zby>^Rix;*DbHtPrnskzSU$Rje%Xw|I+;eF(4V1#PP#VEa7BrgeBC1FcAgwXOSeE`3
z8zg9^w=l)l5;>k9blZ>W4Ug3Ily(e!iE!8<uUxand8LM8O(!eckdXU29@*o26}9Ol
z4l$r1I?OQVq3L*djc2ksta-d$GhoXrZDP9!aT1&b4&nzfV}yx9-w_2ZFS@+lex4lO
zG`f3mKCwKRd#QHIB&_ZijOPQiM*>+BLsRfJA@HZc=c3$ppDwRx&R?Rt3M--rSw|Q7
zhP@F}kyEXcP+`qvqbMn$rjDwR09yB`4v<-cihtiafhy@t6j5Gi3lKrULPAqXXckrn
zNUEwa=_4vHqq@fEF^T}RcRRQm+fD4J4qg@tUfxKKm$PO0c{lk2U5sv(9jtjN(CR+9
z2N+F=H^V*T=9`D2^oe>bwh9v@#$`}30Zk)}tbRIXhs2~j9JMc=dr^=@m`pC#uNF`)
zHth-paUHWeScukGW8RVp)fcy1$c)NRsK`)1qms2K&x%{OHAY3?z|VIW17ZhZoG?j<
zCRiP=b{L?xmDm+A7(ITTuQOb&i1D4K6XbC81QQ;N=c|5CKOrt+oN6>t05Al2I+G+{
zJSN0JjrbTIi)19gnxLOway)Gz%r{TRGyB?HTj6S0#c)Xkm*&{(pePQ}rvgD3N0!<=
zsl46N&$_s$+N@)%g|E=~x9Fxg#Djpwo&bt9Rh5DxlWGTxi<2uYUXOYQ{z&f!KVVK@
zr;qm0J!HqWJ?MCTz+VO&uyo0nb!oCg+we+QWfY39k86iu?kjCY;uholR3}X>t<Q4t
za(8z4?EG-UQI;`gz7(cEtRhR?l0v$Vxlvi_XmWyX$qX-luC%)HLK-c9`P~lSfNDhL
z3P72GbIurIvLsoRieh3>SJMOyCmT++6H!gDD&R%2&(CUUwq<A5N?SrKX-$Rq(UbZ9
z`SE@K=4SHpvYfTzae-W@`(`6y&)L3(^=RoerZX+>8&0#B5L#3@o?7R5>DJFAxDYHa
z2Ges(`S(u-51)?wPR$NXpQNda{MhDu8%l)#h|Q2wIAQ$?$x;DjrJsXHEhLlkE!9HC
z27L<Mejc+JaB@Zk_?YR7p^nG!8$l((%_4Tt>RHeF=1Y<De6tRVv20V*jEqyJ_Zi+@
zu|1goe#^)m+^p;NR`#p6>*r^njmS#1<T@;GnrvM47yX{1VW7C>^!aMWlr#&M5DJX4
zoIIb1x=&^0X4I=v@H3w~679Nah)YIN1gn$qHtaPOE!Q-*CR_<>eNCIcj7<}T9%%S8
zYmA+M5r=?`MoIDnD0)n=6y2Fw)+xHM(zCx?M`OwlIMSb5W0y(p%%-0o%wEIbkz?o9
z+@vgw8RH9CC!G-k$tcw#S%j{JZ_eQK`(cXVF)8>Hi9Ya~gvC&lHb%o+$ZN`?rCnek
znHWiF2=cQhEKMO0l1|q}nHC*s8OytI_sV6A^3k44YC_^Ilssh|)+j>3(sQAgWI``Y
zS>Ys0<CQe&rIiK@)~eM|$qx1su4U|3p~1xie$|HW`J6(mQY^~n`O7}hzwPtt*Z`Ok
znQH9Z!`L2!UI?7vmt&WUvufZ1a7sWp1+w@Er}JQ8YT!@Q9``jRl5T;rt{gLuY;PUm
z6m3-}7O@&A6<ZH~J31_@7zxQJlw6ga!daZ!1%f080t&(Tfp9E*&X{TtElEm(^rr!e
z6*;9vZVwB<0CIi2Xnmm7E%@_P=CZESiRWy!+U5JE!ogN4t}~s1FW%zQDel3$)^Sva
zahuCD@VtZmQ6M@2T&4x{c~YGDPe8@X^F@<n3x%pu=Dxt$O!SQzvNx76ud&92GId6v
zXK+kr3%=5eUM~22$;()$DTzIt6S&X@Fk@Ap+6sQDMPs&n>BqVvqF|kQPz@hZ>lU8M
z3>Q&X1^6U7q9u%ZOc@521(fxg%x0Yj7!Vg1HKt@O`AluntyI;c*ScHR!H$6#IMLbu
z98wJ^IV%Dr=ej3Zo?6CR2c0!wVJdD(N}e`{s89Ojv~y!&hH?|)p~53#6XKB9l9G}n
z^7TXDn{zJnsAb;(^wg}W`ZjNfuBYWd&{1`Ol<_+wF=&YtW?-cNDfXuZ&3ldrXBPQ0
zb3UO9Y{%RsGVI;JDdIw?fE@=p+!}+Ued14QhDwn^I-49tM+i`aKu^_?F36KpdBj_N
zXimIjj3$PgoM}=uELbhEB9muzq`8-tiTA8yi}P$_MDZvipcW#45|RSov6hC#)?zQf
zh(9qpXd51xqrC|U)l3`$Wqhzfq?##`eOQrFw%bWZRD@2(Yf&d4<qU0w-rWBdq8&wg
z3PNd-<)?`YAR+#5NSQgs0sjjrCoj;rK%>8rV!k+gJN_hH0_gSRX1ZG3P$&An07J?9
zLiAm%m1`SXifrK@M(Ld-DDU#O4#+xW_(K%*39V{Y>6~i@nNIV3Mkpj){*=}Wib_r{
zR*T3znVAOY=3;o};-`FMY=)p140pnFaH?8?Tm`Q{i=IPh##0D^6m#MN8nnQ+S|g1L
z^ChM%kq*&v8_}7Z1w-%|K@3S$Mmyh-aWDI|W0#;5U*;S%we`0dmNY>N$jk4@m&vCk
zk-3wCq98?0rac+e&UA1)-hCDXtNtVEO5Wr=jCQr%v=vkRK>yB`<iFW+9Nq!E{uP^#
z4sUgK2!1udX_fZ|rJkPxuPmG>y9=APxV_OBCg)^gMAqCTWM~9V(dq|(csBEPt;2-)
z_49zpmW~}e14dsDwCi#{Gt=AVeUk8zohwJydt_((l%V6GbtQY#H#a!xq%*HEI_0Im
z+_KqT%RyL)N39VSi_A1+I?*8+UpsrY9t3c<S^dAlr5DIt^fLgZXS>-*FfsaV28iw%
zJbuV>(IM^bMj>Y-IdgxN(X_Qg1MiXOBPu-xAp^lU!cac~*;%C9y)6{5dh0H?L?|JB
z_aC<0t@v{0Mo8y-j3k|GrS0OqxSqW^zdN%uJS?|2|JWk^-2GO5^ZpE9hZFGWK1)T6
zjdHiWEf%57rkk1A3d;X57Tcj|xQ|>P-AI>D8u*u4BoL_vj(?k_f@(Ifa9!k^@QNS~
zA+F0!FUc1iRv*CU9ClbA1hSk@sR-T^nWGI$n8b@#{7@$#k&6L4g9n1Vq6X*njc2cJ
z>#I*T6`4i7^nFBVNr)oc(?<Yv1tHLu2_5HU8{dUSa%{hh6au9bYmbGk^l>JOedaac
zHj^B?FGx^HbT28GTgr_Cpg7ZvZ!5WArSxV`J>+rp0&Qth_pX!eW5|kG%TzCrNTT~9
zub9PSCQRHL&Wb$N=h=!`#hRx&8h|%bPkv7-j~$jnag#=pmC&(5q1H^Kl)Tmwv!ohX
z_nRVJ>b#i*CTJ50X%2fLU~U#a%7cpwk(qAVqRgVe$mSxg4{*~h2{7enmQ6GgoD{(G
z6odV%tfxsyA>smaNx+l37@y+;I`{`d_ZN}7EieNH8@lrfG>Yzfe(;=KO+q>u=xYfd
zhf2Iu0X?El+Qvy~iywnI<um&!jAxEU0Ln0ln9kU=k2gjI|JI1zAB_m!{nE(#o_i4X
zV+ZJPl}>Y$D~GL3A0cpx&6`FhVR)t9;6PO!Gix3yUw&n=LY};o*0xCYtB-g)-=U%+
za5$iJjq6?y5i4kMYy?c2CPGsg>S5P10-uswkYkuw-2?!jbiLL{Bb2YTGXAHIl^FTU
zvuI8mg6!`Cs=#AVrU|iW7vr}-%yeE2>o~zZbKQY><zWPd-!QX32ZyO4PJpGgM2yu8
ziKvtp`6Z%t_~F{=XHYNcjV96xM>fceU6Y+v66p{i+(+9G9`~NLdX4-LHxr15tQJ2*
z&+hMCZHHI;2}4&sMPCydyx%w+dMQzx8d9px4lFrS)|A2O+GKw^Rmt7oCZ&mdI>k%u
z@zeAZWjRH8o8opwaUcdLfn)tt8d;n<PP+#9!R<?{&XLR8?AkpPk`Vd%8Sx0be~Z*t
z5*FeMr2luYOv!MvABY)_sm$~wuv28%BN*#|IK<madjwP2L+csrM)Qu*oru}(qWkFK
zd(RI0Yj>fSs`#UauUFFTc7NilAoZH#+yrE)XNeOr7h(x}aIS1~Xz;hEuIn4bB@Ki=
zHwggtOGVfc<$8o6Dj|x{G}Zgwy{=G@7#(YnGPi~LLu1g!tYq0sZx#V{iQ0b&X(4s>
zMBjhIsaC_bZH<9d$2=*8PPwSy)S*?KnUz?lBt5$76n1`A#fw>nd-XWY@VH$@G#Nxk
ziAu>aRLuKGEEQ$)eN1=~djkI35ExN+SIRJHzV#p9XbHC8@g_HV)%=@plH32`n;!wA
zW<Ih&5Syr2A}e@9pA+|}hE<}<anzzw)f~kx`d{SOldC7^$484t#rEo-ZSp3_$aV1G
zS44UE^M-(%Vy1th;TbXT&xT_gVkaAGGa~>55F67F#n%G(DJ9t`qCLq|jHg|$Q|TeH
z?@;GJ>h-eoC|@T!JVj4JhL?#utOtlJq}fU*GrZY_)>3?>xlF31sH>|>=_3Y=CPV7+
zO9Z9{SB0y<QHMuYcVxdvya4gh^ZHSxo1I?E-jOXW`qP)soni+u0O*?$G-$#4PQtfd
zSx|vh&qugVnEZ?bXswc<8Va0ht7K}kzV8JiVPzE3ZA6gYku_Um{4`w;1eF)oB1AY6
z8pDmV*K8rfE6U0Shyi)XeLrZW23L)v%h_>(r|YOE%iB8pI?sMdpP^gfjc3^jesIVt
z2kQoN?YqS|1dLMH(vKev?u+&nV6I9%Y>r53)|gBpmP2BdOad{`pR-9fIkk96%I5k5
zS3O;0O8b#;mB}B}QZV;2?WAd*QZ|+;A632rZaa|{u^v%|k=R62nr+0*R;Dj6*G>ip
z!jmHK{o^bgL(Ty_;DN)a4G|n&Y1yB5bh@cSkM(y*DdfdwJQ!CHUjZ+pu4e!cN01mX
zW_FxXosB@mQs*cbpTcwPf$C*|h;c@kf^5%BUGr-iHzNg+4~eW@A@gk+xpU78hKi&x
z`dm21qtxh~G*Gg2#Q_k6fDE+=0p(GV08k12z>hh$HiH-e;Yx87|8UsDHzuv!Zd+Gs
zskwRk^4*K@{eA55?m2y<9p%yu;^S=rfIBJiEokAUgkTscn|;rTEyqtmC0-&WQw=E2
z(6B<LhM33jBk?m!C~8dvquL_U&gkLp3qNQ31{dIHH;N%7hAGrLjjAJpC8J0kwMMFu
z#Wh%>Ardc<5$ChN_j4qIs1`@G37i-ddz~t#Bl=QIgutEoxYG_@{01Jh9-cM(WqNEf
z&XrmwGDtoFEpw`E!c=3@@JRj4&jH(X{7=<Fj2^q3%6Nx)Vs3&y;$g^?#F~N8VfCfk
zBR4E|-GHBi+SBVa`1o7cvDs;-$?m-_B6MhcSelO0FvYus{j3y{F~6Vi{9l|Tqx-UR
zT{IjO?{4+{t7bV<{T;LNFzgu#FN)vWUv~HB4-z?_?jBy!qw&cvj^b@6ONKK_$)!fA
zib@A9Fm1VLkDkL-%72)40q08xL2b#o;yCPU_tumN;gMLEa|*{9o7G-Y)B(c`b-|lH
z62GN>zc*7m8YCP;cg5l)#H-LVgBCpC1dOZ$G|r5H+c6eGQAIN>fkF?tDO!h!8T}`n
z<ot=GKj>sm$mu6tjj0>s)cOz`&|{8a7z64o#SL$)lcYJ$MgY2@v8aE{s|DuYjQn~Q
z_BuaTwPH&NCYs_oUc)sjiuO02l+6j@mDlMfmAk*KB>P*J`wOwKkLqCK%R#~@0N?ju
z2e(WZ8U#&1i#Dax6~gc=yAy!2GUouMIH&f+IH^kxy+NRt5mym&PlR#9Ak9h3M_$gD
z@ajvq40o{F4C8RwvtmokkSZt%Psm3Aw?IXIrNB(1A_OZy_A4;Qh3S_k%^3yD5&Hfo
z8hLs1xFdb0U+jUUuf>9sK7;p|3cHG{vMMVJoer5CCr$LF03xsu6lvYC0GL!JWL!OL
zVrYFRTp$*3r#w1OP&YsaFl5at_~=AS|E&{2{g+Pk$~ph<oha{rb|R^dPIUdziRQj2
z>iGYo6Vc5Sm6zceZV(D?3iD;nD#x!zFzt?~QBgz5`$|F(71Aab#*jz?=HwC4ya`n>
z7O{wT8ZYQ7I6JJHOoMTkB~2WlDU+*(x)v>RcAvfKFw!#?_$%Bom`fz}&0~cKXIgh5
z%UMr!XeZx*&9w^ibMu)lj~Ff&O6~zt8vRQp8j>LK9p+}173_#}KyoT9T2g?uVVBva
zj=FTd<p}_~oW2Dk717I}4{krYSED@6l^Dp)!A>%i8;K2{^)+KGRV<O6$qLW06MvRG
zws!|F4Jn}lb`olJk82Q!jy$LYGK~lEaJ&G8x@;_o4-Qp!Duvo69#7GD!n;NIHUnd0
zMS77M*=9<FZ5&mYRchfNw<PKy#~vgohiYsBA#7j{2>|~U&yYf0La_Hcolvhh+G!Aq
zF4G&+cc<Zz8Cq4s5Y5CO5XKuDP>>L5ud~|ZlC2(g;sP|fPsX(Xk~c`==xw8eh^=!*
zOOT3lJYG7u&*B{aMz4SALnoXPaDGNFcy$c$z-zg1zwPDc`C%{e(pjj|XC>x>ma}j-
z{Dbd2-cb|9<Ix1VU0+1M(0ol7P+dV@h4>_MMaJ^_B(+GNQm<>3!oO#b<}oX3ghImQ
z%iy@Fpy}vjS%)>8o@0S-D~E3?dn-oHrVm5NcqJ%FsZT<t8myKAX59r=AB7MQ$|g8w
zs8E8<oiGSxO53k7VAWtb1_CQd>+(^Ia(@-0kd_JX;z(Pw5J(PSOU|QBc$s|4gsT*+
zQU7t$g`pW!LSi5#EoS|xWiE8^E8bm}m@@(6iqbCltd!=JZ8X&*1;D;rooVkBcgAbd
zBsskUse)*;=Z76IqC1f-zke-8ZPxhiVH!9n(F-5NXxe1-#FiEl*qn>G4ms^$Gy1P$
z#QCQfRmo}Z|IcD%|Nftf(cn}uNo{SA_bPp;-ahqK<RD=gqfV-*><C6W<1LlUkZ8Rf
zHc*Y@kzlZatdBJ>Zg|rVvG!Zq8{3?AwvO4{r}TQl@5%n4GZEha6di<q!E4HMf7-K_
z&x=4eJ*_#QQq$2=&NN78IBOO0X)FVKSFJ-opvRX+2m@XyrH1|6Vml>_zDb*T9E^~z
zw^<93(H-q^Euf<yCMFo;&{3sHTeE4)@H?)jPo@tpY~|bi#d)Wz#D?9^vX1U|e;QB&
zxz1wy-IRnYolS9w#is4lSk^#++YwmKRij;G1X_ZpO6)+3oliH&l$e5n7`O%nB}?@b
z7@yo~Cg$O_LWm3cWw(}hh81qnbKpJZufPp}*5V;&hc{BCt!(5=bb;pp2;aW2qPu;h
zq9_IR7i(I^?&kA>SGFbDU#SQYS}G*(9GuIShVt82EK-wprpjl8xZ?Ee#A4vXDK`yZ
zTI)!@FxvBT9GT*U*D#{AP8x~GCCep1|4v+;<i$6#0z2;U4714UoTVkp)nzHPp?HOM
z<ZzbmxkPx$uK1$}a~QW;eL)RpdUj$Qv^<r$9Pqm{32(@TAR>yg7BYWwQaZM=`O1;G
zLN?u^2EXr|430dfWW?d5c0~E86JEdQ_3)$2-`6Y@ss8#O@>=~PFGNOaO!J^JD@ok<
zRtI}rO7<8UXioZ?yTDmjk^&GSt_Dkr(oz4xi0-@`ji_JlvOawWX=A9NB|01^m{bLP
z4Lf8T#ilE8VEzs(_jd#$`4fREZ%vjjWvwoj>=y9fP77x`CNGEW@7%(6!7glji>(&(
zKk@P5M6>Ni0Zy>JRZPVU7F8R{s;x$1%}z<=(H1HI$xA8yf!7P~2fU2J0HtGG_fm*h
zUy459754{Tt$*O96$W1W7remJ0ar_S8;omFb3KC4)rIPwF8y#G1{Qql+%QcNie7GB
z-!#y>Q>@2(b<MLp;ZZt9IBtNwhH$BLgJ`hLzd=#;W1*{5rh%wxUV*uE_<gQY_aMcO
z)N=tjy!Nu|+aj3*1ycCAg7y_}IBPtZC)x>(CG{$7;L9~9PDba8{r&XL&G%QJbT@Hb
z&kVOLl=RS)FlXkRfO5-m%7xqH7U!d-OoL6*%1~#sWUlRQ4Y|{XKlV!80QpyY<xTvm
zMREgGYB3mG7SlAZ2FR`wF#)CnIzV+Jv^?`XK=x;7x?meUj=(>aVLEES?7+drmQY2k
zB$rewP;l7~NPo4Wf2S9P>wl!zMxP_}Pvw!e4pSDg+PmP+Fe=NsH5v?J%djbbM%3Ex
z`S3&H-)7f;3~n!r>A~z1%-0{Y7NU(xofnz+_Djx|sc2w@h{p28gPMS!FVoV{;u@ez
zyC6!3F855N*%X5n5#oy@P8k1yK202Ka>28huo3$PmL7$5&WVI=$7$)^kBD&1yvSbl
z6_TWO*M%5ZZpO;284)0^c5hR(4l06N-9VE-bq&}?B?YaFN*WrKoLlb0Pq5I^j^+n5
zW4Vb!)WJ(aK}#E%FIVsLlLuC}cMdleH?xlwU(zY+M<tTQK${RzV_Y>Xo_TnOVtUG8
zZHbP_b^#PPdFP1Ar00mJG8(Pp8;|?^YLZyDn+Z)2QxinCeCt9YDZ-VjQk6$FU>cq0
zh)VNj*en!`a|taJ25B>Szs~3^yGm&S0EAK9`t}&XK-k+K?2Pp$`cs21_k%5OWO^2I
z_im$aca|?7nV!L3lE=^T?a1LFxq%S+ZPf;X%*jkkUL$mW%{jwew;Bd=8Bk4Ng9ifT
zH%3BByiK&ZL4`e*3#%y!8!MnGH?e4z)VwmXa_I^o1XigWRTsA2DajDw!5E7>lia$;
z3M!N2!MdWz2mIwHhu^L0zGs*9$H9I)_9UP8?R($J;M!5{lBc|_?k$R+7y|sG{g;Sq
z01?Wpqp!ojJ&5P<{Fe)ctO%*aj2F=bA$`3G<g+HGpOH!%ouP#cs<p*$b`P0=G;A|V
zN77W|O92$BCzavI(iMQ7qvA3BDxj#~L9V=keqqTW<lv)Hx$q&Rb334ac4Opxn{RhB
z!P=XilhV)1$hy|=F@gZY*+T@%BSVdrCV?K~u`u0)0OaT@5RDww0XU-5I-nc#qcISt
zVsNP&S1`77OkktbS_^1qk+rn;0Tmkfer206XU<YcgVYqXie@qkW7M1=f>NmB{7u1c
z7zuT!X3QY5pDI`dt~?m3ycPXN@QuseGQOD|9gb4e^q21Eql59s06Szim{?yU9!`Fc
zI$>#ObNjN#wpsw8bwsOKlg_~c(Tb~8D#u<py4{6BmG602;DS27ewm}~xZjCv&NuQ+
zIV0Oze)>lvm{XkNdo8dOE36^81C~Wq##pCznq#F6$<b2)ga`oER^|YdKtcJ2<@5kM
z;auAGmjHmP!`0yEbM`p+esc4j)M>Y?COutWzjXEKLh$i1@$z_+xzGu7<>9%4=mQRR
z3iGuggcgQCfRP5@!(h4066FhvRVWoDWJY4osRxz-ou-g+v?Qf;3%6HjAjizBJqbXl
z23HIhLkK&FnGK3!5As7N))>T*QK0^Q8)FUM`z#J2%qm}Ph#G5nQ~e6jbwhv9%@K13
zBo3w8q(ae3VZ-0vao+2aOY&2m;YI$o^=HKfjeGOlf;ogJBqVD+UA=~?PGfm`!+;@T
z!a9SIsi=ZJ{9cH<ZZ)^#GxPrX3SEX$uM?F8KeN*!KwHG}tmI`2z8kL-_<salf|(II
zu>U&>ksNEOb@CSB^Tqm0eD@`tte$Us?frK})%@s#Fw@5IL{?f=QPZlEWen-bg?<!J
zAynnNXoWD#p22{Y?B~mi;CQ)YwZr}S^-DY6FBvV_a&4^n1derC1sUZjMQFt)Ehh~b
zr*`gHzgn1n!l=B!+ew!YTqbpwxJp#;SNC`Xi8vMeb%h+UINugs8j`nEEWnYfDQL+g
z`U{o_L7HK;qmr*<G=QBNX#g${x^+a!UDE0rUA0u!1cqiOtgtu)@&6nVW`T*MocWFM
z`x9aWX*16doH(4z`%|32`ooSbMN!Ns3z?tK2r7bPsR$-rG?{RG<S-?*8#}3X!}daL
z=DvNcq18~)x|vq~bL|`#-TVq__nfsa7Dex<!(BMGnz%T5oe~#ok2O%MGcfY-ou4Dd
zrO`}BJM@j)Pu9kIer*9?9SZ<c+&@5<K%E%Nr`U(zB(I1U5{qlfN(c^VMOHH8dR(VO
z4EZCax#&Da2)xQx3&|-5N@SbDM;Jg&Xz9arVYxt%>-~W$6iKjuOb4vgy)|V|sC0UY
zJoUn;Y+X!R$2dUL#!$<5%t_rR)mBwnM#f9bM!#$zD%(Z|T{lK&67gzd9#t0zT1P8g
z<xP1nF0U)urW1<h0!V;%ErT_Q_GJ?PnA=s?bGGnOq+7T1#Z@fPv)E;!Rk(`*hRdfj
zf5QiQGZwud_$%07+dmMl|GVjAY7GPaGM)E7O;@#2G+u$1_diUB6_!JZF+Qe6M@<o)
z(AFz5sKFJYzE?K~pt5W-8N&b^`_ay<k0<C8{-05Y1o;>0l9x=A>t%s~C{6x9r~~Ku
zgSxoI+X;0|G1i7nmiB6nuH{K&WT*i?IqC#d9mbM(_qRYO4{M~)6vsh@JIFWthAcZ8
z@?|LH$PGtC$JlXQNZi_6eriQ(uqt4pv)LnQ<Qh14JL+3h`fL(8>_@u#foe|kecxNe
zMY7ATKGmV5{R(M>ze5^O_WvHz+)(bW410$h1x`+pR!nFxMh!m(fKo+zq8|f5%(g)$
z5QXx&6avw%N?(B3(D+XeNQ>ByrU46mg~K#x{1UprCxYy)DIrP11mh8G=O1AWue&PB
zn<T@B0j}=y$)657w^>D@<dZbee0Cka?pxj+3~6vrtv9?zN-!X8tkD<FY)Dpndi?3L
zk$c3!@%v&^@z1O1fP7<%?!36Ea>@7t9bRt{uj(M|z$A`>yPz6!Zv=w<+1<)-UpY@3
zgCJS(ib~OKSVRT#fFYQdaSK_+ipk19cR;4O>^|HX9J2U083GR>AOX`CRD4CkM8OLD
z%{z$y%)7@ag)*>0G;UwCKKZf`cVJ=d!{39z0gwzHV;=~id2=XI9#i>FPnXu9HH<YH
zV_|(uE3k<t&7*GsTjUvFai2mWSQmfvBHyCDtoMEAq2hPzI&Fn#rYGwfxH&2J3cb6Q
z-p1SD59k`<uAyzY-uo7dYx5c-Bc6OtEXNq`|1GwS;^t(OhI6x$)CfSvOw>iNUidW@
zw_xeQ4~^HX%jh5_w(mYPyrX@~R-Ylj5B;J_%*^<?{gf7RYWu>T=MCG_H8b#VVpY@5
zdhi-2rDEkNfrjnxur~S;*8bBV(B($^m|@~1da~GP_Tk;!wM%3R)@eD2or}fCkxlr`
zp#~sL0f%4G<rwD4e!xBY)t&w!7=FM?={Bjx)k^k!bfV^Tg_)a3FZDm~0V^iZW$Fw@
z$}eHmj3c^0Ke6e{QV{nO3_W%<O8;1b`LWV%bXk2{ouAv-z17+IgD&*tTrcs*vQJDQ
z!CC1K6gr%Eq^@#o$lSFDZsxio26MbtLUK<UFQ7b7l5XdG2G|a<FGQq5B?$S%5h#lu
zXrTGv@JXT12GE}aoK{A$v0phX-+}G~?6BSmr1?FW2%l59<1H$2p+3r5n&e2go(!0-
zHeG=c$`Y^E_(bsf)P$YUIScF;M6}wP0E)G!9N>{SBDxX<hbHRVGI&DIwrgH@otTuD
zeUmf!DrdGa{6VlEE>ksXr?yhdpogi>IgLhVeiSuQYbRxG+X;6zN2#|R*D4!pnl|ko
zCw*>Qmac}eWa@1X0;6s>8Hka<^hwebrxypNAd$0Fp)<f94+UKynnH*(9qRG@@rvl!
zCf`-}PZY7~<JVMA4H1rdCax>eBj}P|LnG7~m@UU5(Vw=<>437xB`1bYxw1I1QpDNo
z0$r`k{EYbpw&hU-=6lB&Bb9;L9BObWIb&#`I2mj1{ASHa_Cbhv8!R<TSN#VQei<+B
zxA9*7X}t4a#w%hQ#iiSK0B##h?I}5!G9L0J(;#9#ZrVK1MCkhBs_EGMCI9_ck3R6w
z<_lj?@vtKd`;{xStWG<fjTZ-<O&>0B%K7uJw5FpsSWs1m&zhH+BCI8qFPxK9)D_PA
z^fQL-%S2%T7%FfIz~zvDh~={kF(xKXBZ0LF^@MXZ;g_N-m~ND4!&E?^6w~IIX-?oe
z1#jz7Lwdn`82XwZ;~(3=oEM>`fF}1$V;D03nE569ch2xU;Zd}__-+9Fs%z*p(;sy$
z;7?sU^!;aD(;X#0Gy)$n1N8n79_c@XH}WAooc~pL9RCpBz;EF>{;Tk^(FLL>u1vE$
z@Ng0|<fvN4%c>UGPc0^00Y^3}>We}HaM?VaOmRb)nol>X_z>H51q_c1KGk0Z%WRMe
zAf+L?LXHqMUrFCW^wes(VcG*v!@eppUiD#h;NswDsG(F+YN)}6raLrIF1J!16=kH~
z5HlW7nd^^XqhxSH)X@R8N^p>M3Zb?HR@YpK;hQ8o+3vOm`cN6`=rUu)t3UVailDM;
z*q}uqvWgt_ri7{A&w?9~Tpypme7ig)rU!S(InlsstXd#)FWp3`+%hOMUo7K+70w^Y
z9{pP9|8R<ymE_v6EoNRzQ8c!7+An2jI@zRz<mepgoXyG@`&mK#a${|Y*uV8sd`*8j
zcEfl+HpJ%hinoNc%CO6vjV_Xs61FY7prib@qJlIi1~*+;DUgVKmhPg3pSmr4gNn0e
zNf{TdGR_4LB!Lq<4cFvvU8%uU;b_BSYda?Yw^)X`B5KUPZ8CT=erp5+P0>cA90+=h
zZNCHu88R%URRFa{<gitzvPDz^-lw(XwHs6*Vi=bsGesDi7K4T<E~5e66NR~!(j3Cy
zb0f)qNXzvwLbYYMv;Lr&PrJfkm)hi8uoX4s4;0Nr(erx~_&Z#|<LG`o(SPh^>K|bS
zbf-2DbZ+v)d<?(Lm$`mA1ne@XhLS&sEC7h`0nUR6lk^A?;OBTlnzFpwWk%m7Kr6)b
z8noBPw9IPb5q=dbCNxBD%cL<4;aozK)wSG$(TjcDY>Bdug7z^zWW@W|XTkk%3GKr@
z*S?P!dw^kz5r@0i05gIJ{A;LE3Yx~0X%i%rNaU33B$Rpf49=2Ht1A*r`Q|n5VKn|a
zw7MZ*JAO7oYb-USNrQ%X*c1`rjjaWOIN1zKq1UywVT=F+Mw24+{5?;^F^mQ@{HU2k
zaP(xwJ|5`R(nhZu9*`69^UQcKZZN$c^pfOXDEKxTYAldSK853v27rLlI2i~-=Cd0b
zsdYgAJ=fZG;VLbex|*grX|1JmW5`HrXa=?Q?L107b-uIG&^)a6wy%(BhaB>X1n}1<
zg0scp1K@3r_LHC5_!64)yWcrH9d}b4ydGW_`RMhA$i2pUh(n;XarY#Eh+;?$!}$H<
zhn6FuF@~yIpaE=5IV8^#Vf%N^Ov*j+NU!;i!_7z5WRut$`Z=H=F;)zwxr^!J3?VGn
zUqzI$@B<61tyF}RRZND*vG`d~o=yV60T_7*no#ioRCWR75%Ju7qxLp!Fz|N>#s!l6
zX}~q$>cjx+TEl;wHyV3;zPw#bqkp@sj*zSF9_^I6jtYjv6G+*KkwvSaHTH+_`|5Y1
z&*Oi1Fi#=g3jiciLFXrw2Oi-c>~w-zXdzoYwnS`!NC)*yBE-U$iSVsa&{6?XkPw$?
zYX%X#l$!1v)tPykrb0)sv3H1qq!2TIr-Q0+)+pbt(c?sS!q0E=b<h-)E32x#`$iU8
zX{;BMYoPJ3LcM1~ljJ|^9qRWtC6)3CaY%(1CVu5RXPIi-IizrLdE5SqR7?@SPZ7k1
z*PRy=C(|)LM(y@fVDqH~e+?aVO{hEn<tk0$U#`;PSBq^GJ0f+cU_J`o#$v&Rjz{ou
zyWOSSdsjP$H{iw4Qn{2yByZAb<|3WxQbPh}YI~8M5d*6dyAnzae*VYMQPCQhj%?s<
z!N-*^!>g@>i9CDji_h)#-oTsJTqP!S>g_!XBJTXcw+0yY%p}J*+G*zT^e4CoCQPao
zzD@6uT1QYqDnl*+M_thm@J*50i0$G@AnxA-5uHpgQ1H7r>)O_NeJ-v=F|6(40>@A`
zg<+AxL?A(ghu~Pn2uxhWEjI*5IslQgyaOOG@(rdy8vm#I3c*Ag&iuX;ft#zAJG0Y>
ztM>tZVi!<J%Q7$du09!@1Oy*MHd>jf&mT5i4>dW5+X4e`M}AOpf3x?I@-8F^(mBAB
z6<qUbX`JZfxj&|m%M|aDe|C^TgSGV38{c;j&f&PlN^P?wM_KiAIHH_WPx@%m&?Btb
zbu2L5s&4sXe4;qq`nExes(?)~6_LbSeCg8@zzvOqH4a7u`m!L)u5sHYz$5+zewIj1
z1egFj*quP?W9cZQLbE6eL*c~<rx@cw1|>){#{RVlH}@_<(5Y#9`0y6tL1iZ`C!|Sh
zfuU~#(;9<#I?Kw9)^N9n2bPmWX$E0%%1ywLICkbmP^DPLS}EEuir-^%I-q%l<>yF0
zodNOF+^4go(Y~hh&A484Jmg7jhkxnx_;DFU^+Wc&#4*&%5X0%+L#*{DS{pHaYSrd#
zPXo@1`z~mRxY?R?dm+i1kMDw~r}L_bW`foC2zvvkBT)7R3BE|8YzNvxYSoCGcYz`4
zHMz3rnyLPhIZu*I$GQ7;r`biJ1#aOIDRnW8GO~J1lRl%gGRm)1iKtw5Ej0Dg)N~y;
zC4t!?taPU^mgQk_RNve9ZQIW<A*=@_4;`S(;>!oP=f7v@xx81UBxB6=Qg~oAkVx%X
zzzXNdvTcWwvzh8vNm+oNXcOgR;@3ml*PnJ2`}rlb68km+tw-0LgneSzBSGpR&c-DF
zxcB1x``#=4@C9}FN1J<^px@I`Xi!+*IMm|D&w#N&v;q+v=w=N{fFPbu1Q-vrY@(sd
z*9UD7Z=pFg!;o?AtLOXClbw;Dv*VNT8E_skG<K*A=_E7hj`Z?w)z%fUi-W>cTq=Q=
zv7`$XUeWF}pUs1s8j%1dMRl0{%2JI=%`DS4;u~W(<|A`wlt48wffO(_fqL?DgE5f7
zB&5|hO{D*bPx>F?^Y|scmA}Q8{IBAp`z1b@zr{!NxA=yuqWu0B@j3ldd^X#|uMWJ(
zmOHw<S*w0$#9_&&a+5LN>ga)d63TDSxR|o(_`bS5J!3xALfC?d9|rV6*JYUoApgGi
zLZ8t1FJnrL|1hR>BRoJ)7|EHT=;&k7za30*4j_<jKvYBv7u;OQrBP+D!ki+~?RQO3
zWTj|a0c=1BQWTlMCiupLpTX9aNl3P{pZg+&ktV7{vC9a(Cku~AyR3*UlpYuXA#F4H
z_YGLUJbxW{Y;Dmqubbi4#|@ZzrWh#1wCkrI28V+K$?Ck`iS)6&StslM*da6M?%++J
z>|eBb>hdG;>mX0+y!R<hKg;tdqKoi;DkuGyF=bK`U!DKL+NYVmqY2jv9A?E9-p{eF
z%j>W(K@3-YoA<{N(mt-8q`gn;xKYJEMweCfGZ~y(r;(K$S-|nA+}UwcLs$<c-6UUP
z>Al&}f=h;+Og<J0M%F_U<t&)klU+6tJ+gVwxIvt6wNFkoYg_o|Q_Umoeiv(3qQQrD
zQ$ZzqaA^F@VZh=N$eD!rziz<zF8{s(LvnGLEd7*<>4NKN8t;G4$=+A()(hbWs1d|~
z7sOy-H&E`XgwZoLFiS!m)bTuJFEVtjHDd&P7{J5?V;C{5HST0LX&?Q@{qWB9lM74p
z<#co1^D?ew`(4G|=M7u~sxQk!Znux|e~u~ZKE{+e^nR+E{7q(_(XYaiLGpy6Vi=TV
z_cTzV@OU)L5B+H0AWmxHT{#{<FT8>t`){$l3Z(cx7z^Gpx{}Rna-)_l`=a>A1b3&Q
zbhK!T4^vclHznn6ue$_&!L};4xC*Zc2_zMsZ34sPPeS=D5E<95ld9(pp|KFjK6#qg
zyTMZJ%O<<Y7q)qEo?&0TxRF;Sfpr_<X^Pk;n!ex{Lh4_AK{D@bGF^JoKFWUdv{$H{
zWn-hQ=A@Ba&R(@=QMwr_l4gE_1wnc{>L|)W*P+gpThX1Ij>sZbP9h9{yc++EbPOvZ
z-{9QJLm61BFk~yzMb~)E)GD(;{g?aLl3v3i^ck3~KHTTNQ(gs>MK3uq{tx$oy8U+F
zU>5<fNDPbsY9g1i)4>e4Vj6)4hC`VC335KX#0Z@5gt^LIse8cS{xA2n{dS+!&p&PN
zd7uDR{lk4^?4yiy#?HWPlfT`k4xF|hK9RHTl5Ca9QUA+*@IJrYH+cNZebdABu<Tb}
z&=)%8Q|Ed|!FwBIBuu`m@7ar(bt^wrq%WyFm5J9lB^y*&C21@zzPBI8|Ae=I9?_Px
zbYt{|ytBp8Eg<{G5*OR62;HaJ*q8B$_00@w`bz%VEeVsr*TMz*;F0+w?Ts4OQva3q
z;II5}00%$PUKFND#y`^D+03uB7X*(YH1pYY$ZR9`TX2#Yu#C2}iTYk%nM!?+B=lBK
z6g$HdYI)7Rp=X}x8uh`)b=Q~JkL#}I;U<K;n1_$+E{~7vuF(KBl85l=-G9CA8W6f!
z+Z(tqSdku3{&n5uprR$4o7F#1$=!TW(NEh*w&bl#^NFcH-5trpUf%Rm=^fpl!q>R_
z*SZo3O_q<V9!@xQ-Pv|IJ4C0NfYE6#OXIPh?Be4bY%-)Bq(+i&qc3?Z#_#`r4)*Vf
zPxSwX#7D4?FkjEYU&-1iu4~CI0*$8{rdnCHz|Ru)no2{#ZQgCG@LlKp6;ZPyQKR-W
zSZ(Yh^OY(V)!loGH&WMF0^JrKEV&Q@9^#R>`{RmB#>0v~nx<qXkD&kpNS+oliR4;T
zN{gU2)gM3{2i5Lrrlytof8QjFuEJ~NujmC|D-)wtUd%_Mg7e4%L1@EH%0K+;`04{%
z!En{BT0eH*iqprJ4^IyE=lAokHQv}1OylF}qT#HGxd<-mknZ)a8H2!3bP&q~f$wBE
ztb#!Y_K4}~`pD?O%;>aC=;}NOCQK&LZAUbXA6iMUW6)Y5EoP0a{k2f70E1Sz>=<FJ
zJqL$6Kp|GJ6iGiLUIQnt5z>uxSbnz+4KIQCN^{fGlMe%9?|T3+4wwW?1HR%9zOqsI
zpMxKk8%XZ2;0HD*Gb4Ge{yX?>oDPAw461*er+sDx4w0VAbC{}=naTrvllY9LGMic<
zf;1=-MQ!7xN$C<XIi<#IoKwci8D3J-n9Q73Wm=Ngf%_5u6t`%NVpUWU-Gp}-ML{_J
z>VAp+r@8%B7vrPk>}fvFhi`%N;f>Qml|OPeIu1*Lq6zS>PF{cWZ=#@Y4=^W?z_)=q
zDX(EfktJ0^kwjLpNkUP0SDz~Rn5o`2bOB8c5jHY&j>4|ai;#7fl1MkA#PVJ+Nz06?
zPPJJXk|H@(|A3Xvm<sGmot>7n$g<10vhVL2$TP$b@as<PPZInD7BY$38qU#?lJS0`
z)4>#ZZFWM+ASXNR#<0T(0vvTM4yX_xCPonlYLdm{c#H@HAlx|^2$Oi5{C15l#G4=!
z{WS_X^BZ@$%{BU{{v7(A{ixLGDTa7#tz>7qoyR~N<PT9DfS3qeM|2exfNjp6eqbCu
z&MpV9gU7LJXZ**s7iS*|J29WP&ku)vj0cZrKgxY{yCUQshx~>SusMd9L4^sV288{<
zj-sluaRDO4oyT8A64s=h5=hDX0D*Q;Ov~Hx7ln2iAgl|>o$2BzLY`eXVfb70OPtX-
zuW-Y$nK2<*_;4+xJPAw$R9(EdkYYd-+`ei-0Wd0mppXhcB^O8@k?JoLQtz0L&nD&5
zifKhP4F@*0&i@w_g2Ukn?0ldQ=L3bI5V`&zC=BpF{4w7m9vfLA=^ToKB%_ZbL4xtC
z0+z|khD&M&gn#85MTnFk4{)Q6)r|NmZypT84YPwN+z~fQ^=KZXsIc*YLWl>kSreV4
z)5LZnB-!^={C>0d!q@*(+FM7pwJluVxLa|jI25-cL5mlMLVy-`cXugX+}+)^I23m)
z?i$=(U)r8?pZk2@xv&0{m61J?z4l&vjAZWln=?3p(Her1oul;#R5wa5%TLzld*_3x
z?ye6{BYhDVH?QAR=ZJhpM&5il=?@POWWB>uKTu2TEWd@--*uNUl8cpnSAk>PGF|Hp
zS3-#`jUNA5A_r(|;c5KN;}$$tB>a=!29z8ZKBe0hY2?t5PaL18RXE8TT_*=kkveAY
zZwj;-#00)CHxJA-KSVd}Lw3UASpSY-i^U6uRr-;Ri=W6mnx-=@l5U+b&U!7`ft}I$
z5+67jmFE}-Aw*C-+jm2qkYMHMrB$ZWQ^3!m1xr}r*Hy;duoHMV-O-2H;m7ORr)<?%
zeB(qL>~^hlTC9OQ*iJp%268{zRcm~0VhNdF9I<B}*krC@G&7T$L?1fLSqfl)N&X$|
z^X;bWOq$9_n)&It&YMJ*X7d-Z>Xh;3-we(Xlz%5yhuoG$W}Anv*mmXCkzo2i82Hit
zgTd*vY&$50Y*1RJ6<0*^+u>walafBS|K)Jji#uGEk`-8|A4k*U6(@ec`D0}=dBuVL
zE?vPIV7oj_={c@4LbfHZvsIsfBa^I7Lq89nq@om6njNB(_R6Q4G62S`z~MM0N8g6U
zTB(Ax*9NCtrw#kA_F+7=D`LLASs5A&z;ljn+w<Y?-|ew94qxvGBS*z66naDImg$<1
zK_8;HeBo{5f(HUGvF(cGBMMr4M}ovIgRwX`PrhA?!%X7G=6b9Y@U<bvcIW2&;J2t{
z<+8bFV4DpN_}k88{NyN$_dDF@^D1h`&Zj#`lL@b9He3f%R8^26J8e>jO0i!<KCf<O
zlGH}yD5TIc_Z--8hqU&-hIT$FrMExg?Tp{KVA$dKx#d(WMR)2ys9G49{_@@Epy@;s
z*veXiFR`NF$SuA^$?-mtEIG4(HJjX9`d2ited+)Ce1BUN5S^vV3qFq<?U4AR`#BR-
z3dgk9lwWL+68EdpL>xH!nay5JxHO^&af033usE_<sQ&9f9aA1L{9yCi2PjGn#V$rL
zN?3<^<N8yJXTjCRi-k}|52pL8{pEH*@e-geXOt3YJm+7oW`gwWv5U4k%3;eXgh)1<
zMgFoP`jLR(ers#fAuGcmhlAL6=B5i@f`!}+u_(F5cvdVrF`AdRdQ?Z$(*mj>olkpw
z(WBfZndHmgw@4R=$mS?9`M>;2-9mb&ViC#NNq@dabLrdK3ox_ol<dY&h=VB%$fB;B
zg#P$Sss?oaQ=^ISKQ@{;n3!quB)}Pi`b5<0Zh2WR4swNjVr&0D3Kyi-D;We-l=UtD
z`IDzO>nNY@Q_oqeW!rRx;M0Z1Lvb|)$@hpAu`ul4o+cQk?ar&Gd4aZTn)xqKHPObU
z&-B?&C0{TOyeVsmcOFL)HS)h$Rj4e?AEGKa7)86vSZ(6<v<};D!<#|EY_(-^xF+xS
zli@#&5K8eWO>L!@e%ng7MEaWku741XTll}H0}~Vq0Ac}_QG;?ni`f~2qO9oN3hHkd
zMzo4t!L;F#)>-fAghI<l-@LKUO8G*lLx*Bl6eAlMy+gY;y&mCzf!Zr{&F3|4KzdpK
z4xuhkQu|)%x~oJhwrz8k)Y^Pi7<)%YkgkEfJ$1|<|9e7&QM?CFwsYgJgdpPs+3v4|
zV3zF8f3=u&{%SFie{C_DB82(B^D)a@C|POP5h|FG=iEsRiAdovEc|18vgJ7)X+p7v
z)dOmRW=}Eji|}LB55d&ogp0^_kkM?CP-O|0N6|2>&kLVOk^WGsUu_BkgW~^Z5kZo_
zBZ4{qXAwaz8sef~5kXS+e^a%NwIhEbf{1@b1lRvDA_(=55kZyLh@h<X-%jTAe{eFd
zpD)IB5~oN~<odFYo+ggnLt6-T%aN_@jh}bSgYLJr!C$LQykjx24gY_j>eTqo&-7uW
z=5W3m^7FX=Bx~7lqWy8t_W@m4csW)=5y*)cgZ<1wEc{jsQ>`3beAg#)4+oD2#>Ph#
zPF5$aQX8HR!0o3i5`9`Yw|%~^h<&;KC;MU_3hSRn!%At9lEp3i2Z#|fyp6#Jtd?p1
zqyz`h{!R)0ZZ_H0;rz?W41~P<M_n8E_^ATC2!`~|lY{iXNL9cqse1U|NY%7r2QW3o
zZfK5=D~<-1SELm3ocvDMOqxxugNbCp45<J&Oi)j~61z%;n``CUJ$gye@dcKOY>Fzn
zF1W$;n#qPV(@~|qAvNAbo?~U<fX`*+q@hN+zlux3^M*)bbE#j8ON>u-r~RuhH7&*D
z@yntS`7(dimT0qM3QdG@nDElNRVh?kiWdJ;wG}d@z4J+%YMgj_^cixIwupv`GL2_s
z&@Htu(_I&n@U$)(eQe^87<*#%*Wof8kw}Ge38EU1zN97}iO`#>1rlQ4O2mInB~-ot
zu?s*yhrp1nbyX2y@T*L`24b>H)e_&P2d4P}d>E0;LxTV;CbP<5?b(eow!w&ZOWu~Y
zRLrK0Y%|_eNq@PS+pE8c)x|%=>h3RM_4L{~eI171s<X;$y6g$`XuY)H&;Qz6a#!=(
zTLNeg3Dz*sG8Lf{68tQeBa-zmKhx`%pNS2b`1YjNN7NKS_SMg%|Kn$R{P8naF(dT<
z_?hw_1N+6U&Q?R8;I2lW6Ki13i-`3(GE23^@bdQBc)h%4dYGu(>?(1Rsn;NT(CnAe
z&hVTH!75ymP}pto;&i@+7OTiW&@nhe0#-V>fTiu|MxivOxf+V$oH{3%dk{W_Ugn5G
zsD@+P!s+5Xh{@8<qPp$3geapc9^dbctX&*DePnnkD)?l1<w8b8q<fn1<aJf*wlVkb
zq?VfO4n`}Fqi4FCYQ}<A+FuPvnJ8tABCDAg0OnsV=BMxz!VERo{|>AgkqCL>c59$h
zWZ~H)c+=Y=j<H9mwsz;#{IA+g{=1z04`IQ7BUS^{UM`sro2g1hd|9&dcX@G@-jwj)
zYll$~w|ZzjdU#wa*P*iTNdX6x>q7s9tddRZz-4kXsYM2si@w^Kv&94-0iYJ$*@&iB
zCi#OKfu~4R<EprYPQ%#0CkhYo@yWZG^IGXpJ{MOV5lL`psj`cFy&C;!wiq#&67hcC
z^`|i?DlD&B`3Qi%u;M`R4!wRaw0=*buywoeESx-3?}1N!!G<Cvne@c5D~c3CvS`Um
zs1y`QqN>dPOjpWk#avPE{Y}KvL%}dpKl!NtJ<$U|XVWWT1yrp|;E17&QVmvR7Ldhf
zGsQNMunb=-_OlOXVQq!^&L1QRmeu?rA1=k4yUEsmdv|amF6Y1|$L#p$e<)7TgKYkW
zY_4~r;vVJ$E(-K7?f}bqJZ=&KKf84f&1P{4?F}As3=SnFfwNJ&_)1WXog}H=K_$u>
zCsq&zm(0k%#gIpIZNZEq$;nLIz+xxV!N8Hn7}AuNBOxN%Ez3R6>JUXCgypQiW+Mi}
z^%oWzFMRk$(ENCzbuw-3B=lru`oNCuI^ZT|V3*{S8Wok-_f+s??g!-Fd*eLkN-ZJz
zYvN;vO^D_V`Vi9kK6S7)I(#>MhF>i%W(rt-1D`1r7Pkr~4XNXbA2cUk<Apb2iV6w`
z843%LHGgSjrN1?@^cqX=|CUDH`>m1h{%B<0b?E<`GAvT}1%|4*7!@(3li{1ElhN(N
z@QRxLP!bWc>{s$$a&1KaH@Eb+My~&V(#Z0^G;-i?jm%eL=`XnQ#sj=RtnT~S8|J&v
z;kzM~7y{8f!5J3zD2<s<Rt)V5I@DYt1eG|AZ`?ZTACBBfA&ntavh6pw#3ZLvcHW0n
zx8;4zN9ZV)wM=S#8;NO8{MI=P93s4uP>1`6t^YQh8x&m1gX2Hz=ABpFOv2S$^IJFT
z`@j@LR1lDYLCj(KML{+8=!>iAD&k&hrgob<p>AcRMnFL+cqoF%gMF)R+{HyP<7QAL
zqHB9W<a?hNz-bT2des`*db0-TrZX}m62Z{Apmaa$K*(cJfnn+R{>ebvK!n#28gY->
zrfze&(Q~B$T>nD`vU2SW6e7xAF8Jby_d#fkxQQrY9L8<@-@anH1my#9`bghE@rXta
zO%K{c%h%^fzJjy+e}l7RilI_y9}gqJ1Hrj{Dfn_~)7t$}VneF=DGr1y1(Iptiq$K|
zv7$`R#~yL{FMg4;v4;>J5ghB4nO(eZRNhF}qJ{+dNRD_jf-5|0^%5ZN=GC=9bpIeo
zi76FR*6|heLWs(Vi?x-aB&H)5C86s|4{DQ=i{}`h>LaI^mZ-)QCK-y?$81+%?KG8%
zKRom0!H=LPx<nHF%BMyW;nrlT#-|76UHlmgscvF0ED6<)U#!Q>PAu_@tT;*rTBSZ}
zXam?F!#n^jOd@>MU}<F4^GcS?t+plUr164BN0a1w`T0S_AT$K1qLa@W?T6Vfy`~$T
zr`3b?0Yo1PWmUCT`=yVDF7x?|7*BZ+9Smu(mA}bE<MjH$*lO0e{mwVtK>l&5qREfp
zc^@1@NmB)InoTUJ5uGSd#Zi*6dWsBARu1+B<2V!V?-6C*Z{diY^aR^3C~2m)?581Y
zn4DaGO3-Q@->v~t+v;H)>aeuym;+3_1ij#)a+>i!vA)^o%XJ(=IyQH@+DAtEva5e{
z-P2a-%8>v{GjSMY0(ezuUJ<e3ljFo*A7<}lxxBr}W5hUk{C>%2D;0^k*0qpOa-J6h
zM&552Yixhh5Mhk%->x>*f#T&BOjWgcC+WY|0Cul=`?((Hrhy;HOKN1$YIl9ziY~@7
zQYPnl7OnM-0&Ln=m86l?N;{9%o%W{9dv0a;-Dv+-_-fF43;GsW8$tpVOIn9xQTmpy
zd4KW*V|I_5ID0TTzBqfhG2sMPHW6-iuy1Y^8bg`3S#ykR`>McOiGw4&Np^5+3BVVL
z(0icE(uOU+at2z9B;g8Ii;c6?x=gGncFWz_cvY7P@zUX=Dze41`wX6I6=1MJ_~*vZ
z1!#?@UER`)3+?X7eHCqBGcgb;s_VH3B&vg%_#8@GYxyBOl8}`91HY{QqrL4}dO&1I
zzdcwE?P1v3Tv%EmTea|zum->V_;N51*KrukQI|99sGpFh(hsJ66IMcU(!WlY@W)Gm
zo){4<StFqT*}laFG_=7Y(Ya<EIlOkNR&Yt@I#|Z{LHM$ijT8UL#omFLZ7MgcTh@Oz
z4X<eq???D{qn?}Z<(Bt{iq)Ie#6n2~*!3=G9mJ;_(d#*Ae7nH7E|$Pe>Vr!BP*!sh
zF2_~~1W=?=zBWLXciJcouxP`>j}+}A{vB70k4wx;oI8vx!qL*?k)qrzJZ7~`0!~tI
zR?=PD*(%VapR;Q|oQScBm&SbgpgN!CGHS=xoX^_)>enp;!!2k+Iqq~@UJqO6<lBbf
ztC8WTqhXIB^jtAb5EE15bN1~8s;%PzDYTcHTd$aKJokHI*7pHVPPEOND^%j*;o)-F
zL|DOl79U_o___9zbgYh%p6{W*I8FAOfl7>;tuIfQ1S<E=Vge!sL{>fAyv}cyd-f2m
zIqNkw22C&DJhiEcJ*jCbJh8lz@EEkdh@cdSm%rP3J!cwkWDfGJn&H9;VZ)yZpjq5!
zB(0kMM&oa_6mI7wSE+(UBeYLT*|_-JY@UzJPmj0G_YZZg9c=H~AukU~I8Ro;v=OJa
zzHYtRd3;*CSEHW4NKO?PPa4a-w9+^Du{C!0okDoBDnB3KlQW7c;N4J<6PU)d>qv(J
zacKb%XOo|W?bi2iWz-9WD-#{nM@bzRCf}uQJDE$JuommW8<{d-ucq0f7rUTYZ}QD{
zmxx{}rMHh_e>|yP_Ua_n;alRIIpFEL_t1XYpU^z)dcS|>Yx1I>NN=k)aX|BN_NPu|
zKYYao%rM{K7+2^Ty>CrW-v}AIf+nZM7ybNip{fhto#jn7KeRX@?Ud|CK>3}0>$yWB
z3#oDafYXQ?K0{c>t!`JVDP$(9np*a8waZ<i$n1mF*jq&J4xwus??VrP!<5|@!>1cV
z+w+^RpbjTBOOSzUH<7qpcse299SrjV472ED;+qQ~m20p<G=dR#;i9aogiF%|B5e{I
zB0#I{ixvq=y{`uoE~Fm`^0`E%!{iH5XMftAyq!#v9&Mjuc%Ixm#x&T4dq3D{gMvdF
z+-%w%ZSSs^lJ!V<vRpWO04!9&gJw+JZStX>j}jtx(TTQxn+Vz&RT2Pb9gmCG|2GY$
zd|HeU{lgb%$Nur!R@AO$@^1218O%b;f@ED_V7g7(eHpE#!}t*Ckz-d27E=7t^NFyn
z@l7ikofI!*GC8xjc6bM&PX;f<knakTPfka=G<t$lWR|%^r*`SGkj`lvj=90NjLjaF
zL_Ov{?eI=HVm}TI^)AGGvJ>!)vhOFNUqmOlR%~0gorliiH;*v-J|jyYd#wBr3lO2n
z1t=k0qpM%nt_TU8wc&UxYl`~{vjpm*^bm${W71_;zQ<G|T8n!h2-E(c`J~LD*^<!3
z6sU#LPUxAz`?%kGf0}~3iVv6i9>9*aa&yka#L+2~=*JAJgYtvW-$6ln7Di{vM+l-~
znybawg^QW~$W2)l)?GQVi#bpSrHe2igBPi!y5&8Rk)n#9^~`Zci;l@E-H)bGxe8bI
z0^qzyO*>cOoiJf*UEjECC82Y4JQ|2=*d}q4xliXE3V|=pOvgHsLE6%Hd-t)bvcS=V
zY2+XEYzGEF6nLwfW~i|I%2L}F4?^dI%hl|n!+@ocKgE4!94#M{dwqe_Y}9E?|KWa7
z(2sHS4hN(7pBne9?81vp$Co^CCx?(c32F<QJQZhzK_2sK=?tjMc3a#1Ls2&a<P}u!
zH9(@iGTLNxfcfI3Lu)Wq{#81#ArH|tx)wrjZZJEr9k9o4a8+!mob|R<>00o~q!gim
zYH(;jNd{E7fb}+=xixWF{tvjGQQ2|`y-;X|IItAPNK9|~t5Ws2`_6e(8O@}Pc&77u
zc+P6V4SFTz7sJR;W_1pi?4?(qZ?0;f=cbq+)u>-9*5Nc@X4|t~+-8yt>gL9o;PFY&
z`}^ErT;gy@-Fe@VT#h^k$Ap<j*Y#+a!_W^A#&gr#smkiiqa_lA=y}C<RuhZ`FylIJ
zf=7>6F|bJ^pi_y)?i@R)OYE&Z?LU<>(RqNM>V71&<=(RG-;R6`A;k$oU@Lwio0=QN
zOqOLoqS%Jptkjc{ae@#}vsoMA(R$`~d$@j_azN;8*Gf%mZ9jet`Ghub)pB8Q43<OS
zM?-5b0b>BQJe%g(?)7x?yuMar+h*jhqJNBj@tu?Q7}>cpMVL3x8Rg93t)_A(Pp9Ro
z<~M5+CHBugZh@8^St-pkgihSYwo4w#-{}ylYrh%4=b}jcb`w@p+(}3J>u2JSP5kDe
zQjc1&2h!E`hq*Pu&6$VKK$!E_c!L?b7SNMDlkggZU=N?;Umidh$^F(&aK~F3R$m6k
zjJr+i*kh`RHr0B*fw#|RPtwa{H(3}qyc`6__sZKDf)PQ#vVJ70e5=$;5LH%SnlZsl
z7!~vwF(}_OM!DOZhyN@dzA7Vl(N&t_?Z9ja-Ovxx3i=Z33S*`#XwM~%2xmL_oy=jO
zyH}1j8y^tvTtgJn73NoRrkSOFl=Hy-$*wPTBe9^Tr%`G2EMrrk@5S)eYIhPl%@&t9
zPIzUJZ4mP7Y}XnJH>^HNKVf7B&D){s%#$%vCT{e=y)ZMkFO;(xQe>`hW0+q4qqkDK
z9RZ`xRGlR0wmV*21e&tLB{jek{&c^JiayNmJC*<=_*6>k_)1c#aqt+*Fm$DQ>qS(!
zruCJq6t_9Tri9HG(4EU;0_~&2)sqrZOGCzn*E2l-vl{X;FIIRLXP_0z>Op4%guQj_
zDbWdD8?x}$=}1B+H_e}8Y}Alf(N6;v;7qhN0BgljqwXx(+XzR6lKfa<w+j#kVHTBk
z?)H*a4xJ>w>>apErUG`{vr=A<*(>~oVWa&W9>SR1SY1wwE5FL>$$ro$4i=g0e&84?
z?Doje-rnxk$YSU!6Qu@A_Uw!F%gwT+Of1RO$(vDX**oa_ofGVLHX*S)6nyVZp#3sQ
zI)?46NZ8D5z?`$VnerZ1D|9bL9ukf(JDVR*ug7)>wUxZ%Bi|3G^LaCds~^y4xN`-X
zqD-d<I_NM?cOJ-5<D3LLf2$RJlL%YyacAx6GJR(eNj!VKh#u@kKw<2$T-7DZh(!3L
zl@<Y?IA%r5p5EXPway|QxE0Xn25r0*V8#l&+Xp^wC~&9+olkJDiKda?y7qnevI9u1
z?j+~k%u(Q$2R?~#K!q^;Nv937oMMMI@e=66J=lj8m63$g*~68w{CQjs29FQQt>}PB
zLOeR_&<_+q0XM6)1C5nVjRcnT+3xc5Oec<42yUm<sxB_?7p;mgyl9Z<Mot({S0E^@
zVyA50N!n@BYm>`bmxsEOLN?4vC=&SIUQ80T$fmaIl71*0M3%9`zaJJ;Lh6cJoubF)
znC%HdAN7*8ytlILHkiDZ`e=V|R~@Z77LF699qBJhG)Bl^CCNB4{v8T+Ku>ShaRMln
zR%(m@m~SV2jYZ9#w1{s8GA6#c_mU7CvIi)gpg3ULqXX${smuB5C&nfovz|tS{n{Er
z*I?EMgck-6mpTFg6mnG1mJ4>F*bb)^N$}Cm7X8aDAN-=j=bA59U+Qje==9a^L!EeK
zjG>V{88}X;NwymEO<#^5y|h$ZlRh5|-B6P-YGr6;1$16aXOt7bHAm)T^v)>0e$pau
z|4c^5ZX8aoz{^L=D1?x(-FRr30_&HttrsmS%X7prnf&Dt@7rl<u93N9>x&l_>KHH+
znQUqufv~4fc`qL$xm%<sFyPtish_|C((MqvD8GCZ<%n&Sa;-LJ&PZwenUvYC!Y;ci
zjNVDw*55DnQhb9T$bS!<J8BWY3xGcrg|blu?E%I7q!pYPP9L=*p9B?2#ZbGv;wXAQ
z4+pA5*E5)k)!DKgqzJ*)j6EIf$9*E!Ky##%!%j|IREriV&O8#%#&EhM4ac>mZTkMX
zagDEb11^8<k~B+?q6m#)wd_;=*IV6NrnhhuHs0SC_nw%lP8xC06togp`4N(3U@0SN
zm0a}oZ<%xxZp)yQSL5mX@lstZ1;Wi?pN`aR&?uJpIJYFSFGU_ay+yh_hhaW0R+$5@
zk;1WA^>ga)Kfg<$KT<C@*+>{co@(EDc>q@^+4|gsVSc$2jdPL=fUds26>!>*hz>mU
z192M_$z1u0M9XPf$8gEt_B5K2QSG03rN3k#-`@deB=0wB!+#EXD!%YEx1Q#5drR4R
zI<4;<JeA^{LVL7*v>ryh*Xv95&%6EXgbk1wv%q0IX{2I!*TM^Ux&?3}3d;LrvjDN8
z4IU`OZod-Ni2&Q(B~<R)zx?^@5D~8wt-}c~w{|aOExEde1kl;3-s$!8fj}osOS9*S
zi@}0qEW<gE9r65Kw2e37Ei$+FM8r#btDBA~fe{YaBha2_H7T!o?u_p}TM{?B|0E;Y
z$4N&gB`R`rN*f#VS)32|BhNSF1F{mv=n~C6>dsD%IH$^OdsUZ%iZ-&Ud5W9M4>NZe
zPsa)ewO(`k?;{+IAj{snUc8&rV%kw!Y|&)0Xi>Yb0ikx$kUsI|&PS6}mZkxhC;VZA
z*!Kbzyy~ZQSsR0GcCV-}d!5uCzItNDSTFN(1}ScE-1c+UFl=-b%*!u~W%IX-*$5sV
z`mQV_v;oWAjWm;%Y{_dF5|nBb&<*hTeB5<r9(~iPU3qq`Bx7reyL*{*h@sjKv$;qi
zKh$_73{z9~&|2y`iQt>#w_01GLkr#Y;jXfSOix`4&a-oo4RACz!pg;|T^gl$o`I9h
z%HK{v<3?BE?$G>c2+HZ9Y^nPED270;yaGMPRNf2P&q>EMehe5a6lwt4<UWPy9Pbq}
zqM3lpZd3>X3yFP3+vV4%Pb|x`F0p}{@waE@HKNu9XRC5diaZZfp?n56Q;3@LVqOJG
zOhtA*R*>nY_iho-LS6(oF+=hR!=vUbU&V8GD>CBCZZCBctQbdjd6iY3pC3*%n(Tk5
z_hZvxV|7vLZp+359f@<uj8xN$vRF*zrVM1?iS#AQTncmc^Gz0jq6%V2){eGPr%P63
z4d*FGL-c#!j41a$`j<&=ADykZ=)GeM8YW|Kitu#!Y0!hhxQlt{k^gzW?`N}TzZp&W
zfQ4>Ce1TViLUbHZw?}ewdXE>LSaMm8X^@ZplLzL|Szy*<9I+Np^C-n>$VIiP!q}9?
z3i-Qc$zIR?A2A*YD~h}p=KReC4^AK&cNCAwc}+{urDU`SeOeEjTZ*Nl>O~v~wv$o#
zB}6*ZZirgrvGx4Bvr5}uM<Fe%mc+2%yXQAWtqGr8xbVbQ-DTIeKzPWO49^^>Ezja#
z#}8ULa7yITcyq1v_FOOxcz>oHm#UT0w7+!kLNfMx(Z3`sr^PyX@gOfh*?RYH5WU1I
zBcBy-T!qHJiOEpGxg4huCzaa+_vk;7Dl_DXh*{vw@_N7@i4l((SZz?V32D<kDpk!c
zmFA$6(p96ZpdDP;O8Tf=w8^n?lg3w8E+Bi)vkf_%j(z>cDxjuTEvyEg5)pp6<%>ev
zeND_4UhqEtk&zG4!@daOwO<IweY=8QQjJ6bDG7|05Fi%0bKhxE8eeReE?wS5Dz}t8
zs!~AwGy%=QD)N;PQIADVv9gJgZgu>Q!iVE#>=LE&;$jV<Nz_OG^eeUK6!tPw_${tr
z)qESPWDbotR3o(TtuE#k8m?HIZze;hO75P41(wt32F?#g0{#YWk+u~>cRxO0H@JF6
zDX2yevuTVvCkW@q)2hPF`b4t&$CBnEk#19yC<X+qj-L|XdkS}18Q&r!w`Z+$vOoTQ
z@j>h7=|dj|#Sp74n#Udacnf+m@WaJN(iC8EagG%sl(PVwVHyQ;h-1`c@!RKbY%(%u
zaW!0JhN+HmWrotq@1?QSM|i)fuw}UqE+q4QqhftAXZo7SScuq)iS4~mzhMr+K0>yV
z_x6BO^(~F$w)_ucemSU*GfCR?8Rx|wDtI0Iv#O(4;IiHrYfxMXYxbB%dIL56@{xcs
z1^M}Ngoz*28>N$zh5kR_zUupijBl9ZDMC>)4U{^0`RtCA<Ts#P^5eNupNl_F=v7Y_
z@^mm(A|CR~IU--^Y)``v0p*J*A6QeqC3nG$46rdJ`}c#iD8~C_bMIF_wkNaiEt_=$
zW8_~D(|rrp_Snv9k8y8Y-znZHnF1~JiF9+dDRAM%e51yGNXRJc6O_2BG3ovIDnY4O
z74wP28a)+?x>M5n+=Z(sWyV7mK{>XRIacx|Z?P(?sScftq?dU8u<nPMK=6la!DZ^V
z-(kvq%;d&6q*hhMlP@N<<XQz==pf=B?Qy=TX#r{XuS|^#cA^fFK?Ok5;<grTKF=7W
z?Uv8}p7?qRndue-SL+7cbfK)tpaeUlp;!j~P^b1#S1#gQ2vG*gB2zIUTpmnZXfYoJ
z?N9n*L{m%MyFqKXRprwPV>XzL{DxaqOB6Z`x_mQN5hNS>ujKyNCBLZ6R^TOk!Q1mJ
z{BH27)pA@BWd$%18zFa9hj%n^2)@2@vO>yJwK53R1#hZq+Dvh8bPH)NcfhW4Z~J*k
zkS8xXczE9~*9`c$EGGx$zAgG9WLyaO`nJrsG&HHcV#_PJ+Af2xPCR=HqE#nX($lQc
z_ki}L)@syw^?;aUivyH$v%0$rBYR~7IfrX|jhVxyoFuP_tA(_c!w)lqh>CQUHar(c
zfiaqZPD?>~wvQV$>wI7{D;s8E;n}4a;`6dMTa?vEdvO_AC;|k#U6L{ejm7HEw=&at
zo0j4f;dX1dTrlB2dapy<P?ZLd(?(h$_qK}F<Y=y4+M0Fy?fHwxX$*ZIcq=x!KrZdm
zp@t;1FY8lX?*kCIrnYwmXF#~f7B!0m@>KpUD$yw#FBEE0U~=*7$pu<MS9)$C^%INi
z^g3g<fK^C_*Wr^G>ep{qp1v_9qyCY%4mF7rynC2Aq}A(^3*{+&T=oTlk}M&>981R1
zcH0R@T<JYlSc*8|XqoIS1UKT)s6j>oC(Y67OdZ;k_(bH_5_aV{+rWoTD7mQ`fBT#z
zqN-q%;_!LL+ejwo=mBzHzI(W_0N(_Zxt>_bT`^)AolTD$`RY3a()cc#v{9Vg#e@Yt
zfrH9*i)M4@Mb357R`X>AbeTDP&+h1CnLX2!E=<&ZcN|1JPwFX@fd!jhv3$_>xmCi)
zAb`XCoV%X;R5y#`lew!{v~FSwi~z%BISc<#P5RsL?A_uXany7C9<-$zQT9f{Cb4JU
zwxpBb45X%Jb3!-I$wH0I-1k9q5@04}0)@!!@2-uucWPYloP`Z^VYObn60hLhv~UCJ
zj?a(Y6$R+bh3}0&20qmu#OuV)ZU(L0z9s29s!TIF>Vzi=&hLRiWWr7y5y(N6^D~(3
z(QoS}ZDmA$whvQ$-{CB9-TLy)gsSI6_Fm6w_qhpR@0G)8?}y6SG9=4`T6BWELx-wS
zKd71Bc<5l5V5!g9)fLOsDNbdzyTCX${Zx^wgV*4MIEDgGU~#%&RFFSmo{@Uw6iPAq
z+3lr^1leNm$GUe}ml&(=og_KxCQbHiZcBt33TebHoxa`>uda;;Cj#tZxt86XD%G~(
zE^-v*GbIVZCt|2uo{#tj&_9bQZ=>|N-t4wIy`=QQPwKVb?4Pb6p0xh;@VUqBr0?ls
zisPiUDQg!MZYZ<a2JihaiI~lYTz@EkegWfp{a1*&$DWMP)qIb6P(Jwq&#m=cufD|Y
zRJWE7banJ66UtUvB4qq?cyj~#4CuRY)G63&O?Xq^<jkFz5{5|zBRz{Z1jX^rh2PH<
zP*DSm*n4YZoyjMb1TgkKmp`?bp4kV5cssu(4uai)r(fagI$p+N>h5H}QVQOo-lV}C
z02G;?AQd7*pL76DQCcu&0m60lwChzyqWBc5g)mkX3xY)Qus^{aUWbNsp5?0g%u&=p
z_F0???VIBB@ig!>MIXmZB4gME_|mkz`9(8MiYSs$e+`s5a7S+<ZP?f0psI#5BCQF(
zIraGShFX)vhUD+r`23nwg9@*b%`ihZqBU1+Kk|w798NJ$jhe^lDAb?%K%R78$<C%)
zv=U4OCSD<sMms{)LLLb=V=W{hyzbM-@e5!|v0<9=_4kS^GrD9m;jgWLag^6##ti6G
zf45^9wwXwQ-Z+3xAM1$z`z^m`TQ)taSZhJ%#3E}<mNyo~r1<kV^S&?*dd9~=n@AOQ
zCfF>^(9(cNa*0Np&mdHU2z=k0C({zk;oa|(k;>EczCM$&b3IOkhKo!x!O#9Jkp%3d
zkNw+a*S-DX`fv9Bi=@$Z)3E#dYlK{|qds<PsozJrn_A=S*d08vDV1pDMBdHREp!lB
z!!Ch4y$%iW%}wg7J1KtjojUm9l2m6xmdH^ZCH%S|FlR7gZ`d_(=M7&Yn#D_45AvS5
z*61(5++Nx;!a~Sj^FnzYW|WNfcAVsKD9NtUCZjueDp5)y4_*h$R)_j4q8S$o*`QFi
zDxN;xQeOLpTMmp!*e!4uLE=biT$lP{<HZ<GX=`3|cmTw|uiKP^huh(!Ha)rn_wU0l
zDV+Mfx6PkPGfuGws;0Zb<ew(WUoV3^Kc_V!XV?`Vrwv!2Q(KPcj%seiktUG1swNW^
zD-tCaa!-)QCeIFY<Q8QwJJLh@I8ZpMyM))=s1vmP*W~~aTA(&~y+NsfwpAsupiJCY
zWBz*~U)NLi%MlU?K;}eibJ0DPPv!!2*(yh2Q2u?%LY_cfmzR5pZ!tcRDefK@o{wt~
zy<_$Hb5@}8M_Jl8AI^D+sqC91mXwJbYJ31|DBmHEy#YFnQ&`jW4IoQjHYX90ecFq{
z^Nut~tfapd1;WnAm_S?zjvN!`4(i<&hQxPMVTb%uTq-!~a%)c8cY61$q<k$GK|6hE
z^dCF8tx;0l0!Gz(#X!2LxwWdZN{sS9&JoxpvRQP+16&u0{RqB7dZ}(MMiqSUD8I?q
zs7i{5_V|csv6C2&1lfq!*EeyR>&zc+y$d}gID8zJM}%Ya^Am%VMq0`QEV&*-s+EGO
zEQ&J{v0vX<mtNo8T#4EV)I-)`(@Q~d?ABr!<dG^&(`8M9+pe&UibB>Wko`-k-OuCf
zG~gkXV0j)!PPmM(#=)dpaIylg%;P$ZFyL6KJ6-OlIxqd@zMr5pkf5YiUuMeN#3rft
zyltq-Qh@dg*asi^x0jOWuH&v(&sX@u$|Li}yAMB619w}d_p&8@Hxu^<r0PV!GKNHF
zwLJb@s#MMAeRwB)9NP}JrK?#Lnh*X|41btSO>$dAFrhEwBbNEb*gZc_YPxnmMSr+4
zY=yo;@DM3;1&FTsme7@kvRn9&SXv=fWVTHl72#^Pm#s<toxH>GB4E04H1p*?iZ{10
z+;X58#X_C#%$gRq|6*hJg=h8!VTHK;#B-egQVZ7RbZ|zX-7Pb%Jhjr+pktJt?lXU-
zhJ2L~EkEm+xZfpjB?_v<jk&G1W&>4;U1NcE8TgEEoi;<=Or^Pno;c^oMzAQk@9Uo;
z&`_(TlR5c!kt)aINVs{`hes@uFv(+QtsGpa99%*ijf+R-n?*DMegr2}W5tAhHFi6<
zXtzd}%)5s$!QtE9fEcKDKU2gGGEt<Q3V2uYzV?$Vne=Kuzd=*V8uPat3cyf}o|oWK
z5kX|OEN(}e+e=MgKX@g$IarF1#_Z)cZM`wQJUtW)1j8i6kem*ug2INwSc$LeExHB{
z^4EKq0e$E21E=6$H;|j1n)HXO@geeb1+gQc^-n}+N>fk;-_zB^S*eO%x+g$Q3FnMC
zCa!3R-78bL=Y^c*xk9wbp{`PK24b}MuEdQ*8V$7ESh`sg=#LY!!;WOs?A+9<?2Jve
zjJJe-NiFzkPxye-Y`57Co;pf*Q17-c`t7+Pw3jPfEe!7pw;ST_*{xZ3)j}D1H6#6m
zx(E41elfJwi+ggJsZWdgBzfUL7_>QoBfM{HMiJ29P2!4JiRp~!-2mo{sBHya-{#`H
z&zm0syO$7vD1JMTc7OIPXeywxX<|0^T7d1B#nVGd=p<Ir^2FH(ssJ=u@XSwS<gChF
zlPrxVd(aN!how!Kd9qqXoV`OWf4!;eMj<OPQGA#IJQgyIxp1}4Tx~htxgFUP;z|}v
ztJ!o~EP2Yw-M=(ZFD+aU+22rm=+n?x;#x!a{tQ=+crz*N|McC<vq@3)zIJZ3SChxp
z=tvf4`u<TkZ^44CQvD^`kQb+4Zi1er`+?*#9qY%CGB!420<uZ3AD>Tha9X`pi)dyF
zB<S$X(A*_)12P!?;GBGK0PFh}m<}^RN`u3u@|Vz|xszkG=WA(v0kU<6dHKv)12{h>
zD!Vf?ct^1Wfkd$6*-7(B`guhk!%RG5Lv}#1uDcu>?^rgG%9a?{wH9MvSNlN9v41yK
zl<>yMxxs<ly~mA0*{qIWR)OwQdl~;zhAZ-|P7bmfOBO#-ZNUAd^3`6lA>CL5f2$kp
zuH~u;Kk+yf^n$N9C)iV%kK;9_YaRoUH%un@uCn0g_zQO*Pq}!X-r30!J#d*CDj0V6
nDr7+ctIWL-g$8hAFnn)K@Y?dk>lldp7x2JIpUAidSg`*A6uVN;

literal 33096
zcmb^2gLh^Py664awr$(CZB=aBs@Qfawv&o&+fFLBjha+H-KP)w%$#}W{TKGS*V_AY
ze}5N#Bm~5qXNC>{u(5%&0iC6joh`t5r&Z#5O9I>TX17qqO8D^|p0w<>oLyE}RsFcl
z(+XXC`Nm~ae_k$ygeW@c9EvJ>&h_UbsDvVs194gV*zrkv8JYkP2+|8rx&+DRTj8Q5
zIXt2@zf~i6-m-6mUyI9k%+G`FWBwVxS74nrZq^R?-yLtRfP9;v5l5bG@K?Ux?n~i%
znCQ#>C!+dY-hee*+no%y)0aP7?B2V$9lXN1J5Qo#zY$~bEB_F+0DjI+1nd~Dxrpfx
z&k3sI$8_2GY2=~;%AqTI21H!L4Qp1{d=CFQ2yHqKGSs<BbGCj2ec^O{lo_k;SLXNd
z36a0Eu+-&~#-Gy^Vp&jg8eLM#r7*)ES%1=q4G%?6?-Fx^8rhs5k!T+mgX4t|!CJ6_
z-+lvJo;AR%K@nzv;AtDk*Uj#?Zj1&J4CV1V>6cx2W+Ci1y=)zw>`wFPNME{cD%^(m
z<Y2pYxDrTTq*66?!Qa3Uo%h7Hvjey#v_C*ES#CO~*5{veH|}yZC~t-l9&EC@z~qg^
zXSsS>fR>o``RAjmVJD`GzzyA)qWd^bTE7dzl*}u=P2<QaMl9aF97eJ8Lb+$5DfOl7
z6eY2oeHgA5BC||l<*;{Bob9p(`@X*HA0?9i-dr=JuFR7$ls-F#Sk8X_zK@h7eLa)1
zgG1SaNY~VH=BPPp()eKF!ruNQwwF0Spd_XapMABn<lVUXkT6X?ap(lKxzeuZtD{Go
z`ZExORmb5tye^Yf)2neOV_vC(_R{D;tMo@EN!@l1=>m3r7szJaneH3%3U<Fk8r>*c
zt^dJFF|c*#O!P10r%r~z#I5F9{>j4c)o%E$Te8bJxrER_X>hQ5XBSGHIS0dQ3~eDs
z7{oqFu*F!iTN^p=K5h=LI2*8?si|%0-W|kP6^$6ooRxK5Q1b6O?;nX-(OZq&onrD8
z5k^#GugioFikmKMHT=?VOc8`xD3P`XJP-YlRP!j7yy!)aZPhCIF8f|T(>!)Lp!5?S
z0uZXoegi+gOV<33lT1~@X)ifwo*>hhwk-NKn_m*_sJKi*W(T0iuO#@Znfcy;0iz{c
zx*Kil74I|30+VO1Ugq9w{|O-XY@@hqn!po8_K4Nk8~C#|)emx2M=e6z2qogx<AQu6
z)v+s}{7}AR!;OSct8!fFvRQuD9EMynaTK~!uY9e<iC6i&pn65*ArIdeScF}$JSxu*
z9=wweE1gmXgI?T8f+wCx?27L31}G0dR}99Yebx9B&R{y5lyFX_lZeF?z>6qCSHUI`
zCr%P0R?{eN)!3~7A)ZA|HPibDB@Z7f(iyQ951^?iff;Vk;R?<3SaJzD$zQ;=CIARv
zHM8~fG<q}a!L-ZX1SAlt3g?&-W_+Y@8iWJJznOSL7%8_t{UG^SV-qlchg=hRc9G(m
z@taBMu+Sb<vxBMRT8q*uhgmMvh3$Spa77KrBbK5X9!_y}ulx-tV5Af4sYY>C$^r|1
zqlNwWPt>A;KKC7YCT5Z>5csIeX~7Vk_hZO3EtDiR2}%3{0(|fu+|U62hd%8nwlrF1
zwIO&3Ih=rqD6<XiW%vzW1uQ8Me}uAT7U?1sCL*!}&>G9I7xNIIiX;?~h|^669A)5?
zOMv9{VY_Cdw#2g2=-Q^iE9^JHojvr7CL=7kDp$?1T`a?g?_0{J9j5Ck774o371PBM
zk!YtCZM!QOMaO+baXP~@vdaaMk2cj%4y)+-qC;zwMG1{!sou4)00v2P)Y0gV6FKHT
zv}^kInV=H4tG7NYOir_v`7LybD)5J@y0;vEbO$F2h7C6Q;I-=kXixWJARbvW-r*6p
zJ=*2EZ0YDWg|C?e-zHNdBByNx-@wWr*CdksN-BaG%p~;po1u&rlU?s4(>O5M*b1#=
zMK7F!CDBpDA*$vT&5c|hR^FOJQQL#yX;fm}1Sl_4&i|nnMZgrMsT0>22klCzny$lK
zT5WM!+9lP^QPpmZNfBWmQcGi}f3h$AtLm(AieB4KeS{R$nL!fI6Z=$p*9Nw20JVuC
zE!tbE)0=jA)HpoAbvA0W9PO?E%8c9vq|h4|uoC@EF(I7#p)V?-G)8z-SWGgFl#*1C
zlvN#9eYVNQdJlcrjWa_ugMeW$vJf95#8N8)EQ<6g_u^KT!vOJnU?SzNlMvemO!U*n
zndajp<q|WhGwvjv2U@CpQXI<%+`J$(DzAW=xU1aC;p@PyR$VQW*jAQjK%bk5aC8#g
zVo^S?Y8o6m=3sLz3%=8`!FKkm-Y9KGblU+D)gD}9jFqORcr%#iu<NVTu!?g5yh_m(
zrGRHd>kq@LkOOr`VkGA^;liWq@laca;0e*>HXzE&i$R#60kB5~5e|>#$PEzMNXTvN
zx}MPvhq*+i-ryFi1KALd8V6$Y_^A&))(*V1+ouo*wj3U=N!zLoR9onRmFVh0`kGIL
z%k>X`!MXwji?mQY@XFg?I!Km1dVD`L_xt^SG@o}aUnUvVHan{0m;6ko1ZK-7`_@bI
zDdk4t1C}QX|A5KtF4|m&MHX%UJ}rOBew*4>iyK7DQagV!`OIPdX-RV+43Qoa><X`_
z(bON%=zUz5`~Hzn%C)VlQG^T=j!ocj&9OmJ)#I`lmc=UV2HQZxerds(zrk517m*jL
z5V$_r0Tg)nvSXdU%GlRN;3kgWH^YKN7_}h%F!&8Ba<X@5Y+YCZP&s-YdCV%i53ggm
z6m}Jba}V?(dIICY8qEee+OZ+^=2Mcx10$6AP@HC4&lE%jm@@m?iydJX`d4??a6-3f
zO(v}OTF&x4>DdevzfiHl;c<bkq9jt?wkC;l<12<RJ4QoQWfJ)lm~WOPx99Dtx6wgb
z-Nx(+*oLkZJHusv+OEl}R%CBaQR>=~R{z$~I&O@a^WIf;UD>!kS*E3IhkYNwFWj;)
zP!QDqF6-1m`rC_*p-lriqfbLD5ar$#nBbxgKDLA|8)pFyiFrzC4M!KMtWwWk8VjA1
z-^kCskhXe8$F7G$53f)sx+r-uh1k;vtu^oa7?}>!9Ajyg?9m=Dv5nmWH`c9_XGOP#
z*qE)sKUd7W3Y=_3QiE;)0s!0L=QaJH7`=>AwsiZ`Qp6qM916j`+%)wgU}kl$tG>An
zU}6F?79T7*kvG$U1G>%m_Vh;SvV7XiJUuRZwmdDdx^!P;zJ9L7Ht;_3HvZ@n6#xsQ
zi?H$(YH9nJlI^ex0adg}t1ZApV*^wMuJ3M(&ji~d=8i`ORK8wd6pN_fjl|vKhWCu@
z0bt5C|3r<B<HB`aB7aUaABtz21-}OGeD_)0G=<3J$6~aZ$bJZ?AD18LPHBf)Y{$vy
z52K(DZKaEVz5xrK?2Hc1a%;kM><ZuPU3eK>Db6GEMRW3UHxQ5xptQzx$d9Kc3TfqX
z33cc#vuD_h(%hiLodg-l%T%8L-gjoIXKIb<ClPcK>x}I7AcaxivY23Oj${<c&LTT=
zog>&o;OzYALKRfGA}^?8*fcKd!hmgPDHr!M4w<8dGe;l$oORA~eRrM-hpVdHk>j4M
zK>vhd{4uP_=oS}VjzAs*27|v@3Y)amSqU-a!1CTuu}bRo&VOstam&F|V6a@(xp$_N
zZo&AnGOR-kuoQK-WMeE?gSJWuY)J5U)0iZ_mWYXqFbai`n!Yb1+$k%`=m)0h5}c6R
zjMMDgNYf^zBCxxFpn5Y*KO4>@)9Lk;5c`Ut-Fa6n@KzY6*xg8&i!h4>{Rx<@iVkB^
z)ygc5dkcCnq2$~eF-Jh%v_=txsA(m#2;+N*ai$3<x?vJ%8gpP&+H)h;UPBR$lrfB^
z!Lt=>E0TB3R@R_RjMY@lBA(x)lK$4=J1^nygkGluMUB}B+7(B6D0-dsgid~b9BDM>
zVGPp}%`v2UjtP~hV<K3JlqAR4V1tWs2Oe5gA8gr|-?eZo6JDbaq(cbA^d+@j^zqm(
z^QEysF<Qsgs<dN<HM1Yqz0fd9YaRzf5c(OsN{^4UEkuF~60v$@wyjWQ65~nHoaD5k
zyV_-=`L5K7QR6?qWp#5CV~-gAIH4cytEClYxB1>=NYslQ0wkfA7R_KK8Ma{0Xa2DA
zO)s;e?FjW0Z?dK=Ihc4F5m}b>;(a0jp9vTMY8;MYBA8qa)_eG&!*66?q9`}MumV+l
z`cT0B@$qAkzjM6e4qEC~A@qZgjgxZ?$pPi6c-TR4@sgr0x`&ujsYbeU3Y|z88Hzh^
z$;#|wOw2C_3lAS-4kbFtIUqzn2Y~CKI038c+@J_f6+bg%nHsK43N!~z67)9(N(aZ9
z|Kz&lVuN43EryzMy)D=NVUo&05EVIlX(82iC)Kz2>>OQfuI3;};-a@2H9zOz-B02y
zqpt_AyA28fKMpz~rGYNY?j%efR&$DyO-N1pdQcQn4ncxgIJas}0J$Bx%@Yv>nIE|?
zREVTS7-$TGsKf|Ht4#mEe?dW{7$QN>@EFEXuHphxvnHW1?%LgKAOgKA#hGQ2t&gT8
z7u-u@I<J9N3|cQo5?NhNlCuX|A4k6zQm1gkrfNWgh05QQM}am;#9VL99R^zFThKB%
zy|rL=*f|c*hsNqFnQ;qsSLwVUuzw(v94;~_@6CSg#{e|4{?3+qQdt(-@}cjh&*o5~
z?8hRRC{CNH?4I0GL%)!xZoR3(5v8vLS%#!UT1ZzeDUlrK$rG26X?L~l)7I*J@Ix<#
zFPe`lXYz{Jh=(iBM&|@{r5s%!TTwu}TgYIZ&YuOZk7CGgx!cG}v^@v^xm7d4kmEfC
zYaT_x!PgkMM4Uu%7YP-5r5i<=5f({yTt`&-S*1IpDlVVKm|B3?#Oui!bb)UyAIn&l
z&VbPAPz?z!k>{Y6u@9)!KA096ZIfm4R2XIs+&+j80J0`aPSQR3nrc_I&+1HJhqd|O
zJ`tOm%je^g=y;-X+Na`9f1@Me(|>peo+I}i?coD3L=onpvL(h@lpNsq{!WNyM4e!Y
zVV(R5y@GH;Qsr6-8#T&oJD!Oe^de!aNP5Y!e|LcLr1D5C>Mcq#7iM>8AzGWQCTluW
z?%e5hIuz%Ks?1;>$NErOgsks&lN+70GNsAA0Tb#81c#8ge~^Z24#|L2STce(mN#Ub
zSLn({Tzi@<y;uo;Uu0@E^Lu3{z~$&kx-%FLkXcVZVG)F+U94dXFh;m6s5*ZGrbJ{m
zO@b3xw39f1U4g&KGKwg`{VI-M8;3&k2%x-bxi~3C$@+?Wzc^0lgo=bgOpzMPs0t6v
zqVQn_G7j0n0bMe)_XP8M(7QCy2pvFSt}Z(iA^Ubzsye&y(e18Z^wZFNP3fNd5&n-l
z{$osP-?Q{v8m<nQ@iM<W8jHq)nL{Bh;#8t58mC^fxXAY}rxyM$kYQ3b;<b6cJ>CCx
zdOql|;aE;wrrH~0$0@rbB(;LHQQdktvPGXVxgpp%JxIn!?-6uX{Rybh3UYwN<4+o<
zoN=F*={%PS1y#Q$X_pQ<+zeLHB|#_D3h~qk;f35h6%mR55kb5(;^-0|-o31?hrgYz
zqu2Ghr~3d!-SsdVt{YtC6eRTnQ;oQ>b>T3yw(=SJ2m)Qp<Y<2`QQFQ+`pPdHM6vT}
z%DsV_B1b-L@@T{1BdIb)T8k0p=PH)<t~6;qnN<y%PGSV%FCH-);TB1xw-3#}3C&eJ
z@W0f_vE3s}It7$slnGb+AjBRazwtDOEz%YIVL^uL-1#>0VB7Wy0;?H!LHqMY3%z9X
z`z$L?KSoKUOpZdqXy#jD_Z6L7&iD4br&}fV#8~6Yp0#km%wkaEEB2Cx*>>0YV+2(P
znL&}?T!nn)?NeHV$3@^6AO;qfsml;pT#dQo>hRT+DOubX9rie&aUKC=jU|2CH{U?&
zl6<R1MukGKVF*qoQmEqBXW(k)kV6=Y_?^Bd*U!DTIXEJoGXX{D5L&n^XB!Et0`eFK
zNe^n`of0+PyAr+AI%5|umBKvc5hYUv`l#q@lDUXtsd+VwF5ve4;FcCD%=Z+HI*%)p
z!MIwSSUVBM(xEM(-e*w*g)D1pD54<L=N=kz466+^gN~EW!{py0qII>qaphu^T~%p)
z>PWaJa~D9F!Hhg&tjvlGL62^@B{qv@maextrp7*kQOVnk_Wo&)h&KFVf?MYccT<0G
zm*>ianX9tRG*YO1zFsyvZNPI)o-T?c7YHu)`^a3F&hK8t6`rFA{Z{&<6i3%14a|)I
z?2|>hXRUuAy^h6K!0`~m-I%Ap(^#Dup`mVc+C;D3inF|Eei-3QuU`9<*azCU+MD>5
zhsrZ&6e7yRB9u%Ww}~Sa7YG(30#HS}1uaEAF&#%YY`hDBmI;lXTw3i$mNFQ0B5Ji|
z&fQ?`J^Zlsfl7w1fZ^rh^rBm<c#HEPafvi)wnEFV^MJ<>n*2LLq}3abYbQX{k5I;6
zGpm+|yh6?w+X81Dt!>uGjpJAc)apcJ46V?6*gs~zkxLFxN|!~j3k&?tRi=v0XbSeI
z9UE`yETPLBu%eUrz&U{ozlR$+{}gouq)jcZ#S-5cO^$$Z9anSCM0)u7i%FZ4Ufj(A
zmqu2koT<^2X0T2{^|Z%T&ux`SVPIBQBZa-z`Ihu%=|Sr#wW^zXKS78qjRd|E_Mzyy
z2~77Fls3wQ7+;ZISIQYf4X#ZcJ)RBf-3qY74AGUA;%PJ{<t)Zc7$&7bN@1Z0a8QuF
zcwmLa`U#w>gMVuOD4&W*=7H$195WDgSnY8aAe#caKJiEilq?xYa1^E^Q}do9x|#X{
zxw;=^xo76CqmwP(`8fO;xJGO){&)lxd&n9#)!%7qP@yaI&nHLG6;S$uBNzU#Ojb25
z_WW7fg746Gpo{yVGa;4*+hrWI_~5@oSzC0gt<e|Cj2wwi+b#*`oFh3556h)K0#V)`
zG1zB{#U2?3q-)SyA+^wuyY>tNl59*7oUrBW2`{nsxKb(+e@fgzELeg=kbQI-WKELC
zDl}+Qy9KZJQMeKhSyY<hkNLFYGf23i5W(K{wBz#9Pm$(<T_5bFi{{)`vqn^JQVyHi
z9q94PSx_s3SqsT_1!}%0Un;!91ZL{FzQN5Qx?=VBls+fEM!yHwFImANCsIO$o^ToK
z&NI_jGKw+k0YfmW;})TcmylIK_8}s1F9l4%R)sR|fru|w)WKm0jof$CP61C!Ym5cs
zL0ejh6!siqGgdeU5}E`5)Zl@0k*2oy(WDJvw-Vf4G3jWZ#Gs~FTw%ON2ytvrQx_O8
z;p50Oca2IDh<m$$H!#NvSMUsWa~XO&;IlL`zl%c(D62k!JZO|NfZsBb171ZF8Ok`t
z-qq-w%(pRcxkS_N@I#Wr8`_O}K^$*ReL-3jkZOA0f)zQAtOU++aMPJzo&@8&(`y!^
z*9>)jL99n%7N@u<mre-#m?GM&S{%k`>rJx>GL>Zc4^(@9SP|L!2i1bt{vFj`{w39D
z+ryloR9Vi)T{Yi{wx4V_a1WUd>5By!P@^UlG{(-1h)>qVz=OWCWY-6gs+aVImy^ec
zZmz$(^mUQ%!e&*%*m;|O>h+#y&Lt8$Cu&Zlh|=Q_W5@WUA5p-WDdyA#gprSQn(XUJ
zMRo;So36mU*G)ez9c_fsLGA$p0lVTCH+-TPJ`T}zwudm%#_r?%io<w(Z0|wA%x~R!
z1KU6}GX@z*OVOUr-e|)C*^qn#1ZQ@geQp-qUjKHsyQRIn@X=&<`ewyHWr*;&;OWZE
zgvs1a@%7wyPanD2Z>llTM2ZahVjeYCKxAM?K2ODLvD{<NMdZR1dc}t^D61c7T%)dd
zG)&iW6I~0x%|evT8<_b7@`sz^SRnfV_|1%Ot8dzb0K66;&JS&9<~-Mbz2Ylu!C*VU
zjcb|AlYj%!2ZP<C`nHaS^6$*nW2UwTwk%HH4Xq6o5fwYU`M?p#8d1{vLa@kf+o_r|
zDpcGs1UGp`iv-12QIT;@z+9NOpgibeiTDpp9i^Cv!ZkV<WU1n+78C`KO&bam05FXG
z#$R%*7g2sTe&pV7ie!wB+*DpZ+T~OtGsu7!Hi`d~Otka07y8ks-}Bt6y2iX~-I2I>
ztXiNo0L+5yDR5=_a>K!!EA&9srjNn38k|A$1GQs?LamudDOI}_VM#5zevjbZmZ?j^
zlw2Y`n4vJFvLg(DT&`P*&(l;yj~ilBa9Y%gc-^B!1a=1yR9AahbyCeH7wf%D-<O74
zAZ`;=&YpmA*qjX0As`I-<REIh1ESAx<y&2eW}yo`lrYuHA%vX%Ir9=FP!i_ZhAK=q
z;fZPbK(N1Uk2)9e2!}wenvwTml4wK};n_r=mTYwrp6A2iGfR@y`d=Ii`#Z-RLjG{<
zkQT%B568AEFK}WsBRP#>8VdMLAT@D5sK8v~hft)YT0@U(9}nE~Qrfzri{Je;O85^u
z_qouF!s=3$HMZ+UV0$eV!~tb#otw(hOuCkjeVcYbhbS*b9gRR3Ch-imRRNq!R1(uY
z-5m(>^e$tqk2y7Yp>kv<F|)hbiCHhukFKUh!0IU+UcVm#KKIz8BwP|o6Cm*z%r!%p
z0#9mT64_+M>hfZxEgxE5djz+o!&*|A?T*~pHYto6J*O-48-szOsNpN5oyk`cK2M!{
z{EoYbml8w{U}w1ro!;F!zj&+g^GsDgLQmSs`+OC)_HuM4Go;#*jotfMzB!#iu3hMw
zx~7}E$tq285#)+~6gD;Fonwjnt)euO%_CnYcWFKn166=?wMdH|F1a|NtEoWw%zt8=
z{-JH*ELN>XJr0A<0=<M_TFh^IKv%gmvY0xo9n9IXLf-QERt+op+x`kmhhBV*Al36v
z394uDyq&=S6YDLx@*f|GF8#F`2`=+_w&cm>9hGB}%_%AeO3Biybf=$us;!i0kM&e`
z_6|a9?_OkQR5O_^MswscqL$Au(C%2D$DQX|qH-O?GuM&bcOod`lP5;)_csL1SE`p)
zy^)g_<iV-cox#5k-)oz$H9gvlj!g|npqE2VQ6A2up2lvFcGX0J@0=WM*(kE`gXcMj
zvSd)iL4xdvaJ*p<RT#x+=jk81FDUxPLM0d(0z2H<sJ|Jqq2%e^d8vw%a!Q^gzO2e+
zfR*x_s8vjCXyazeMOcbjb73|qpk_?zk#F=kPqm;ogrDx4Om2iZ-<oW=J7*$x5yFVG
zpY*e2hKn`Bgr1M5e0_WlHc1^({9w=<mV3x9VWKSmNXR`zJq&Lt3m6$kca)(p;lJ7J
z`Q6Kbw079s+A$vL8MY4Z3T}$*#`Pec$fA2$&l#*9{`M+_yM|<X^ocWwAScBV;lLyF
zt9(E;yaGv`v>L4fAG!K4WaG^($CmC}Ye{N>d_nA#+1=X+My#B<mHI0%+YbCp%cno>
zz+Lz1E2-nUJs5`TjezwYHKw{V2!tFbE}fA9ey6Sg#9mrVAx&lh&1;@Q3Tn4ofp;)J
z+M;)`cSBsw3^-o-GnB{2@N3W@3rhk`rL2ZZ#YwMowAOEILz<BM#GGc6A;V)a3uaMI
zAhd40c5(qA>UL!$4boaE{p21`h@Om02l@+w&$nOV?hmIM*})%gv*y?E&jh-Fu|25v
z0+?r~tw3`|_F{~6%6SF9n7u>sVD!Iin&FfTRWF45n4)8ns51!Ew4)mvTbTyd%B@sP
zol!5>)Mm8aIuoGjb|l0)lHolxmsD$Qa|M*6yiRK{D?3kPVr+<nb^^&EB<~-jE>}X*
zA@w(sHo8z;XRJHEjz*(qclo*@I-4#XbuD@@*y@eW{0*eFDt-^|Um)e#m45^70m}k-
zch1E&r3?&fKGggr393p)xuD1*sl+C!q#}A>on2hj>|(I=n(Vk)?;atAt51K2;!{=l
zu-_icBdUsZR9Vt-ea4KsNfgU`n+BDgn>no_(Wf@3g2UCkSNs=GnHSGY)6baFBb-5S
z@`we5XxinG3`xIyN(<W+w9+YTZ9AenQH)+N55GGoy^QI*qzCY{e=oxYj2FPXbHPXk
zs}NAlm<<S9KVErC%rO=xrnHy(5-I$eO&YLD5wObTQ})uz#yY#sxhdgl=2U_`$_||l
zt?ALPjp0JyK>V%URl#VU76uJ+6~Juu<}$ddV(}@3mn&7^1@qA3-bDvUXB((fW0fx8
zi$lAc8GL|{W#@W-{(qn%R24eaBV=XY?&_ZFxU%!z@NuvHyqSBsKW*P?Rlx+Sb_T@B
zhTe%&0^J$k)RgnrbH%m^SG}fj$J?ba=T+ESBS6F7VFr>VmeWzp0*K3iT~4E8y8eYo
zM7KUknv3R^+a36w(L2du<ZOhpu#QD}gGBj`!5Q8K(?#0ef+<pYOmgZ6_o1Y(&?l*Z
zF*<|NOdU38f?LCzAfklc6W0|RG|7uduXX-m{qLm8knU)N=n#b<i;_&%bV<$0@hQq}
z;3Gz<)YiYC3BbIOn#(Qr7{wppgqIeP07^5=hO2+(EOve${-)>I|NJLy1_k}Qw8`|a
zFciKtXwhll3>)td(Xdb=Upl)#`7yffhF&t=yE)_KQI<I>&cyC<F|a2)AJgDr#f9Bz
z#m-8lI>?BM{Gq+lCEJN%Pl)ieJiGq(c|3oR%>8<QID8h1FP=C}Zj;Y9ea2{ZS~|l}
zmaK&$?Pym}r!lomPidyd5d)NF>{Gh);oVOtK7|ybO6oztSjX#MO0G%gYAc=ja1J1D
ze<^(YDdBgh^`Uw4?g&wDU-ARlF}%<=o=Y5o>JEe@0&K=cj6)y}7I71zjJ<pVw7lz*
z5vcIiG_j03h}SJ8NP_nvf?<`AG}%FBo2^s_g6ApFG|{M6UJ_!YC!PxZdv%&Nmq+e;
zTT`7ma7uqCz!OTsjZM?fmCixuETYxbg<C1_$~yqX>%_|R_QiCr`WcSF81yfB&J9^@
z%=F=v3bkXunD5?F$MBvQQ^Uh4Z|;;l2P!c0lG>|O>{su9XNPr2AIeA3#DIU7Y)hVl
zChr9<`0bQSn9A=7B&Rv5#B@1KQTo^d_io|ZDh!`!IyCnTIGRoz7k?Awb@m#t4liXC
z?jBcFmXfCwVTjSs#6wkns8Jk(f#A}J=CK-g$q`cqDD4J-uhhL6b0Swf#-9J39Px>%
ztd>)v8=#+T;1#^HWWi&yiFW>{ilt)F;wW{pe>qUDX5pr!?~@D6rn8`uPv)7B&SS87
ze4RVzi))0P)Cslz*3kE_j%Ygh-*iM}jDOt`Z;q^4|5Hbd{;wU8=Bp!yeRag-KOK?f
zpB)kV=Sj6?7{(Jy9-SV(yoa>1Ml|vDzSJTtFoypc@Te7CjnG^v)PfY<N~ns7<!tUj
zQNe47MZ+1Lw(Ec%E6q5z2G>i1`<Z9e-T2Zrs-q+!u1rGcR>-T8yY_cFhhSPLQ{o&Y
z`fuYdOqzzdx-3R><%9QOS4C1EfRsk!0B3`~NyfjVIvMszuskX*0}~mfmE;1YEUUSy
z^KD9Yy#{Y|V@xkNf`G23_rO^D_4ZQ>ChuO`QM{K)eks^9k$TII#AW6IPJ1f_Rs0)N
zUH(ATB@Q=)<u9n_Mzbxmrz}SVt1{dlZa|}SRU~gGio2AVE1@0|N2XCu4sQgnxRrFN
z-+GxA*tSZ5w+dJ7X{Bt<Rt0R;Wp~XnqHZ1otDbm4<!0xG9z(I!Qm<?jQDZy|wi~pj
zZiI<sKO#`J4bp))sTR=*MtFNM0u$9m^TOQBor&58rVIvM)oTElWVV9Ng&^yMwGXwN
zFj|4o&TaVUUcB~Xb+bn`yzJjtxLO@l+iPPC+73YMnm^`kG`|6UHxehDV}OsWA%|y}
zh;))H4e)w#H%(t~M=ulmlMw5h9sT~E5Oe;S5PN0m+gFfJAh=<#O;z3{Kg2$TFwYu8
z!X;6H`kis>Z2_{;moN%2Y5;@MD`Ms%3X~HUL3Sa+ajAo>gwG5nRsgF#S(gC+Bt~>K
ziQbN&BAu_m=qf4#W!(kdAVrQ5$R-duxTnzk6KFYk5s9M#4JAf*s9iR_E>I~NR~X)a
zqB+t7R7B_SdqcSCa2O;=>+mN+NO3%b0iH6kyM1f$8paw=p@@F@SLgDmQeOG~lr}HW
z1R7sg{L03mX4hb@t&!~oigA?_lo;y3VdOh-dtuTg!Wx%A+wBI7_)2uvW2Pg$dGFE?
zFx|n_HY>eEsOuX<GdKY+<#n1sV%Xgv;b!%~7-Gv{ik+vq@zE2jY$GnOmu**x!<^EN
zmpRgIbpbZygTb7opl!v7(Q>b}u4T2t>DS(W6J`6p$;#$}Ibp0^6^<^4A<$uj?hv>l
z^7p)md-eZIUaa5!%8TbOfAZp6=vQ9U9#X9Od8|ER8gkKt|0V<0y(8u<i2;v*QTxV_
z{ZN9?z;1f7$r@$hL2`ru-e2ps4O%>cFbTTNz7xYiOiVEJbHnp;f9Zf=M{W(CBdsoS
zs2lcm>r)H<X{)XHve`#@``eoXT3~I-l5z{gi2bUlgRDG+dh>Q`xZ7kc0TnE=Ywd6!
znZBjKqdL3ee2<qgxg${!6d%`+ghQiQossuZFOysj+>3m7KB7`d|I{mpAJQbp9N8<t
zXKreDP1`yQ;Jr9;adc|~-;K!&<cs>|wbvI}0mYtuIMLh{bs&Z*&V6iY7`huSdfsKv
zvx}$bhse-S5eB*8odFb;{^Z3{2cahF{_<8Wm(bq%NvDHV=Oo=5|0G*QMi*+FX#NP|
zi%dybaa@L@iTsE{^#$e7_4#7AB|vd+oXw@>QMu*-|9czp^zqU!uQpxP*PzqLfERpu
zl{fLq+x}PfmsgE?B4LrIs<}0z<7ozn@Nz9?fIZpA!-r1-7HgqH$`W)-M|U&>BBOsf
zQ|CLkCZ`hG<ZAtu4vph$$(XbVqe{NgVSe{G7!WS$Sk#aecpmq0tGSKw`ejlnAWtrp
zp&C~$&U{l8*L%YZtgAIaJN<c!fMLii50elOA}$rRl<l=X<FA^payZoXRSsR8{XobW
z9x*FW2uGt_R;WU@<E$GhcZDdLce-{Fjd5@_Dj0PcaycZv(qReelBHwOdwm7FnM3AY
z#)DPka84&mMl+}1SIRXGGw?uBV{wCK+f3|(UT!j<o`xUJAKYLJS<TC-52AtdK{aZV
zV2&Uy+Sqf_cyq*2kXGFmQ~u<ybi%*WbM%Q|92gm=th`d*7u#kzE$}Zy<I+}*tlzM5
z=GVRkYDjW5Y-I#WGmWi9&IH_~Tr?)5)x;4kO}RdpDGB|JN1>+tY-~AoJb;f`WYNvx
z=O)G$2O2hy&l1}S4(2n;Q4jpp4#|9AHQ8n=lL_aBURD-~13YZ1!E)3~GpBQl9noTV
z=vnzJASOOu2$}J6YhV5Qbo>lqd!LM^-$H3(RiH8;I`YE#z2U&k?6$vs%(r)Nb?1V>
zKP=-Ljwco{BP!q6dg8dLUiczqLh+OnHMTEY0$o%uN=P;?T>h$<YGB+h(UQNiV7HkQ
zrc^jPk+p@&^;S`;N}Y=;E8M<1Uf@!op86);`2$U|^AqFV6Eu7`@lmE9pUq(z<+OMW
z>Q^;jwlk14to(VNVtejz@$N%}46IUbiKtR9KNKi^45iVXtJ1@HP9=88Vp3)1f~vDp
zGIDuV1X@D5PPt>*80hA92^ITbpPt$QEM3xgh~KoaE~qE6o6KuanFK7qAE10cerKvK
za!GIk79Vv2)+eL6yYRW^zL!yLG5@))%HrIl=@iByll4hddbj^k1)rx`RB;6VJH-9l
zuPdJ68K&ps6*^$fk!zaIY^BJZqCd37&j*F47O7a8oD*<~cu(I{tef{;j4XQT%?|Z~
zE`COm8LNzQ(~p3MVQmMV-xVjgdPI`(eigkReV;dhmB))W)p%KnFHJ8O7LT67DT|K9
zv3c)7R5-~xwb~AZWJ#b<!)13o2I!p3VgnLza`j%5U=O&1-eS<D`znvo*u||b=E^NB
z6Ol4~1sHvj;gYP~`dUKN74k@0q(7z1lV?0BW->CJ{$+LK{LCzdpQFybx-CArtNMn}
z2Ae9N3C@0EuH`4{=C8$r=1o#4N~)@s{<Cy{s?eAg+l2OUDKXyq$qQQv4M}l4DR_FP
zoD%xQl+k2%ggcRnGqPWg{45S_Qe{-jDiQ6wRFaaYmW+$^syIU1`aXqS`cD7=m_#QD
z9WIcVbwYyP<V{M*Y9t-f7AbpP6#L1^)>K!7-#$0Q9iA?iQ+=Nw<}A<P-f?sR;yXwj
zxeJ94IzT6RW(8>jH8YAg;TOq1fZT@ELuAMSKmwMpOa^%ynF%%42{ju2IX4%KNNDo}
zpye`}W6N{4$v<Z-tX#Xo^MDi2fn)1R7kV5xp$7vW#Wb(W_BWaSw9q*|ro>tayB<bQ
zV3Lk{Zqlz3S`nlUSyLq(u)L8nFK=6UeE-lMnakY3_f$3Y-Qi9u1cC?1ujdU|`dn)o
zUms)8o9-t+fOQXKZ3ThYy=<ltC0bdoF~%O8WJEd6!~;naT}PI2(Zu0|4|M1`LY-4y
zRfAjIfreOaL+Ut}jA-+SK0lr^AXO`5j~Nv>@?<HX*Klu?0DJP>2b)YW5iX$kF+?1~
z_+?^{24o$Qq4alpLf0#VOl(K=hLgeLdtvvRIhT-}M)V$DPTs_+FBijb450v(7ojSX
z)pJu#ur!p1>Z_xFy`f9vRcK5u>%%jJNZodw(0x(PZJQZb65Ea)xl3@$&XmGrqgdUc
zDJz7w<~T|n?zl0iT;Q+P2&3hc$MO}u(lYaDQiP!vQYa(KEe{R`3Tfu3?Su3HAuFQj
zBsG$2sSH&6P6c}`Z3jOrIxycKj#keidlt>i{B%C<ehr?B;32!i{O~uLz{v&DH3|V`
z8KLSbr|;SQw$-7zWO(*2&~hjky)bBIawtSf7r$UqurTQSmGwzo0O67o-MANmH*8mQ
zwhBxcquEf$n%@S*Ay`JTvtdd2EG6`0sFdf5<v26g8ingk9t|}mqNrEL3!I>max^Q8
zWH~`wwt@#s>O(ztQQZ9n5w@yMP~!lo0o8!4cikXsk@Vq_^_}J~->4_wJ`aaCLyu1J
z>9gf)y3VqtlMUXbo_c0m!Qm(){jUgN2ka5<H~fEL@SOb+=Z89lH)o||GI9Xs<DQWL
zLZ<KqVEJCnsH?N~J=FXdOj$y;e3<ySW+xXG-wsDS4~yO?#w6_*S$bP&o(~I1J{lvW
zPV`WInq$h*H0~V@|JOD}pdOll(tI^qXcW`|;NrFkm>rt*KeJdrNV4>AEPklcwb4nu
z6}87JNJ{@}_Y1?(?*rLpWW4^2%uy0pMxoi`Xgv?uB)46V%;&HTP0VrP1N}BHBXR8c
z6o0nq`~itoPoOMs<IS7-%*249D{Nf$EAwKGe8K$o@N@sFJ#zkN$M(3hV_|Zi*rP!6
z;%qEKPi@Gw`o#LadUK&q1$9_O=H9M1NWK&6e@kO%Ci1gV`#f$xron`b7jv4Fy9ep9
zbo7`405VN{s#5-K*O9yi<4Bc3cZ?)fNJaU2?2Q&$o2A(T3x7K}Xdl9pX&rb0HLh-j
z1e%R9>|h<Dve-ho^1v|)K*zmqA{qa&&QQ1gx!62x!UwVBb%7$s6IK@-f@JngnN7m;
z)&>%h(=zp-QMiNVJYq1EVZu&a9`Wy{iL5WxV5-FYRb#9A*0iDlCR}4f325~^*PtCG
zxlwjaMT3{LhkGdFQ->+)zl@5&!vb@RCpV_2R1$)RC_OvOvosUf^!BvW9|cg?Hb=yv
zm%lljOS&n0*r&aM@eiU0WsFie4?C8B$jQ(pSI|f$2H*7L6nas2+9UBWyz+}<Ierw7
z?<Ap8C&%-P0d^`1!434}n7Ro)GFX|?MB~S0aROmsPPa5y<F|a|vZRDTtoEoxG%0>Y
zV5I0SMU-=f7y(6d^^0yQRC31{S@z7~0v7wW<IZQxG};Y}Jnf||NJ<wPX{>$iY(M^O
zXRAfkSUPvQ&pR<9(d;bBKB$gK?1kO--P$Oi3i_{+?XQENb=2*oTlJof0d#dN`tuC_
zS)OLS;87D4vTohZ5B2c{?h@a*HjyTVDD8h0aEbm$0oURy;9~qE;M)8x;KFNu<y$xF
zd7C8!#Y;*d-44DVw<&+`x8+<RhL|YhV^(x_3dQKajS0|TL|+SAmY$zBn~p3}g8MG1
zwA@YqYG51ue;C+GR-^<HW@RrB#wodi)asp!OOjPDKr_qb1Fr3+J0O`#j!BNaOo&v(
zRG6<@IDd2SPA$;nX2=tGzpEA6tc~`@PH&n%vs1bDNemP29Zj<5Bb2rc0poF!LhRxi
z^ehgnE?6bq-n|WXgb_+%9bE`e{z+bc$`Mg8=@N6$XlQ^6)5-Y+M5;F{N3T}WuJW@C
z>MlNbCh5@VQuw@Gd7GM(uR*a{M_=nw;jAU4$j#X**Uh@5##u&`{Z&Bq^#_nS{qgQg
zV76JrY$I!}^f!jnNVoo5`c}knt_wmX=SUlfuc+%2i1PAi2qt1k?1k~G=pQRvvpRq=
zHYfN(Sn?JGH&`zMNwG|}Ks1ZX?&?P${i$v2p;hnOXO{LxNA(ukC_{F`ASaf$zpZS0
z|Gu)Nk2BKCk`{v97$0VqZspt2Xq|23K1e&S+SnbYv@sd;pDY<wXNc^c!<EVrw4WFD
z8A8#Uy;y)V{I5iwTRO|H9l{uNhb5TMaY<6c$<C-GgAkWE*8tST)`B-0!n6N-)^+Zv
z&4)T9r8y9a1#P4yQqsSZO;hFSMfeG*MS~aGR)pG8U76C8-k58D&h)x({t4gs-x+!Q
zA4YCaxb#M!b%bwZ{OKVP-lMX7A9Sl#QVV{?SQ20jO=KkdU}ImoWjfnb%k>1su*DBa
z4!>tV^d5GwKJFcENkFRYdj&>xFS-<PRkvTWdS(io1Bx-JR}Xh`OKePO>Z`D(oJxZD
zmMz+*T@lOZ{GD+fViM>E{6B1P|9#jE`gdV>>R*Rl-1ac!K{BjIlXe>4csmdFOE@RY
zJM?*iG^im{3Yvq5y7+sW0^mNu3^~odgbL+dkwxU;{7aipE`#mFYcM&r5OzKmzZ(5V
z*^^O(wow|>@qF}{c-Y}2FXQRZhSKR3{sH9uEv6~kqJNHXnVvz}^QHUT{d@d3Lr*IC
zgVQ=0rLU?DWX6d(LpiWQI^XCRL_^H!p1T15FGjcsL4S>KhsOWw2=_bhe;(lys$9?h
zbA+1`@ajC__xeBF;GPa{n|TSOjD~g7g9Fn?K<{D%cTPu(9`@UaAKDpSvAFm$velLP
zQ*4Fj0*57NLCF{hM<X}rVyaIrmUBn_u=SSPQX4U9JU~|BN=~v${(dX&(Bs3*c|Iy3
zds*kKjd)lIj4f>huOjMQlx+hAB<hBk&~?G#gvriV(|*x@aT*Lgzgv2NXfwO-g`X8x
z!hmtjacwvr)Nm!IW>kq0>F!S^1b@6q!;V)1uGUXS(5eyN-ynpJEqbapaN<Z!|9x%j
z$&kTBA17!_Rtz1|i-;JlFAS^xmguwHnrOx$f5N@P6`}3>kH{slrW?6%tR7&fwipA7
z6j&(>tX7bpGtjQ~1nt!4JpzV-vn))8K#2HM6>7Hk`i%R3j6Cu;BYXd4<jB7ndE<|f
z%^N0mg=pA!tg;Y|v;G+QQ<qjVX#}G_hPrZbUkahi)9GDAR;S&!>hZZDRp^fG=nC>B
zHHwiYwlCt*wzt$v$$j^g?Bd*BMr#7sC@uSyQhMaqf;wYq<j(>Pr7>Rq&_?=U;6{}P
z8<vCL{anwCSES2j7{V|eS$(f^qPEYn1$<B(mU#`TjTG~pVowdA^tI9!^eNcH{uYlA
z+|!sd*-EmeYYBszL6(r;;Cwt^uL6izgXN14qvSr~88aRu@7&Ccfi;6TJ_PS}y!2-d
zftmgivVq4xg}mqg4<XO~UC2g!$pU;%$DtGc{(YywP);A=tRUO*yjS>4JW7=2MAso?
zpVyo?S)D$95As*Hr|*GCJPY6a!eHfNrbJ{0+fN+cRU6+V&#A6UBNi@|+M$28n?e?4
z&s^R~&mg;bGQ;!6!b?@{VQ;w1lPNPpEqHn!wF6P0C##$li5RKWuYP4+fhrDv+6PZ9
zl80BLnKM+95cxG`SihC8tjnS__gB_U{mQy?3h_rJvGV<AsAX7%f%1`sfqp1ZdN?XW
zhZlvXtNfbmFcp-V?6^$1!sU)a$%(eKWn)EDspUEgA3o)d4PtuN!CzT-SLZ)uT`FUF
zOLw8aoNRXSKX)?O)SDa3tIv(w4`XvoZ)ct50337ol)+AQOT>=*!t1#Q;h$WgsQIdA
zhZeb9qMs9&r7ITQr-SqF?sJnro_57G*}72@VWtVEUgNYR^uj6m7#Gf^CT`Kr)a39N
z-}MW1BnletC$YIbMQkHer*XqG%D7xa#>%f};-zpMRz8x`ie<A4wSP;=MC#0_4oAnq
zC~Zx{>PA=qm<^{IX7ngTgfjZZYnP0Jp2Jl-oUt^+*}$ZRc*M)NqX=_QI+Puz%1PUs
zJV*vsfT;gb>3kbFV0EkH)8}SM=D7Oh$-(jbalzf{J0H_fL84K&!>a%<@FSgFR@cTW
zYu>s&G)7Y%N^qgC`21@{8;EN%u<`ew!CdviGbyr#zvDWBr?pXhFQYeaQ&9O^2rUSk
ztH%pXvUy1MGlL67!L^i^fJ#|}t?tlJDO7Y$);b1@^)v^yab8!phRmT^C$x)c0k)f!
zH+WLz0tRcuuTbKy$Ig@f_!LQxw4(_QOwTFtvIuv;@7p^>jb3(pL#-b_7VIY=exddb
zVhbo7g}4Q8vw-LGDh1gcwX=%1qnD~*PxW)et~CQO1wf%3r81gSy5vy3<d7kt_I35}
zu!hWcm?g4DMgaaQO;#&HQOyyp<9k-_?a`S4$;W_U4Hc?In$(8UC<GP4uZs~SC2uZ|
z<|t8i*@mC!LnJhF`1V1c|I<~m0Z?o&zP&!A-q{N<Ou_MF!3Ur|upEFd!P3{Ncn2(D
zh-T1`+X%gsP*O_GhMPoG74Gl{k~aF5QhlAi*dpQ`itf>NP3P_;v?^h+AG{ZOn{7OB
zpAnS+X#w1eOfZSH*LwSm|DRQHGo5oo2j++|)f}RIPz(TM-8rA+*QA)5u!-dv$?yrT
zu9eV@F;g!}jz0*UUf1kd(+hATah~}E#vNwL-$;fuS4)f0g{ZxtFN!%7j|>3iJ3e4j
zpIAs-_ejr>N8`mc`kg`yx7K}jYLWcmQ-g*1-lHLQtPOTQTWQPgLoBz_a@M5{dOuTE
z_BWk!;B?6y#aA$r7ROhTUe&*Ta^OJKt)fpQH>TIiIc7EVK<YW!9}W-Gk?0M`9>zO}
z?x58%jEVkG&e51eGX(R`<-UL=?v2N4t<V6OQT7W1+}Lm~ni<CQ*t~b8H{?#u_o6P&
zbHJV1RnZX`!>lXP1u7Cfc?rB%SzYEK1q;y*m6P98hHybq%i>BmYh*7hON%8RP1o14
z1YBUI9`0gSc@=y^EWE1s@OEA?(Q?M{4uidR0Ko*^n~VJf0xLl@A?u5VNk^pOcva#i
zWjn5FSgzhO@!jx$RQPo`^L4&fyV0qJAku7th#!%06ixtjg*qejE6z9pN0?n#dgFmo
zQV8gWT><aT0rLsYSoal4D}o4E!s{5dwakFS&(6RW$CazZO3i%h?ZxK%m3tuNRtLkK
zViK`#Y>6N8IqNd)7*=uE!WBKpe84iD!+mP;Co1O|qbn%QG+=`!#tzi6*sWmNp~>8a
z2d;`t2LGnig!RKF#Dd+0Kvrb8VoIz(<?dW-Av=iQ;rUuZuuB?t^Gjp+hrA&<507-+
zklRmzDJ$0hbuXLUWkT)qs|#Jse(nwJu_Qfi=HZffx&7o7nZ;PJIA`tomhDE>;Okg+
zL}&16tLR@=<=d`?wbXRh&atRT-TBpH-S)EdGOCdn#@TLAVcrLuo?wBEZ{l`WZw2zH
z>X*m!nfNvQzBsacIX}Z+dA^Ng)igU0a5XAL8cJRUu%L~<ypkSFKo2VdBv!(sp6A%{
z?XPGGg+b-O<wm6fittLBg!^syG+g3MDm=H}3580$GA~2NB~R64l0dtiN)x6^oKln}
z_T(}d=4y`k=PQC=-yG_^vN}^2{wlr2HP3?ip>qW&Fy`;7s6Y8nKx>t&i;TlzUiG`v
zCs;OI27pFGaqJ9}rHRc)g%rzfzSI&9e>bvt9b&?$eZK+SC?SZp>-hs{vcmxllf;9q
zyRX3f{#Ri3+Dsp-pK0l{`3umu{|4w(1BdfbQ1!22^Ogm)QPSy98A5RYz@SCtxC(mF
z?4N_xx$G1@4oEzVj~rq++-vs0vJ(M|kR%W$sAC&s$3L^?cFy|HRc0fLcmMqfM1)cI
zp-z{No(u4zIuWiJunb@TpBd^9k&VJHJ)4wr`FKEi#Mb@2ErV!NZrct!lPf=9&(hf}
zGSX7@!OhY4JVVxf3SLnf#oA~WOP2R{aCvAqM379>22ir)#_z&@h2@NWx+xv>U-k4N
zkx_%~JHk<-ZH1vW0BPzUzohnpeeTFJj+QDITBG{*n=6`sTc&#+Ey!!7j*x{ooYgdE
z9og*~BN#f^<P2A%_blBph>37%Pj-lhRexZcXS1uP+T^=x7I+^>4S<lj8F=?2zn+nV
zbC^)--k3t1;yX(fDb6?5BC2^{Ha`(sO@f|$+O(Zu5uNgimaZ2+DW?3@mKUTNVFnjQ
zK(p0#^crLY5j(#QRR8e#>p->4ve<I{K61WoJSBigPvie${cK!6Akc0;RHz#Hg1CM6
zg9}XQFa}^L@`GY@AlcJkNRmasi;r2Zk4BOclB%rrv?Zb`d*}`I&wXlRKMK?YKRgQy
zjP`Vau?2VMXA0=HcsR$O88kUc{qfffn)wK2w?VnmjOv&xL-&@DE{B5Kp&?7EIOZHb
zvogkrYfXn-Q;!-=t#>BViC*Ek+PX4+si;kbrTmM}pbLNaEd3Xs1^y3wwmT+#4FY_G
z%xu4hEa-A)r{Pb;jxU|ZBNA<1iPf(zUtpJrx1%=|AZe-(CDilm9Fd)=PrLR(ht9QT
zW*1(w4}^ADt|d<}{%P@bqI&3iZix?Z`2N=<TK=DtXfbo~2Ka-nO?V6(Zm9SWkK>yu
zpMU0M$W?G0YW6nQ5}d@&WbRLnqAD58+834=DAODDHsKRy2wTt6>9juTwrsH=W~$FZ
zUt+(!s0Xe70TQS_gElyeGZ#e-qbS1;Fa*<TE-C65IaxL2AYu~N%H!%kn`k5EmeWNI
za2P^kE<KGK&^x3Q$GqXdH9SPh+85Ias%(9TH2_+)SmDh%C>?b*>75BJ1rAqCpL~|z
zp<04vLos=w3`u_uSc&NFdRIjnj0QjgH(dN6gy$uK7-BUk+`1yoTT}m^6Z4bC?eh7b
z#0(T=`fsafeu|5-|FViUcmd{@YsBUCaOtXZoY1)Rv?jW$Zp6lTGMKOzvZ)%>-<gxP
zv8pmSdcS}hW^TK2TV7c(VMvs1B-7(C0Jw?K9e^}LhJCBoMe81E?!tBpZH;<~v_Oyn
zHDX3dxqV%ccx{>m+$E4Lp)nX;EVIu)4L4GJV)M(cy^?eXCa3Pl#?R<hXLu{VH-^|W
zMr$ycg&rOWF&g8oKkC<9FgwTp1?gyqN!~h_Z%3Gk*#zu&-jMyk`M<$4)&DD=C;va-
z8S%~e`hSk+q1`=Rf_{U6-PG@YR?+r<TSXJybFatD{BsozsMt{;2#!Gd_f@oOJ5yIi
zg{m8d=;rfGM^(a&%0Yn=7$!&UT-i$j$3<5<%+o@z(-fkMbVCs5WpL^YD_0?$3Kd3&
zcfv%|OMQFh%>Cv-=J@kX$7Kq9HFlHj*&_JzN$tYdm8$hEFM`~@G6syhj(eR;->M&Z
z1*2MwD31VgKKQ+D3U};0aJvCIjFl?gG?algN}V=h&3IJ@jIHv86eb3Eo?GIqSYP!B
zL<mFupG`C{eI}H12L&@-4Q|k7?oobYyiJdCKG?N?xvnU9NIqvo+21$OGGCi$*DwOc
zL31L^*?=(2WOW|)m|Bc?^>cGH+s(+nIIcPVKxB-!D3b^VlOZmD)P6gO7R?X`!gB0u
zmnjG)ImF7vG;;xmjxRyO(ftuLrkR>u%rtHb+NajVjT!ymvCY&r@-024jRsyYD(!Zl
z$5Y{TUt{!o_Z0ka%OD9;$m+|V$~@(V+TSh_`KK}`I)7E>|5e&q2i4uA+ZuP5;O@bl
z;1US#?gV#tcL?t8?gV!yxH|-QcelIw@|~GEb>`ffTlYVT>e|0%cW-vT?^^3=54rzR
znMnu%D)VX>W8dV5%B;NuvGt)c7yP9%Gj07*nPC&|jQ^<2Hq%*$(k0}~aYI{*g7pFP
z!Mr?>5ByW9JroM|A{3xQ98%BykFCr#zBJ0|Z`rPxybQR3H`Rnff4QQ?MrwVHD&S(+
z#s@0#VMopFSs&U2S8*X(6KZXCT$4^q@>f%u?}Us@`1Njq1DoIau>H=bGw%^o@JrBG
zkX?jOy&rH9#@9MJpNgDa9lZpg@sFzb`U)w&850+7t=@2CmMy=M-eI^X3Y$5Xtb#9V
z)doyUo7_Jd9s&R~DUdk>kOlLXQs*tE%+u6YfFhc`4WyVFGhdy47eDX!;kTlB-_N{p
zl(%lm|7#IloaU7uM30E>h`2Om>e5bZ>aTcV8l!j-CD<L-JF?i8p~&-0aU7(_N_Jc*
z6lf)?1kjZgH=_TxMj!l(H5yCnztzzHVvSCveX}XqoFOjRB=8Sn@2mXQ!46^m)Vn6E
zM4Ry=rEKy%QBT5n^aY$-=XQ!qpXKtEVjz1R!+ZZQC=rlia1t0K3NlvnabK7vb~zN=
zEI1A}>F$M@Ds`l0mCYdbHgZ-xsnfZYKhny0`KyGcuHBkNED79^O4+Ivg0~)KY4AcQ
z*@Gkj6+`x7;Ztroq#{Kr88MFjda9VgpKHa2jK`mg*n9F)Dv1unf9LvI##ExOl;CWL
zjYhOO8AGDWH6D3BTqlX6n8oJma4(kxyNIW{&1+_bw~R{%e@*=Jf-=ZP{=33hRbJx7
z@KM}<)uiLc_+V{&MyvnU>Kyq_e&m0HP~6%U`cze+gWm$b;G>5lE+=~A%u>-=s^Q~J
zG}DcOkuggRW}B0nMrOZ6X+QO-(r}vCT>j7vuLkRy>N6-&17S+EPD4tYD2-=R_MNti
zs1e`{ri~QBt5QvC1PWXhDkY`+oFQw<+y`Ew62^_uWVn@!{UcXp-y=5CSKk3n)W^_C
z9Hbmf^+W!vZ3zahZdSXWM%e14_X<#{8edgg>?DYQc=th^X1##Y1ci*Rugf$i<N>op
zn|VU#{LI_kUMi!j65em~K+C#524tbs)?}n<msq~+#1RJm!10RtCCoJXK-GvgbvWr1
z`%paX;uB}Y*tj#ZgKn(nhV7?0Li4Le=F~Hz<j)C@dd%_QS@LVN`X5f{-EDn<6B?OA
zFzP>bLdya)a>NG*-OxW(G^UvF-&SaY$qy?u{6`f{jINlHZ?Tn#BqrbVR~fzcQATUj
z$QRmwl99u!5&9~c*D-zvPE{qCnLC|?taPe<aI#y2pfFX@qLKh~l?pAVsV`KxHJRec
z-mhqJ_1rM3=wtP{;FO<SAtus?!~sk+#PD8Bu>3=!F6d4|YIP17gKrL7y7}(#MAYVT
z$k{uw47-t;o+)PBrEdd)t1k{bH~oVOZ3z$EDD#U0A~4WronH3!L0z30%EuAuhp=A0
z?Z$1Ps2@_O8C&evLJT-p7!mnmhEH2i%S+6zOAovd>VvaV?Z*Ue`F_y%B3eL`lr=4e
zXWvsrB35z>-1%D|Njt<n5+2mezHJ@XWcDqb>?d5XHXgsRtiioKU7y?vZyeRu@>RaM
zUVe8XMnvF-Snp!oL;J92gMwr4;OWe90fA*6!Czx2tr%qINt;bF`2xcvj48<{M`U`j
zAO`jlRudU++U^U>qnq{W_ToYiYT6XX3zbVDJoRlYONx*LH;Xvs(`NY2qOUI6I+12m
zm0rQ(Q&IB8IcJk<9yh@>@dp19r9b~IN>fLhP*1T{kWV>1wtm$JZGenyXr8)%P1y7F
zzTQ6TwZDx@8ZS~=za1|aW(X_T-Z;R8434+$x{oIR-h|+0#gB}TxjL~;EX?*DyC64<
zroKNH+9NlcIv_2n5XL|i?L(P<_@^>W2~eiHB7t1ct_IP;c@s(Szck$G9T4=+TV^yB
zhm_5z1}I2hzclA%?osUMpolvGlY#TJ$}u!|My{>hf6Jn)`aM;|&Zq7D!jbC1>-y_0
z+jtAA+IYCuM2DX=n)}3ya^yD*vZZ}@MTbbZ`?h*_b2PpG5Dk>*H?fp}LS@h8i`}`Q
z{<$Ss^+E(&!xAnXwL=ctoj}^T)70bWlh^N5V?1ilnm*w#lHZz6KG#SN^^;?)5Yez*
zqMLndIy+j2rbx=x^n<JhE9-%Yw1#Jcj*kwLrR&k6>sjlosNLH7*0~kJTBE5IKw>hs
zdwaP$w7YxEx29B8y`@2rv8c4j`K@>-#ne8ZEou1$DG}X!6L(Xv%sC-J)6MSC((v$A
z3d}ZY{a)M334He&y7n>s9FK>rY&TXpe9fu>VhUBC-Mr?`tedrDkat{v)+qar{vQ6S
z`{7J?YB%==+3!Xx>HAxN*FF%r1US<%yT#5m7PE||1r}PPG|vl<WhSG+m+rK2s&1W1
z@SD9M^2|Ac7^h{IbW8uIIemaD_osRoV_YxxaoGhJ*9}Pq0J)V0VP3)^J@Ahp^j30@
zYZL5e7D+P!jQ&_|#Yt6~{S}@3^uIw{Im9kO1fI1VJjze?#B9^Vy+0t3Zb`YQx})xv
zEf({QR9{f7dzyM~jI9{7{sL#6v5>}Sl9;yXW%P9=EV&KM7@!}zSq4il;uz?EZ4@+%
zEQR78(`L^>lz01Q2s+zMIN&5&&b~Zduv9#wdOPrV>J@zllx?U*iO8KTI~L0Nq&Uk^
z%|LQ%n9;pF`3_`H!RA+#r+C<^2JVdDs3M!j8BbN;zz;+uaK52b*Bwp;xlh<d#FC%>
za-=5=|M~)|Wa3OhK&$E7|C6GijhjO<VdfJ)Z6!vVnD87FQu?oENprbjnsCTBQf9Fp
zv5T&QcU%imc%Mw45=ViOpm-oa#~=@Khac{x1Y@m`NG#+Fb0UCoHIC~W`A^1`#5YjU
zs>M|CRYtyWB3lE^IVEuTHUToJk*<8qspG#L>F+E(jVp|+LyGSr4(dW<j8vIE4sa4&
znnLB?lkVaf3l=L(Qu4;TbH)n!-y|OAaWxu|j!`QEcQ}KrS_q}C;-CMebs+fBIta1^
zf&z6^Gi|H3eEWL++YOyONiO-t>Gn>CR^dGTN$eQq*MZW%rCY@u{3ot-Nq{Ro{=Z!5
zy#I8iM@HUk$cLERqjg)Qbv)QKvjom@fXGxR;s6<xFFGXat26rzavFu<w8z4V{L$VW
zaB<cXqzlytKb+~fn{aw+YhBYrNqrg%<{3H-Z<Wy!Fo(La+&65qNj)pr4x!W*att_+
z@otamm2pETpr^T5amuuX-!R6dkI+QLxIk3t@A61dRgMC&D5eHcd0_v0^WaSOPxBz^
z3BB0c%WRz`amT-5ihVOr7#BvmFaQ(=%buBK!ydzANv=qBLUGcOrFF+hlUFX%d%Tj0
z;g2odKIR|!>4UN6Kl$mpkNmXKM}At?>_5p*M}_Bf6agKw?X^U-<0M86MTpLtBF5xu
z1Y9wzC>>$s4>n>j6QZOo^&-)?YwwVos7XFpg@Ma9r0hfeX%`H0AzW*3i%b%a33ZjN
z5+q;$AzJbNlW2t*Op@kFd4KBFwXrA{!ZO;sbu7m0^$)Q<j2Cb6I<ftJIm1r!PWkL+
zJHCO*uxoE-hdQ}m=MbS_g0Sf@hgTn_>fm2e)J%V+s3|{E)cF+)!g>*mKQ6KPlbeqy
zD>yh=)ufOjqZfaUf3r5>3CG$mF4c~3>_QSO+zxbPvDWU9r@K*=)gU1TXIl?Z0}!tS
zaI*WiY>PG2eUFFDpwrc0VFu{(m|6DTW&gJrwfmnKHPRj<?C!WTGVQ$_j!;@~Jd~uP
zlniB+BaHh6zCHF}10mDA;yT2@ktG0mRc2oWwEY@qbH#vQJQ}6i(LS0~3?W~$dv8T3
zsAGWlfG_cu+HS>mq2@DnLUtTY$0wNheGjsL$MG-ZRetN=$g7A+n)<Q-Ur)NUUs#am
z5?z?iPU~7kYp>?7mwpzgLcgC_FcPkw7Nnjl2R=5@g$jw)J4cEfa<_dyi`~;Yr5Eo>
z+kE2^HX{(n)~S;{72KEtteC=<Y7PSR4SE@O@t3YQX^xoh5HG=+8^bM3Os5*7$KY0c
z`R-ESyt*R}Vj1uW8FcUUIFDtBjI2keTg@?Nu0+R)5JL3MJ76Vah*DuYth?}RMMU_+
zO`C6j4^@l^bY;{L*f8j0M0n%ew7=HlpS3$mty(`9c68ot(}3y8R211DM>E!jZKY-+
zRa$l0qn@Yg2`FNdpXf#fN_EZpoK#uu6#Cu|O7DDyLicb8kJ&Pt_&)G3?r&Iw!)Y!3
zAIt59)!pv=g}qQ6^pIfxl-u_K$g7Ob(Ds=R<W*lTNUn=oJp!S)85KhyJgf9?CqoNX
zm9jGipBCFSwWq6TyF^AI67~w^Aue~c$M5X+rZglDkr_OyQ^lqInWY}yb~7whr6PNA
zWL5wmjetgLi1@lwaWfpAj^dhKiwZ22RqYdk8Ygi*Pi{o2$Fo1`4H^XKuZfE3N@(Nb
zjPhTqEXrgUA3<u@D?pGMg;Uv~yBfC!merJ-+U=)YwUux&UE>u~rBubQC0isnb}W6;
zYt;PTf|!az%Gv=wsQWrp^gPU@|L7W=w*TEV(5k1+=14WXF!p<_H~|uH(pl{G?Ssp6
zHRuEXF0D8|HxWii6ZDGCl?twYpUaScwGp`i_KR0PftV%br?gi81x~DGqL^mLK7>aC
z0Bdy(YR*cIEsIOV6jV+E3&2`U-=6>RrZ3<9@up||?M+Yr@TS+f!Up~2O=mNI|H6k`
z`)LNiwW9F;;95N@!JQCWQUSPD6O#b0)urG+xK`c(u9YLr-&`yG7#zP3u2te6u9e3h
zu9bzta@-%TRZlbLSB$KmgMG9rM7MU{20{}<M{*y&^kTeG(ma;`8Kj;T6?Wn$b?E^E
zsAGrxwaP)FIQ#l4QDA%Z&Db8=IaWsgsl#d<SGcBfN>_X1qa_4P{va@Ah?JwZ6!S<P
z#&-a!)fIqh721W9`p~;?^RHB^3t8`1q6Y3SoT!ZG0IJoc+T0n%&)TlM&+@Gjr*xBN
zsbuj^f~{fpUyb!UWa_Or6LSDrYS?K0ifsxwa9L@mlKC*9f|$3AZGh&Eo+T3R#zP(J
z_R4s03xm>2ak_=JvvhEt)@1%eMBEMBcELyb^hOL`r-Lp=oZij?Tf0hhfe_t8ofQ2g
zPxfM~i;2yeLTTb{s6|gzYN+Kf8t3gVdwPqm(uX;{;4_AUcUI|dG+1}F1okElBAhp#
zI7jpYso#u;sD;F=FMuWhy!VZ^)7U5PrddEEV)i0Rpcm)+0?9fKN!vRM&Wq=<vjltE
z7k$N%>H=n?H;~M#r-KZ})X#4hB$MYK;cKChjXeEUrDvqxT8nv4!mk(8aXk_Xh*N$5
z;k~~lm?-G%Wf;)AtpMonZPV>JZQT3lMP3h(wruWu!32g&4_#5>AQF#li0Ey#J*HWV
zUuF9->m@s9-y8BcSXsXQ@I~$$@u!_ZZZjvLh&J=8J}S<iQhPF*ipe$_i0TWDn*ZW9
zd$1ED9ay83!S!98;y9gC9zKHerk~5<Ye$6lPVr?ZiLSyv51Yf5s1j}P$yg#H?w8M#
z;!HOImz;N=2(CS)xmWZ*hueBy8o<p+ude!8K?BV0P}kvK2*Ul}Expo4a8`={8+6M)
zm;N8nt%}WQ26`r#sP9k|WK8`WU^G)oxn*BfLMu%@Lo54_z6Dk`%l%tDA9eXEp~JW0
z38KN)$@~~#lkR2IT?~>(iw#;huRKEA(CKriZtEv>9vN=ykL@$mwv_1W-^`L+qqSAL
z^v9|Bgwj8pFKk2FmRcWOCy^fU_2*z~+Gkf-+a52}QQ=y=9|IL*nn*Tr=jHiy5cP8P
zR7c;76%*rV6)>a}B!%4|@QaKADdJj%KPln_q_hPdxR5ca)_-e<KLeEd_#D~c1-HLJ
z4;fAJk{3Vh@K|R`uOO{kG(o-AC5-04{AVU7G4%i^yz(7m4ZsO6GnM2TR(OS)J}0WQ
z9MU8kYT?w8mjhaB6)6vBL%`U@v+d9nitl<Y!Wnk&$2*UxI?S+0U_B-W2tR>EPErtV
zCd^R%F&l`xSmMF7?KPx(+35=xRjq4*Wu)9TTRY;1r>QV$ZXiE^@)D?)F1Wn`^->zS
z<oqq>a~{CgqUrksr2O^HYJPYz`5LnoBC1k5hQ`Fn#{T#Y*8<Ibn#^3z@0qzcFN+&y
znS#S*(M82DR4+>0;Ij9~6%&dMVZV8H7}2w1?T3s%lj@ay|BR5a;;bOqPu^)gA_;y_
zDDNp1`v08B_GjL}jDsmoRF=#gJS%3nA1%cP@k(AcI)vpnv#@^&6d#b^qmK_(xJrtE
zU@!I1u3qtklR(!oAI4}dyo@kFBSzjB+~1o!35-`}bkB)=KJ_30RfTaBK3wjONF8c=
z`i8qwe59y82fu1y26Qw(L|cmi7Ar2MnsOq{2^BdhK!}_;LlIhyqDR&v9+0uX0~Ii4
z*~%Be?%(;w?e2-(^mK9(RpzbTmYgxz3mVnUXA|BGu9$5;s_P4}G@x>e1XPfW;8_MI
z0*D2bxK`&$w*-!$L3k#SGOE>EX83Z)zlie7iPgFOevDBJ^jpY?!xT~~(JH<bgKI96
z%^(QnL~J2K$Xof`uh!Txpm$iXlI4xeF7TMr21=IN5t-(5Y_00?**zJ<%I{B@+zTYM
z7R7kR48=I9QzAWq!@Zg#4aaR=$8_zUo$rj7Tjky5(8KLk>s+%GPC=CuHga6eMl=P&
z1M!eBs5N^Z0&Q+%>52Q3{0>p#134v~z=i@?Mq5QXIdndLKWkxFnb!pp{HiWYiTG_3
z*eg127czfjuBqa&;o?tUBCEI(Pt2zQdGvmkk@Kx1mQQo>Gu+;1#YKP!Tv9-+7QdLl
zgcX`3{zkhB80v9*j=Zk?OwI^@{JY9UKg^R!nK@AXMgJLPYhEcK;fGj1*`v~2z=Mws
z+KZ3<8u??dAn*9o!D27)(H#FZ+yMSj<{sKU6s#((-jH@xvj1jRt-t`I<l@xnX0?7=
z=7KE*P;vt#|2lR&sS)q!BPRODUN{m)5y>}LFwz^nOXMzB(r1Vul%dPCzSWoG5gDeX
zJb>BVhN+W+=A`E={~3XPX{(1MsoI8-Nh5`rRlqrJ^_i)X0UN`V)I}n6#*V;W)8~#E
zufkS{mI~}-J-IMxJR!J>>pe(t&Xyw?{KZ%M?sNN4Ow*thW5D&jJmT1`!6x*Jok6zi
z5Y61lsr$-F$`f|3HD9B{H}5lt%q+|zyzR%Kk@1q;Oebj>%hz3d4L*0*Tz2JdqTTD`
zi5Egk#6@}^dCf8x3(WvG#F90;Z7y$lx^~}7Fo>mEt@^TfiR-sE$M*S0!{c*1Q?#Zb
zq?GJ7XABkmSkU&edhpm?nOrPJf@bnAj0?HjA&p0QqHL&|v<>vtw^x!_zr*u2#}gTE
zZ{Gk8D3TMR2c94~j#nP8uxED+X>Xai;q!ytnRN-lg^|AEXUiWQA<Yn=FY3P+kDci!
zBv9FKje1PYy5?DqB%*n<#;yG{A5=Ew$qGSEQ18X)eg(BNv4xq`wv(iiBTEsdeq{+Y
zp$#<&4m2svRhvyhL!xc(p3e$bU$wgTA*`r17Oh1iBs#SrqCM2!^$HtlE`AfdC=_#v
zyCC1B4P;kRDWRw8(qK7;e7oUvwrY6OaI$>!SUw7_9U`O;F8-BdJkhn#7GLhof%LfT
zv5rLbnj8!l^Ll2ANj^jBl()Yy*_t9A5D!I#d}T|#Qxq5G%pJg@m;;=w**gz}u&Nea
z2k|xwD;I}Id&ANIQ$))iRIy~hd5zjg(De!XMHwwmI2NM3-bmr$z3z8DI{)nXr)j<l
zo5iOZ7kG7Do5@}jZqH?6FJbHETS$|T%!WPjJg)o7yI)q=@xHfxH|FNyFdCkVS3N_M
z1UZg&{FMs?&ufx(EJA)4n|{^7Z~Lxy%i!1&{z^SR1Gc}x4-os$scH893fLA?<=@1;
z`i*80yeRLv+;Z)ojoyuk$lcR#I_)cT;~d*dS!1%FO5Wq8<s9PuoJ&NSAq8Rq+UxF}
z+Ty{SZuvMP90wU#;l4Vrm_VoAjG}>vtI^AV|A5L4tsh#1B14w>X6N$bR0BD49DZs3
zcLOOQE3}4pVAG51<^Fq3o(AI3W9!1JTtGx*rGy2yfknF0df|z*dKwBI8RuKgfr*Kr
zIVyzc(?<5TG?%^pMI-%&IrVK@Lr35n7{c4_ZfCs9%MQ_w_uRh;tvq@DjChLsE%$oP
zaS*9hheU4U6>`JZ^*5KWsN!!BVYeJoSGRYp3q)4KbnuzG9vDTtwVwAAfzsoWcqhbj
zE+m83@=-=651+UDyt})dtE1CYD`)e|I{wq`?y++fz0U3US~^dso9A2Q{jDi%mTUhb
zq`Ez{_`8U@(U14^C|La1MCVg!5u3>;YqVYszH})KoyqMrn#if&4UtCK9r#Fba(68e
z6~uMQWN}|?$eHi6v%bo0NQjVNMHsMD=p;@Zlo~1M$m_C1p;S^+4!h&->={<VYF_e<
zxV-}h2i&@^(hjIvub>>?``(gOD92dj;nO#rW!_wpCndFs$2!R1{R&II_-sYU-8(+J
z9xE*RiAb$)TMs$06!5Cd7Mkcm5oL;tO>VM!+rwVYbBqupTDRZ)x^EFaS;Je{+ZuYg
zf5A)sY92a|QW1q-0dE+ik>DNl7%jLE|7tbiPY3h^Y-s?v=6=<5LHM2Pti#@R?>vmb
z$GUcLe1xSxqt21c?URvu?tWEBrXQ$okP$S`9=+BLGAJ(0K6vqxa%w&|&q3fPHHOTF
z4v)vDTbpY16Zc+B4kp$?lJ0rAdqgl2=QE)(9>dTA6bZ7#!kLSZpNa;d>io$BOhMQB
ziWT(33-jDzj8E@WO-3bqw&MCO{5CD;JZe&BL%g3jZlhzKK9Qfnf+1J^JkjiCRA!R>
zlkY>(F58$>WbuEB1!-&X2j(3~7@ZS8mbeF?ppVDvqpaOs4mflaT3P!mK0R^NwNT8o
zeF{&yeVZV{s(W6GnPbHQrbTXI07mg81CanDFWO$<*VRJi3^N6j{_f4vLvBqkv_u8z
zU*ZNC*!{d#Jx7}|Ao1Ns4}=s#0xl6#QhK1uw>y#6fyusHm+lImaIN%tt&f!jfQRo}
z*##4AOK_pSOiYi|0kNhf<dv7)w%oJ;K0{OITEIOqoIO#^@b}yDv<6DM!iR?L?}v_-
zrO8nhWc-5H34w-F%Ak{i^rIQVrer*)`@F;1TS`KEje4^YFjp_K7x4!&z+8QFR@Csk
zeqL4hcA3@-fo^(QzYmv@lR_nt^ZQkU=|T7GIJ}?`T9g$wGeNZihcmV*Z(ro@ZFW^R
zoNMXf3~K2?_Xa{oGtlU%_Aq=r6)vrXK{y{Ns8(Cq-$wbot6a}=ovWvTwpN7)1+(M)
zNvp9{bo9k5vF$Q=()|L&C03h=&Q^8H#<q|QK?0X<vpTQ12Nr*yBR$6=nmS1t4Wi?I
z@=2bT@C0&OTG>w2rFETFm$ava>hjKZ!*bHo|Enugf>Grk$+2uxsg?%04I+ip)br>6
zB`(v^@ati%fZo&j$X!Px<5LgUyU!Jqx%=;Z$4ub*GOp<wPf}58yipWava7uU6xTG8
zssgsvePKKtf!`{&)#z%cHbAQD+X(a^y6xtacEKtjAFBx@0h9>zv6?_#Ex8=<6R$>E
z$2qL_Gb6HWd%6r|d%)cn_|7iOm`(=6L*Jl!ClqePx|4x>ww|9bse@KQLw8X|$Py)J
z==Gbepd$_)Xld_4vl_UagEE%SXrR51C;ZY9aUS2Fo*aPhxZ%8)Q?*+!fzbV{I`iH=
zm$8kVf9B{gU=yGWp4)1C0e4l<7JP8w=RIp#jRT6JiCm5)ZvaYkgdRajB%>*+KB4RZ
z?XNY7?!Gc$JL_%2KyWV(_C0S_@E{`U_-bmUU4%h}*QV9J{%V+42IQI&8=wi@jABQ&
z^OhS8t0;6Z=apHpIM3?fzta*}MFRLI2DtJAt6RVvGkAMG$$NaQ?aTWOYv2YS-T3&L
zr{!x<BH__O?R-)*a5#QAs>c)&PCT-Mx20q2YSsG@J_0Y!^QsqHOAwvZ);IqNoLhI$
z!;?fLdLnH>54;d|DMCM&%v!Fi5&Sd#D<i<rnqQOfqz-(a4iXD*bJ0UvQJl%n=6kf1
zrUEgTD~`q>f&*%w0W^u0LK17icn)e?<*o9*B^`8QR$J_&)8^`K-=~WE#wxg*kE|3+
zbJdFpzw2@aeYQlhZVP9E4-IfL#|%m|8DSFeQcd8OrcXiVNgrPhFj#c0+L!=>+|5GZ
z$JccC!WThAz#)~{M|um3n-FL5_c|M+pGLM59^tux8;ebAisg6Z>BWN4p)vhGE4$ET
z2XBJIM<s0BL3d6=9o$xHab|6dmDfJ6WYBUv;D0y0-EJc6R|94UJ$%c*#DIrPY2Cd|
z%SMSXgJ^YTZI3Nfza%^%QS3z{+iu&--L9#Lz3WPi@=o?9@lqB19!VQcqcKAnJd?*X
zc;B)TA&ZZB#T)+3|7x00r;Zp{4WtHaN8P9Vc(_tV?ixO{m*rOl&sprs1PglmSCJol
z*vZ=1+w{6XIM~~2h;MKawFj?i?{+)d8SNg=m$)A8tUF!xEGsidv1Fo&(MjTolj&rO
z{DUYEstL5Ccc6Y}JXWp~IU4GVC@o3b@0%|kcS&V0j<?%0Z~@l5V{eZXZx1=xEryio
z0oKs#rX>OAzb-6+G?KsV>TbG6t!z+va7BLJe7@{%43{a&ip!=EQ1iQ@6IhxIWV@xu
z$g(=M<-*P3aSNrB$>YJUOIq0sQzoU9kWI|iM2yG#SwOQrQ|nl}PHUTIK0<pr06NFS
ztF_hH=N<YE>GNK=he`bMUa&P|X?O2o(y@X(OiivVRr=X^0ugd|b>w)ad+3-Q!&}p=
zVUx7#t@&-ek%CpuYqI?tM^wZWEX%$%hQt;cZE75gr98C1E?V!X-8#3?{1(tf4~(|S
zy|?Dr?}c-1$x4Erk$Y<noLgdqYC3*%6V^jz9v`~M<zI3w4|dRVD5VR&M}9PO-N!N%
z80X0@5z1jXP^b-_uHIg*b5HF_h33zmp?#hA4C>y1W0dk57RN)UIss$y1Ob&|=0XNx
z|26``5FEw*fHUmmAY7vZ^kfuh_Uc)kJ9=xJDcY|g!)2I=5kc5C8WX9AGb!M+`S3G&
z@Vd`!X{1gw;MWDResc=kM~S{)h6d1MvTT#P`Z=;z-5GlP!?guHXBX&AA~teP{EQ<D
zDRnwW=@ngquz=(n&o=JMed(uIzk_vpXLUbp9xqHM=e%(bunlL=dArO%?X9(}c4dUO
zRQUr%{@x(PAFIBibJ!_B^ar*gQi^<I88cjhp%^S|mQfed<P@eCa<e}e_sd^t3AoO>
z6ngKbqO(1vr<yt(AA*_BtYE<J!fX}xpTwgf=oZ#zp}Pe2I<?r6nJh05QMQBESn|%n
z&#zgqY!})NhWQQlN-!%hkx^IK%QdU|yQgq*mO$zyC(28DkN&hl8iZvX6^tE927g-J
z>KKCecg~wZd$!WE$AK*MjfD|jw=xbBd(~uiKFJ;1>-oF;<+_S!y#vO&%MVlVaBq@Q
z=gR=@TFGObiuZGgl7wc!NyPc;?P~53y%dv=`u*!zZFX&#mxIE(`ZDN=bsE=F3rTVt
z-1g1>`XcLeBr#dbZe$_x?^mDqb27HLtYB0crvilO0=0b_WAlu(_s;ju_F6qNoCWL)
zovG8C3<>AZ?eo4-gR=spY%R+8{L`~SNs&eI?=}_-1YmB)@6Xgj(l&w&`LsX9C&tfy
zE!KG6IO2=#t3o0MBcHOCXZ6Xa2enCf8yG}#rDrN;`*Ot-qd=~qFR9vvhM8d{NVIsS
z5n87ylrRgh<BN`7=al>i!LkMMx@n@Je3Houylr?sy-xO}S0hHq;<k(@9ppS}0Uv+Q
ze)1O={&qv^)l7J~ism|HwyY4A3SVDn#?~h%S#z|O+}X2hI(+4}JCsOn$I~iFtl-7z
zlptDn%0*!+Pn<NRxIm53OzxD5gir)1+ce10@e-?4K3mLOet(gV*)`mvJaS9Bmr#Ov
zQ4kF7c;ngCpPVO+=U!IdohsSllX@+1Bug7BiVc*881SVp2tA(CUzg4ciC8WAkuKin
zT$e=rc{w9aO@K$OeU(IG0T0!fTu9mMdcR5YDQ<4v(=KAMjYdV1{(2piv+ld&A>w(w
zHl6EbrH6cWRjVj<u@x_YmUaMzz(#$uG(0i+P!VB^0cvq8#&t>PaLa&q!`n69xob*$
zfbmNQMhap_@I+PZ3ard9aOL4lD=d4Kl0H3<Kd&k@SOW^T$s~b`3nqPeXFFyQ{^@?D
zjMe!U4I{-x%g(pz&fl>7Z0LD%W=gt7?hPV~8Xab0Rd>?K1)U3rR#{Fftv8tWnng-0
zoeYQ~5xwKKZf``KZ5<EPc3VSBpO$;+Gz=v`;-g69=y5>PW9c10l3(blQ5%Y9-QIIN
zpHw>CC%qQd&7GYQ*ou6WHQJX@POOb<YX>~E=&jmQo@@6JUI~d`XN$~+Zj;USC7cyy
zCt%4v`3_{VQZvXGi0(4p0@ys#9_erVqaW_IYTF6PrNh2;r0^oU(<uqr@<BhfMG8jI
zwE3}}+Aj=QYd0l^rSTa&?Yvkp{qQ5r0UtzVzK2zpuH!h6L(8|I`gv>32e@>?I+uYM
zRB*0S%BU!}JjA)02S7ECR8GeO&rEt}{I$TvY<A&T)F!``*cLi&D|nt)ls-$2cTa7K
z^<#LwcE85)n-?gb40J+LKXfDthWiY5q^Ygs^-zM$nPJNqQyMHI>5y%F^MD*FB)%mv
z-ky-#j$0;9quDTd&FRD7?JA?^f@$=VG)nX4&Ce9uqT9|1`tNR!*I~4-*VnKeiy~2n
zOZLOfCnjA5g#$cKkUZGNMfM6wed26fy|nT-7uVd>yq$|XQDLZVQZYN;Z;!@tg^|g@
z7EbyN4Cz8N-lk~P_mn|7sfAP{A~OsJ`mwrB(@aGaTI+Z6!8fK~?7p}{Sj!YyXx-ki
zC?s(V^}&IbD*bBfI*Ykt>x3mKEEgm-GF2OWwJRHm#YmrGUTn^mISP(<_ROl1)r`^5
z+n=84+$I#iN>!CN@%WMvwh_Jf_Co9}q<2UnF~B9{C3=k^bDZKLtxVS+=tk$fCW1CE
z`m1tcG|n@PjfxJZb$r>u`|`(V)nw-Qnw@)rOfIFaoss9AvQ=Wm(parzwb_AAY+AX+
zV@a)d;$B$URZX~DA>bOb<doqz<e_!*OVIM$v^b)ty($CgH`a>o(=8q5-eU=H$*O)k
zjTXC~Z3p>8coF?Y0?{@K&TY0bH5PAg0rQaQ{obSRsdO1T6?`3+r>ETf25i5)2NHuG
z<S$>v?8AoQD!_S^ce?gt&!(l{qU%caD!whVcerzf?`_F3KDwky6&)a%>x=#HV4N$K
z?DG)QPS|ztXWl8z-=^L|OvqezsZpA9edKh7G-?m@>`U7qT^rgehmaGPymDBwJ5mTs
zzx5GHGGosAs*u+MoPpu)u*I;|$*fc-m&s`kW_~2Bwu!EqkwSbBzc8`2bXGk@W7y;A
zs`lpN@v5bg`5B{8T4}_<xX&PSPv9$lY1nQo^^YrqyF`>J=hcwJC&eAS&t)>)RN)|n
zEco$ibD5I%<uvw^9>zu*tuoqbI{s}O9qH}f%?=~-JA0=^X93N8qHpuA?Xt4ABUQ#f
zdNf<d9JDXT(<H|zgpS!$ZL%bz{KOu;)cSrh`iWsl4tIu#Vc~XmU*h0)W&xFKJite;
zgBSsS{N_1y2YA5R=0&@4`~Du5R1BpC3GW5jrV8v{+@=a`x?Nt5rh*0PqG4Z(T@2g6
zE2d5v>HSxVc%0`hP2@s&eG|r(db<&v@H9Mln^9))LO6Z9eh2wPukhZ0T+*pL)GYYX
z8_cX{A6=k$EtQ5LP(+-MHPzr9{3odR1S^U`0q7}@OlZm_Bfp%RNcz*-exSSNUv2Y{
zHXt0p=|JOOY}9L%IIl<1U}}u9!FMxNLZo?-2R>&+%tsRtW=YB#sizkbrN~{SOFG|U
zK(!}Wp$$&10NwE7+(_rkyyOj-6cls%XmtU=ML#*c;7^WzZ38aYC{&S^mbf!y3rp?w
z+sh9{mGs!TqDL`lL^XYFoUS5=Uv`svFuO{rMxXcgE$UL(I27WxRDJU2MmK#^E1MS)
z*DwIJ$nO%>C1tqkR)-X!D}2YoDjBxRb0|qVWg<@xty8WDRZO7t^oi>d+aR^M%29`u
z1`PW0r37nFC>_o0vsw;S+?zz!Ou+8EIMO4>336n6gZHk8?*!+p5Exh`@Pd!|M3i}<
za*Ign)sl|P7a<R75OS}!&|el+Wtg{aj&*X*gG#Hm+Y)5T+8ICbI>r3tJ7@*@5PnL@
zR+)-NY`S_;L8FvjUsJc3ijsHsHLeTu;39nYEl;e6sYt{Up@qVO!2}Nn5dqE<Mi%ZZ
zHpDc<#6!j<Zm8!xQcI*^{RQVLnf7&*WL{6>y@@x{O4i0pV1)_>bfJhR9V8~$3<)yi
z6-Fu^H{=HmC{jQ8)^?(TuOGia_C{@9c5bN|7Py-A*Yeq<K-&pH;T-nXVij1#@R=z>
z-rLc3t!bW=6Ks{!P*Jq<NuU%3BwR-yzk3Npw9!gXa9=<3qU<%3L^%ffnzbHstu#u9
zjLe+m7J(>N$NMWDgJbB(qp?Dx%^>xxTfX+PL5&~v1*Wmf7OJI}?Cs}GGik~OJXO(d
z^L>Z?jRa9{1IP_LeolUraKs&;y05eyJqLuMoO;m~4pG`f3RUe+sI!{|zP$Kz=!HrN
zFZ<5IWq3|p#G6fK`V<?OHk#x-8yu|&91yrwcmrcW@<IAA!Z3Vn6cq$5`^b@2fL81~
zZ;M>)_o(^)!P}C2jB!I+|Lm`b#~$8Fe4)oDUNJ7J^>gwudIX>wo3GPV8Nr_}kX)d+
z4Y(E2D=v``ZSn6&McS9MwpFpLh@aduUf-H;xyE3^ZoLBXM#cl8ZM-R3tL<lpa*1j#
zNCz4+f)*RC?{aB=sFdlUo#~|BEZ$q0q-vo^@QRTOIE3N_FNu<+^=Bl-_L-;Hsr@i*
zvdL78xyG<^NA*C>`kIfEe;1Mwu5UP+*(=nsAx0bl<z#}98RS=WS~DCUVhxFqP<@-z
zs$zbH<3aN%;K3{*nx(^q-zpXy*mzoV(O~_;qi(q>hbFm*XVvvp%Id(9-~|(L@B}@O
z+B-T8K`gR2K)7)K`l_{r`1|@I4cj`V&iMw?ij|$cU@pz5R2T-VCF@fl%PRC1Ar##T
zw_Ehgu%L}hT(LZUi%1Km&cs?DtbYd`R&XRv{gDbsDI&-xXu`^S$lFboW>+E|9nAeq
z=6DLJ^RP;)AU3`2z#N_ParTAO++(*HCYn<3MeAC<BR6dVNU-46Lk{k{sF@uXn?91M
zI<@Kxn(mt?=u>Xm!phni?tc7=q)+E~dC36mWN_uRH<6Njo8xp=Mb7KW-sD>b+rcM9
z_O>CIjI`NCh}yJZwpK%GDGRprrF_IC$qR-(Di;F)8pg`5;>?STR-x09Rud29ljX&*
zq43P|7hcY#Gb7^Z!uHq8i9}8n+eQ8RYEco%tU7r<I1qITS1u!LLF_3a19M?KxwdtL
zm+sR01xx%9Qg1j*B(a^$>&5Kpu3i;^*<p<A#Da}4Vm73cP0r7e_JWqH+uHEI+8NFQ
zZRx|^k;C1oG4H*Wc|Dycnp9?Xr|C1UiG{+Pus-b}<}nc0hqwgX5wJ*M!O6B#QuK86
z%0CPEZOuw8UVIK4LYi9Z3+@8>c@+uU%c&-YQ&8YXlGRlXSAa^7*W&duxJvDt$}g3@
zHz76_J4ZZLC$18vTCBd6UA~!zkB_juj5(vW<rrc1{x#pax#8Rex;)JVTUFS{g`b-c
zAE}Bk*QC##@MMkn(&J>c&q_1z$pH6(`0^|gqpQWWsMn100>K5c4Rj6tD_Xd7%lAsA
zUVYC3wvcLB1nVkl))(L-AV(ige!OgHhgnnQL-I)2V*6L3xu-3u6Kxf%mKi;T&)ImB
z2qutq)FG7Er;_zITsymUII&&u!hTx2%3MBpT?o36)u4;$!f5bLV^@nMBYH{G&I?WA
z7@;n6E2n=?6EQ>uNseI)t4671_X6aS`vlQ^C)Jwc1g1W{S)u)M9B2*r+{fAZ2NGbe
zs6o!DEyHk8*H)5Tj4SAZq{~XyZJ^7*r(g3kh(J$$ocOt<xq4|<>us=31y7zVAW33O
zRN8Mp=J+wn#|a!+I8UoreK)O@5kUxLZqN}$F9$GU_g_bV=Vefpm8qTy;>r=3WB5|X
z&RI3Om1RJegU$mVpP>;|BdAiq9nW5MEryko#NfGD6j{W`s<aOw$U+vQqBz22fBdjr
zJd^eWQyf<9tww^zK^#-*W{($*APSieIt_dXL;OReB`CL2kh5or2xY&NeU{b7zU#}z
z?+jwFap3)c&Gdqb8h@CiaVfup!bA~bspI9jl_MZ$AFeLE4FsEy_v<%n{IAdJxTMH;
z+YBMG*obyzVPI`Xv`(LZ5PcxKS``9-xPdYmx@LBj?)*C{0~b5Wml{OJsZNiioc>zV
zk2!uU+mWOtI^QVOk)LROyTbBZ+NqCY7pE>B;BN#xg=L;~%vv`?s3&BR1KHeuw0&60
zxxXp}$km6NAD<8r_^MA(TOmf}a&R<;J=}%^1==Yg?G(rf=+Dxtpvkc;nl68C4cx7^
zZ~rM;T=v@nvKVwWG?Wt^@O02w+gYqV_R-^Hmbw`z*7~yF4#s9(TpM^7XVS<ZfF<v_
zsMPcH|F)-^A9Z?1-ME-i9SrmLTlleK9TLkcYcv)CchgPqGC05Hi1q<q-?(Rg_pi<W
z*REpODk*H^yv*&oo|Xk{6{}|EG=46?p8a?LU^DbgN;h_N+hL$`Mf~0oAzcFuF!w2f
z`RAu1!WsS+hsOC5BSz90G9m2@yE+;gFz=5K24EuzWz@?{w&FUPa)cka#@MJduU0}g
zf&K<Q11walU&!}O>9~Zw&vHn1zol%xM}>%T8R9EiHPz}8q1r(HH4d;1g1EG3Bm6cX
zDMxR>h6gE-HcMIOuwu(`_&IE$ooV|~3g1tsPBI`A37lgIK>%CB$NpepJG~^yjt)?W
z7di4g!U;>NWDB5$BadJmRir|4T|k~yk7tprLftm6rI}fJ1sSAP7u8LU;?AVxP@D#A
z>M?K+KMeri;aTG&%``CGZ<T+A?`KKaT@H5&4{+sJ7u3_n-C(?U0GyBT=>g{>SBt}f
z*3{d`>SKw9R~_LT(GDeClit~>=CrnDL4sO&VXOkq^9C7C$N{ao%T!hngEZ_ZoJGP#
zwuuZC6ACD6VrLHV$)H!5pKqbd{T4Y31mHam^$p?*@=E9ov~-0(>nv+4R-%~bfCPba
zd?t-UCs*%|5ufiF6y+-9gS<ktyhEf{GU!sja==mXJeIR*ObQFI#P7L}vDO-j&r~tx
zOM4L_VU)3&rN-v;c9?<KPsKQ`E+Q1GvipeelVo3h$@^*GRDx-g7amSUk;goT9+Cib
z<Vp61)zjhsT@bf#SvS0gvdIoFm1;H*QRcw%C;v#ZHAbR+g@CuW6nDP*H)b+n(5!iJ
z7mgy}X_k@K^`hnVwUu7P)u^L^w+;-qs<h?)=WjJLiNtJGH>yK5&ATM8el_e1J)qkT
zEFm&H_SQ)bGUTnll-z4HM|dFTkGj-#X{!@!l-bkF4n^3x)S`q*{MroyD5YarMDC!T
zg~Zi(iB4bVc)7XX9D-tjZtrAPPMwWS{G9|oFMQfPgZd^tY88%RlzS@H_}nums%efE
z?KB@ZF&<4SW?V(;%OF+SS63-2j>?^o30+u4mh`;^M~@G|pYn@XoRBmB3C;@1QYr(G
z`_I=}X#?PD;6)${h?Ahw1P~l9gfu*R1|sWHO<7ErN>6{c>vR-TrgUXVHF(NrO-geK
z{lgGamn6R}cylf-CZp1zu5wI5*l6%UUMRIZxfXLlge6iHYUk=7Ca(KXg=%@8D^VCT
zvtFps9rZspB@Ur4JiRVfH%B+2wEfl!tOgYr2`nrn3V>5V$9(truU%95HY!G+r!A)2
zLM_sN#UFAwOt2Y;cY@lu(dw+6Q5icvt&?MKGZ?TL&FT|=3OV;yG&3#qu>K5l@%niA
zN@;!(W$1o)M-Q3$x_fcF^BURGY3#}Qkh{Qn#6ub+*X0}mB8epe%mCvf2ZRI8Qh#+Z
zYbx3bdAJXUfw1`v_IUeM;M7G5Drt;XC{Ynz(D8@A&2OxBr-pUh%rob@LOn7_?}#^!
zWv{wC)@S+TFX0)}oP4Q|`fbwfBdtaz!2!raZNpyNyZFMEcFPw|^~bMPKi1n;Zojb$
z?C)H>9?iaK=bP2Bqhpi~N2}A+6O7Mo^#WG{Eu8zB=g{&5RcAHGtkaUwoYG2_IV44{
z4cQij9eKXx$iL3Rm#^^^{n&?VW=w?<O83q|v_Q#RmlsVhx-Hr2j^wxcejZtsL7eRj
zF+YU8zgQQ+?g&)J;1l$PZS<#JBz&(=mLcYa{@x;dg+qbX#h1Hh@PJO9l8A+ni=h0G
z>f<ZsuMf`2-C;Ts)hHS7x*(Gt^r`Tru~OiZa3&Be%q$u|%9C;)c}ZMS!Eh{wBWw;j
zQX7NUr=(!XZPg6o9-bXCZ@;~Ev@6e>Bgq~#SHBr+$h^z-`kWip(G5YA7lBq}p;mbR
zc55kRli<5`TRT2n1?P8uo*#b#vXtdd)4hP;fA8^WXfRNpDTMHW;0Mh%u2%-CGga@T
z%jS!A<=-w_zHI@LQbGk~@%Rbv^HvWmh4U>B`tOlWuqIM$;=RD{9zJj0t{BZsiH(pz
F{|91=(QyC(

diff --git a/x-pack/test/functional/es_archives/monitoring/logs/mappings.json b/x-pack/test/functional/es_archives/monitoring/logs/mappings.json
index 6dbecb8d503fd..b392c18e4e49b 100644
--- a/x-pack/test/functional/es_archives/monitoring/logs/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/logs/mappings.json
@@ -8,93 +8,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -104,112 +25,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -224,16 +63,6 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
                     "index_time_in_millis": {
@@ -254,22 +83,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -277,66 +90,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -351,18 +108,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -390,17 +137,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -413,17 +151,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -491,13 +220,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -507,33 +229,13 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -555,58 +257,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -614,13 +268,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -628,15 +275,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -648,12 +289,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -661,18 +296,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -693,33 +318,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -769,13 +376,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -824,15 +424,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -842,9 +436,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -862,26 +453,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -889,14 +464,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -912,12 +481,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -930,22 +493,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -956,9 +503,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -969,22 +513,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -995,22 +523,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1039,12 +551,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -1052,22 +558,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
diff --git a/x-pack/test/functional/es_archives/monitoring/logs_multiple_clusters/mappings.json b/x-pack/test/functional/es_archives/monitoring/logs_multiple_clusters/mappings.json
index ccea50f747800..2d6c2f885f831 100644
--- a/x-pack/test/functional/es_archives/monitoring/logs_multiple_clusters/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/logs_multiple_clusters/mappings.json
@@ -8,96 +8,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "follower_aliases_version": {
-              "type": "long"
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -107,112 +25,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -227,16 +63,6 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
                     "index_time_in_millis": {
@@ -257,22 +83,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -280,66 +90,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -354,18 +108,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -393,17 +137,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -416,17 +151,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -494,13 +220,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -510,33 +229,13 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -558,58 +257,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -617,13 +268,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -631,15 +275,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -651,12 +289,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -664,18 +296,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -696,33 +318,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -772,13 +376,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -827,15 +424,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -845,9 +436,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -865,26 +453,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -892,14 +464,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -915,12 +481,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -933,22 +493,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -959,9 +503,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -972,22 +513,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -998,22 +523,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1042,12 +551,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -1055,22 +558,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
diff --git a/x-pack/test/functional/es_archives/monitoring/logstash-pipelines/mappings.json b/x-pack/test/functional/es_archives/monitoring/logstash-pipelines/mappings.json
index aa3aff8b5c41a..98303a4b29d67 100644
--- a/x-pack/test/functional/es_archives/monitoring/logstash-pipelines/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/logstash-pipelines/mappings.json
@@ -8,83 +8,25 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
-        "logstash_stats": {
-          "type": "object",
+        "logstash_state": {
           "properties": {
-            "logstash": {
+            "pipeline": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "version": {
+                "hash": {
                   "type": "keyword"
                 },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
+                "id": {
                   "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "workers": {
-                      "type": "short"
-                    },
-                    "batch_size": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
-            },
+            }
+          }
+        },
+        "logstash_stats": {
+          "properties": {
             "events": {
               "properties": {
-                "filtered": {
+                "duration_in_millis": {
                   "type": "long"
                 },
                 "in": {
@@ -92,48 +34,11 @@
                 },
                 "out": {
                   "type": "long"
-                },
-                "duration_in_millis": {
-                  "type": "long"
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "jvm": {
               "properties": {
-                "uptime_in_millis": {
-                  "type": "long"
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
                 "mem": {
                   "properties": {
                     "heap_max_in_bytes": {
@@ -141,50 +46,30 @@
                     },
                     "heap_used_in_bytes": {
                       "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "long"
                     }
                   }
+                },
+                "uptime_in_millis": {
+                  "type": "long"
                 }
               }
             },
-            "os": {
+            "logstash": {
               "properties": {
-                "cpu": {
-                  "properties": {
-                    "load_average": {
-                      "properties": {
-                        "1m": {
-                          "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
-                        }
-                      }
-                    }
-                  }
+                "uuid": {
+                  "type": "keyword"
                 },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "os": {
+              "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -199,103 +84,70 @@
                           }
                         }
                       }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "usage_nanos": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
-                }
-              }
-            },
-            "process": {
-              "properties": {
+                },
                 "cpu": {
                   "properties": {
-                    "percent": {
-                      "type": "long"
+                    "load_average": {
+                      "properties": {
+                        "15m": {
+                          "type": "half_float"
+                        },
+                        "1m": {
+                          "type": "half_float"
+                        },
+                        "5m": {
+                          "type": "half_float"
+                        }
+                      }
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
-                }
-              }
-            },
-            "queue": {
-              "properties": {
-                "events_count": {
-                  "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
                 }
               }
             },
             "pipelines": {
-              "type": "nested",
               "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
-                    "in": {
-                      "type": "long"
-                    },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "out": {
-                      "type": "long"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "queue_push_duration_in_millis": {
+                    "out": {
                       "type": "long"
                     }
                   }
                 },
+                "hash": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
                     "queue_size_in_bytes": {
                       "type": "long"
+                    },
+                    "type": {
+                      "type": "keyword"
                     }
                   }
                 },
                 "vertices": {
-                  "type": "nested",
                   "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "pipeline_ephemeral_id": {
-                      "type": "keyword"
+                    "duration_in_millis": {
+                      "type": "long"
                     },
                     "events_in": {
                       "type": "long"
@@ -303,111 +155,63 @@
                     "events_out": {
                       "type": "long"
                     },
-                    "duration_in_millis": {
-                      "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
+                    "id": {
+                      "type": "keyword"
                     },
-                    "long_counters": {
-                      "type": "nested",
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      }
+                    "pipeline_ephemeral_id": {
+                      "type": "keyword"
                     },
-                    "double_gauges": {
-                      "type": "nested",
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      }
+                    "queue_push_duration_in_millis": {
+                      "type": "float"
                     }
-                  }
-                },
-                "reloads": {
+                  },
+                  "type": "nested"
+                }
+              },
+              "type": "nested"
+            },
+            "process": {
+              "properties": {
+                "cpu": {
                   "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
+                    "percent": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "workers": {
-              "type": "short"
+            "queue": {
+              "properties": {
+                "events_count": {
+                  "type": "long"
+                }
+              }
             },
-            "batch_size": {
-              "type": "integer"
+            "timestamp": {
+              "type": "date"
             }
           }
         },
-        "logstash_state": {
+        "metricset": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "pipeline": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
-                },
-                "batch_size": {
-                  "type": "integer"
-                },
-                "format": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
                   "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false
                 }
-              }
+              },
+              "type": "text"
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -431,115 +235,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -554,29 +290,64 @@
                     }
                   }
                 },
-                "fielddata": {
+                "indexing": {
                   "properties": {
-                    "memory_size_in_bytes": {
+                    "index_time_in_millis": {
+                      "type": "long"
+                    },
+                    "index_total": {
                       "type": "long"
                     },
-                    "evictions": {
+                    "throttle_time_in_millis": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "merges": {
+                  "properties": {
+                    "total_size_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
                 },
+                "segments": {
+                  "properties": {
+                    "count": {
+                      "type": "integer"
+                    }
+                  }
+                },
                 "store": {
                   "properties": {
                     "size_in_bytes": {
                       "type": "long"
                     }
                   }
+                }
+              }
+            },
+            "total": {
+              "properties": {
+                "fielddata": {
+                  "properties": {
+                    "memory_size_in_bytes": {
+                      "type": "long"
+                    }
+                  }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -595,14 +366,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -611,24 +380,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -638,176 +398,85 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
-            },
-            "total": {
+            }
+          }
+        },
+        "indices_stats": {
+          "properties": {
+            "_all": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "fielddata": {
+                "primaries": {
                   "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "indexing": {
-                  "properties": {
-                    "index_total": {
-                      "type": "long"
-                    },
-                    "index_time_in_millis": {
-                      "type": "long"
-                    },
-                    "throttle_time_in_millis": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "merges": {
-                  "properties": {
-                    "total_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
-                      "type": "long"
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
-                "segments": {
+                "total": {
                   "properties": {
-                    "count": {
-                      "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
                     },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "refresh": {
-                  "properties": {
-                    "total_time_in_millis": {
-                      "type": "long"
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 }
@@ -815,68 +484,49 @@
             }
           }
         },
-        "cluster_stats": {
-          "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
-            }
-          }
-        },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -897,15 +547,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -913,15 +554,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -940,116 +572,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1065,16 +678,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -1086,12 +693,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -1101,12 +702,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -1116,71 +711,10 @@
                 }
               }
             },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
             "thread_pool": {
               "properties": {
                 "bulk": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1191,9 +725,6 @@
                 },
                 "get": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1204,22 +735,6 @@
                 },
                 "index": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1230,22 +745,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1268,246 +767,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/logstash/changing_pipelines/mappings.json b/x-pack/test/functional/es_archives/monitoring/logstash/changing_pipelines/mappings.json
index 28c3c0e1b9e87..3c7511f426e2c 100644
--- a/x-pack/test/functional/es_archives/monitoring/logstash/changing_pipelines/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/logstash/changing_pipelines/mappings.json
@@ -71,96 +71,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "follower_aliases_version": {
-              "type": "long"
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -170,112 +88,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -290,16 +126,6 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
                     "index_time_in_millis": {
@@ -320,22 +146,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -343,66 +153,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -417,18 +171,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -456,17 +200,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -479,17 +214,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -557,13 +283,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -573,33 +292,13 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -621,58 +320,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -680,13 +331,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -694,15 +338,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -714,12 +352,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -727,18 +359,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -759,33 +381,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -835,13 +439,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -890,15 +487,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -908,9 +499,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -928,26 +516,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -955,14 +527,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -978,12 +544,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -996,22 +556,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1022,9 +566,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1035,22 +576,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1061,22 +586,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1105,12 +614,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -1118,22 +621,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
@@ -1175,79 +665,27 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "logstash_state": {
           "properties": {
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "pipeline": {
               "properties": {
-                "batch_size": {
-                  "type": "integer"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "format": {
-                  "type": "keyword"
-                },
                 "hash": {
                   "type": "keyword"
                 },
                 "id": {
                   "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false,
-                  "type": "object"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
                 }
               }
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
             }
           }
         },
         "logstash_stats": {
           "properties": {
-            "batch_size": {
-              "type": "integer"
-            },
             "events": {
               "properties": {
                 "duration_in_millis": {
                   "type": "long"
                 },
-                "filtered": {
-                  "type": "long"
-                },
                 "in": {
                   "type": "long"
                 },
@@ -1258,34 +696,6 @@
             },
             "jvm": {
               "properties": {
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
                 "mem": {
                   "properties": {
                     "heap_max_in_bytes": {
@@ -1293,9 +703,6 @@
                     },
                     "heap_used_in_bytes": {
                       "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1306,34 +713,6 @@
             },
             "logstash": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "batch_size": {
-                      "type": "long"
-                    },
-                    "workers": {
-                      "type": "short"
-                    }
-                  }
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -1348,9 +727,6 @@
                   "properties": {
                     "cpu": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1368,9 +744,6 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
@@ -1399,25 +772,13 @@
             },
             "pipelines": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "in": {
-                      "type": "long"
-                    },
                     "out": {
                       "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1429,9 +790,6 @@
                 },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
@@ -1443,29 +801,8 @@
                     }
                   }
                 },
-                "reloads": {
-                  "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "vertices": {
                   "properties": {
-                    "double_gauges": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
@@ -1478,22 +815,11 @@
                     "id": {
                       "type": "keyword"
                     },
-                    "long_counters": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "pipeline_ephemeral_id": {
                       "type": "keyword"
                     },
                     "queue_push_duration_in_millis": {
-                      "type": "long"
+                      "type": "float"
                     }
                   },
                   "type": "nested"
@@ -1509,12 +835,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -1522,50 +842,24 @@
               "properties": {
                 "events_count": {
                   "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
                 }
               }
             },
             "timestamp": {
               "type": "date"
-            },
-            "workers": {
-              "type": "short"
             }
           }
         },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/monitoring/logstash_pipelines_multicluster/mappings.json b/x-pack/test/functional/es_archives/monitoring/logstash_pipelines_multicluster/mappings.json
index f2a7cca4efd8b..de13ddf620d77 100644
--- a/x-pack/test/functional/es_archives/monitoring/logstash_pipelines_multicluster/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/logstash_pipelines_multicluster/mappings.json
@@ -71,96 +71,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "follower_aliases_version": {
-              "type": "long"
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -170,112 +88,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -290,16 +126,6 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
                     "index_time_in_millis": {
@@ -320,22 +146,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -343,66 +153,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -417,18 +171,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -456,17 +200,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -479,17 +214,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -557,13 +283,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -573,33 +292,13 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -621,58 +320,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -680,13 +331,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -694,15 +338,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -714,12 +352,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -727,18 +359,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -759,33 +381,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -835,13 +439,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -890,15 +487,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -908,9 +499,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -928,26 +516,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -955,14 +527,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -978,12 +544,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -996,22 +556,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1022,9 +566,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1035,22 +576,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1061,22 +586,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1105,12 +614,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -1118,22 +621,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
@@ -1175,79 +665,27 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "logstash_state": {
           "properties": {
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "pipeline": {
               "properties": {
-                "batch_size": {
-                  "type": "integer"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "format": {
-                  "type": "keyword"
-                },
                 "hash": {
                   "type": "keyword"
                 },
                 "id": {
                   "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false,
-                  "type": "object"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
                 }
               }
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
             }
           }
         },
         "logstash_stats": {
           "properties": {
-            "batch_size": {
-              "type": "integer"
-            },
             "events": {
               "properties": {
                 "duration_in_millis": {
                   "type": "long"
                 },
-                "filtered": {
-                  "type": "long"
-                },
                 "in": {
                   "type": "long"
                 },
@@ -1258,34 +696,6 @@
             },
             "jvm": {
               "properties": {
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
                 "mem": {
                   "properties": {
                     "heap_max_in_bytes": {
@@ -1293,9 +703,6 @@
                     },
                     "heap_used_in_bytes": {
                       "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1306,34 +713,6 @@
             },
             "logstash": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "batch_size": {
-                      "type": "long"
-                    },
-                    "workers": {
-                      "type": "short"
-                    }
-                  }
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -1348,9 +727,6 @@
                   "properties": {
                     "cpu": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1368,9 +744,6 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
@@ -1399,25 +772,13 @@
             },
             "pipelines": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "in": {
-                      "type": "long"
-                    },
                     "out": {
                       "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1429,9 +790,6 @@
                 },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
@@ -1443,29 +801,8 @@
                     }
                   }
                 },
-                "reloads": {
-                  "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "vertices": {
                   "properties": {
-                    "double_gauges": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
@@ -1478,22 +815,11 @@
                     "id": {
                       "type": "keyword"
                     },
-                    "long_counters": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "pipeline_ephemeral_id": {
                       "type": "keyword"
                     },
                     "queue_push_duration_in_millis": {
-                      "type": "long"
+                      "type": "float"
                     }
                   },
                   "type": "nested"
@@ -1509,12 +835,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -1522,50 +842,24 @@
               "properties": {
                 "events_count": {
                   "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
                 }
               }
             },
             "timestamp": {
               "type": "date"
-            },
-            "workers": {
-              "type": "short"
             }
           }
         },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/monitoring/multi-basic/mappings.json b/x-pack/test/functional/es_archives/monitoring/multi-basic/mappings.json
index 75bb2602f1a15..76717c0a61bba 100644
--- a/x-pack/test/functional/es_archives/monitoring/multi-basic/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/multi-basic/mappings.json
@@ -5,24 +5,9 @@
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -44,6 +29,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
@@ -68,95 +68,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -164,47 +90,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -214,36 +121,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -251,9 +131,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -267,10 +144,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -293,136 +184,92 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
+            "nodes_hash": {
+              "type": "integer"
+            }
+          }
+        },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
+        "index_stats": {
+          "properties": {
+            "index": {
+              "type": "keyword"
+            },
+            "primaries": {
               "properties": {
-                "primaries": {
+                "docs": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
+                    "count": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "indexing": {
+                  "properties": {
+                    "index_time_in_millis": {
+                      "type": "long"
                     },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
+                    "index_total": {
+                      "type": "long"
                     },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
+                    "throttle_time_in_millis": {
+                      "type": "long"
                     }
                   }
                 },
-                "total": {
+                "merges": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
+                    "total_size_in_bytes": {
+                      "type": "long"
                     }
                   }
-                }
-              }
-            }
-          }
-        },
-        "index_stats": {
-          "properties": {
-            "index": {
-              "type": "keyword"
-            },
-            "primaries": {
-              "properties": {
-                "docs": {
+                },
+                "refresh": {
                   "properties": {
-                    "count": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
                 },
-                "fielddata": {
+                "segments": {
                   "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
+                    "count": {
+                      "type": "integer"
                     }
                   }
                 },
@@ -432,13 +279,24 @@
                       "type": "long"
                     }
                   }
+                }
+              }
+            },
+            "total": {
+              "properties": {
+                "fielddata": {
+                  "properties": {
+                    "memory_size_in_bytes": {
+                      "type": "long"
+                    }
+                  }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -457,14 +315,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -473,24 +329,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -500,79 +347,144 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
-            },
-            "total": {
+            }
+          }
+        },
+        "indices_stats": {
+          "properties": {
+            "_all": {
               "properties": {
-                "docs": {
+                "primaries": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
-                "fielddata": {
+                "total": {
                   "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
                     },
-                    "evictions": {
-                      "type": "long"
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "job_stats": {
+          "properties": {
+            "job_id": {
+              "type": "keyword"
+            }
+          }
+        },
+        "node_stats": {
+          "properties": {
+            "fs": {
+              "properties": {
+                "io_stats": {
+                  "properties": {
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
-                "store": {
+                "total": {
                   "properties": {
-                    "size_in_bytes": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
+                "fielddata": {
+                  "properties": {
+                    "memory_size_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -580,26 +492,10 @@
                     }
                   }
                 },
-                "merges": {
-                  "properties": {
-                    "total_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "query_cache": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -607,24 +503,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -634,284 +521,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "refresh": {
-                  "properties": {
-                    "total_time_in_millis": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "nodes": {
-              "type": "object"
             },
-            "indices": {
-              "type": "object"
-            }
-          }
-        },
-        "cluster_state": {
-          "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
-            }
-          }
-        },
-        "node_stats": {
-          "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "jvm": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "indexing": {
-                  "properties": {
-                    "index_time_in_millis": {
-                      "type": "long"
-                    },
-                    "index_total": {
-                      "type": "long"
-                    },
-                    "throttle_time_in_millis": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "gc": {
                   "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
+                    "collectors": {
+                      "properties": {
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
+                        }
+                      }
                     }
                   }
                 },
-                "segments": {
+                "mem": {
                   "properties": {
-                    "count": {
-                      "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
+                    "heap_max_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "heap_used_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
+                    "heap_used_percent": {
+                      "type": "half_float"
                     }
                   }
                 }
               }
             },
-            "fs": {
-              "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
-                  "properties": {
-                    "total": {
-                      "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
-                        "write_kilobytes": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "node_id": {
+              "type": "keyword"
             },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -927,16 +627,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -948,127 +642,28 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "process": {
-              "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "cpu": {
-                  "properties": {
-                    "percent": {
-                      "type": "half_float"
-                    }
-                  }
-                }
-              }
-            },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     }
-                  }
-                }
-              }
-            },
-            "thread_pool": {
-              "properties": {
-                "bulk": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "get": {
+                  }
+                }
+              }
+            },
+            "process": {
+              "properties": {
+                "cpu": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
+                    "percent": {
+                      "type": "half_float"
                     }
                   }
-                },
-                "index": {
+                }
+              }
+            },
+            "thread_pool": {
+              "properties": {
+                "bulk": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1077,11 +672,8 @@
                     }
                   }
                 },
-                "management": {
+                "get": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1090,11 +682,8 @@
                     }
                   }
                 },
-                "search": {
+                "index": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1103,11 +692,8 @@
                     }
                   }
                 },
-                "watcher": {
+                "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1130,246 +716,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1394,83 +775,25 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
-        "logstash_stats": {
-          "type": "object",
+        "logstash_state": {
           "properties": {
-            "logstash": {
+            "pipeline": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
+                "hash": {
+                  "type": "keyword"
+                },
+                "id": {
                   "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "workers": {
-                      "type": "short"
-                    },
-                    "batch_size": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
-            },
+            }
+          }
+        },
+        "logstash_stats": {
+          "properties": {
             "events": {
               "properties": {
-                "filtered": {
+                "duration_in_millis": {
                   "type": "long"
                 },
                 "in": {
@@ -1478,48 +801,11 @@
                 },
                 "out": {
                   "type": "long"
-                },
-                "duration_in_millis": {
-                  "type": "long"
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "jvm": {
               "properties": {
-                "uptime_in_millis": {
-                  "type": "long"
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
                 "mem": {
                   "properties": {
                     "heap_max_in_bytes": {
@@ -1527,50 +813,30 @@
                     },
                     "heap_used_in_bytes": {
                       "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "long"
                     }
                   }
+                },
+                "uptime_in_millis": {
+                  "type": "long"
                 }
               }
             },
-            "os": {
+            "logstash": {
               "properties": {
-                "cpu": {
-                  "properties": {
-                    "load_average": {
-                      "properties": {
-                        "1m": {
-                          "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
-                        }
-                      }
-                    }
-                  }
+                "uuid": {
+                  "type": "keyword"
                 },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "os": {
+              "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1585,103 +851,70 @@
                           }
                         }
                       }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "usage_nanos": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
-                }
-              }
-            },
-            "process": {
-              "properties": {
+                },
                 "cpu": {
                   "properties": {
-                    "percent": {
-                      "type": "long"
+                    "load_average": {
+                      "properties": {
+                        "15m": {
+                          "type": "half_float"
+                        },
+                        "1m": {
+                          "type": "half_float"
+                        },
+                        "5m": {
+                          "type": "half_float"
+                        }
+                      }
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
-                }
-              }
-            },
-            "queue": {
-              "properties": {
-                "events_count": {
-                  "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
                 }
               }
             },
             "pipelines": {
-              "type": "nested",
               "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
-                    "in": {
-                      "type": "long"
-                    },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "out": {
-                      "type": "long"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "queue_push_duration_in_millis": {
+                    "out": {
                       "type": "long"
                     }
                   }
                 },
+                "hash": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
                     "queue_size_in_bytes": {
                       "type": "long"
+                    },
+                    "type": {
+                      "type": "keyword"
                     }
                   }
                 },
                 "vertices": {
-                  "type": "nested",
                   "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "pipeline_ephemeral_id": {
-                      "type": "keyword"
+                    "duration_in_millis": {
+                      "type": "long"
                     },
                     "events_in": {
                       "type": "long"
@@ -1689,111 +922,63 @@
                     "events_out": {
                       "type": "long"
                     },
-                    "duration_in_millis": {
-                      "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
+                    "id": {
+                      "type": "keyword"
                     },
-                    "long_counters": {
-                      "type": "nested",
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      }
+                    "pipeline_ephemeral_id": {
+                      "type": "keyword"
                     },
-                    "double_gauges": {
-                      "type": "nested",
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      }
+                    "queue_push_duration_in_millis": {
+                      "type": "float"
                     }
-                  }
-                },
-                "reloads": {
+                  },
+                  "type": "nested"
+                }
+              },
+              "type": "nested"
+            },
+            "process": {
+              "properties": {
+                "cpu": {
                   "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
+                    "percent": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "workers": {
-              "type": "short"
+            "queue": {
+              "properties": {
+                "events_count": {
+                  "type": "long"
+                }
+              }
             },
-            "batch_size": {
-              "type": "integer"
+            "timestamp": {
+              "type": "date"
             }
           }
         },
-        "logstash_state": {
+        "metricset": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "pipeline": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
-                },
-                "batch_size": {
-                  "type": "integer"
-                },
-                "format": {
-                  "type": "keyword"
-                },
-                "version": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
                   "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false
                 }
-              }
+              },
+              "type": "text"
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/multicluster/mappings.json b/x-pack/test/functional/es_archives/monitoring/multicluster/mappings.json
index 7ba6fd939afa8..7e7084698b788 100644
--- a/x-pack/test/functional/es_archives/monitoring/multicluster/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/multicluster/mappings.json
@@ -1,121 +1,54 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-es-6-2017.08.15",
     "mappings": {
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -130,29 +63,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -167,44 +83,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -213,42 +94,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -257,36 +108,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -305,14 +139,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -321,24 +153,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -348,41 +171,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -391,68 +214,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -473,15 +320,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -489,15 +327,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -516,116 +345,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -641,16 +451,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -662,12 +466,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -677,12 +475,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -692,136 +484,40 @@
                 }
               }
             },
-            "jvm": {
+            "thread_pool": {
               "properties": {
-                "mem": {
+                "bulk": {
                   "properties": {
-                    "heap_used_in_bytes": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
                       "type": "long"
+                    }
+                  }
+                },
+                "get": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
                     },
-                    "heap_used_percent": {
-                      "type": "half_float"
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "index": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
                     },
-                    "heap_max_in_bytes": {
+                    "rejected": {
                       "type": "long"
                     }
                   }
                 },
-                "gc": {
+                "search": {
                   "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "thread_pool": {
-              "properties": {
-                "bulk": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "get": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "index": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -844,246 +540,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1102,7 +593,8 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-logstash-6-2017.08.15",
     "mappings": {
       "dynamic": false,
@@ -1110,83 +602,25 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
-        "logstash_stats": {
-          "type": "object",
+        "logstash_state": {
           "properties": {
-            "logstash": {
+            "pipeline": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "version": {
+                "hash": {
                   "type": "keyword"
                 },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
+                "id": {
                   "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "workers": {
-                      "type": "short"
-                    },
-                    "batch_size": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
-            },
+            }
+          }
+        },
+        "logstash_stats": {
+          "properties": {
             "events": {
               "properties": {
-                "filtered": {
+                "duration_in_millis": {
                   "type": "long"
                 },
                 "in": {
@@ -1194,48 +628,11 @@
                 },
                 "out": {
                   "type": "long"
-                },
-                "duration_in_millis": {
-                  "type": "long"
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "jvm": {
               "properties": {
-                "uptime_in_millis": {
-                  "type": "long"
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
                 "mem": {
                   "properties": {
                     "heap_max_in_bytes": {
@@ -1243,50 +640,30 @@
                     },
                     "heap_used_in_bytes": {
                       "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "long"
                     }
                   }
+                },
+                "uptime_in_millis": {
+                  "type": "long"
                 }
               }
             },
-            "os": {
+            "logstash": {
               "properties": {
-                "cpu": {
-                  "properties": {
-                    "load_average": {
-                      "properties": {
-                        "1m": {
-                          "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
-                        }
-                      }
-                    }
-                  }
+                "uuid": {
+                  "type": "keyword"
                 },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "os": {
+              "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1301,103 +678,70 @@
                           }
                         }
                       }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "usage_nanos": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
-                }
-              }
-            },
-            "process": {
-              "properties": {
+                },
                 "cpu": {
                   "properties": {
-                    "percent": {
-                      "type": "long"
+                    "load_average": {
+                      "properties": {
+                        "15m": {
+                          "type": "half_float"
+                        },
+                        "1m": {
+                          "type": "half_float"
+                        },
+                        "5m": {
+                          "type": "half_float"
+                        }
+                      }
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
-                }
-              }
-            },
-            "queue": {
-              "properties": {
-                "events_count": {
-                  "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
                 }
               }
             },
             "pipelines": {
-              "type": "nested",
               "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
-                    "in": {
-                      "type": "long"
-                    },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "out": {
-                      "type": "long"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "queue_push_duration_in_millis": {
+                    "out": {
                       "type": "long"
                     }
                   }
                 },
+                "hash": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
                     "queue_size_in_bytes": {
                       "type": "long"
+                    },
+                    "type": {
+                      "type": "keyword"
                     }
                   }
                 },
                 "vertices": {
-                  "type": "nested",
                   "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "pipeline_ephemeral_id": {
-                      "type": "keyword"
+                    "duration_in_millis": {
+                      "type": "long"
                     },
                     "events_in": {
                       "type": "long"
@@ -1405,111 +749,63 @@
                     "events_out": {
                       "type": "long"
                     },
-                    "duration_in_millis": {
-                      "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
+                    "id": {
+                      "type": "keyword"
                     },
-                    "long_counters": {
-                      "type": "nested",
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      }
+                    "pipeline_ephemeral_id": {
+                      "type": "keyword"
                     },
-                    "double_gauges": {
-                      "type": "nested",
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      }
+                    "queue_push_duration_in_millis": {
+                      "type": "float"
                     }
-                  }
-                },
-                "reloads": {
+                  },
+                  "type": "nested"
+                }
+              },
+              "type": "nested"
+            },
+            "process": {
+              "properties": {
+                "cpu": {
                   "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
+                    "percent": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "workers": {
-              "type": "short"
+            "queue": {
+              "properties": {
+                "events_count": {
+                  "type": "long"
+                }
+              }
             },
-            "batch_size": {
-              "type": "integer"
+            "timestamp": {
+              "type": "date"
             }
           }
         },
-        "logstash_state": {
+        "metricset": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "pipeline": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
-                },
-                "batch_size": {
-                  "type": "integer"
-                },
-                "format": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
                   "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false
                 }
-              }
+              },
+              "type": "text"
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1528,7 +824,8 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-kibana-6-2017.08.15",
     "mappings": {
       "dynamic": false,
@@ -1536,102 +833,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
-            "usage": {
-              "properties": {
-                "index": {
-                  "type": "keyword"
-                }
-              }
+            "concurrent_connections": {
+              "type": "long"
             },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -1639,47 +855,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -1689,36 +886,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -1726,9 +896,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -1742,10 +909,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1764,29 +945,15 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-alerts-6",
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -1808,6 +975,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/setup/collection/detect_beats/data.json.gz b/x-pack/test/functional/es_archives/monitoring/setup/collection/detect_beats/data.json.gz
index 0548d40cd4f82da106ad794bcc0bd57369a882fc..e4cffebf210adb9c94cb675ec70ac30407dc8301 100644
GIT binary patch
literal 23820
zcmb5#V{j(%w=en_6HIJRY}>YN+tw4?wkLXG+nm_8olNZH&VQe~_dRv%ytuckx~gCP
zUUaQqpY>f$7!3pRp9>823h?T((bjN%bFWeUajxF&p+E{w)HkeF(-GOIz$|Y}K|#@4
zs)`0V)<l&=OvR8n{{01_42Ky|R5jcZG703uM#dG|eeb~CiuM1pY(`A#Od!B(Mtlo&
z`5W`?Xy;?{H6d^*u<G9d_-f+eyyBPWhkNe4<$pcPHQ`~O-|q_9DQoRgv_N~YM-i<N
zuw7`gYeEiChu%f3D>XYX#N)bOUSo*kh(pD31NfxG1$(>aw8_g}{b|oooj{L9<r!O<
z;lqh<tk>^p4eD&H&F{%@=$m@Uj;z^9cye4ut7K|uq!0F6FX8jG=;?j&b8<HtT{%b}
z%-`L(N*9LIXQqExPg18z+doPob@n+Zo)>1vsAXx$g<C1xLdJ)j!zV;$EilULfRxL@
z74I3b<A4F~bi;dhErCN+9NCL(w4b-}XEV?IK3gP3es2nO?u}kTwDc5`U~TBOXV3J0
z?=J0qb9y{#umg1a%nhd#LQTs78-veAeNq8kPotRm-1@t#`t61&Ykqi8O7qR{pAjQx
zyTr`g0iWRUv<LwoFMi*|SQbxg9k$C1ns)3e0h-(-?O<mlnbqOZH~z6Zn=NA}GgmVf
z0y9K$`aNwgzKYZW^5M=Bd<=hjxBJ;*jXD0ViG)-MNC#8VPIxYvjj<<PsIFw9#t6rg
zuMtVx(75~0)m(V^c&y!l`AhQC*_d5YR6)>xjJpHe)TYOUO;dXe@*5J1ZD6H+aM~6x
zp09>#*kx<=!h0pT7nK**&TrCoU{JPF+#g+Jwa~+_2&p~czFa)s=#Q=&%DOoE2Roef
z+ajBk#&}et+MQ_ae!;H#<qD+s_{fI;I;U{U|C!dSzw4^v8Bd{^OjsNzr%Ns1*linC
zk^51D)?M;xA3r50iz;*hlfJ`J5_>Iocqd1Kg*X=pJN|3GkK@V2N3ipW6BbL-4b?+*
z?Fl!uN*OmwK(a<J2y|}zFS_WjxfG-bX|lmSGZlL3s0lHXkq}$y`7NS~LZfQk(5azv
zA31z=6;*JUsOWJcgp4DNoIXtt)9@gi+4(@<^kGc*Ma-&3s#^_Cx|q#G{C44igAmUt
zEfoGrexrPir=drgf?t}URl1@gGj6uT+Q;0`^V5M%E_HP-W1`jXB{m$!e%BM7Wt?2X
zyL-)taDfbG!=%O7AlY@;u^MCagEc>jA(eI>*JeMBIR19?^uJJ~fYWfYn7$BsCP)Pa
zK`%rmsOav*=I&;>{KU+M)H%R>yx>w+9PMe*o4NK9ds`^9%D@s*?jH~mjTS?QDKxjr
z(3Jc`<rPs!E3=}B07r60#84}-q*Mxn=RA9K6{|brqT)-DkO39qjUFHd<0Qm|SYLW~
z0G(xp(_vp=F|dD-(Qj4LB@{5cjk&x2nV>7WD9=$6IGph(|I+~|(GPVU`^k^`yEFZh
zMm<nwJ_w)Zw|;-4(<G)teP-a*aFP45@(E~&E-OD0I?hy6>9g%^(>BzY78dFE^T)xr
ziS4%E9(gqjPJOBN4!`udfl4poUp_}ioV7R!9SWhLp?i1|Q#EOkcg)3g!s!`AYol|A
zGwORQXH-#*hFsS~(!xV6Y6vb9a-q$=AM#&m)&$R1vfOWiO^JLp?~F|CxZ<FwrzYYj
zV61sJ&+EoX_^R8VFvfZd36{^rVj|;cH<79aR7(BfIbhmUy4&IKS*)>^+{mmsX}KPD
zS<O2UwZ~zd_4dEzIEE!Qta9_3dl)n`(ZNcjoLBS~G@YyIm`Kl@;ks{UtBIC(hMCu_
zQ4%aUF{Eu8XM(MJ<*gkh)xbtJ<PXE7S`29r%!?2kDkg|g-9i+UmBRU~+HQ(h0fx>x
z!hU|=7}A7p-2VC{0U?aTFkoA=g}UDk<%cXrA*trnnjR@k1n(?9Bcd$lqhtpd3uvRZ
z11!H+Ksm~rLG8hv5pR)O;)t#p$v!3eqZlidh%CPdR*9hcA*=amrklzI?R~S;qO7AG
z+4G}Z8K3pnbXhj5;i+n?k9xwVRBvpwUkFff&1T~CD83DuFZd8txC4r}E*@jpuWich
z9$g#x7&Aqgi1;@8yMxDDCu|c{XbkPA8G=;xb2dtTupmnlvegHnFE4-iXrI8~2_3-T
z;^PMmJlh&GPbiF;%9AdSozs%GxR5m%tQlo`AVR^PzNrAk+A5W^O~gt)NI<2W9|1^z
zt5*=NLhRrS>`^n7N;FNm3;6w4F~`lIwJ2<p<u7dzY-w~;PZ5hQeZGDXMi;d1D;D#?
z|KjN?cksQ9me%p$3p^x%f;YN0cQ9bHD~>OtDFnTdJ8?06e`3T>k@P}b1542aGlvoz
zTTq9BGDhy+4EcMzGcz>B+;P^x<idlxpvDCcF4Vu{Py1G43~tFP=Xhq-0h5$^Ou6q9
z;B*YIILm8XP^`EOBGz%gJ$@Seqtjy*2MR77`jit)pL{#)PJrA-+p@k0wtARw!XJzT
zESDub?vT2X*L-d*kj}qikRZ8Q!d*I_w00TH`n$IH0~`mz2}yL(sEG!DzX?R6yYW?5
zqV*R!ujhhF$S5P5Of@(C+vJO&eN`6W1^rYQ;vjz3fJ&=-B!|~(Nvke=k#Wf{)TS(&
zYdqx9z0y;FwKP)G4fNL*B^I24@wT_p5DI{o$F)-<1({uiQa8M2bF=M+oQ9(zD(5&%
zwtbSeLCwb~DTLW&O;^~SRUFEHTe7OPG)kiNMx1JWYYhIi`KHZrS`->uw{lzGL4);t
zjxwTk<@ZYK;ML<uJZw!XXMW&@N6U(i=aGGF<0^p{?nSj<HWa~8S!!W~JBII}S1$>u
zrT1~~gJVbm@lFSTp(Zn1=t^Y`D_#2{8%ywtbhusveEYkq2k&0;d&YZ32Sr!ud)t&6
z6T;7%W*p1R1}b@bG|`ieyFY>|bHL4?F($}qwG)-Uv#z#LPaWWj9dR@ZK7-#L`7$Po
zQppcn#Q&S%7Hi*$p;T8Ljla9SK*^0St(VvX8pQ{H@l+c8iSBR&&WAEH6Njm*!ybR5
zx8(r(a>s?R=6=F&#;a{R82Uy}<mX0j9AV8jrAxPG!L~}rU)xAPJrF1!b;aSnuRCk$
zwUD$rW>y*qgRJ<mEVGt)O1B_QmZ!w^tH`jl_%xF+V^ei5w>^5urcS$ff!-T(<>%<w
z9RpGRgIO$H5acOhxNxkyjY(4Nk-)frHsKFC{^I$`SK_5h-<nedKA)U>tTFs)dGBns
z>pPebffq}^@7qy<DG}76>n(}>``X{rsT+-ePPq6!rM7LDFt;4gGJ=p2)ZMk+QV|9T
za@J_0KX~9b)U$nz+-@3s(^ARHAN40k@#Yl4U}l&;+qY}4_Y5bs`V|LiXSde(iXrdU
zosm0dzgE>x&+KW6TT<86<85_fDU*qE2vlA-a=47_51JN4E+`~TqIab1M4OQbt$(=#
zI@fBVpA1)0pT>N{Q&ZN_TUS?l^YU}MeePHG_0k;Nc0?<O;%dqHMdub$8}1wm9rgD<
zMmThyy%#d!mh0V=74QO4?aAbA&ELF2`b~u64W$&{2m0<uk@WLweim-1V07t51_h_V
z%96ml=J|0f1a*|C1uq7X8WGmcle8IJzN>?;9`UQEATZ0T<C6|#L1rVU2B#K04`>oM
zS^KukCxneNHb&O?V#9$ic$3p|BNUTml_rKG?C!{`_Cz%>Xm;FSn)NR4o?BmD_s=3%
zH!TXNp!`Ai1gwp%O;)>fs6SdX4_AN=W;MTn+{Cf*+wwyEMsi!UMC&NkIp&N177fgl
zfn;ZZu}Q<ogTBO$e)Sj<ov6Gl239qf2uoCBY0~q;Wimu=3$eu+AlZ2CLb~_bG|DAG
zqN^_B9->ybff(lx8y3M?IeV%pB8Vo&@7G8CCXg}607wY+{emFdObHV|KES>Qp9-4q
zG(z%B)sqH{v$_!@#EP|BlX#D*x1Lh+VZI}>d6A;XEpKAiWGdFY#FqD7(~ki(KfkuH
zC*C2d7V~w7q%*yfcWRGQG_6Ju-1KA$E{<7y9?v_sMt|QpD=`;om8R_f$TS-tlc-8{
zqn)EpJ;vKVrMcD56!`>wKl~;ew_(CAStO<^%JI^0mrR2CLB}?NW5vd?Dpo>m4G7+|
z!0i#&srK$$MgEm>RDq@!X5PV8<pCH^+dvb>SjDxWi`;)?aPpF8);iujIy0z6toZ5G
zlQ^DTT=;^)1Up+*!H>GUBv@d~BWa;|>Y)cd_{!I!`KAN2B?Iz;Qr^{Pq|+tqDwpy)
z3>Ws;&VWdSWZ&g&nc&kaH!_+M=Za3-IL}u7HB7<#_xzyj{@ZnCTA^1Jg8;XdXSbsa
zf;KZ^U)POHylUhCVhW86^5VzxQS=|yG{MIbc_u=<137rtsj7AQBdq)-A}s2d+F?&y
zKDU_BjsefmTc4m??w;_&I0DoZ+*P84z0_^2@kSi1>>uM7g?RjKloZms8j3v}>R7IX
zwBhj+4+D)v=NS3}4+A!uX@zxN%l4poU1yMB7h}P%mpA?z)6~}897|U6zi$mGIj5*{
z-Kri%PhQLJBB!T<^G+kKJI0*HkLZ?GoBA4kIKd{a<1}}fB3cd^Bx#$(J%scIo2P?t
zAZ-4k;VFr$1hr2Tl<Xr%B6%qJuKR_9hrtJl_<K*>Pdf9aGGY;PTT8m*=p1H0`EFja
z(w+T<sRwnc9{eSm1{#BoM=;0y6{on6?&_gCzlKcf>N2Fbg6qviQpEA-ENUo4A%VX)
z^}=bb2rkpk8Kky_ivX?}ox2`_c_n-Qe1u(WsGEV2p&P7{8F6;M=1gDMncdcM@`Ykb
z&Xw@Y6)z1`O^OrY4XAe*t><}I@F6?i0@Wh6x^HJzE78jN<&ULwjyc3AgcVd|DK-~X
zgf2!CrH;m@(dBUcryP22?eC69zQ6c)Ps8^2hm%WzENV8R91_sV7(B0Z23lc~KG919
z&7QEsA>f0r8V$+rVqLdR9vNm)S}<X^T1L>2!Hf__h-D1g>YeO4Ks!@HM`*KuB7&zF
zXTRCptIX<yEDRzs%=o7z^@AZk1J$FT>Z8AA@@jBp9=J|Kk0=awX^a08EM=2If!i9z
zF3CHD?iXV35dvCNE;<j5yZU9-s#oipSA{xG@59TK1mjoGHUGoTm*=DLsf}Z~EGmy-
zR-2!3Y2>6%2Ewk^0(|pxlc1$ek|X25g=}T<QhvXt^w3&dgvo9gGolHn$%1g4y}B_U
z*}bVcSlAC1vnsj8ejMTE`8au^#a6eEpmYpRTENx`LzWdgx*HL5_79${FU@I#1byTq
zcHb}I2(z<sF=I?UQndg3Y+CjAagFz?08s~qUd1;H*SwsktMAROcQ*`=Z&mULJw_qd
zeBDK;pU%I+UaQWwRN^-wg#K`U3eucvaGNU$PrHZURVHa@rfG(0W@9)N2vJW6Gt0rK
zb*aO#gs!BeXGt+a0iQva*ow4hBDmI>jS;~n%uB+sYPaCfa7W&b@S1Gdtt&~etEb==
zSzBmM1gkJn?x<)&8iXl>)FG;2w2_-gPANoYRmkqLpRoa-M?Yu0P3}Hx32%R5s>p;|
zT?P>E51U96_SXiXWRgI56v|A&F~5p=`=^k~B+_(gi;^1<!Hls;t-;zRGjIMyxuv~O
z?)8QoRW6Dk0#C~DJY4(@`rEfmafvWKBTF8`R3C*{F?quJ{8}Y()3&td(cbqWE1DDy
zXd9>M9MP$+{c7{~%qve_|I|ZZS%zler&!}pwl$EM@!?Vq&trs*31k&-Cb?y^106}P
zu?jsA-D+<wlO$1lha4CcGJ=?{=?EZSjRJ+SQAY~ArDmzU5UR#~aS5A!=NX-7x)8%O
zhE(&Woh6S3{)&alu^E<I-@?rjh0pIjNHcGS8Rd-S*^L{v&!zZEhIG4&i>+w-o)1Px
z`*E$=tkT~)?AW=QQF6WF=~LX$lK%mHXmIcRV+jYL{*E8u%fi>)Djy&e9C*9+-0RD4
ziKWGyxS=B9_q##meu7!wO-q`7#x+RkbdD5v2#igzMnV?0sX&g75kbogP^PdZ*uX*>
zK`@w`+gzIZU;zXr^Wh#t)b?vrtBjcqm?xz-*^5njQ|6GyDLyaSHB&)jn4D?<6Q$Ul
z=@f_#Dgx6y{@8@~I^t*h({hD?0#pQOpGUXhSa=m!w%NMuuT`RU8?9{$=u2xZoS=rC
z-E+1gA(}Ik6Ab%PV~~!eSu<%C<H<*xJ$Le7IEG6M98lwI-G<v^Ug1h`M=Z|ekX)w8
zD|hR4y%L|C>DFpTq8Iot8mqI38wDsjagBL(jk}x70RrWbL;))^^u9lRZ{!)jV2}EK
zOv77M@T%4sdH0f~$cFF=Hr<S9-ObRa|1TEX;9?EQY@XYJ$qj0=b;g~lI~W^-Yv5O9
zZJ+C5nLcW-QGtc4(Par5GvTY&g4Hpa-Jx)lN#Dp1!+=b%PQ8)#-233wW1&uPEZhnN
zA#CEl1IQ&j7~VAoWS7Ox(Rp!4eQz<ck+Tqf82<zA0N!lZtYs;Cw?%Z>BfI4E0MTpj
z3E{Va%;*)S{XDlx1$*rO5x9r{KY?5EKfvvNaOC1cmcJ>Vx(=sf=zaC8r6XSxI@)qD
zMy>O&8ef{!8uJ3PCmG|`6HLnd()!2SP{kFjxD0Y;Ij1$R8TIbl$l9YYpL+Xjxz?fo
z(QP{VTk-#{TjT%I?e5YJSw8e!^Pi;XM7Yegi|6>u<pb&9%mS5mJ~Q%DnEc`(M4x%b
z6{*DcfHD{ARirO{{!CH%!avMXLWWpxm+D6qZ#y5dqV{j5LD-K6Np{g^ktXbWnNv3Q
zKS)oI2#qda_7O$Z`&qeaiQ88L)F?4e5GkBDHkwpbbwXTTRSSYcE7vGmSyaPPR+gN1
ze%(J&`Nl^^Hdu_-sMJ-OH*PO5mVisHck9ns9`uB*t1ED9fG3Zkg3mYNZ}NDeJY%EU
zTZe71vNhIoYLMKg;-_hy81@C&yDt)NssYF9N#=Nh;2Knp{u`n^nSba=Sc=f#WT6*N
ze!lO&i#5ovlILcPV(O^3k<8(Xu04N9@M8!$3>W^XHHyFdThwzq%s}l?b_e0?gT)xq
zelZ@TLH^$iWs$jH=q#r&g;O+!&cH?^Q=q8vHwOLR4QjqJb{Y^V_Yq&Pdn17Hsay}j
znnm9Bz^Vr^ChdZD%h$(w-_z(ivt~uP<k_D<*Xil<Zgfbu!#WxOS|V%{_b0HB6h5fL
zmc1E-o$H`|hDh{>H3rnckcZLMP7pPqr57)<Ny9<8lBHs5%6h<}0j_6A1P=n)4eLre
zoRh8({l=DmW$r2h_NTsv_u%SNnK@8xR4l*!zS#G9Qr<1yTqJxCQEm^Y(>avQdpWN|
z52aK;p9rfxwd5Wbap0)(z|Tesv;GYJZI2cc%E08%O=%p-pNHSEMKcbQO@&q?qG4~p
z>5-g@t0gAyB2ubr{<K=r%qS(?9zUh}|M1h?2nxU<J$Ef{K2i%94Rs;sX5ZC*eDdxr
zQi>NB>gp!w?!mXO<?xeq>>hrF-|T7Z-X5Uw@W~y1`m>?w@VLSHmr|e-o~*~$jnHem
zRuUvD?}dRcN7Eg$!V~TP?a%Ie!^@?BXMswFQQrCQ#_h*62#v*Fj?8h$!2InfX7RPG
z{^DmRQ8NC9U!|r|wKI6){hXIuu=#qcD?yxXk=Mj&B0qUO4x?_?bEJ)zD1;U*7Jm_l
z@Lmt6OhgToabU6*!R4B_vm~sZ6o_l!)Hx7y=&y>5P13qS)|<SqxPJtE`dkmX`K{e>
z{ao?+yW4GZYV^KxJNQUw7KizB(Z`*zp01vOooz|7{&Pe=2M&kMK^vvBZIU(N?IQlh
zL87QtmL~N@>?kH8C^M<ZVyk<yJ^3iJQL+oFQjGg*|8JaQ4(&JCos_}yDv4&mwIk)C
zWh;BBkC-LxKXb|oeF)8Adp~iWFeLHh=xLY+t#-ak`hK~k{8ajrwAmE<RGuEK$_Xa1
zCjvRSG&JluIxs(1XX&`_K^@M_3g`U?5B7%IFli!}k&o|jG*4q1TuHYZdZ8~ixbgnP
zVA`Nt6}n*_eC@a%?s*G{DzFs384(oSpTE1T<JjH4Zfo7h7c|xK($ZPh`k2<)ukasQ
zwzea8_H5a%i22lANWYu*3`&pRM(JE$7|hH}Z+E}i+|p09c5r}c*lXS1Xy|Gw=v)AM
z;s^XfKjT#o0u?l-lt})=*UXhu`a~SHn9`Q*WJA^mS8N2JT}jK5iA57WcYZ}r{Ca>j
zxV<m<ms|JQgWJWbs1<J*5n5vsjc6M0JrgMs@<^yOb2i;L{}UE-%+^5=Z}Mj?J5RTj
z&~InGbpZ3CK;-0|&Dd339T8@RX8}$~oqZKj4PAR@Xdt9ba;M3Fd){Lm*Jev{h8&qT
zO&iY^!<_cuhjv<EKr@nC<ykgjSe#`^iI8`aEkWQ)db`53@w<7tAb%yD`V@AFR&+P#
zjpo7NhzKKypiG?bO3VNxaN;E(%K4r)b;DZ7oW^R;YZ(KaUKi#Uxt6}!b=c9bR@LM3
zRIrIq3#|p|Bo9ToBXUVjm;VN*SenLvz!}AZB{a2&V2M*431=e2hIG`6{8K#Vz4Re+
zEgY@5I}il@#vqma&zME?*iTj&*=2;_f+To<NdQiJTtfIrk#7ldx9Nn=p<?cYKh%-N
zC%jd|@wDSqh_e6?`Eg~7to>*8PA`v%*UaD4x8w;;Dm90@_obH~G*h0CdK_i9)fzij
z`~-mXi6rEy1~UweKeRg5{0>rDV<^?iR@+)}JxN$$T#JNt3SS0An_<aH(u2w*<3Nw2
zIy9?}h>{V_Up2>2o#m=x)eejwwu39>l}ns3JjM`>y69tS$4In2UnXhx4uL-Q)nrOt
zUu1!`Qsk3(UA&(cOG1ytGhABTDY+D;jS*4-=4$9!bv006=m$dFg9E1<I9Ss+^~3u+
z!l(LRed&TnkVc*RX3EVq#r1~$b^PG_pb!JG8b1;4u*%0?GL{o-g3Q!AN|$<HLZI~l
zAFf~d*K4n5>Ei<?2X4^1uPFg!s7g7NHA7KLo;d}XrNxGN{oYeY3Cqmo+Yh{F{kME_
zct7A#*+!nL!qnQCl=pnbM&k0gd$I-hItQNl`aNv7QFm<kItd|rF4Q0Ylo0H=O^_<?
z`D}UDS5YwZphDjK*nSrC<wy&7E)o7i06GM&$I?7b<&Qsfj{`vyQH!~En>^}SMH8ce
z)k}d@d*Fk$J!cZ+42}z-ow{LRUBFuzSPv}dA{gIO33o24y81Exe2j#?1wFBMz|D1}
zp>>9#zkisrQb#Ld<W;=|#`~JA0z(UV{A2PNVlwtUYZ<dN%9nJstn|-L@AV5Bm>hmS
zJ<@9a$1N2z`Up+T4r&a=G4(Z5{LAIyEM48^8qf#~@)}OpbSznb7x1>r|Ng#{su{S>
z`-3{GXwH)nMN}ol7-1Pl$?5IPNlX=H9zxdsY0@XkgeAUq>R#PqXqO(hKE4I5PJy;*
z#1rsOz;kc^1Prr8s5GMdUjj}_0wIPwUtU1`AY?Q}g4mkV@!Q}SRmr@7pHmXCNi|1y
zSpY(_^T^4V;{~ji|Mg)y0QqO&xgXfjv&^v2hHSt;LB8OI?Y7{CMtPv{Zrw&%prQ|@
zR!~Tq%o73nQ<)8Uq~JJ<X%kE!>QfAcSbf?#i)I)-8io;LbQNAuR5^(9aH6aax}!C+
zLl3XET<No0a=IHX{;=2K-2X5<^Fs|tiXZL?VzLuw;&FP9^r7n^s4ltgTO+F$`K2c<
zpQ?}P%NRrX2xpu@gplz6QN$Z;a<)VZgJ-*uYh>h1i4nXyRBERHI<$>(Dwt)8Poiq|
zC!q~YK%f2(K1~PmTf+v8eZ+Efx4xEQJP7Kwd5lP|v>tn|Q3!Mk$jlsY92u^#C(R)|
zu)uaRCJCCCR!WhfYb+8pR2p)1*{TdprrT@ATU8BLyF1|X)zt39C<nbKz{W4Gr<V{u
zwc7~#5@AJQcDq1FoImyrK%dxE)(y(fM_i^q68O)$Q4!#kRK~@SsR@l3#L)C^b3w1W
z7Sw+NF47!nn~DQ|_akgo6=0|03F2ZnCP1Z>7-7;OL<OTm(;%wjRdIS!aC%k{e!bkH
zi#fb6r)M|TJieLSFt@|?0MyyT@avdd^K)VY%X~#%b9o3)m0z!~Z7e8@Nqk6z5n0b2
zq(abH8c<x>f1MI7D$dT;0U>hRS8jg<#kDL({vgG5-?Q~D`!!$R;vNZYH4(+DK3w7^
zNAh!?h_S`L@HZ5~VBfoiUx4sExOVz0C_S@4ALMa3&$(CsRMZpn@KjVbItPut`exU}
zCa)S*tbzB(@h>cYArHbg2mdZ_rU$liT|)Oh+S@Z=Nx+|Z%tp|~k^n)QI(|zXlz-Cz
z8#Je?H<h&U>KN&PwOOX<K%oT}3{zX}kvTbhj%<oX=U^eD(wJr`Zp}(g0?bhSTtU&6
zqwPo<ja7%8P8AlpdByp_Kep5tmTx9bH=^7m8+=~GLk+G+-*wSnKmWH`#pu6T1%FX%
zx&h@U3%7#&`;))@_9u6Ar$0675Pb#_lma~*S+860p#o|JIm}ClEK*1nOD(##<9Ja>
z&J_$7#$47ICwV<P-M(P3YFemi7E*=j9`z(z%W~SnkMohB9Q6)yRvVi#dJqPxW5Jk}
z>(598lTT+vZ&qk}9M;&YaW13_MKL2vnh+98vDv5sbRn7`za$7gHIiPh{J9l_ufJ6s
z<U8MQ$ls1k&8q8TdW@pF0%J|dp%cOX>Y69rwn;CZNvwXsqf~2R5}<|T-Ll|pse1g|
zg)mq#(d_iX{e38&90r}~?{-7XZ)`yoaTvGv(0#+<{{Qs~`4!{wE+Oyq^2+eKy1bWs
z-XF@p-#y-4XDg^uN9fhDxaJ#oNQqDs%spaUOtAs^_|C*B9#3epk{nt{cCZi}?t>&%
zz^0#6tVN1~p*=2|DuOjdq^~3nmaGKpj(EC=`Xq;SFU_Z=hKHk~(J^W0)pfgMba~Y<
z!ubYY??vyY^<!##5flLLZ#z5sRKbIYSa|#brKCS=29YEUoln>G#Rw9y5loAu5x-~^
zJ@0fN)JcSjj*Dnj-ODN>P>XZs!qOu;RSJU?=K7wDwW$_mFUxzvLhKHG|4lh)?^PGz
zkyTi#-uyyANCSv$v0+lylLoRR$<^|`HTWM1k9w)3*Pu!c|GHNf-xc|+PbEhgeRCVg
zQj<Wlg4TX0e7+l3nh5ee_dF$(DkkU<uyz&5vY13$qX<UT8-W(IHs?WZ*w#O7q%Duy
zg|C8Kfd5PNA3renCo1QZ$FexAW=1dsufF;q?5Z9GJIi>=<=#t8e!*#ymxewvXC8Wy
zAAKxD8fLKP)a;B0X{LEu!HV4L3HC@<>djt^7dxZp1HrpcrjAL2OXS~%d2T(2Uf$@x
z$v>S;DYOJSO291-i!XweW(j?o=C$1@le_b9VHrkQ5h$?BPF)>s&h_wX??4scZTC<s
z0e3lFmdVK{wHpi|-gADp14Fe6vLEM<E?ulK5a_rX4wv3m{<FTYa1x}tCk@!%J0(6d
zarU~sFAq^xtBVuo?uyW8`SPRpbMD$@7S%VyWrY?L;H9!->(jMRE!&O~Jmtd|c9Blp
z`aG>7sI>d;vAm%6;RtPd6c>B$QxF)8>@*`lg-=rcN50{<m=osfm$IlL)Gdzz!qhaA
z<(i8Wh`yYHR4@kUk6&=;kkwQ(^h6oMcTn>!GzMF~o`Cnq*ZkYH62KEA0@R4d&iCD`
zBrPL>+yWw_ch7m;>P{Fd_rJ!wg_Jpny8|>u^vRR7;UPkfB+?3k2%bo>XcaNS_<3a0
zHq@5TrqK^>N@Kq4(5dP#kcA~c)}e+I@0KA$)I^)#hkpHPA$Y!N>;LY^(crbs!z`O#
z($t<8ZYL8&Wg(&EV!_KzKuCyc$A~|`8<zKNLeRpg5R;uV5M_h@^W>w8*RpwJ88w$j
z`r8fAi472o>Olj*o=waKHiXf<d9OdPQIsU*Hsz)Ed_8_#UT$Ugh72_kjw|Frz1U&`
z>{IrCXNZj8!3b|DkMIoR#ZP%^L|aOqt!a^GA9tx2mq^M;YvYK&(m<hEQO$eHQpk@}
zwqj;ss9C2OSB1rdy3zQ*))~_dYsSk>6-ke-GvLEfjVQ;Enb5|{ai|g?N7WMm<3iB{
zu43cV42i_Fqne6~&4?gUj1&`>O*9&d(=8~;H`K^c4RVTBW$QCjrexuc7wjq7RcxPD
zS8Z?I6r<({IDU6`(vurleZOA3vtvuOqW$6{5Z~`CNe(TDwu(f8S+ih8r@LaIyERLi
zQB81Qf38yWP|OsQa{u|h?#|bFf{v<qKFcawKs;5onS(QDtORaSjx1Y8s%A^PkYRR)
zQ)wjB#MpgADmLg0jB|650mcyn&#Yf7bLmiV9$R@>ZWlFWmJcWrt3BypgOQhM7i|l0
zXiu!E;?M`0_2O)e4ExtF`!g(Y*wx!>VHlD{uryds=*Nk5Lqj2@LJ~_d15TqEq}bQw
zEi+^?RPC{n%u$!=T*hn%G%Gg`nreKK<Ob`~#wp+<K_}H*ewYLxv0@foA3c`Gw24SG
z&GRy3!zx)9^<BXE<!Kz$a_dz>fux4y3@0sZ{>=(>1diWGmzMA>_d8w;T4q>B0}juN
z^%cKfuQrUSEvHx!^lB4qv_0_}*>Vg{kpA-22U5}DDVMSqJIG=%gsHZbFHMezO0cKb
zR!W<xmAec$xj}XHU3=KI;AU8pXlo|S;9NUe1&<AjN)$`=R0b{Ma%L{~crxAt2kvhE
z^ep$8L2Q=QqqgsvN(knamMJpA02!!(pn9B&BbO;tVptHVRlY3_J|4a0369FKjWMGC
zm|~OhBu13#uEM~`NSDZb>pJzhq$|xt3p-Hhq5cf&RgtBnWuen8<4owa_q8=P9E!_h
zq^#Q1e3Uc}lKtVwCcS)2=SGv+PQbpxc#b7$dO}^9Zqw-IM!39OB5y#TS7a2K35W9Z
zuK-d52jq*f?A_VOX4z1W9`Bc!v1tJ!WPU-d#zNg+Q1+!%6+ZQ8jjU4F!%2F;>YDcP
zGKTGCHVv3vgq@15ML|fps(v>EcgQITmo@Z3bCHc6w;#l&8PPYZ+wB(=g^Zv)+AELA
zj&uL+{>NmG#rvRa^qYKD*~$!crfOsD;U<M}t1@-)gLH!4SC|ol*{$%e4Z>P|cmM+8
z&t<>Rq2Ha{K?QM<E#4ak?+WAkrI%(?mu5I1ILgn0m+{?`eNch$r@M`%Mp@6S(RMQG
zqcF7#{?e7H%WN{R7ujgb#6lybC2m_)<)%sL?DcBT>m%!??vp7g+Vy%ANQril*J{v{
zR|b%^ndDZKje~b;-OfNgA68+WdE~Wgy}u!vX+8d7Ohl|P{chMJeI$cenub`o;wf)5
z>%(YE)D>!~mF4P6S1Lv8KmbU0_lNLV{+yTddh55#{q>60=BJATt;xDNoe8)Zwn|!k
zX&MvUxhCY@O{^I_?hsMN;ou1dX{6s_8k6uW&aj&*p*l=zTaS{{7U}Z8Gg~H%OQdzN
z8Vjp!`5ZKhaS4~>7ONYE|EFVtjMUS))Af;x#5eA;Ps}w+t@lgBFC-IluOvCFrD;OW
z8gUnM|1-Fi;wGy#inc}Fq2^k7sy=r$xNx;7|99#=rswM}+@hQ5^=l>mB|IAF_M6r;
zyDmYG1}?K9fvqV48H}#nIqFKOiVOmZ5w5-CCez?9uaxEC0Zj0GP#^*2fCJ|PRP{1k
zaIHszyv{7d9Wa<k7)|DGiv89h!vDA7u0wr{rlkheE^JsQZG{coa-6p%`j|-!7^RF}
zLM^S9@`gp_W)0){eMfscJ9U-*G?UD8HL)_$>A?S5C2N??7zlJV8HZS2gebM?C;@g(
zJdHz?;&Ow|Wa(nHsBd8U2CXT$D*H!OQ)vNyGZ9cfk7b2CmK1Rl&GiR|yJ;>7RngY|
zI+zo6!$Jz6gS!Ozg)Z2h%+4rQ9i@%lOl_^U_?7{5vqr{xf<Ku-o#OFf>iJ^leZ0Ex
z_xCBWHOj6F{RApUQt4=_=w$RWWU98*@%_kXiinhhTZEKtC~;kyq92XSO902JU&fv+
zw0V?R#(~gDUnUmDSgh{m?pUTZzD`|4tOvymaUq%r*g)N(A%@ox7#&e`@Q#b6UJE_i
z=kcVS?}Tcmleq~4r7eax8RwFnt1i+JYmKr;-{R-pn!fh!YX9|{K-6N;e+Te|{rNub
z{e2%EmAe^HFKdRWGSUz>!d!)&mKIN~G135t$Yn*cI^=A*Zj*X}V3=k;pJ`pXeIhq|
zo;rb2S0b>9xa&LaIC6_1(t2NG_oFo;AP>>OSY{hkEv?Uez*b4Apj1<;C{h&z#wRG3
ziG!?==X>vL!}s|59t5ql9-o}PzxQvGu8iui`2!b?#y^%8Kg5uzi=|bMYxyFwo8ZeC
znEh`<d%tGK$|x#rq*eX@bk-LnEj=@h!HSQp*G9Dx$R(jp)m2@MpG&GpJ*Ga&FjW|<
z4wpwMq5rlIS1Kb9AQb2+I<?z*b9Py7*7v{EBlqZUof&^=20d6Ag?{>+r!)I7hGD}u
zc6wBex`kBK&Y9BI+@2n3O~`G=dss-j+T*$Z9Da^&gyZQU=*9bj*s<?LqyC$u7O1IP
z4Tj}DP+G?!4-o`I7`=kcl;sBC1}$5hG!YzRc7w}$+0Cr`pN&_i7KqCKS$Nf%k-6fB
zmKtK0F5J99(M(G(+4ieFtM$_bwA<<!+~~XB9)$<GxG0h*K*2HTs3%^H8X=Kw;XMhO
zI^LT@6KLUpK*P<ke&Xn{U*vpl*p^vg?RTlTP-`!&1+~5YeS5mN7dU8?dB23ifseWA
z`98W2R7C6jork#@vBEtMf5wfuy3sM9#!|O+X@b@q=6T6!%MEo<Va|*i5t>}zZ#Q6=
zq$GZXkYkAE?P|=WFBs?So-3^Y>17!hr-GdKmV!XaVl`kVHX>M*{j7pEpI<WX^px^U
z?%Af6_?{^lXi1X5kdkt%tWmEa0s&=vQ_P@pb@-g*+-y$oMT6eJimD1m!if_9xk@lw
z!zT|GmbKMoI~x{#<h1ZF$2}}2VV4ne-eOKq8LL-cGq^w*mmAcSrw$(ixzi(ORXjTE
z_%SvvPgM#J;Hx@!T9~2n*?%Lej5b7{o>CNUn{@k^lYv{E7#f`<MQT6Gtk@5IY^JYh
zI5~&(4cb&!6dC>dyl0Q0tF_>!i$0Id2rYViE<UUxd^{M|@&0#GM$3$6Y7G4Ipq2<S
zjymUILeVBqha>BVX&Y;>Sj&O(<9u~RR=wUwKk>`e5{G<N5nT`(nGS=EF$||40{7nr
z>8paNR$5Ixjygi3fqs0&Z&_r{DsB&CN!pMAbx1>GVO_;Ikt(1t3h96P1BQ4%ZC^YV
z&M6Ukh!2czFh{j#5ocs2o~@KH(ta-gr`{3*NZdA#r+3+uOZ}%>O-TB6IQOa{$y6;e
z;~vlGDR^53jOJv4;4t7g1vP6{WZ}))zEw9uQX`|}*Ujtb_sYD}duVpkwB=BiHQ=2R
z=r8x_*Z17lZ)M6uV3!Mlynx9Zk)TF}aAlxq<IgF;QyvQJEvcL=8<RuQ8*`r*OA1M{
z03sd6WI{NF({R4(RQ%W~V>&wppA&zYS4n!X{IzQh_1mSt8vp)NUq`kfn7T9nlshEM
zDr+W0OazB3Q*EdMt-Mb}p11~$-a%xU=@1yN$ThRsWLtCcrZ9x*GB~B#Izzop_z2fH
zkpHh2=&-?&sc9w)Bh|Aj<RIuk?|bWX^-iZJ2MrH1DXe3E=WTnsD27T<{bks6C2F5x
zdeJ;@NPcEn(1FJ+CGkR<>bja7wjuvx3m8~sxcK7JZ)Layk+?!>UTE_N<gordM=oq(
ztm+r@4vP#2<09RWPYZaD#hnWr`KgLP8nzde8MoE`up07VU+e+X#zAJFr@bx3f5mPQ
zv5`Wb@!&?W^NAD+iQ@1<TA|KPe%b~$0x~jU&0=jIoN6RQe@-qBH?o-kW|Cg-f{0+u
z8nB6cJ^!M&WPirB)BoebC_K-9EsUN&X*s5;vfA5!%SJw4=tjy`x^q^ns$ri!mQ_kb
z)B*Xrinh5D1@-sSa)kPf+Hlulv%w7P39_Z+jL%*J-ad>BD2oV9bL*(`R<&_6);L$)
zp_QH@zY^ocW_6q>=Ly0R@%0xudj3Tr_9S_Nk#OKpKRxuc<Wt8E&ZI4gz~xR@WL#I%
zSCt0fMs$qd|4eq!dT~2hqS)9Rk%z>8`;ptHMH1+-o7X6U**e2R1_kwgYd**f<1Jcd
z?anW_B9qcgDGfb?9Av&v&+}Q76^2|uinLtrPhEv4w)!sMfkWjmi|yN|1AUB>^I>!`
zaQ|9^+B$=H<qJhrp=U;Os~m;6`NLH_SS78MnN6rz8&o&eP1{usSdg?5zanM&is6g9
z&J)YSInv0o=U<$r!Oksa6HxMn0ky1`oVY4FSKFPg`|4S7x#2x5e<*CNlWiXwrEfc{
zAfnS0WWMZdh7BS+;n_!Rm#LEpz5DI%#0J&>B|EOh6r-IRZ4_zs5yLiuBOQ8Y<+$z~
z8;`9bDQn;Bdt^TFU2@GKEu3`bZoOl}`4ueSK-ywtI=%3}!Z-I)mG?Nf6Is`=Av)TP
zi`cUUJ{-u~C+~+h_qOism&kvklM@!l_vt5ZxZ2GtH;j#64kq184hwz1KX$p%=B9(<
zd2cjGLFBds(g@;^SPykt85)`<FP8XIW1WD_J&~Y`^2&HVY`dQ`=Mzlv58qWD-DLgf
zk2i9q&O*Cotwk|PE#{180KCYRBGj0SBr4r!=s`-X@NS;HM!0uvq%D>?z9Hw+z>~O5
z(GOFSNVR+jrF^A$Px#w5Oci>XANkw5v*jHG{&4#ULx_}Y9Z9QNjz3zS6q#Arj6L19
zxLf?~Mt`pMp786Qq<`k!J9b0=-0ln`Xz|Av(EUb^O%A`{D}kFyTgA-IvMyfrGohG<
zj7{U9i~P(r$B94!9d_tW!H?W#u2$VAO=ltbVJ;n&_Zm1Rhkh?v?}?xu?Yb^jyZg4s
zsr3bUnA}rUFIES#wWnA<XKyEa*R1O@(#H5OLexPtTke_0=A#>B3VPMpo9EB%<Kx}4
zZCRYGOieKO<))7to1(Ye)Dl5z>qZNqCOR+DA#R%Aw2T>qRCK1kJ;rnLBXLQCA4y>q
z+SnN~o03amm*;@e_@Zp$>s&>tY19=m#oX@h^JMf2da3SX6VkCEld9M4a>FPm_e$+B
zBx@70fvC2f1!PWW&c_vlK*qaVq0qiL(I|<1q;91Jc-B-1+?btzAYgr)S5UcYeADZk
z|A#jXvtN=gII~#GD9Qct<|&O317j}5HXWc-<M&p8T+P`!SM>sNwth*|k?J-jk|8ML
z{c|<EDFA6DLDFhd8)jzcB+g9Fn;aA1E0k))UG`*ny$FHQaW)J@WTN4&Y@-)0vP4ur
z7<<UQn+T>8aJ~lY*$#x~AchL)Zm$ul&R|sLUf2xRIdz-(4P8nOk$kE-m=!u}Ord6q
zB`QMVaeD_X2y@y80j2GTgVYK5>fj9mqPWY0_?Y}A$B<(^84~q^e*XwjNa9yT^}3x6
zLQ6aZs@4^Yg@O6ym|d2K%`|jp<L~OUy>!nfOB5p;{hk=(I@`49M&tPjDNl*%zS;b_
z2234-;BxbcYA1ARrIuK__?OkjK>j%xq4?;h0pizQf}<HcfbpEm%mWs=kxH)l^se^_
z!dv?CRtqA%<;TFz$m3L=ZTyhdgeV=ckMBe=_pTvP143I^$)6=3hOB<;hV)855+s5N
z&<q2q^;J);HxHb{8FB27`5J;S{K*<-pU(OSe8wyYtl#>d!Vhc#3jPiTx6sh&7H5aK
z{v=LDCO;KM$Hs(L8dC<h4E7CMRR3a&+wZeSOg~%_JQ}Zg&igS#3w;Yt7qnQ0PX4|U
zm^=NAwb!obmsX+JNNmf+7$3Lqa3*vO{T>&|*q{U>PviCKLcrKynoHMhb)|7)aG7)C
zw-$b~>t`IU>u{F-7hhWfg20H}*W_ZfUwK<qD+a_PyUYE6$)JBf_yfLGnUM4vjfB0Q
z?ruFHv}77jN{o+#rC>OQ`F(5hUmr0$?TTTWsb=S-Fp<eU{9Bv5Q6<<^E@yV%#}h1)
zg^SI#e6Mo(fQG!MfVF+5ZPcEF#U_P19g<so3$T9tdXxckNO2VcyVF%98DGv7eX)?h
zlT%We!?dXA8>7bo8vV@eLq<^Wi}%MQEt9ay9q&oVZp3w#jQ)f99+(9{LKO#oTC`5n
zb~F!O(-GuP_cNJ7kYi+t-m3Sr78MD_6Kz7)*#?S7h=PB2dvCtzy&Zo&w#G@h-?LMv
z0@@}cu!E;@Nnf=84}N?FmtD?__id%5uu*oe)Rxq+C=8qax(AA3ikwFytik$}3i}mX
z<C0}h8i6Dh6D%Vf;nmL;E^ro;MS*8ds6E2_5<nUM(ZY91v_!Z0P;%UpAB7HFQN4QH
z05!J01qF3Oa41=PO4O7cN!gB+Ms5*Mr75(`GR(+OWyXR_t<191GfEtl{x)qno%>hk
z4z`wB{i;_`R!x4h^P(Nq4ejhfD|%ekZwH>?H9W57g#ZOlhq(EwxWc{e<ML(~dEZe^
zhs8`%sH8f?2G$r>d~n*s+$w}&p7<OO48cuTSXS`%GvPGA``FEJ9ywnM`3kybw5b)=
zyAo0u$@daCj+j=lEm<QExPR87g>9}`#-ox`7<iz?0S1)DXVeAcoekvSJKW(A2m~dO
zhG5TvV9ga|f(LrS4MPI1;IAw&XUIbyghNNdfRF2Bu)A(ZXStOCV1O>@D?PXugY)|!
zSwYSi#|0kICV2)8&nrQ2d*N9am<!}_C;ah&>18lkUyf#KUw5i_`JUZCdqdg{Q%?4u
z`NAL<$dio_7u3FH>0V6-h_i_dZCaQ;?r_Ojc4ED?sb|djddPYpq9A&)1NwZSIkwHP
zD?Z!6gBhMSk?<eg3#>5=q0jV&!W)KiR0z2##ey0^Kz4yW_FrN~0QL?B46NTkMvd&*
zd(2rHY{GzR=-I}QD}ELXmJOSopoqinsc;%oxd@z*9=D|Fm^iGBxRu?)!BKic#SKHl
z#q4~2(lUC(%^mUCb1Q`pvfM+Zv8+N(OUz-186~L!${5@;YP5Y#jcql#7IGAG>?z`*
zu`PQqoYH3E|LIpnWr_5aAl<U0;<me{wli)wGmh?QHY-C*DD!z@dv}QvKxdoSe|6(z
z6Lj|4Qa^2vKbE$`J!}P=YSOhH{USe-LSN13C009fDW@89%$4DDDrt$80L<%IA7C<3
z;-S^EQX1Wwyv8VjW@l-f^WOa>`_kgx%FHMR5H?+2`Y|1`wWS7?vLO6?ZL$STol}+`
z@|<a86!Q^<DIHsov|mRYWwW=-GRfx<T4^iBD1cUmwzqpC*K<_g&i+`sgh-5)Xg_*`
zF-$%4_BwSu_#_{<QSybSYo+QpbeyGZb7b9ybxsVub@K9NBLKQCjs3ckz4T2_VkUll
z$voy2Jy%J-pUWj_o7x#jDF+F0Ir=MX(q$>BF$SU~VnaT$;NhBa(tV>B&CY(xHmoU_
z9L>(Q=sZQ3J{MXRFJnZHT*MW1#FkP-uI9=RQFNg_GGqe}TtjkvFINWoy8UZ&l}X~z
z7(>cI<uog8@MnF(t}|yMzUTE#1ye?Sfw|fZTlSw4eDHGw2EmLND3n-B!G&m!=3x#n
zm8+^B%(OvuzyphY8B|$g?M-6yGY(c(7{<Do1|5fMNI5Xvo?Tbgq>Y!M;7o;<{u_)%
zS=2NtYi^W@pbhwiu=sv)F*GT=fMW8rZ+TvVSX(L`Ap~uZEb0yi4_KQ9q>hEqI<Dg+
z-E*!hO~<8NI_`~ptk!V>36q_fn!dTF1_$j+B^>jg6H71X{KkYqRB5P+J*RG$2Cw~c
z9Rd#x2Y+h~7hTTMuGkz4QX;z_&=y{{nn21;amE#FEB%aNE(A?ze%5ldfs+^tCtDs1
z_d+pflDChrhj&_)`$M?@vZXHH$&sW-AI=<~JVY=n-0{-tdczhgVtG$Gd*t}eCX_!>
zY^zvHX3zb3d9x|IpmQFRJXUSl@WyqYc51~bn-0b#wB6>1H0{TB-#hKU+*)JH`Mc-j
zEmgy=*~+P<LgH#6T5#e0@@Q7l4^Q$T!oT7=G6)=gEV6dB-$}XV?mdMoOJA1y7Md?&
zzipWl#?|($L1}5n+}B8ggpS_bzvM~UxK7L@3#Wo>t~L3AM;5&|%T9w!BcI1sSJb`>
z8=Bz(E5;%U$kD&()F;*l*}@V855p$wDz?fav$`g{8gxZ_QC@#Wd%szu@5k4Et}9aK
zjb1b1{jbZB{(3k2E033`&|SQ6mb<YP>5@s`vE$B7PucOAW}+L9a6_`RKubcYjMsIl
ztpSy~fE;jC!+gW=+OTkOxJSJ*P?H{+;^nB3X}Rm|8ia{bMqe%j^&A!Ko)+vZW9agc
zd{KPqmC&i$8L$lv7=OQ>R+ZqfZGL5rl*td|&;#;vJ=cD%qNfu&tzLx%W?yFpi{z(0
z?5quM4;xUp7{w<WD&lB<8u58P&FXiYGI^d=l+VZZc~36sw38uGiSC$*&h&gi&GB9o
zpvWXi)p(<GSQJ!d3;uOAZbt63KiiZvJuekcxQxi%`5VhP3%|e`xau#n(8gb_Bf8KU
zRX;B0;UH$wa>%GU-68GjhgQUruGop$A7L-zUGvoFv)@<>R`<L@ZEOW2Y-xPNRWb{J
zJ4JMZPbmF0$oRlrAYl3pSoJud!4hGb)`79g3iNz{=no@?uVrKmtCDC*tj_^)MleDJ
zqYqk94$44eR2WXu#)_^{b1{cWKY&C)7A6u30fHqF!2l{>-Pp`{cO0_%5~?M|P@~8R
z$mDj#Sqq~*gB*+|25=f&XCo*o=u)LfVm57f3d2|2T|N2MQOq<urW>cVAf#Zx6RN}9
zZK!=lwvVsOv>`Woqv%z6N7N6PT5?)FP7(X~53iO|9{uAJ@iMatN%GN?ZkUrs$NY%6
z)JMKPTlP<}tj>!_&4$;4(4mp-0~n69ld>EGCg&M==g?cbhsLg3`*2wbxbfQNPDkQa
zFJ9z(?`eFcs^X1(Vxibjv9*~5=J62r{pwPh!%nlLBFHBkhqk9y$r&gwz6fMqaF*T3
z_Gn=J)5(1OM(6z^UdHkLGzxw3N`;<LIOOnw5RyFb`~N9Z@cFKaS?ilWXm(;#j`;g#
z8!~je<g8NRRqyigL)+dC1^xt)FZ8*>qs;;@1(F%GroLP_<9-jeoxJgW)T0TFsDQM0
z_k7=wTLqlsjLWPXNx-3kV#hNgD;}BYBu8q?h!ff6GlLO>zz1+7Axkb0LqLGvpP56D
zj5Arr$I4;o^iq4}GqYc{)x%x~S4UEg768PZw`S3kXh?UQNOz)Dz(13jfmgLsa*eVw
zx%iaHS)0XAlBm`fYCKtmSGwGGF?$5qGpy|3X|RXSvrKtR8j}?Wa<(`i0(!VvHF14U
z>9uZ##Dl87)i2uPD_42=2CUrs`_TMWM*U?}-~2}=BH`w#@e}__2s=Si;zmhp8|Kdo
zi2zqxyIM~y6Tf>=1O)J=b)_`3GZ>KzSOfb)0~(xd1Dvoh;B}!gtL{mpa~gff;7@yo
zhToloE66rk*}MmX$wWmK*l;7c{SVK+k@2kcuN{+opK0CtzAqntZSlf{Qt;y5K44=z
zs5YNu#=WS>&9vK8$Em)aN7F5C#JikuK6O;PQs#zW#qoLI`PMVpcQRv2B0p{uSXem(
z{zOlj5~xNb!VLGC3k*U(9<05^w5&VXys1=PHBn!bEfF*yR+_TS!COj%xWYia9~ziq
z{a<yQRZtw^zozj7hu|`}1ef3t21^JwID;fOL4&)yTks$uxH}9MoIrr!HiKl4;0(^-
zu>8-Si{09@H+|7n-PP57@%8ikzV{`cbJwtDng*wg^Q-f#3CRcbH-772a!;~)6E0lN
z`$D79Ai)8d+wk?ExQb2setXDb**=eTvzw+F6e_*t@QZR*9U2-R$Gucm(>jMs6+t#y
zZ!7+G49MI4<O&EZpxPLWy0`Wn3mmtBTEFXrxh4|c5G3UN#!r=>L;%<XD1@MGyegq4
zo#Xu1dB7jU7AxwS&Leu4?9^(HNY<C5WfEWZ-G~vnzG*=*oo5!qNWi|&-k86u{B7nZ
zP<r0y9vTee`~c*@(VFu$ZdT?RGUejuBhgCMUv<d47|#Js&t3ZO^v1&kel4Cy=_z7x
zwPgi@LwpC60(2fBhC!4EkRZ-er&L=3#f8Ih>a#Zsv}M|^X|;e8Y{oIfESnjg!Ja-2
z^X3F31+a)DudG1afa*AzoqqzY&S6FLp(CQa<HL(tlM18WQF(_}=kWQ&I@^tQq^|So
zH-efxj1Y=eS;d23>p1E*5LhRd_q8t#8+MCgs`<_70KsAM*@?CeM}Ul>j}p*ZJ{7F#
zzTZ=yS7k;T|M0k2KZzN_R`{qVx`M~SlEm)XMNr8eHx*1x^x+aq;h!w)-MG4`eJ8`b
zVZ2HW4r$Ba?(7oNTC+0ctRY2p^WcXWU!Aq-?2UJEXQ+!m`nz-`Q*oy;0JhQCIL<x1
zsqcRax@#1z>{aCj9eh}<uQgaA(L2K1s)O{5=7oI4o)4H&Zm-fjDqWboLbl{R9^}xl
z#;-${Kk>V8O8-1GX<;-es~>ojps@Xm#hgtSYtpF9ih6zbI&xstsdXOSP5%&g%40u!
zW1|SR7EOzE0#!zUq`!BauMS$pEz^IOm=Lp^83vH7&~`5+;WOES^$~MdqlQZ=)arm6
zL?F=o&7uqRZWff{JuG2kxKt*;Fz=y<kJk6&yPqiX(>+JwP9L=WHAS?A80Xb5>*tTf
zl80+|^(~o_o_#tiL*>-c7_k3lI;?B&bn$%gOVdoUlh=JP!cP<3!2vP*H7A!<RZ!ge
zeAIG$(V;WXM4?ZuomF(LE`OzAyZg4`?T>!OE#(KL;|Uwr(Q~%89<AWYI%3V8iPNk#
z$wnvj!zs^|e~H+g4*U)TiCp;uxRKY5Bqs5xfzF#f_@Pzc3WgOR9lufnPFxWPp5Rk3
zv9+rwmhHX)OU|NP_A1&eiTIq|r>iO+4B-h?)n4@IwZsV~>bFu*&Kx$fi{cwDI++6k
z*vrC_Dr_!d{d&Q;>SKY8sc{w)1oKR`&rfVi+vJr<$hX0(P2ZuabXS+mXk+!JF+VYK
zA_zz$@np_D&KAKFW_^EGy0?~y)f5>?P!}i!q6Ixp>W59f@}n$coiSoe629Ob=NrbT
zumHqSc(75sQFnUYRMX|>2Hs!X|GcGkU<W=SA1IX;;}EBi6o!50T4}mFMv`4FMSuV0
zNQXv=dr0GEXzo)AaV<qSGnPXXvES<T$tVKW9RM{$u_>kHu^q#{?`!-5I8#2-m|`(X
z#XI)1=zb@GKG{uBxG4>QTJRa@NCdc*GQS+X%=+F}S~Rw1)I5_{KlC`W_NA@Tu#p>c
zx?WrVDUWVe17?G$Kj(b%V|M$!#9=p-zXfN95RjnFmg`HZzVxWEL##!Nzi9ESwhlC;
zvTqeEbX00<pN~#7ilb_4iFP+i@PV-YSkN0P<)I3Jgy+IIXDzF~QyB>gItZ`#=(&yB
z^H{cLq(Kdh)*2VkZtbwCs^)`>4RijL=)EOtIXj#+R28e47b|TcH?-w3PszxYGL-AK
z5s0-}jUzK0k6HUm&i|i+1d*hdM?^M=ub8TeP`Qo}J3Q0uM6f_G74;MzN<H@XdQ?@+
z;KL@=KZ1B3ohgFB9Ozm9IY8y9d+}CLh?oH~d8Rf3?V+#H^-0j7kUt+)%T<@W65k><
zi6kc`g$;g=jvvLJR-Ku1!TMs0e08;=ehQH26%tr?ZDPVJbS{~c`U$)QfDjGwI=^=A
z94&U!3;)b<>p#hJMPHs5Ba`EdGV?v}TKR`8PxF2J4%H#6GY7f5RCSVeOxt%$A5`;P
z277De*-<hA8x?I?Sg?eWUr(Xh6t02v^r^7ZzdAd`hog1Fb(z<(5TRD}PBl4E^ecw1
zOQ*LZ2lVcAt1{?)LYQ#RO#Xcw&KI$4_R$n@sv)Y!tYPkd9CmjCAX3#xP(IBH#oIe%
zTe7CI38H}1eAS`F6`^}q&|;;RL!4R0--L3o90JrnCSfne+fCXExdtqgM2M*7r>8aZ
zBRhZC%i)G?F@uj*&mDLbCQDCW8w!v9yjZq~7BDfBGmL=s<Z~CaeDxt1XGTk6*t3B`
z%YI6AL<q}hsD(;lfJxYbQ7Id~-I9Qkt;=_hAIR8LEt#qvg>?G|nPVRv%UmLdiLKU1
zbm?zpB_R)id~H0yZ&SXK?($2ZP_BLYO%jJf3ijQ9m-c73zi`Lo)`SBSTPXfrx;<d*
zrSBRq)6;49JX}`ahj+>5<a|m5N8eR<E9aLMBn*7;WrKDXblGSAZ6@)1?a!N^^q2d0
zJp#j+2=GL2a}vbK6R(K)y^WRTnPT{AGq&oIrLp-T?menK_s>)*`p8Ysp#{WWZ+_F~
zqJr0W=Azhzo<e!JN?TtMw+Nv;P^Th{px}!mXZOU3@<-Oi4oUODX-EL_DKzWsW<Pp&
zQlOPcoB}e5Jb6no>h1vnOj^-*AdpD~?e-0;FTo|YdhUzNohm4EqsI*kU8be!iWv*O
zy~V73NqS_0qfQLykr|Y@hVuxxq3duf^_Mff)PPk(53W|rPOmLW2TS+pcJ&2Ad|8o2
ztcsBU95ss)A_oA|z}%WPNcJyX`B=WE&VZr!O=_fvO}UZx{FXY`hj&+P_aicq5graU
z84VM08PTAZJ=z}YUo_@Swgq1o8c9WnJZFndzeXGh7~2?R$4rYHN7+?L8eLHx@<4#3
zP_BA78`SBhw1+6d&t=xcXcg8m{K1h(9{eqpG{p(*Fq{EelR(wBsBa{iM&xw2;uXtV
z65-c?oA~kU<Dh>Zit7WM8uDb&&U_pCJtGj3>?PXt$6?8jg_e#2hbBAA7_NVUX_+wp
zsi65VUNmU<yc*Sn8SGVk`X5@JG~(rTaz7t>(aHH(7S%KRT~GK2ojz<F_9xa2^F;ys
zT9^4s5_#*YqP!ZzgdWK%0I`I3AK_}@>Nv1O{PEr?g*L59SI*y2W^i6d%{OYLo0R2C
z8~tvIz!R_^{a=A)u>)VK`fGrlI^($t`F3VIt?7Yh;aqx14?dT_m0zynY_gQCVoBbM
z{g(~Kf}BH|=^H-hGsGh9v*8<SXzPJmuVzTnldq|5*yz+k?R;w7&#o0E8;MW~D@s$c
zkW?el;Az8mp{eSGe6MU2VlZf?5YG-?<p-`IQDti8>bvTTStn3|N)DeI*FR(vfs8LB
z<t0kWp_eMo@cfI^{L7h15K#$}aszR}0eFddmy*TF=lj*j_uU&|>4S9O)ChS?ZE8p;
z6cC|*boKhZeu9jAMC>7N{~2G8cyP__ta9=+!ml|t{u_`ZM;e`|V(1^1C`9Ix)O$8#
z{~a*1?q6nEiDr!$CCk-*;&^#)jJHe6e%b5m9YfX4R6TM@UiJO{#0c)2)^hJ9@=n&@
zD@-O`+!YuIU{C;@&4hSv8vn<&9lF1;K$}t;+IPR-bELKiZd*0!r)_T)o2j?;fbSAD
zu})#prJA@{?==?rImS-$$nGvPm(0dZNv-EFY7Tm*Xd*pSBhkOfp%$2BfBs72h(W$$
z3z*%I97fZB^+!<jLl`UkD<f{RP_=Ex1sPAdXuvO+_kX8$GkwZUHb-RK%c(G!s_siZ
z%YQRDY9K46mO?8Hjja%&NPx!-7k%X^;kIN<l_^{y@swukk^J=1D5)&Z^JB;_>6Ula
zk0j~U_vb=?kIGAIKa2ZM776{K(_^}O_06e|bPT)vq%>&jg=ocxvdqp~vUp$K)kb*V
z*g@2=?W&eom&Xf1e7R^ITn>M|Ba3BsdU^d9(C{q8oX4%5EQadujB|5#Gd}&HciuSz
zt3q>LWOK({b4^|XIwz3O+fPVRx{k1}=pDaHrS<FX4Y8y#y=i}(VK1uTO-prW{~yl&
z>MkE=J(63WIB3CQ-ELx!4+!ifLI$wN#j{=|p_UO(<z#@nFhu!<Y>vuw*NG*D#3W1L
z>WX!5igi<*UE5nRz`?ZaSq$0{lbp10&O~d2N)KG4rKKjF14>5*6=B&!`uZ5|d5oej
za$V1klxOZBIzR&R5@+8_-x8ilJ71TM9pL1$BBWa0A5NO+1hxcIRkns7j+S@V{dQ!C
zPZk_{Z3(x+4p2YS?$H#v?22$17u3lu4?P7$xinMo*B);9;ch~O@Gv)VhP-HoTDpQ=
zta#yIN>Ls;?sROezH7&UYh$t89!<z;K!gjfU1{x4Flqd;VEh$REAS)QZ{hfbY)kt%
zjYmD$@D=&!S6f*X+4j&gK;)T=pz*}Wir}eXm;H%I-$#RyE7Cv2_0hEil4My<6o1rE
z7CCRsyNG}ASy(nOe5~qZfql-JGP2@>gJq(KXkK#3fP=f$WTLXIs>!B3=3Y)uYjtmx
z`%BKoTC8l(*Eppk{GAv-$!FK5IC6Y|a~2z6`M*>!8Oq0$3(e;(?9pbs2zcjSj2=!}
z$fW@1EIgP}FzsqcpPHf(YfZMo+nbUT_9A3d5mDBEqimmJ%zK<B{QMqQg*?*rG}muI
z^a;;1jJvg(>mBC$HcFZG>+M?ij5RS9ax7>sXIjwCv1@JM`|0_yLluG>zGnqDvHqf!
z0ye$6?svBYdb%7>NNGScw01fNP}4tew^&N%(}tP_y_Leg53d=&KKa6581;4$_|q~y
z_89so9lKtCw*2L?^;q%gmRftE^n5z8cEa&BK0H?kH_u<nZ>KY6Yykq4^2l|uxtmx$
z`0aUZ4it$l{$$po4e#Vi4^rB!(6PL_Bko~eH9J<9RN4R>{IIpnColjn8VJ9{2=hH!
zg?gQqMSp)`u~YbwA#uHYg(817F(B2Qw|w<V-(*-xsB}vUeX$6zFDaY<|0jj`;tAN#
z8Lvls$m#@N;acfR3eCx)`jNhy$@4ZGjrC;LlE-2%YawxbD(z=d@c(a8u$iNRwX%zB
zs)@GWDKLvrio6(3pIpb3_lL#s4JiTJPT^R6^IY&FpXMN``mU`17Zp-8q0gu=U@s{_
z`;4~;`2T>n)v|@F&Jfz$sGTUGu&OLqlrKi%D)Su#$+f8AM7+#e9a4X_B>lzdBFY~3
z#KZyq#YGGqe!nnd?bdB!>YlDHe?|%nS!!;wc@iv;6Q}F%R;>D!MBVS6$OJKJ9Nr^m
zr>Aa?t>t%2;)`L$^;ReGL2!QOhkrKw_BOjG`-+=`>nl(3!q?mlQ7(r4*h7J?)dkk~
zK=Uh#w+jv4nq`zA@wiW&{(4F3AYh<xpm6{`BsD+iE-=3M;1|-{NQuZpOqV|Cf&V3R
zhr(ewSxs*zlyUKt(LOyuX@|*mb09O`sf&SDz*I6GdN33PcAP{a1_;n)-jvuV8G+Ua
zGrk-ogI%LS*<jh0-f)_8o*61{qz4h;>c1wKg)@6O?4B&I7isSB#BV=g!3)!m!hg|c
z1kgMyhet1^w8Y4~{@de=PzJN2mVt??`(wAGJ4wauiwud)@M93j^`NYrDkvj}FsdTj
zT+VdcZ8;*<q~JT@I_`jhnVVa7TJ#8Pa-#gW!OLXxzFBa=(Mn-8#o4Wj7|=@o#@U{D
z4?=zJpdwRK6R&0@i1r0ryh*ooMDOhzh@~aeu0N<|J8jYMw<`}vLkpzWss{67{*|C!
z6{=E;$cRdfFQ?rWtgI!=*|5q*)t=`$tuV;KBkt22?mul#I^99R)tpTt8v@LA{wVxw
z&>>hUGYA%15RxnJA3n|;Dv7a;H>CXs|J8Dp(2zKT_RMIH+i#Dyj$g)dVdWPWS4}{c
z2u4o&jcsm0+XZ_J+@v5CHJu`NxDGo*<&?~+DF$(Qjv*|p=R{88v1r?aU;|fD_iU_`
ztJ}o;Rt>VM2FS^{Zwn77W_ggFhF($CE^xG3Kne$azjTZeh?o=JohZQukPCFBR1rn;
zR)pHf`o_11K9s(-sl3_OC-xh@s=ijmo}i+y2g}b!W}qEq-1z3g0a;xPj%a{mej+iX
z6w-2AnEkIGe74(!+P+v%?OUEZV(D_@rvC6|oTeZkOwOM9oK~<8jZXGCGu&VdLrZ40
z#I;ef!nMpIA4tL<BQKq3HW_*lZj7+1VKI`C7mfK<9LLUWgqP;f(ApS5fIXe=P+%Ds
z+4w7mfzr3x!<87585yMNmw2R*#>UzDQ>sDBDHKzSlU=azRn}s3+55S(x+Kt){;VpG
z(=XE$EQwIxsJ#>WbRi-LwF-4_BVI)@DkBL>Jid`Yn=oKcqVlUyaBU5f?e0q^eByEM
zQN4J3R@=j>;(|A_w48NxthUwaGuIjTKxv_uM(x?M@dU4R{ZzV=-^a!9bAbgTnrG1?
z&BPqRV6R*MHLW`M=O%MM1a1yJkX9Z&JKJn8`|*$ENzp;%1cbjI15K{lS|JJrbpVAt
zL_xkZ<oBC$S<|#tjHOhVqvZFo_p6?F!x^g<YFB?mTu|hhObM2{=-z)BgH)7in<5d)
zTpUj4L6YEm)@u%}EuJQdVsvWF{I0Fj{7LJe$h{umWRUmcw$I~aCk$>(U{W8HbZr8Z
z4ibJKo80gAeKfz_gdN_*O*ZY+MK$d_eFGAHo`g>v%)-u7Z=iq24@}1MpRAGhlRgjm
z=R2ZJJM`O^PM;@Dx^vz>*&EZ3=M!2_s_$Hm-?-)Gbf(^ze4a)62o4<TMzNnO<-L8r
zm&wFI{>1klZ)v|rJL9K=`<tL`1d!t4=Hu<LD6EY0(Z_|k5=c7#q^<L$pidvYpP#Yc
zLv;T|>i}4CTi2+|R35}s{d_uzXg=u1K!-kaKZqBSc6ShG))0sUE9yMul|RPR2Xa?F
zWtKmVxjq!^-aRQ^Jiw#3`Ktc+Wqgw+dOcD>i8haaadwX1H$T!&-}-SG1{nk}ROZ+A
z;6#3w_#{~f99C^}ki^@kVr@-bi@hDzm=%!G*aY97GVl#z<k{hR&J-C7qMlnMILMLx
zWdSG)?Y55DOey@3EsMxcA@4#eIqLq3U+`s(TL_4V$<Pn9;rJ>WgQsk%!4&q2s`Q}F
zgPx;+l@w2}^;b5)Vb{Lpmt0l5A{D>;rz1@){P>a2Y7P1?s3FdItmITx`sOk3gRKMz
z0!K6S$xPaNGV~RGbj&LnnCIuRW^m91l)5M^3k~=_udAhjcL%V~c+Elykv1>FP!~Te
zKi8RNy<C586Z08Cw$OC$HQB}6Fyqz(=~|c}2{v<}nW=<peUT{>A)F-;(O;$SZsYvS
zN1jenrZ`MoQaE8ywa{pMQRY~EEg#FyKtG}etCb^7$S0_gM2uga*`k&n)ff|2BLf@d
zNl$jRF#+U@I#~M%Jv%)Hduj2r-{G^j8wcfgspKcjsI8bmgvqIV85)t(GZsWvdtZ%w
zOL3hZK7SY2uQ5OWimp~AfHR_|$W(2syI#`5QrJu#^5KB4ZTgk`J9`0%=E30l#>gm*
z7k$F^-W}5)2Q2KhD%Z`-8Jo>ojeiqiy&?&tCYuxjYn{3mpYufZ&gz~@S0)!c=$;DU
zqIqoQYn^6Sdc#+|9sFvVELXh37O<Hc3w6%3&p8NflL&7Hs7KhZ+R}cQRS@*3#yliH
zsXD>xz6otN6|Opn4@dcj4gIH!le#@;Fn1N!#><r=9=7HsO+v@C^hAo8>7W}_IQ`Gb
zB$R>Jo@HmQ=w3yq8SsB7ZHgz}UyGka3?C#wTTv@qtS;R-kQiDh4HQN0g`tg1H0rIC
z$YT!|!CT|0rY`lr-n$vPX+8%CXzRc=(}xYutPFo7aIs<RGu(nc2A@T=6|pjz+P}ry
zWCHU??nd<zb0|i9I0PXZZ;tJT7llqg-f^}asYVTjH}=LYtKJ^{|2(yhdmnd7_chmL
z)zTVG_RrWt?I%nUyC_Y5<ekZYbS8R+-kC_(`sWXfK2ix4=)UhlEc(;2FeZ+kJ@x5p
zXPR%l3!bu-Ezix2WUuXFrpsF1_1dQMm$vZg+s1q?zAW!868;rOereQF?(C#C`A<-2
z_Cjb71G7y}jWC#X;w+0!mjrCa-{LY`NjF8jflX_dc<ydfORisFpN0Kri9~wht{jaE
zskf-|C1hXOwB(?|y@K;orE=zN@}3s{`%oh0ypeYp@+xmoH21V}id9ziwC2L|uUEv8
zP(|58G2mhveap(>M6q(sPpGnicHDpDT9Q;?G`WY^0f6rsR8mQy^vbiJK{=5pTqeLk
zqy*Hvd&8TfUYbqtc4_<8H=xTXkWenFB1F}qI4{dLjF-gan^?}&<G<Mx?G?6!!8s~L
zyh90hG}AqHzcdc37}Rrc90*TgP(~(MON6IdYqT=0(Jxg?ulK4mTgx-dz;etKZYW9!
z^ma55NDxtfvuxL6H-E;=r(r4k7?*o+JsTM>!pFH?<F_nU<7NXOj$2L)PF%3xoXhwP
zKvz;bqWmFW=p?2DK*4%?G0#%L%(Yc6kJVcda*RzQru(!1ky=bmBTY0tM4L*C9{SBn
zRw0zW*<$(lD%9xPvhQxB`-WSrdVP#>?vK>Px{(74K5pEQ#cS~e<K)H3OOj$yLM2nD
zscqNUQ=DPwJa}*RqS%vCDZv*(v()Lir<Q~Lt$*k2W_Nr-bs4lK@b&OXChVyRmk}qG
zvwdNecryWlXnM*VB%Bjx=j+tKa2%Uj5eBE<kDScC>We+<C{h;AFzp^TybAs1dfzMY
zf2k-%BDs2RlUBXeQJ&`@5Ud1)3SeGquqtPX?V(cZz=*rI5Lq-J{8HF_tpkc`)1Q8?
z<Q|Qu9riry^Ejwe->1F==(cVI!*^Dm*;|uC$rW@UCnM_qeO<=(lVp{L6>h;Zf#;B9
zH71T~OCeg()*$Tv3g#TfQ9rKX?6y}gl74{A)bwz1y2xoBY=CAhMi@$0X_mJFz^`)t
z4Py%TX(zh875N!=G2=1zij;%ESR+_|%N^r~YI6&p<k9nZKGiFvzB^~0H}vUAW>D6m
J_ai3C{{k*I^vVDL

literal 25512
zcmbrlQ;;a#x@}vwZF`n&+qUhhS+;H4wr$(CZM$mT`R}!3?GrcFxpCv1x6HT993w`2
zt+$@|kq{8qf2y?sfQ=2D3}`JK?Q8+Ay)EoE#amupzn})t(c4_f5;TUl{rof8J;|?0
zTo}_~uz*C8jW<xn<C0Rl&i?$U#uo^$2r9IYOe&HF;srO`&1zg^DgC)kFTgQ&W#D92
zgaeCrz02}ya|wiefB199cgOb)C~*xd=SipkwD8Bkd&~#)v?Ei~-6eq-Cr>M(oGV6<
zFA|9l$60=(o>LxFR&BYnLg_@NP~u?PYE-XFKf#pZJotwF7947e`LP?NJ=~RnMs+;J
z)K-;7Pa;D)qDR-qzM!+wF1L5XZaH(@6<fELg|kpYrEO@9CL;>WJ@MwO`+NUjba*{D
zQ&&zm+NXTiu6G40F3X}?MMS+SC-P{rVdz$lu_UB`PQdlb1KlUg!-zR1fop+SA8@i>
z27Jw<7<(D1wVOiJ;Fj?sQ4>CI;-oWL=eFW9)NLXF;8-b<)Xl=`{ig<<i~k-Jt8fU`
zW7s$&8$RRx<8*m-GUoC6#ze07i~Y&AYy@s%*i(mE_jGY`cAMZ~%Wo!))HZEIA>nze
zpFqH3#~q-$CgM*3v6#}b<)5FN@1IQFXuO<fXl<<7BujQOW-81F8OBX`biSXguI_6L
zy&k8YtZz<WkB5un;Z$I%KP0ykxKIIQoLzxdNku*=2f`59X3A!kn~dIPEkoeruWQ~X
zB8Tk!8uO5rcEvw-OOJ!Pe`?lrEu9~7R;|*5FlX{tdk&OlZzeQ!0dOt9!605qcBS~&
z7UsnI_4iC^wHP{Hco^flDwUUqZ*J#_fkG^xGe1}a+QLF-;SZt$yl#?>@-u%aN?2tL
zmH6nsrPnF;W29O8WI$bx5qasJmJigInlp<UtTcJ~>2{A@9^d82)|YHZD789M{h5Q0
zpftqJ|7~=(TOd#ydrBsPS?W@@csMmKdP{acPPp$hN)M}5>?!PLhg5Qd@Vq5~W)OE_
z@`JH|$QJWEACAYcMOR1-Haeu10`swC2q10(Q;avqL02_<Cc{uNtdxWgwhJkvW?tk@
zI?8i(Y>?EQG%Y*eZF_}fxg?Z5xPE6XnuFBOsNz5=MYnC-uW?p#V0NyF{eIN;z!4IU
zFl;qQQc+5UI@R-+<h>A-Q<~4oI}!?b&#A+F!$KRCbyj8qTMezXHoZc!iyGtENT7PQ
z=f~3$c_=h@QIZ>R98Gr`ghfilCd&r_*&%iPuewP8CJM|q!W$3v3lRhR(epn^M{@{%
zQu<zdBq-Vh<oQ_;4B^;s<>)%d8$xSlGxKlJXUT=;B&AWF*B}0y@E1q3AT1`B2pBME
zaLCHDmgk&vI5KQFVCoJTiop=0zolVQ?Ez3+9v(cVUKqvp()?)4?XJN6a}PTKVK#yK
zi~-X^5zxc-5Nawmd{r84CYfo*aH_aJNrvq;$L%mH0!J$^qE87s#p5#ZB_nhCD9I9<
z{>alfz}fpE!O>%Hcj9R80|h0XWUXPI9~a3eHn?9d!)y~AFEgET!UGUgF%0e`N*|^#
zJptO`9qS}z4=cRzo#y_aD?QFg@hQ#72UIHd_#!3sitZB-neFW{|Lz8$Bv%Mne*_{D
z7AdRwMmEomJv9SYzTuSqCfzb2oUko8l5|R-ZJ<UgI+l)O>&F?&p4lU5gf~qX^`=68
z;XS}T@*Cq#lerm|2*Uh8Npyt6nw|ADV(o`4kmCdCD7T1n^?0aa7zlVxsx)(;f0IY#
zPoH|?7@8}x2r*^cQcQQ<X|iFfL0q4vkuzEp_ys>qzN#cUn}iSTLMFtokh1-(x|Awu
zBjqH~wtb+__<%X|QJGV^CWAwSCD*pKVePJecyR<3s!h`8v?=w){)?4b$)Nv&KLcu7
z9oJTJ=3*}?<y1Co8=Q5XRQc4EH&f-NP~xOE0;P|>P9H>hk<nlM$By#I$Q0ysgh<^^
zTb}#NEG0yP38f^-0a_{onR`EY;nI&{iL+uyA=)ty|9l2<u2Wt7kH#X=l;jcwGiInQ
zW=j5Q(FYM%N<jf|{zLUtGP5b+QkU^Lzlrv+w$YYJhjQ`?)#bk7{3q7(icv-3RcHCF
z3UW!~&Z<*TNZ;Ahr*~x`JoDP`kCJW7jkH1xEbrCDPw=S?)Q&MlX!Z2RNQzVRQ;+fu
z>7julR?WJNos8O2N4RBTecW@^RS-)Xp3SnU3MIyDWPg{0?BJ>A8n=&MY$fM2{RqI@
zc}JRUrBtgNjNIL+_F*K5yP=329^Grxcl8j%obj0DM~%|p6eQumw0bV`%mMJ{%DpRs
zt%AbgJM@$*N<$@&T9vLMYXcO&4<k<|(BYNUJMrz=U)cvB9NDmWDmTUwC$r}QZjv84
zT!dVcTqDT2N8Ny-m;oir<xz^LKr!w#oI0RvAM~t49~jfNp6qkOb08-xKte3ebH3g)
z-$i{5oB*mz!Y3)1Wfw(;poSZV&>WNEnEWhGyv@#Y8W$5PAqx<9T+Tmc2HDknECT?A
zg4#Z^0`X4n-#zf~+UgwpwL6&s*Paqid9(Mz%hd768YKS2Xr-*rze7$!6&IO%LM2;D
z25Q=jJl`)$(!g{+yXoMFLO#&1qq@{j@eAJ?@~X{WVKBi9xJTB(Dm5<E5LeAc;e{ou
zJX&oRm*<E620y-Avf4VZLGnCHsS^mJb3%zy_3Y0kI3UqQcc)W<%=#Fl=)x95z9Bei
zUe%y3@z3IW^i+dDwx*VU!?XKCqqc3l_h>%lkjxz<_h>||jfSP6s+VTM&^tpFx>XU2
z@e{zHXFClVyVED<&~$isSinG=#k4aF7+=A*x`8VBL9uUMv$A4HZ@*sH(y}tf(*F#0
z%JcxfbD|kp`!&sy(t)#Lp;FC)zevG<)WUcYpA8zxZI?O<knH*+<r)f&bx_C!u@KUZ
z$yyTe(YB<kCkBp1PATJ_SqySJ5^ULuTPfb_<s9ujTks2ICo?Sq(_ar-IMyURpYUXd
z9MYH0V;%!KeaqXIUa~-9>vStK0o0*3QfY)tN7Re=iQsOOS8XWmx1qIU5)A$M{wrbj
zlajETi0#ERsN~wWcr76V_<<HK^O&Si7n<R5Fc;F4G%)tejn*t|tqx%Kw)m&NpQ&}h
z{iJ{%KOWn>$J1H0)!pw+w&zhRK1yjiyz=KPZIGt^JL>l03em7@Hro>&`=jJwLxkNi
z6Ec5$#5lf-;wSMlG^t{s$+8HfcqS#mrz#ies*1DeDG_t*<#URZf~EJS$B@0yd*Qmx
z3^0P6r;j%@*UU!1@A<G_^R`uT2i;#$KP<f{nqCsc>yJ_u>)+bjSRN_b^%&*aGqPHl
zs5gl4L1sm4zI>jdWW~i+K)YR^VZMKym%1N5ZO>l%;yqAmR{{-CUHjTW4Q!N@In`XU
zU!>X1j|b&3z;+ns{1`ad)Cfl;7B>bY5R@5{vI}aQB7dDXKBDW*>h&h9Rt{V)ztljy
z^0+E>F4C~8-ksz9qKHlAR@HK;8i8;`(8Z7Z!WHBYINo!5kh&xnA3=+iz!P>yz`rDT
z5p3NqmwMS-QaCmC8KB62@fW+=%%z)|+3Eduyr-;O>2TDt1GGwRKVM!7p>X#oo5c<u
zau0vB;<N6)bQYskAD$nl`OPlc7L~gu{oEKlW7N2-5~=U6^eH&{XgSPMeF?Tb`S{(>
z;z^a2ib==5w^m`peR`5zlX(rWnBVQ#7)dh0*ySc2ZHRp=y89Z<SqI&jMzA%`>}gJ(
zU&8@3YCH0bLN9yU+yg|gqpp++R+2d^%=GK<tU@MKEX|Y#*8)~%F)HMRb+4}%v)1d}
zMDNHuF7;b7yHaC!I}p(mUUS0?3a7n5zwf<jX^L~QTax2vVO>4cU|Pe=-!=5tsm7nX
zPW|Ps7|rK_CF#+U&U@)6x(Vu(!?gA!qeq}tQ-hQC!JOu_pBM%!ca<&Xc}1-mC*}r!
zr<3$a?qLt6mLP4t!9W5Ba2|C0gn@Fubvr-lvK19VT{P%M+7LI=Hlt%t-iObDSC1l9
zj9TK+eZ(>pTPPjk%Acs^7&O`QZuSUs)f@dF!5~s+TFi_)!)1~)q+8n^6_4RpT=M~e
z7zFa2fj}%|@Hh&PUWS8UH#hl28D&-R<=fpXQfpar<h#6=A!=3G^3`^q*)u&w#+q3{
zXpPnVu@2PmTaDs@(8<p3>v&hlU+H;7ijv-;Q$)wgJS*myk*!j}451JoP*rLt^1gnl
zU%l?XX-c|Lut-S5<aGrMJp)Pd3+EKQt@l)aW$PqGB3^1a^|If=E>J0vI3i2yr~Fc6
z!^{|8$y<LaU$Z3*qMl<zbEKUkQ5~6}Ml*WILhYLBuUzEQTZBdNxxEs1Q1cqCgH<Uc
z6{iLrk|E8TID>n@Ji!eo!=NRv#(h;gK@)ss7TRQwqfu!8eIl|sWK2fU3KZ3*3zBT~
zcZ%q@3IVHs-fZ$!KO1xHXXMgZ%mC*t2Cn7v=KbS(d-e77tMT66_nR=D2UI^?1Ld}Y
zT;8zxhTIuXggYY08S?T###k#lvpeQOYTFPE`YsH^?y{nMz3N6W>Rtp=$c$(~BC1v<
zSvGN+JoLVUlA%XB4nxk_WtD!%8g72<bZehgpuJcNtj|p(v=v3jT|scw2J%=0l!(I2
zd|N5dL8#%f5d`vB*~}Go0<a4{#ST?VS6F}<_amTM;#p9VJ%+TttBgOdRo_`j4tCQ2
zf;sjJ((nDs71Q3vM{VA`o6^ov^H~f$YZK?9=1`+}0ettY>rHz1Y>WFM8t%3_lc;1%
zKt!o}Q+9c#rJ1nq>^ck-E$~3<Yk312E2gdZcp6kDnoQ8yNC4K})*`h91&3I=gxyh%
zAKC~Jl8`|GW#xtB3N91_lRfq4EM+L2)Qu`nKg8f+T8~50qiY=7qYi0u^jUT>0W6lk
z6`)(^5-b*gGli-pTHX3ieAc_Ln|RLL!YjW0FkvJnV7+z&04VV$aBKn*%SkprnYajB
z*Z9a>&_hSn_^=ExdS=7=V6AR_Bb`k%<${{k@{qSlY2>z2F)qU)e~R84EHpig(Yqy^
z(&?3H7xrs6Ym5Z^fb~?DQku|!?+rIC$Ts7nklt6#a3_muf~2Y^Arv*kYLPo~oL3S7
z%E}sJ6jmVN%+Qh~JcUFv!Ca!?HA8q7<TjJbXbb$#`l+^)t~bF~hXdc|yUPI7t~^8C
z-*Nz<f^0?K;v>Kv*<<n<DcD)$`Z@oTb8J^h3UIF^XBsv4!LyFvOFkzaCD6a6*^ysv
zi{>Gx3trz{#z(a58hux&Rq@n)sE00c9oNH(t$_>d@}Sw!r?mP{F&vEeCt>6oUI(;b
zi5MG)nrXB)ykFJ#V8j|;b~DbJ-z#a*T!YnT_~h4BmQR6h$rZm%BcCuIp|Vq*-2KBd
zau(ZHikiIm1$B92(M$rT)J50kQaj48>Rr>1mqgBYs9RpRoo}yi2NX*`VmGPfp+qGa
zdV$;)Z59P}=tH<WW#lc0=GP_uuz8neoEW%a1%Mkw)o@no!W(@ISA_9{s?g#3G(UlY
zEHIQ^#;UM!2Ah#pC3-p5Lwe;*N-LA9m>PkM(K1J_5<tK8xedu$y{BSKywDy%_q*>%
zQzpQ9;VL*kW-cOQmo(2}u})uqvcZY!_n%>UoYI!yHtCs}a)OtBVL?SRg<2Bll%@3R
ziho{Wwt<iILOUY%Zu?j*=tq2}anb+tHuJT2c3}r!5wsqf3W5x7HKmdOikxk*p)#}R
z{<@q-O#owr>Y5+(sjx<aB#~*l#guH+-~cKTXcEH^cpbH#y^k@?hA@o`0<&^?L;Czz
zq*OEqMr4V55^PyHrlyi-<Qk3#DAqd8*hr3E-w8mrox?Z6FZu0)Y*)3uQ~IqVBHmF0
z_QGTh|Ba`&m8nyJ?JCftM9r{uwesLN5KSa=4;K>u6p#!}V2M2ZZ2nZiqt`v?uNN+y
z>}T?kSU%qpK5tx(1sNl76hyjKN-q$1sEE>ty{=$dWxB98bP>cZe9|z*p+nlCFHjIa
zAe)e3dh<3yjs=Y+Qbw^QWSnC>^Wg}4B7%F!*t93}3XxvQAq4#CI+jIq+tf&Y92i5q
zN{cWqGLLoX8fV>`@!Dsmk5m$>Oady@AstGMcgMGPk>si_=3Aedl&U1?;E3Q1Jik+?
zmIu(;3PVqh0bvZqR`Z7EUqvM3m8*N`Mg-H-|CNWpSrB_eb{J8=yb)$J1iz~`_#Lm6
z09$8AC#IyfT_4vX=!kwdt&v#wY_2`mbohjoQd7`h_yz4+!M%hWKnES`A{Eoq8MyG8
zpIqju>Cth`w05TQd_Nq{b>?GP;l|jm>pOYTvg-ZKH=Kdu+)9)O%XPjKW>a^(yc|ET
zhw;zXi#=aZ;X+qp>AyaX{U+!hsM8;=gJjLo92F}!6MF14JhY(jW}gav<K$JH4FNIm
zQ;Q{mG?B^B$is3pbusa`5f9@ctttD(j<9iItNeO5%LghJ&lUwQMrNx>-lvk^cr&5)
zQb<6v%hXG1f>{wJq$mlq2?C1|(FA!h83EM<!3D@;m|a9V$_y&!66SGD5Wy(+P_bM`
z?84E+EiuJza<K=ERpE@%St7a)ys3-5tr7j!FC#n5Zt5c(oZ}A^0+XxN%m0E=K!$d7
zZ}5~EBN?ngoBSIdKz;#I`A4U6snj~|H!QHzaoWwZvys|$iPY)-2&-)9jOSs)8#>=u
zENgf>wDk!|hO-HBnIzQ+s_)7ga?U7rLf&@s(?uls<D<d%i2X0gL7ujoeqFxTZUUs_
z%v=5fGQ-^>(VJQ9-E3CjJ@))Bv3YS>%>BxpmI{lG5z*EC?hBi>j^aizRU5tM8s`LW
z)fVBswB!O<eRg%QVy<ydHWiJVV`Y&imkKzQ<$9aWdv4{O-$iC75#c1)e9Dnoz+1UN
zz*AzcwBTysUE(Y5CI1ry*e`>zv^)X;*ut16Sa2g}^6pI+c11QcvQPY+el7l?D%o*A
zH=DpjYgQ=m`a?qD8$BQ(Jk!^2ao_={C|dyXcnT^U79p?mNj}GkKRXLow&k4mA=Nf1
zn6xcCo_t24W2`|fKABEn7r+t5mEA94ia#YB`>9NJ#q)?k%P}V4)1I{pacZ}Oc00JR
zY3H+p-3Td*;Qe8<t$MGwVc9gr0pB-G)rsL$HkK=G`hfzZG{|naIoI;;eoDhNJwe`(
zs+BWbVx)=}E>}~Ul|#vgb|n?!RY2W&SzSh#ypeL2VBa|0Z+yh$_N>MO|Egge{D;0l
zF?wpp%SX5tj|mkm3hvQkB5HoW<R}VG*24WFXv~{`fMeMS;&I&?SGs^m9wolW&r;*$
zO2tI=%g&daNY&eL1SXiWcyqwv07T9$|1qNy=--eJz{#?F)CF=3EWhD(0OaIiXzxI<
z)ScX(FhU)ak_v-c#xu?9o$Y_FsG?d~C1!A~q!n8p(QsSRqqbOy_P>Gq+<(D+Rf03N
z$~2e)OQ1|e#&5l@UpXHW(H0es^h5k?ofmsK723yR_D^`H{#V*=_@YN=&xUNoqGX2A
zV^Q)Cm?gj{2}6LXzqlx{`a_$PW9e3^5CjU?q$8eD7|y>|E_4uE=q0z(jD#At_=B52
z0YmL#iKFOUdEy@@nA^7?Y0h*xaz)gA=Y@C}cKm>N{1mBBK+7co!Mwn-YXUOA&^PnD
zV940I4>&NDhOLp`2gl#o9;1H-%mFlIkW&@Rvq~bvUT>zD>xXejk6`pO+;=rPPOqAd
zECbAgT5)GTtVK=@rrOPQm09}z2nDrm;AZ^{G6sOrU1-y^Qpo@^ckZ`Jk+}hz?ScER
zxLT<j3m=hFP^l#5Ur;KRlE8{LqAm|h!|~n@Tz_Mbjtv^Ctqn5*BX&i;Yl}1*O>u)9
z;|{P&Pb+rD)bTnVO5C5PZ(q>L!16?KQG}N29-`SLt_igU!3uii7wR`{L|%g+lHYfX
zd6tXsE#ZsqZ?k9EgEQ22&lobm9(|?nb_%BH8~G2McICEMJ16?jdT&~nOX3ZbzB8cF
zLVHtJ(o8j^>6s-9*)EI0`1YsKwW8UA0rQQ|$Hc})j<ng&xUGT-SL|q8sZpF41{Jny
zYDM<<nZ#~vXcDJ_tYT-)j^VpyTG8}8u&t_JIH;GZG_QC`7Xrk0PN?fot~QN5y12v0
zyC3#CxwhpI@^%Cg*ra6|7*&+TN?kuYJLUaOSV(Hski4_iE_2zek9e9?TU~pl?hxGX
z4lhqbd~4=^QcuCeGQ9ClxO*)?kFJj!_vLj=5>9NJZD%2cKGJpk+IuLP44Vzb1Nm7y
z?QPa@`2Qevu!BvU|1(mD`G?dGcnmjm-BPv`RfvaPu-P7I*&ikZ8N%!i7!&#1Aja^Y
z6+K9tB8wIMb(BTI$I>YYJyf~KR8^+BQPoF7y-=hSF1$9}h3*F3h}LXmfDz<8yuBhj
zr`P>{%!iWA*;dH!b$vwtSYG<_)0Q)59{S3&h2)T`U5QYoHda1J?`gT>-{1DeRM0|+
z#AU`TW4`{%ffBn=_)>>+g!N$<s;g_!ddohH4R<m5i{?-A7)Uz|`ikM%@;f;pi3DZF
z6rNH#K<KG!W~X#LIlVrlbjHEx4cFf2H=c^6E)}uv2psT%eEo&3d+v_zYexo~0fQ}X
z&7GyLPbr@La{u5sn>&JM{^rdRsi*x#nIj{gL6ZGfAMwleEV`N5?e0(eTat>^c6;@z
z-~-{M+OCEi{GZHG;(9&9KP|X@jAb{-+*Vy~eGls6M$NFJl3w;XdjeW(9PUp?^P3rk
zYCX!YAn;hX@jUKTNA(*aMk4rGxE;BMqr~ue+<sPke!jZ3TwdE$a0)lE{lABe4THl1
z%xr}K;@590^vVbt)(g&zmOU!J*NubfJ-Oq|4*&3+p3neavG*C~NOj5ueUKw+_>k6b
z=g)+Lj@*`kor#w{_W;#3?A^rFa5`x{r&V_N%k2mSbk-7tY?=Z!j`LfI?0|!6T4Cx<
z*5_$%Dr+y946@-ysT-{=NXQ{f6GMSz%}P$U+Py#=J&ssgPf<*3SP#4Z1@?BozrbEj
zh0J3qKqoz2!4sF^dYFEumt;pm&N{1DUyUZ*f@GQ_W>eoc5KTXlb*y4wE3Vgm%q>QY
zE^d}1B2&n2H<BNPZGS=#wk0q-99ncoZT5mqfL!6~48gqF<Y$9<P`n41g8wIE7t`ko
z+cNxK&|zQ)0Ci<o4;5^zT(r5|r3pfMC9*IKGK5c%P||BgV|d79pdNZy`31?&E=Rzb
z^am4x@0m$3E6o$$Qu^!2-hiA%w2R&s-f{tfb)A3ZFS@_U=;WKc1#Tces&ka<o__EY
z`bvzq@j|~QIsZc1ZIld#Pj&U&B)&z`WfTx;n)-lC7m@mwGpU^yM6*kUI-EgzLVcs3
z%KrhNd-uiXHfxmjq;!&!Kp^Z67<#d#9I!`}dan1^sdjQvpcSpMoBuxOV+*U4j-QgD
z_t&Ti+oN=xy8=+MZbcGAOFR7^Za;j>K%M$Gx6jYA$2KJTS;rV)SBOeUsKbP1O7bTw
z;2kkdaUsdjYs+eKz0^+81l?GKw8R272_KK7quU^>b|!oVh-m9QOw<EYz3#CH1+IZx
zZtzh%A9d=dXV+Lv1LrRIujcaR{^@je@%czzcWdkYiG#=msvDw?a9u_=uh)D{<cuZ4
z6B+0Ta=s^P(Bi&e7JF`al^8zaBkDQz7gCu#>5`)8do2hW?82bD&t9l!g6b{}xpiS8
zCcf_$Pk8Hreyd>%JwreAEHrUtc#n;`Eg95pXFlvaUjutQ2pW3b=*D{VdQ}Q^t>#$j
z4tgb$82F^^>$G99ec|k)I~G)>?kg1Rvb1a&*?M3T;HES<Lpmr$g;00<9yjW;Wrf!^
z^vWS&@Ij~FS;A)H(z}Oig`A+-X7n5E;#~wd7J<|$ou(&AQj(vU>nH^~4q0lMMf!W2
zz0E=ae#ficqhjrTpOkz)XL=#SR$3HvsE#xl2?gQ-{bKoEZona*X_rWnhAx3L<q9}e
z{aLYs9uh%~wl`lZXOq+IyZB5g&*JXQS<OFG$M=4z)V4Qo7Jl!ZF!ZL==XThGK^H@)
zIQ3<;o2^+Qbo&76TAETVX`ib~z!+~rc2@4+`SR57{nF|6;&Ah84ns`9L#gQ^7LH>F
zC8@T*QL-5RrHuW%O9u}%iym+>l?R?G<)A}nc=hFXCG<dFPjO?PQ7;-qo=2GKRh=FC
zK}yQ&DjSPtr1I;^DhB%QXWK<AVu@l_`>(uUNC|*^VCnkZw?z9dd_&_s_U(MFhYhxV
zrTFtG1ICB&G4UOSp`E2)P&{=z7MhF)0CO}UJ*&iU0B7p_Uc6{xIC-Z%40{0jff3YU
zY<;L!L-SxDje3z{`U~C&!I*wv*-99u01g<7BNV`7*i0rY0$|K}H0VZo293>;bov?<
zjqGKUQ{J_rgeA3Qs+8i_E_G9JdF*#QssFF^;WZy_$Y!QckRdqed(TxLsl(zTR`4J|
z&q5Z}1W8qId=P5B*<vJ#*O&H9KZyWkWsP1IgFvDnvONA@@dIi2jujFQa+lpr)NlO0
z#`)fxo-fHC=VPz8=f@D#u3}5W>WXj{VGnj(UWV?WC2}OJWtj%Avbj%73RYAl`K_6S
zE%>5azRNE7z<^6L?;JP&0Z&FAPMI{}_o3fmF7baqTX`d=%yd=Kq(2ohjSXVv;T-gb
zKJTb1rV%J&u8<npi9?miA#P3dG=rby?0v^NPPOSS5h`M1t(-0*AtghrQUa2cq_$~d
zlDgsnxk$K_#=L9v?Dwr*s2*SU^D<lOOX|^RD4|$J%0~!!soh#ZDvIVMw)AL4h(hly
zal-2oTi76!9Zllm)FFM2Pr|SUbR_T^0>eO5!ng)xqL7^1qY(6D1AAq!l0Vw^A-E&E
zw0g4$Ow35vW?cm~YGgQIlPMUuWiwUVSM(Ayw}4DwQGXV#1QxZ$9d~9?e*zdEDwg&{
zD4(xS;CQG1<MT<?Y1jKw@6=7ftzJ=#0k{*4){BP-G%hgYJ6I*T>&|@f!S=S=tUR>H
zi*Oo_K1*)`1O`ikvD3=n8UI?s{QT25<FU1=)6lF1jj5A4T<^OmD7|R>FH`4@o^uEp
z9W9Pg;B<5f^m=YMqlFHl6mU!aVqy@RJpnOT^%PRK-&U#1@Xw5mo=+;}_(2{~>+<i5
z+)8{~`2=CMcxAqEO&Uuy5}BknIcAAX8Ve_kpNoal#o`v<tc$I=OXF&8ufOkZPA^jn
z<$)KT48WI=a&t8y!ic;WZUE$H`l08&^sWOjtkov>&g8!;?jES&j0i;ElNj&MNkbcR
ztk9&)#Qn~4KqK&VbP;2XHppxm$<xR)-TU)cl~yL$adnJfVlSs+ECAM?-kv3=xtvcR
zKc}@^En8$f*CN<)0W2g$#xCijCJWPD1(6pHwH~J<4cKL6WRDp+xJv!jz(2tyvPHTR
zmNXR2S}Okuo46-`lFA$@c?Vom^$<UZIc8<SZ+h)^{_sk9`ii3t(UuY9Xf}l&EW;Lh
zWcF1Ms2Tv&Q<9C+t75K32=HB`h%j<2T3eYq-~_rq3*Rji6T-bU6QO~tgEi8CEP@as
z2UoHxb+k23jx+(0J(BUDE>0}LRF`)z?{t(g+vpAbjcM=&ZwOa%J4ANHs{CgCwH)^g
z06p73Q@|fN_}ToQ2I4fs7$uO*CGtr9Ym!s{<}_zE<a5Oc?>uinz29(RX5ZoWhqJlo
za(ZGhFkJ1>5n-hmU;~O)vEcVy9d{aCHoiDU!K!)F0<D;}Oyi$b!LJ5_(9n<7nUC&*
zFS(vaK~T7rHul#mrnytV@v$dCPz-K%X`}Ph&1BUM?l|Q^ZUK@I5`i2#3C!vXdyN0u
zthj$SYZ$(6wh3TY`}fAXvqP!(w~PBL53?~vn9dv%cegykd*eum<~GSSSH@|tUDddZ
zPJLBeCxb;ci*xUQ`8TO=Bic_$Jr>Hko8UcJB8+Tv`ZDjnNt%-!tKG_ZUADS__;q#t
zMU$VTnGRcG;f4H%_Ek}Vz{20Wk%T6t$t^`@!B8SH7mbECcvxZg;fH-bpfNS^^0shs
zuKQ>8byab{4j3wwZWHCG|CJu-w=x_LoBkVO`~v?_h4S94f)%CjV_(Fmc$fwxgoPtj
zNH+ah7%Pd`#;<fJMiC)4am2)O+|7PCA%2^oCs8Guj8lWM7}K?kW9HULPy#rR^B7Q-
z3R=RddpE`Qr9}rhpYq)KUJ{9Q5Q*}=Ysv75$sLPYNoDHS*LTB$0Ve*#x#T}qc(pf9
zH2SI|mof5ipvl+%f1@Q*rmpf5xS|eQjtWbcrXFBUw?;V57}hzioc)Rpj-c=UzN#98
zb=~R~Nrmp{kD8mZIwp(_OR?1t%Tha!x<Ig&Q$aCjYux3RNvDL<_@v5mr4jmC_TAp8
z5cQM?A}FCs8Gr_fb+S1YrgGt-(E|X=pa>31{qoFOH@563hVGuq7-M>gtt#_TCuvl5
z)SC}|99S|yLrbGhMxM*$oH#G_g}Vlc7+LVvmUX7*Q0l$#Vy=(yMGkj^t}6_3x*aFo
ziaV3jV<|0PN5jk7-LARRkod6q-_PVeajoE2YI!aqg2uGyg|9k3FIz_=@R#Lk>I0$z
z3N6r`mORZ@v;SR7cwS<+ZzM!35q4H{1>UjqP~%D?eZ2Efvd$`BRa6z&^p^=Yptf0s
zVI5tWcj;rEU2yrE7q-&atXeNCRD0-DnjRi0@`V@okYlUOwFkH;?-dAFmtS!e<4aFd
z)~vo#fYl9{ANNTC{2B9i7OgC5goc<h^Z~ZaJg&9n?P>phIf#9_THyJF3KhB(!|?fb
z7&60%ou~s&<JNl~d0T}b{mVUFlrd9&I*W>=Vl6y48a~5hdqd1Z!5vT)FE|OPo)uMV
z-3+a3gqfoo1>2g>(r-yrG0Q0(^1xw7Cz3M(=On+<NE4yHb6E7Yzd?E*J!WV0ym)-S
zBNi><u?m(?v{bidKbeG(cqz-|3q|Iv%fUk3Wa#$s<1J}?M8y~AB?g0-r<839Ke&^N
z3=%?6$73Z2Q#^5G6r0E;<~{N^W4uTcyd)k}PO9SRCY6g>wG(PfWqMA8!xs`+m5S|r
zd)T==|Gdc28f-8q5-P5%i~*!ycT7j4c##|<D8NDZor@o57vX4$a%3RNK=E)%jZdVl
z{v#AfNi;LyD&=6r3rNFPnB9NbW)&&gx}GPlH47+GOVkIUNU>#K91bQJN<^^8>|ile
z5*|bp8E}aVPLxKI4kw^U3D+}oZ}V#ki$^ruphUjXb{5HTiR5BY#{DxfK!&G)=2M{t
zCYak`&sze^4O5ViZYoHQ__B*AGD%DaEls)bvs{G~nI>e&B({cR(D=YfDmGo0nBUf3
z_N#IFe*M%-L>O}>5ZS<s5S12dwdFmICl~<urPhDwcaunYilvOPmWxuAscK17CgU<T
zQiR>?>vsC=y##syNFuMLR9nh7rl%_Xci{+Tdk!?;&?<feXLQLP5_}1dFGEhtITDo+
z>&$>Tl#}(^vimu@VL^Vh&)nSdy)+vaTYb8g%jhKu656%4Y*da&^Ij4NOh~6N@H?Ed
z0+3Txs=F4T>gu<#m>O<JwTCjs_8jxJrMca{r^r*jO%!2OW4t5!FoLOpfdGQRnR$!l
z9HBRdcm2IYo<q1HB=!`v(17_si4cB`$b67<wEL)q$}P!eib(I$4vriKMhX>JW(q^F
zGpe9`WpHFi>Z%deZ!tW(QcwW~WN9qI{eHhkcikwM=B>(<3PwPVOOExmy9`k0im_cM
zTyWPmK;60WXP19S@mXXra!U3BlxXsHXGKWBs>LRqOi252DiP&&|AH5s${ks&xb=qH
zF{*AZE_O}53)A7GK!LH4DOP7duThY6a>@NZDBJ(Ply5E=b;cbl8bM=;D`czxyWwC^
zh+9uPaYW+SucDXX>~y(gT3xX&O(A^bJwVCsq1aM#pg4M-<|u_IL0wrHmUi6XB;5V>
zu)?tLiPI2U``1jzBL>uQQdz8UB&YCKdaOHsD!Y<&gFZ!~fvfX~O)Iw~Lt%yic)KbK
zK#8&p2AW2mE(xJEW8hx<KPN+11JRiVv{dVBF5~Wg&NaJCAFE_6&hUzkJhoK^Yt005
zvm%kHzZRXJ@zhpH?etnCR#mFl^`=2#xP6vYP2_`h<{X>7G89=@uvL#ALq!<XKY}H{
zA$uY~r%uq@>WkWdVB@{erM`+<yiO{xdfM{SlX)FMRlKKbEn8LO0ku{)sLC|?TtKg?
z-LIgG8bz$q+48aj5Hw#7*jij~-p4)C8-SY|@8eF%gKyPmLMC!g)*lmHDIf|mv9vnA
zJ`)obB05MZtBaZv7F17k6*p+|n~GQZK5R<t_{tM&?`{tFwr5xA#PY$|J4!=&3G1EZ
z#4zft2BUjk-u4@pQdLTXE+(;_Ofo7g<$HkZ`92t>T4DVBYp_-d)@2@ZEbC?NFE~;3
zCbkECB1(#!ZFLG^X-OJ;6isn4<h=mfiEOu<Fyp1^&9zEXJ6Wx*Ot?E^f|EpBwwVE}
zJ0Nr^FK4jyZGR};rd!Hg*MqpZ@^UXw9j`Z5=&$F3{#vCkv@QeonS<6nS6K#CxjolC
zzz7C|oCeZlzG<f6H3|U=uRLAp1kJyytUS3$H9>RcOG@$ctf*xPzVAPbUsutl(syMS
z8O%mP<(QSyp-WLLmLoX&7Yp&ecFaZ{Ch8%!%G;-CAmKX>(`g3$22zuamoVq0H}#~Q
zywfdsF59d_F@e7hR{TxqBdIZ%hon^&+n$r%Ie_#vnLky{*8Kma&DdQu@zkAayGcgj
zo=ClM&>OEXD$Oh7QR}YabQeUZI|u3CD;;b=Sb2I_8n67?I%$m8i(RBGM@iaEF5-_~
zc!5)nTHa{KZ8)40wjNlFcLV9}HgD~nR&p`;e!kLwo}7=i#9`MtnT=y{)TAxPa^ga!
z=>33=rR%%r<JLLlX_jk-FM7<p#yu-$hHze1IQ^JAed+UONU(bqPh*=$!8`?f@MWf{
zqd;0<7H5RJH0w`C4P$UQ(WZa#tsM*LrRc4uwHa1+%#Wyd8TjZlF7Z57Y=J+gk(B>M
zj07r)3X<}KB3@1j8dSjlG_&=Hqpoo(>oabpDW=1f16e8hr)Qj-KU_C-|Gi4FQ06gB
z^-g`y>8K6iFV&hX&wSD$a*phdV1G(bL;rLeTO<EvxRUyC0T3ebYW!%63%3~#{&*RO
z2#7abIS53R?Ys@sSs`@J-=4@xFQNIKolvBbpemtBYOxKsplJyr>OJ{+C=5NLD_heW
zD=YN+p|`6irL)HAWZ*j{ZzyTPSwveUfo>WvMpjH~ZRce0R)*PP%jKoBwq$^0S6r!k
z&o28A1k(p&mOO(~vf^b@4H&{&o2><oz}bg_{cuY#TVoMJ7~|Oysm(P<Q`eUb%!#&!
z^EuN-Z~cX*1#Y_OX+0*4j@EeVG#ES5ZN<My|7!aeo8K^X%P~9yA{ZoWN!znc5|3P7
zbP}{AY+Ez8W_G-~+L=bY0cJ)2bbLPidS6X`++USD=W0hYNspo}Q7#dpn#4*n=`iKc
zT&~onnsm|9P<@ltw9mgSLO_Y=*<Ez87V`R{!k;M+LXv;o#6I17z3}k-uJ><^`0ZPv
zi#LU>1%I*%XiSn8x@)u8^;+2OzUHSJ>&$eSp@Qt+-qoQT%_Fe<cXhjX|7UesC1{cX
zdaS%|e0{mTKF+Iad)k|ON%(kSUdh^edK8}j3YLGKtfDt#Ne?WjSw39xyZQ5iZn54^
zBikB}A}+euV|BcAw33Z4hE(I(qQ$v8nskRDL9Ldx(MUkn$-Mfj+|A4?Aj>>OC=^zY
zsTS^XKA^3tW64M2I<=@Qp}_Xlk5nWX<+)sbNfGq!@susC3!7cfZpLFKQ|^26iuR+2
zEhYh5#mC#jc$021eu6Ga-UR)!Gjv>(6`+}8b2*Q?+KgCijK(qs%zgTQ*L0^AnxY#4
z2+7>1ypm&tBNqHXavDvW`XI~*Kt4yT`<K`K-s5N;vZ0GmSnG`Xu&4)J_iC-b)N%es
zn6*JT^2iOO?guYUxwV6$KDV*>Pg0j74^libI?ZefiB0;DV%!7u3UH3-Vw#rSfmx;c
zB{sI?-SX+K3i)EUpIm0qUzf#lM#GAE6M+qXcgx4~Ud+SgJjXkDF#nktrq_of?*YB)
z?QfI)ETnfe-xTtdLu_~D@FpYw5<OBO6>A~<bpISfR(;%f1i_KqD0&oRkc13#3Zly#
z2i&}ZLzf?Cc&Yg)$MS0q2s6|m2MofsNZukq#(e}}5am;z84Bv%jL=oPC}D*?9NVP*
zoGB9;!3N_YIE&F+Y~u@s>yn6m$c!8xW)lL|IP%SMTK7SP>hG{I!7hwIlJjpD%;KrC
zlPA=;(RFDvYC9Q+4YNsYJT4Q;OC9Ovpkp+%T9M|k*^qKL;crlWpfsW)ukywjG8SP=
zSu%d}9F}|-aqM6xLg^!Jq4Q6Xyu^cuR$CQIEjZdy>0x9!I2xL)V&O&-Y}*Z?(oycV
z_T$LjKQzgsEUcswAz+vcO4~!n5FOY;f$?ro`*|&L;L9-X=AZs}D0V78rQC1%y5cO5
z6yQ8^!@W{nr)(=``okFxtX{-!2bAceq~Em+wFfVOobOEjHtQ8&8UVOtWjV_W&Uu&}
z`C3s;xr<2`NE|UnmTf_c{9|;rqt<keATb(;w7?i}K~&YoL+XP<VbH?%5Naydy%p;%
zCK*n*lUIo-gBGX`{*t=$m4N7;cny&t?eF<bAb>Lx8@^>|9N=wykl<;_S2}Pt_J9K$
zj<Qw!63M0iOKn`KI}ogWY;=-2r#>J5?nGfnWL*Qt<d5Uexi6~HZPydiF$`%N)$u2}
zz`GR+9FYSUoGkJxbesbcsk$x&fuM5G#Ri}M%DbD73;%J=;F8{e4qCw#nPiPH`8m;~
zp@8NLh&%F>z}7j8EaRs>8Ps+uqroj^C7458;8zMs??zZyn*aDa;HTy2R~MTpau&hK
z6LtxtpUEbx<3Fu&$u7ZP2lSX2Ze<Wdf0Z%DK?oqEH^@1=qsfls<g}D9tK;P0n$rx%
zW$a1x_?%pliEB6NbFtzkk`B^M3wv6W7g*g-#VI8#a%jj1GHoNP7GC#nX9rMmT15SZ
zYf_&q)X(Jdx;-c6<ZU?6(m|PV4&1DThc(E2F15JjB&^5vqg}8Ds;~-S21lL16ie>H
zi*?q_Mhn-DV3#7sf{g2QBTY{FUlas3vpH4Q>2EtgOdk}|B9gj6b<!E2l#>BCZx)>W
zW?k|Kv&q*Z9CNWwrx34@Lf^B%wvZPSi9zB_)Iy`6XIDopIotM5HAM{2`}k6XKxNBm
z*+*_hlCw_b75HWR{03D0i=(gGORp7>i-G^SG#-lkU#0P@dky<kWi?yI;#Hs0pv}Kc
z@Cp^S5{<Y(LNbp)hgW+<*40p^gX~oMH`0P}Oi_>!&-%Y-6U6XEJ?84rX%4)+I1;!v
z+IOBgh}^yM>W1L7XkW`;u}q32Vf{a1*|EOoUt(D-ERq-o-nDVQQL~2oAG7S1=fE4u
z9~#xuUG)mINYmpZOxZjcpj^ye>}3)CZ?|m9<Iy%NoTu!ZsZUXTM(F!v+B2_*;VfTi
zaljZIz37Bk{}HcY7|9_yhS}$I($nZPyKXVQ4>k{B$CYC+9WgVQ#`<Kb@Q+<4Oy_oK
z4ISpW3BbAQ3(kf<k*tI4D?yKYJqMA~Qb;Q^Quucl{JZII7yP+WGBCuM4DfEz%~a@s
z*6;_)J#7xMQ{9w6Gwq)yIJIekg1jz;&EOJs^CblSvX=E0JKLUm29^hgt2~@s_Xy1n
zS$(K&I2HIk=v=_JUF{%Y7<>4t$c|JsQt1yp)a}T85LcM{wKH0z1;Od;*AD6cNai5n
zPHD$@-|2kXF_k++?#ZYSA4Sq*)dl;cp-;A?$mHsOx4=UcFy!FBNW{2!d1<i@2RIJ5
z2@zo@Pc#P`tno>4NKZC2VZdlTmsVD=+8H`__Pj)Y`Zl$#?vs1lM-)>BIjbw0PmHiY
z!?d+Wxf>ew<4><2F!C0@jLvWD1%$kuz`126yR`pr-17D-cp*u~koOEKrv|}m#^H7%
z`Tx%rcs<M^cHUpN>}Aw%VR#h-!nD{I()hXJIB2EDZ^yRaLy(7=Y5wIfhaNX7(}c(4
zaf#)%^&<0qzab}2)psG&l#>|g*W!^&+N!(^QU5(M-31-f)gTXZu*o$|f<O!OAl99P
z2f1xnuB=a@ra<IiDjAlu922gB>L|ysq3g~WQB2{?d)-C&X26Yj)lvc&M&8ZaGrWCb
z&F{;6AlZa{ndnBxSLjQ#Z*Gi9HacJClgc7h!mY71vz|-Go7>IBqgTzg0Erqg>foEp
z=0S`a%Thf>EaBP#2eLqX&LBe^L2A<!Ob;W(lwA?;I*d|4L1#mdQwKZr1j(vvpF{CP
zCK2%Z*Z9I9&TbZN0WMX^tor(F>)!Hw17w+-o+*^(W0wwZ;|-EC|4nWs2Y6~2{0u6b
zFXz)etL8(2L8ME8X*SQ!IL}<QjXiPoGimLa8{w<`?JX#{DtobAH4)l@Q`msO)`77`
zGzUlS3N@UP_~~UrOH4KUOcy2}O7;OJ8GeHi2C_Q76n^k$DhP&g8D3r~;auC0Xh2JB
zyM&>p0}q!xN5YAu|DZyT*hZYJb9MobG0cHgz~PLR@7SuXM%l5b^IOw}6|}MO`)5vG
z>iGReKC6fjv$f=}1dl?QVXoglskdx@<u4cf`xC{g)3kpTEPErsTmua3!_@FOsGmHG
zidM5e4Y4P7+y^kD_CfzpTQ)WoUj6c3<VdFDV2BFv=S7fQATK>rPAA$?*pRmLj2n-R
zJh7-hJq?jd-A&`$6&m_mjILho*9oE}SnI;^Tb9>Nr0PX96PU2EP@BaptXZon5UR1o
zOA->-0p6t8F)kWy1iCOX+{4>Bq=XyI(&0QS|G5aC1G214B(dhv2@j9qLCy%RSngUu
zglUE%`+^K?>5bYq{qMpwBSz`BaJ(f?^fbVeiv{{!;yC0<Nl0kl<VhZGK%bPzII4b`
zFYd+VBDpuX8aD0uUGpL2Uz?KmYTU5b0I=H<ao&VACHUL+%#<&#@7<0fNamxL6f--a
z<Uq)*S#F%;vS=AO$IM%Qrd>@ZF>@6T%(!XDVQu_3#RRA><aT5Y2r%#<JegeFxr}dY
z{$P^kzCp;PJv3?uWjOnLMmF(|ax=^Jo}#zoZ*xrzgn9J0SChQYh7XP<n6NT0jHr<R
za*>toHQ$G9%WY$b*8)T70X`iA5aTrMaXvL0EZM_J8xZqLlhOS=54zI-5%KZYYKKK)
zfZDIzL({Mc+fp<ODe6kuq?}WfW(4mZP*3qqoU6%kK+}#_wfQYI(9)Jc=2IJlOc`;t
zM5K;PXfBfz1r8)d;6qZH0>)yz3T8Z7gbq<JRwdF)?o%soB_C`N0+)CLcoFyJkOm6X
zC>xS)rx-^r#=JEQD=!T*^Pm$$xfJFbz0C~heu~A0iHG!iZl8s3dFals7|AifQN&e-
zozAJzKJc&wnZyZflv;ga)kuzOsvUr2<uf3OLf6o0HD<@#1!^{o$E-QLi-un8?dwzv
z@rJG?(cE{cl+(y1CPNN?W=^gEdrIZiv|}TZ1nV=A0ef*osumqyWDjc7heU=ARf%lL
z<9G+sPl0*+nyf3o(2GfKzKLy0wenrFgZOs<N8f<A)89TS%v6#BPUJq?ltM<g1L%vB
z17+@lBJIs{1fty9=I6FG&E1Gc9XeXETlRKY7%f^#mtuulYfPFCIgfiJ>m-HUyl|^|
ziphD4MzjN!-TcImPKSsP=Du6`H|g!zjjPxQ6dIRY-o$sKB9^n%aJI_y6RuF<$=T-k
z?-s!<&h|m_Hn!-6teWC;PnkkhS;qw~>Bo_63w;8>W&fBGq3NaN2^-bm8x&{pj>cmr
zGr*x_tvuYZWNeM5m&M!XloA^G#7oB}kplXtK#~ZfobL-j$%Fx=l<=#VeteTBmF3+n
z6Mn*~S^J@S>n;A%H5F}|I6WzXT$3#>0ygU9vJ71bf?P65f?Yy_)fb>KPoyz3%vZQE
z8Wkog27S`F)NrIRSBSBGUV!&)GsvUHs86t?jPmjp5C_Pk;n8i72cH9YQ7L|o6Fb%Q
ze$BLM=fL)*#9M|mtqcnZ`c!>guPqt+T;oJ}9iS=L(BE60^6<@;Z(q%W?Mo@Q3|X6V
z4DTnbNHe5aOu?$ar!5m*A+H2oOO<xsVT9h8Dv`hdkDPBp9p+0rBbsbQQr+)Af*m&i
z+bQUINDGm%*a1#?98*gE@IcZ^UupWNi>VCefCz#oxCh|R^=Kr<(|JEy7jv)ZORx~u
z(+PRB0z7}(2<2U?mLJY(7`!nz(Ewn+A&okei*K1qxLPLQF(?>x3^|p|S<-BQuq#%m
z5ElVf48NhFqD@dP`usU@S?zWt&cZw-F0CuNomegIAG9o&U(wfP_R>0zR!AGr@m(Ji
zo<=(pyYI+8rYRO1D`AP-&()E}Q-vQkK8KnI9tl*R3zx~L1allm7VmcWYj9J)XoP))
z{u5^^!s_Tc8fHTU98e9^wY~Em_Y9<#PLo(HFHqw;hH@rGqTd#W(Y57?PPfo376lxi
zuqf)SLC_eW@LF>h89>`-^z7>6ee?)BPX=7DnlZK#bwyCjFk-^ac&UJpSi*^JBIxN$
ztdzN+biCJ`Hj1SY+v6<mdur0TDQiE7%SDJ0W#-`qE?peE^IkZV!T6$ACy~piccw)@
zf+%)q{hfG+kpZ1FG7Kd0ZCwE)tGu|nI%4_7EKA9jBO@qkp9wyG{2rf91+G}Y-(Cu_
zQwNc0Xj8v5d*sJFryLB*nXyb?E#c%!CL!Uv>o7W@swa{aKvJn$CER0MeoNMKIW;$h
z&vQ#|G!ZvZ`hJQQxh#Q7H<QSA@@G91>)|^ebX7P3z>P(UBbYmXfJA+DTCO!iX9ONF
z$s1f-kOIa-N4gjGB{Y?}*r+V#C_#$m7^Y7Z&oTEiTB^xkhOCXMK}v?{zz@kbTY1GT
z`=4VV8M~qxmqzyTrX63{jyF~z<Bdw-B@uVdwBSJh`E9O6{lJQ;6hXZ_wWBgfe+Upw
z%W*2ziAHZFaR81`(hV45YF=TwqGu^($6m3afoRSFwq%p&lJJYeX0s005TWr2f(Ev%
z<3hbj!_LI71yB>N?kakZh1bXIB+(|m6_jNYj5(aj^MGAH(RM>0+etZuMA3>sQEA%u
zuO1t%iPHpxWv8kucHO-}syY`vOU5?vPLjGSGh3$zjs!k>xOpj^p!slQgd9A8#E~hq
zSzG|fZxb(yj3@VcV+A2i!KV72yCms?D$M-yN^9D`yEWf>ef+UOD#gUsr<A^ekY&?~
zusE{OR7vh<c0tc=U66&jD5==bF0EZ@2j*V}YsnAKWy!g0NP(=WAHS)=zG&sQE80Z5
zSRGA(*7!}$XyhYgdFG0KIf>hsbXY&*M*4Va_oH+z`x@6-`CAfvn(IZ)q-37vfo%Or
zg<0V}!Xq*jEB2vUf6Y>*-3MW|XJfhcah8l}&KVke#|`0)kV&~X@S<^8xB1s%DF5T@
z)$pA8SCvXp*i8UxKd9)u`^iWvt3D_GV|Njb4L%v_S|A<?&SD>w253b&S4o-LbBjg&
z<$#QvqV~m~ndjt?V76!*D?>ZEhaLGIxZ=H4`>Qn1=l1>)k%QUUO-V|YEwJPCqNU5c
zB@1EoKF|&(U`+t?4h0cmiMrBoF2TCU=sLh{jd=u~VZmh$gZ60v*Y~A%Fu=eK|5&YT
z%Q=cqZ>%n+STiL$bLI4&_U%lpREDR54Z1$h?-YG)eAio|)J2@Y#Nr)ySumhv6L^e{
z4feHh{qg>k+3~;=)0}&sS~1fgMV_|GB=a+H^9Xb=DiD7#`mO(`n6qlCqx<$X?iO4F
zA-FpPcU!myClEaN!rk57-Ccrf2qCyE++pGFE_=Q2{_kC<&iMf6rZ48~>gt*o-Ss?U
zj30owxrwX15q@6Ak0E9%6){ETr_F&6n`rUrx&jbrS|ZURC(jI9kx4JueQzOh_wYCb
z=j!FSvv0At$tIcnBH*>y`R2k;a7Gmssxg$wdQ9|l^G^+Mi|6a1eBI2?K2Q1IdJQyK
z@{${7lB`;OF_wm0eGiGa*;T{aduTvKz1?D^pFG|m<|Mj^AE0?Ox(*XsR&NP|Ii{7C
zLqT=ic`i!jtk{AKlEFphHoJuCYjFL9`{<!4@$nhQl<=qd42SaWC`$zcjp{Hj^OYr`
zJDnAT*RJ5Zq3K9IVmPS9j^^yd17XHCVIX2@t@wCws@Yt-4ax!LWiKY8uP3}(-;f8Q
zxMCB<WiA_Vv~oY=N&agGhC|c?#j%2CoO*&CY)buR3{`+K1`s=vdVy_Tv1%{*lVL22
z<rEv5u_$a5j5qc)H!rb~cGAf8D-8~RpMY8-vK-Awpq>=Xjn?-<L%l=X@VI*L0Wok4
zL9C#GCR6rzgx{(8!Nsy7M%@qzB~h$ZV!3my7|DGqoCG(|(Q=J#kfEVk^thKPt{S{>
zZ=(JQOZ%d{Uo`sADcR$I*(z)9k5xlO>-T%Y;er~SnQI+Nk4s111i|q;*kPB7lMPKO
z`?5iHm-6ATL|1~bR@o?6^g{nK6J}&hzDilpWcT#$Lig|SvwOO9<9vS7r{RY`iWd&z
z_EWE9y&T!f-aau1TqL@>Lc%ko=rdx?$t{1_xL4S?RD(YY^4KH+#jNk$QdpWdFSysZ
zsKa_YCB>W`21x+V{oD3I%LbVPb+99}j%UD08K?1J4yYN7pa<aPLf94vp}eBzgbjs$
zNa_TZj1OZkig&n%Sg)^UWK+Z@plxqcWD1%mwNJqyMYOd^^#0;NBrJ*Ri^8+7>?%1u
zCP((_<#W)5k?k)iZcUBd+QZ_I0RPH3a$5ieg?ar5u+TcmZ6jQCSy&1#u+q9h;Uy$R
z5^hETN<%_>umQSNm@>Wr9XnEkM<}szxc^xj;e5s5iaABGy)mL=d{NOL=@WX;9nrAj
zXtFFzLf1oElWY$`E5aT=A%a}WvTl4=h`gfn51Dnc6PCpDAEKwr3)@X4r}})h28dq8
zf}jgDz7_`GFboh;=XwaWi)ASMkF^#JgT>pLg@TMLlplVFKP&jBDto9Y4sW?sXO0hB
zl{OSvbqyR7Q1b*iEvydCsfAh;RJ=w4-(B98Ob{ByB3BEf9a;H*e5{aOn7)g|IOg~8
zC=5WWs$UPH9<JZxqnQo34kmA9Yu#i3ByJ5+4)itd3TPyvO==~YMmVL~2M@&giZ~{9
z4)7w^W|j+r29oH+Ea34JItQ-2xQA$y+rJxWsr3>J05FY6a}~Gw<QoSr{fqO9(*{oc
zu_x&Bk~uh2MyuYRK~+unrfOg0-v&pOq_{2%9T#H2P%fiKouHoPEs>ATp?gP&j;TbG
zur|Wj?C&<0L~H`)Nv?t<d8#Ez47;=?VEVB)Ren>cF2Kh>nH9?k-+<@_YoF)QbW>ru
zl5BemDcO$=z9#a5<ovB9niRe*wC3@y1ddt_X9?lkBe<ad9fGE^*Q%uo<Mj%tNI2i^
zq!D^KE5qScnP?pDi%U+j^hf&n3zu{3B2?j61L&XZMi<VGT(#Q|a`Mzttc~+)N9Zkt
zah#F3B3j$7gD1jpoHuO90ZBNCtFvB$PuMP=!*t{c(O2sLk(b9nHiTZxFuH!+duMEe
zZG%@LYLJmpQFzbXVSaqQ<vyM0cj~i)?~~|4xNwig!q4napb`nQ{ps^iRkprS-$jy-
zvA$JzC7xbZH$nZf-3>uT58=ei=weH%?(V+sIiBv8IV16n&C3cyp&t)04e+2a`5Y_>
zQ~3|f!4KrXeQB{-x1dSLTuRui<e1HQF@)y{R8w8I1^2JtJC%F{pP>z@Rue{6T^aJq
zG7f2?>fD8&4@|iXOs$1`O1{%LMY=6ABj_1u^L9(?Y<6l-yR@F@(nb|hoR%BZR0$ht
z^t<#F&3H=`tniJ-3*?$t-H`*u7V<muico&~hZB7#?3P+Oruu?z)UiHC7eTYNsV7Jg
zElQ&0SA=L6iW|5?Z)9J2GEQ0VuXW27VUbtRzd26x<@r`QzfmV%4IiBNOElq^47pj5
ze~}7dQ8kJdu5coq9{fl72m%yJGCR=_uP9fZZ-waY#bRT0CrR^U<ut*uW|io_avtlS
z?Qt?Q?W|+(f<puV%T=d!4i<+~2v<T@^s6b1!ynG%Pxle;m&f0)*OWOFwk{4>*aT8O
z8e-J)`=6*!4T|hDjdxl`UjZ%w`r#)2e$nb|COvD78@{BkI3PX!vio7h+6g<X$c^0k
z3?<>5Zp_!Qp)AO3pXWN&pVc8U^Hssdl{n^1Mb_h8d;xS=U3ssNnVI+vGBj*KX9LVQ
za+fA1KAyRjb_uRuiUtIOPzKS!BPj>)dPyD*@S|cED!)W#Ap07A##*gck_&6RK%at%
zXErsC<UVD8R|nniYQ&F+m#x>lWLXt-z|L>MlR|YctF04<i<1)^V;R|CkHM}z67SUs
z*2II*+Tpmr7fk~CYprZ9Vc{z!^0gvUYeXYTa;tFfZWt=#)Yv;~9?<6ALuaQEB%Qf=
zYv0TX+z=-F*_%kkxMo;84+p78Bzd<w={h`fIDZ9!Kkdz?n_r#O3tXrtR(O5s*}bF5
zb6=$%`-Aba<8D<-gy)b#36oDY<lkbOSsLkqf+t=M3Qx9=bNd@(r1<C3>L1Gxmgh8o
zz}?_)!I|bE(z!IqUV!l<wQGl@i#zr*9W)Tt95xvC5r5`Q;1ALWsr1XC<<2Yk@$WNj
z>5RMD1&_PZJTE4q8&|d_*OlxgBr)Z~_B*NegP^mFRqkg$ysNK4lh+WWPvGZqc`If4
zYAXJx)`z2Nh_)<GxR=i&EI|1x>RcqYz@fJdx`Ht(k)>d6D2eS4nvnCLOss7*Z56<f
zQK0tnv5u`Dz0f^6;FPU@KoPU<rH7;=%mB^bRjCNx#Y2@(zok|}?QdCGo<_ty)t~3L
zVA6y$Hix>R9e4lGGphVKC51EZov+fHJIAJ9V3lPs2YBtvyc~nxN(L>%%jK<73%}3S
zoW9$U1IpW4?N)sZUf1Qx8lAAYi}G&nD{2Q2Dh;9p*<Mk`Dlh#=Cppqg{(vn7v^YiN
z#eSv)sxZPVS2t4*jhLWRGf{S+6VdTkImlM2si;dyisG@1YglqraH&g6Nus6j+$dWq
zUnPfVD1E@@F@tSZ&=KvyWf@e{#iBRM0m@m?NXe%>(M2K0Ua=7uRR>qoMbRPCO2`S~
zvUIDkMW~!f;U(V%Z>|%wfk_W!I()t#7{Ky*6+?3toQZ-8jfQI(`nc5V?!SG3PcNy+
zEUD~ZzI$Kwg--`UEm^>)o9bM-P**@PYO68y6~ibn^nH|oHqS^!0a{k}aRE1tdjeZ6
zN?@W@{cYvPLo!CHo%h?5u%s*YUv(4yMAf=lBpZ$OeJn<-x<BHk#(>8etEMs#zl|lR
z#?ic?9NlJNXBTm$AX~_ph$@?nV)N)>+~XXSCC<laP_bfh1Bf>OVK*ecMRw4mgbIy;
zO?-JIf(~b>d}H)JXeCnGCmPou7t;Ih0$Nh!#Rp)tZbR}jih@Q|vG+1c5>*(G@1^Db
z7TkAMQt1~N#v?pGS0TXzAEtkXcylZpI+g<s8Dnk|zL%?uT}de%%US~>c_v57^zP@a
z`1kw1a9q6CpV<ELnX#&@tgy;tiAG-2<Sv5z#5FUg)Nb`l?t?WmXEJ=_G&4gBj%P9q
zE4fBf^mpoSnXh5T^i9>gViOz4JD?|j7AO=2H}j!;Sx+Lw*0P+pJDsOmIQIh>Usbv0
zN3)+=(1rIf)3Hi;p6|ib%^1y-0Y2aTKN|zN*OosUigS_~sG~1pQD6p!vEx*hnEW!&
zQsxuQrS9&%Ps^w;KzDg8toTkdlClbOey((8;hs%_CXAd#D4jElj`(_zs+5s<t8_9{
zo+PDBCpfPRB<T?hptWBov^VSll9oftA_vO=@Hpx<TqY1NfFw3nb@9<vx@_|UFnoFU
z0oph3L<ND)&6bq<mq7mn`jOG|L1|L^XS)t};U`Yofmi}~Ri_uDK1#m~Vj8g0Ha5IG
z?I?Eyy{Wa(Ez{|Xv|KP_6cOva)e~JV5XE}!P&rgWzlb0POn2KvcSyCXkAxCuAab&^
z1?2Y$Rz^C)(!6vD(0-vzS$<`wAtmGe{XTg~pLZS$_nL`?p5V3>`hd3KT$J3|1cnzj
zJct$HL%6GbbRDQn|FT=^IDfiTwg6sIgpOAeG9BqQmad?TY9wY;g?lKdj~9y*g+oIj
zN5#E+U<Bm4m&|?AUe31JEs)XqkhAV(V*?=nVd;YImDl`}7|y+xx#-g!eSM85d1_L<
z0*>hDe4jdo*!mI-s>b63NSCTQBu>Pt1DOdjgpUFEs`vPi1kWtP>jH3QLeVC_nM(Xd
zjNqZJ89umMobQk^l#d4b^r<=E6iEP;Y<avu(JugO*@D6QD6C<DdbUTkC_=m_@Zc?5
zpJtrrw>qBoW<q#A2=L2cZX-;Pefug4iGHI0Oe;slDr^^NyFdnls)AEM9~cprbhAh3
z=ZMG1H?ws3nHXaBh2;0$I=<v!(&C%!q8*e(&B!43%BW<-slY%<k%|$_bRJXETcTR)
z*R%6$MVR*308&xp9RQ5S_-%uh`_V{$cD1)<8hQ4?*~!X&-JRa8`PEwJf_=<Hc$~y7
z&)!NsO2O}@gq3&!PkX<%2S-QOt<r@g?INS2`;|HkiL`~2-JAo;m}*KV(}{cUyr+}t
z?9%ZfGQG?aSdt?JmOZU_;6S&5ev$dg*FOyudY^AYy4}!<F1~?3p@V~(D*LB+OS0K#
z-xN2*wOX0V?VM?x89S=N6^Q;?I_xp>QUJN!hH-c#a|C}zQ1CcQyNEE1<h72F9j02X
z_@C?d2`MK^covdkFTtKJ7FDP-)2AqZ)M@^VSjk{tnb23}BmMoM)3SuAe|Ue$0+~yq
z5zZ$5H1IDOQa&ml)ZeVMHK}Uv!<A3-K5!jfp4Ph1Z}~2omh;)FnEtBX3o*+sxBWLw
zaz1y3R2Hg7DGrLgSNL<aW*Xd+*F27qI&0u2ExAA)m+v~Qvo0LTSOTMMdRTyykB>-I
zM16_1l$}xa-**=f>#K!opom_@L{WF;t&}6nCe>_2wONVR+DNC9Ocens0AFS!y5h1D
z&HwnQNxGqMcSm+t`pVr7jMRtVkjKzbP-FhFs7x1rbct=Z4(xoU0cW?TR0Ld(i0}I%
zRX2z6LbHZk-MnaBDGG0Zil_<Z(wu{SqNO5^Td<{Knx79as%lEeK?s{aX0Y{Jpi><@
zAgpf|7_<jwXP7aOZqVQ?sjk&Y|E+_rbX;n!s+@`{=Dtkk503%`A?@Slt<a)==Fvrr
zFJEHi;kPrUgWJV3dysUwq@$Vorh$r_Are6UCD-t#x37IpKS0o~IXRnm=E57H$XugP
zQw7@A^C^$ukGHYa5o+kI{%X*274xDMrMxg}K#q@{;)(ENmLz@gd&r%Drc#muZM)#x
z53B(qw*RA*UdkwmUfXY41=P4=D76u-{8jX+IC6b5{<h@*c9JkVFn7n3=KTV&m{EL<
z{o_MEtv1!+`1Ew?xD2FHvS0OAfQ34URY!key!6Oy`~1+AvS+HotGR~2FI<89CiGVe
z6{42h1z35oF$&ETf_azLTqJyy#b24gxne>eqo{LQsb?WR6{P0AgL(fe@B9{DA4Znc
zkCc?wcWEX|dD|U=*Nzaph8t=Xm11#xQFYMgRQy@_p2TNJBTu?PMEZVt7VKMYD-)m(
zF~InLZH+5t(luZpRBjPKdIBE{fPd`SZmV6!8tGJt01po33|@9`4sFQ(yIeprm3r2M
zJp?h#F>1E_9Yr<RoY!=7r9F$qW{-4p2*3RXq2B%J=0Xk8LmOSo)A(<?Lp*V|OOjMr
z3xwa>vY4KGewX`x);#cv0=JmK9@0=bc0JI2*3j;Jy!ourn;?JdBjt*Ege7klEqS*M
zwsSi0!p?iDnXNcyj<$)VewCz-Ru(y9h#u(ncdTID&?8*19Zh6o`3Aw@Dz@5F_-KI3
zW6!U)Q^L^CpT*<}S%o3@o`>{5>Q#_zXcM~mn`g~<O8xrhh`x2@Jp@f-i`E`Gq>!zC
zcc^hw6X|JH!LUWtSRYAHft(fH1`!>^&+kT$k!8iUy|Eo<9(fhmAUao2Z>Y0{Rhp(>
zHL3?b-he~<R<-)&zZi8t9R(9krKvXZK~>M{&ny;aO$k8WQCk#Iw3XtW+7kHydn!Y`
z3L0YO=jA`FRri-*O{cM&Kx56+aSGMPWqEhp=FH}tGZ)*aaGFgqBOeYzB4j#DYf@$G
zBMwFvo1lyjlnJIc0C-P5l>A(pNYsS@Nyv8?X<E@(!sTaAN}q1E2SnLKQ<Cx3Z=HVn
zN5|XP{Hx=4uMDk0_xKC8E6LyRsB0l7xCbF8=N`Cx5gnUBkrq*~Nd@-Mf<Jioxx<?j
zF|??vqXeM+wg!LYgvhq*uFMKfAx&U?uW;SJDB4h7-8s7m@;cpne>|gI`i%~uoENN;
zu(Y5m42l(8;N>KQ-^VW26)-oXOo5B{0|Nm4a^XJ{agHd`W3763D{)1BzJL$4pywSL
zZ3|wcL3`yz1=>7FxzKkH+)Wm%BxH}>S>Se0<0#a)6vr%~!rHoMMYyW^XjIU=6A1|~
z{d8XJ<^EEhW!B$N(K1d}_`&X|gAU=qq*$FbkmR1_H9P;>a@$~vXa+a>u;uTG>snT|
zSHP;6{|f&^B66WK`YV)+>VXuj;0)M)-=3dGUG>0q04dMQ5WdYm2h@<4W0o$P1NM+Q
zAK-mx%Q2#wMmI<zPuQ|>YwNK8c7*Yv6_BFum*2^mobxAL?V;D%+nObT;(P*CWrnP?
zm6oM6%h&auh`No_9V0el7pXA8cS(_zW{IK$c|&S??s)1H(b7Q>7?f;9Gl|g&D?**o
zkp|YYv%iWMG8p-D*{2+fS+}<1KnM@(?ThI(FfeUD*P~(28sp1GSi$Rh0a)-aSi`dZ
zf`U1TsS2%4PYJc`i1te}s}x01F$C*~i*k1bOy&gEPIB}n&Q)pzZP7yFWjhyw3ylAV
zi9Y?`Oq7vic!K%=FcHoFGEwXcn*i|y1F=W(!!*@3(y3o8qjzq55!d9FR1%xO{HF6&
z-0XWytYS`Yg)^E=aHPTWcda;OB@rKA#|aGByd8oKKT?S;Uq@IqZG372@ya;bZ=_Q0
zk6(s({v^$H_x*M84!0R(JT##4^?X19tx!Y`5iVlj2(I2-jGT8Ccr6Y>S?*Kms-zKw
z4457BQ-yeYKFOuHE1PtkEC2m)hyi=gFCU9&d7u>dLluHX8323S#5xgVb|*AX!X6KS
zwWwqAR5HcQd(3yShMD1Vy_NShUtF{Qz>#p7kDq4vmkz0Qs?TLfSnYF3<wUQ=y+cLW
zQVjvt+NLXmpt`>5j*G!drlxLTxk#DeOAC8Jq>DvuzW+bSlrJsP<^HSEL~XUdT1Km-
z)RJu?z_)lsCUl)!RO*|)iCuC#v^r4%bV$6kA8q{c2S-#)aoBkI*XJ(=iWx+rPuQ)6
z3ByH(5-NbV&a1kPNbBr85?2`PP_&&q3xdy6P^C4~_%A=9Gd#O7XTO&a*s<(@DjA&&
zFDy{W-BxC8WxNdn3Ft=`XfuL8{h6cLat(CDHL4wVTZ$I0)gZrfL_Mo25k5({`If2K
z$)EgG&!KuWP`ZI(^xJXM>#<Z0v)9bmzg=5lc0!foPJ;KK!%@&8|1w^A(%dRpAFu42
z^666F^qiK-gtcz&I6SK@!$!L9ob~5DA4Xvqb4p(N1wmu+<mHo%xYjBDDPhF)1}K@n
z1M7~Ty6fWH<+C*FFnkIoa%=f!0)!&-V|t4;slM!|_M6P4W$R(o9;n6{EnCKC+sN1W
zdd8feJfdW_nH7u)@uJ9w^^zkJTho23aGG0HxlrProDw8WU;Ms$DxJAg#iZGL_->2U
zIPxH+#Fa^Mi)vD`q?F$*)R=N<ajB0w5QpHyIul<Yr5i8})Fp%bJ0waXzo5@KGSM^?
zyFeKu^yxO?2U&s&tbQRVNpSxRb0DUHQwa*4H@<0q&HjVm_D5a`?8t|X!?`W0dn>C{
zq(2<yOuP|wRu+~T;8tr+q@`UF*)1U!oj4d=|5v6$oc|Gi0D>=zYdK|@KDcQ7?pmw)
z&RdDcVW!5=dQGJ2oOvsRz6v0Y%MYO)&>8~{xg<0y1=c#1rce?=E$}h>qOg@xS;)ZB
zrnO5L^7{@jW-M82T-DhM*?>AbcEw#i==``I+{QAaP`nJARzY31veUbcM+Da{Wg@ME
zhJ~&gC@wex7BL)qi@tjI&G2)-ypy_}d|s;4E=qgoHNCn9MJ?=V`)J+WMy2fzHR(K!
zvNqlD7U?|o?jKGwy{>f$W|riQJ>U5nzFFtKo$EZ2Utjg^9r8Ba#9d!OuG;4ohkg^I
z10GM7slNQI_LHF7k=2|rzp>KOQDEq$icHhZ{q>Dy>YKIU8!+|lYLMymw(F(U1M>Xa
z-p$uX@mB$(wT0QCG~TYO&xVg8?z_ruyPAfN>Xk2mi8`waKlR;fwex>hA=`0XS9LuX
zBgYz#kCXC`FZ-ja-QJfVaEjj~qu(#)ysMG-VaE4J7LiH<hPRz-xjMf$d(XGXtDBeI
z-NVPxQP8z^a@qc5m0QQdwOwkjZte-K`8#CmH7%{|-bgif-OuCE`<<Oo_b)I90*%Id
zjo@$PkdcIc;TIvZq6*7$CqiU<2cErXV1Cow2lu-=o5*~$OZcy2sxTPjr!@}j=Kh5I
z>oH}yNW(`eMy9NS>eMEcvrz>)?>DgoCW$whMzo!{??imN)T4cjy`4-!PUI|NTO0_O
z3xmrBYaH5@QSeG$Q5<s|iZqVqst8O5bsH3Q`gm1Ym8AlnNi_JnnA5+BGYj}JO8b>{
za2Q`1@3nDI(J72>6EYW<<c0ARnecfKzHS?1FI0r0uQ~vue@(PD-O^dAo}o`igi25*
zxc-xkjZYb_zl>S^$zp$5`BgCH_JeH+GzKkLDKPGXJipFaM*@ePjoEdtDz-}(o%wP`
zDb8>`#cIym_i%X0Y!6bIiaaUgGdnRlLaC?bi^bc43AX-~HjvCi+oq~#hM$4)f|@ST
z5IfTW)Y_Eh6=+^zd8tMHtaJosX1y$j?MQzmM=qTjM^FG(Fctc&B=50k+mcD`2I}CX
zsC1}u{aQ{Dv*eJTcl~Hi(7E0-d_o3|D<*;)7rQFf{cBPEMIloJojfC!4qcg}gT$6Z
zNFyN`AIwMSU_^jBmg}dl4Z#+=8rDI<VfV!<zd-1Szqqq*VWQdk>RmKf2iu()-MCPt
z1aUHV{)#zD=GG8g3d^Mxyy9JQA(meaiqLPTFt*G7e*QnI05}SNkMze$#FZleUY@ep
zBz$@DPChTA+z&sgPQrFLI|hwV?U;V+cn!KLVGctpLguiVR-JhP$Sy;#9pCw!(fZFN
z#ssM>FTO;uT-LrtCmz<-sY)VNrgPx@EBy(rhMXlZ;l+g0Cw-&esE*ah&l=Z{7OW;j
zG(wY0=FItdZbbbKDxuu_0wf0NXQ3}+-VxW@Rk3c@Hl5js9-G5C>bjFc?XnFeb(SNp
zvnSur`EM^z5Zx0TWEh-RD!g;eOS71IwjWQ5;u3~%Vy$x**G%f?TwFjl$?!d1cm{5x
zwckpaP-ZapdODA;rSSCk1sKM8aXVs~(AvRPE!OX11VAF4`itT^KdCW_fdl3dL)u}h
z2W-xtkWS0sAp1-I3upkU$FZ;jXE7F4ny`!Y+@q=WoE>zHyukL7g(aK&wI$4|E{)0(
zlPrCdqujTA*{!0uMzKCsx@c7`ct#X*x#Suc%#z=z@FDV_8CLaXnvgMLsD;o?q@k-d
zX4L1X&#vl8sgrM@>gyNV>{OMxKT$!G64zcUTu|s>MtNq&5}BVO8}0if#^QM~9`AOD
zK2p^u-;SgtZ>gEJX%Mm8vi~a4O-F(u%S>nG0B%~Qj;u6s=riE3xTuS%ayo(k*EM2m
zc7CT2=vdA{P8mTv5mQw^?)FrSkb!QO1at%+k+FWItvrxQ9bAJ{vrG}iiTTRA+~vEG
zlJ+}Igc~gRQB=bI9*^(Z4GSO{Fd>*kd~i|6Me|A@96b3EiU2D4)Y@jtAeX=^$F}G)
zjoWucZBrz+>@KS_05ex6Rfa-25XeAV{3G{K6;G0*xEhVVb2z?{)U&thli32HR4PO}
zA|~TaZOOzjkJ1*M4vaD6EXaTMp&~lci1+>g;!j*oEF5pTI-Kuz$)5P)5Q`Re5UYVx
zt2I=?{6PSL5WT@v1BcL@+2vO3NMnxDub?f8c$cFgI}j9@TDgzXLtDL>{D$&ewb?w!
z-%F2|4U(+b%=TSrV;_Zy3uZeiw&OdHX{BtsU5uNa-O~`6wtcvQ%kA<o?ech>am;^`
z_A9Vqjp1b-!}%+TgVjj|aeqh~z!!g;AFgz;$s4n=*ad2J&OuKL!X1akG)Y-3xp8kN
z6U|^LX!GGW)UP|N>H|1H)pY!d*|RwIwS%@#Z+-#qqDhWdjU*waEodhOoSGHuXla>9
z*|(~<SR`y3-+YkwEEL)a#-`q2tDtbC{K-*JiEfZ2`|9CY;G!mP#YKYfqxwa<@9|sZ
zld%8sa)aCWKge<Q;T2{S76UQ3a=5+1Y@jSdOL!kKpt4Z#JF?r%GNE)^5Fl06`x=7Q
zw^f)8=*Q?M-QP7_l;>aEK*R0|@N%`X1}falNs@f=Y6}zc27~|IzJjLyPeX-SCz^jJ
zbQ;F4wGGTBsd``EP|cobWUJk^o@xfcwe>!)d?tD!?ya4EUh_B{PsJUoWwu73qt9x0
z)XTI>m<MLip&%`6z(^w^L&}RA*qAnm8c~1@6>5B35d3QQj`i}6ID}v+*{=@|^<N3w
BDzpFq

diff --git a/x-pack/test/functional/es_archives/monitoring/setup/collection/detect_beats/mappings.json b/x-pack/test/functional/es_archives/monitoring/setup/collection/detect_beats/mappings.json
index 2567ef3949ef9..c8c423463e477 100644
--- a/x-pack/test/functional/es_archives/monitoring/setup/collection/detect_beats/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/setup/collection/detect_beats/mappings.json
@@ -8,93 +8,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -104,112 +25,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -224,16 +63,6 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
                     "index_time_in_millis": {
@@ -254,22 +83,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -277,66 +90,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -351,18 +108,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -390,17 +137,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -413,17 +151,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -491,13 +220,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -507,33 +229,13 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -555,58 +257,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -614,13 +268,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -628,15 +275,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -648,12 +289,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -661,18 +296,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -693,33 +318,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -769,13 +376,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -824,15 +424,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -842,9 +436,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -862,26 +453,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -889,14 +464,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -912,12 +481,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -930,22 +493,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -956,9 +503,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -969,22 +513,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -995,22 +523,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1039,12 +551,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -1052,22 +558,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
@@ -1107,93 +600,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -1203,112 +617,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -1323,16 +655,6 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
                     "index_time_in_millis": {
@@ -1353,22 +675,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -1376,66 +682,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1450,18 +700,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -1489,17 +729,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1512,17 +743,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1590,13 +812,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -1606,33 +821,13 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -1643,69 +838,21 @@
                         "query_time_in_millis": {
                           "type": "long"
                         },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "job_stats": {
-          "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
                 }
               }
-            },
+            }
+          }
+        },
+        "job_stats": {
+          "properties": {
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -1713,13 +860,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -1727,15 +867,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -1747,12 +881,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -1760,18 +888,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -1792,33 +910,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1868,13 +968,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -1923,15 +1016,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -1941,9 +1028,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1961,26 +1045,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -1988,14 +1056,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -2011,12 +1073,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -2029,22 +1085,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2055,9 +1095,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2068,22 +1105,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2094,22 +1115,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2138,12 +1143,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -2151,22 +1150,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
@@ -2208,63 +1194,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "kibana_stats": {
           "properties": {
-            "cloud": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "region": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "zone": {
-                  "type": "keyword"
-                }
-              }
-            },
             "concurrent_connections": {
               "type": "long"
             },
             "kibana": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -2287,22 +1226,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -2317,12 +1240,6 @@
                       "properties": {
                         "size_limit": {
                           "type": "float"
-                        },
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
                         }
                       }
                     },
@@ -2330,9 +1247,6 @@
                       "type": "float"
                     }
                   }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -2341,9 +1255,6 @@
                 "disconnects": {
                   "type": "long"
                 },
-                "status_codes": {
-                  "type": "object"
-                },
                 "total": {
                   "type": "long"
                 }
@@ -2359,49 +1270,15 @@
                 }
               }
             },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "source_node": {
-          "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "timestamp": {
-              "format": "date_time",
               "type": "date"
             },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -15291,4 +14168,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_exclusive_mb/mappings.json b/x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_exclusive_mb/mappings.json
index ea61a4b7f325f..211e253ef83d4 100644
--- a/x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_exclusive_mb/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_exclusive_mb/mappings.json
@@ -9,105 +9,6 @@
       "properties": {
         "beats_state": {
           "properties": {
-            "beat": {
-              "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "properties": {
-                "beat": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword"
-                    },
-                    "hostname": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "build": {
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "input": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "module": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "output": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "service": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -118,12 +19,6 @@
           "properties": {
             "beat": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
                 "type": {
                   "type": "keyword"
                 },
@@ -139,146 +34,19 @@
               "properties": {
                 "apm-server": {
                   "properties": {
-                    "decoder": {
-                      "properties": {
-                        "deflate": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "gzip": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "missing-content-length": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reader": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            },
-                            "size": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "uncompressed": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    },
                     "processor": {
                       "properties": {
                         "error": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "errors": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
                         "metric": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "sourcemap": {
-                          "properties": {
-                            "counter": {
-                              "type": "long"
-                            },
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
@@ -291,40 +59,8 @@
                         },
                         "transaction": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "frames": {
-                              "type": "long"
-                            },
-                            "spans": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "transactions": {
-                              "type": "long"
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         }
@@ -332,17 +68,6 @@
                     },
                     "server": {
                       "properties": {
-                        "concurrent": {
-                          "properties": {
-                            "wait": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "request": {
                           "properties": {
                             "count": {
@@ -363,9 +88,6 @@
                                 "concurrency": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                },
                                 "decode": {
                                   "type": "long"
                                 },
@@ -400,9 +122,6 @@
                                 "accepted": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                },
                                 "ok": {
                                   "type": "long"
                                 }
@@ -418,65 +137,17 @@
                   "properties": {
                     "cpu": {
                       "properties": {
-                        "system": {
-                          "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "total": {
                           "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            },
                             "value": {
                               "type": "long"
                             }
                           }
-                        },
-                        "user": {
-                          "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
                         }
                       }
                     },
                     "handles": {
                       "properties": {
-                        "limit": {
-                          "properties": {
-                            "hard": {
-                              "type": "long"
-                            },
-                            "soft": {
-                              "type": "long"
-                            }
-                          }
-                        },
                         "open": {
                           "type": "long"
                         }
@@ -486,13 +157,6 @@
                       "properties": {
                         "ephemeral_id": {
                           "type": "keyword"
-                        },
-                        "uptime": {
-                          "properties": {
-                            "ms": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     },
@@ -516,26 +180,6 @@
                 },
                 "libbeat": {
                   "properties": {
-                    "config": {
-                      "properties": {
-                        "module": {
-                          "properties": {
-                            "running": {
-                              "type": "long"
-                            },
-                            "starts": {
-                              "type": "long"
-                            },
-                            "stops": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reloads": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "output": {
                       "properties": {
                         "events": {
@@ -546,21 +190,12 @@
                             "active": {
                               "type": "long"
                             },
-                            "batches": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
-                            "duplicates": {
-                              "type": "long"
-                            },
                             "failed": {
                               "type": "long"
                             },
-                            "toomany": {
-                              "type": "long"
-                            },
                             "total": {
                               "type": "long"
                             }
@@ -576,9 +211,6 @@
                             }
                           }
                         },
-                        "type": {
-                          "type": "keyword"
-                        },
                         "write": {
                           "properties": {
                             "bytes": {
@@ -593,23 +225,14 @@
                     },
                     "pipeline": {
                       "properties": {
-                        "clients": {
-                          "type": "long"
-                        },
                         "events": {
                           "properties": {
-                            "active": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
                             "failed": {
                               "type": "long"
                             },
-                            "filtered": {
-                              "type": "long"
-                            },
                             "published": {
                               "type": "long"
                             },
@@ -620,13 +243,6 @@
                               "type": "long"
                             }
                           }
-                        },
-                        "queue": {
-                          "properties": {
-                            "acked": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     }
@@ -644,19 +260,6 @@
                         },
                         "5": {
                           "type": "double"
-                        },
-                        "norm": {
-                          "properties": {
-                            "1": {
-                              "type": "double"
-                            },
-                            "15": {
-                              "type": "double"
-                            },
-                            "5": {
-                              "type": "double"
-                            }
-                          }
                         }
                       }
                     }
@@ -664,9 +267,6 @@
                 }
               }
             },
-            "tags": {
-              "type": "keyword"
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -676,25 +276,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
@@ -729,93 +320,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -825,112 +337,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -940,17 +370,7 @@
               "properties": {
                 "docs": {
                   "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
+                    "count": {
                       "type": "long"
                     }
                   }
@@ -975,22 +395,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -998,66 +402,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1072,18 +420,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -1111,17 +449,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1134,17 +463,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1212,13 +532,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -1228,33 +541,13 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -1276,58 +569,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -1335,13 +580,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -1349,15 +587,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -1369,12 +601,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -1382,18 +608,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -1414,33 +630,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1490,13 +688,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -1545,15 +736,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -1563,9 +748,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1583,26 +765,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -1610,14 +776,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -1633,12 +793,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -1651,22 +805,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1677,9 +815,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1690,22 +825,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1715,23 +834,7 @@
                       "type": "integer"
                     },
                     "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
+                      "type": "long"
                     }
                   }
                 },
@@ -1760,12 +863,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -1773,22 +870,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
@@ -1830,63 +914,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "kibana_stats": {
           "properties": {
-            "cloud": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "region": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "zone": {
-                  "type": "keyword"
-                }
-              }
-            },
             "concurrent_connections": {
               "type": "long"
             },
             "kibana": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -1909,22 +946,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -1939,12 +960,6 @@
                       "properties": {
                         "size_limit": {
                           "type": "float"
-                        },
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
                         }
                       }
                     },
@@ -1952,9 +967,6 @@
                       "type": "float"
                     }
                   }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -1963,9 +975,6 @@
                 "disconnects": {
                   "type": "long"
                 },
-                "status_codes": {
-                  "type": "object"
-                },
                 "total": {
                   "type": "long"
                 }
@@ -1981,49 +990,15 @@
                 }
               }
             },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "source_node": {
-          "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "timestamp": {
-              "format": "date_time",
               "type": "date"
             },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -2060,79 +1035,27 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "logstash_state": {
           "properties": {
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "pipeline": {
               "properties": {
-                "batch_size": {
-                  "type": "integer"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "format": {
-                  "type": "keyword"
-                },
                 "hash": {
                   "type": "keyword"
                 },
                 "id": {
                   "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false,
-                  "type": "object"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
                 }
               }
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
             }
           }
         },
         "logstash_stats": {
           "properties": {
-            "batch_size": {
-              "type": "integer"
-            },
             "events": {
               "properties": {
                 "duration_in_millis": {
                   "type": "long"
                 },
-                "filtered": {
-                  "type": "long"
-                },
                 "in": {
                   "type": "long"
                 },
@@ -2143,34 +1066,6 @@
             },
             "jvm": {
               "properties": {
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
                 "mem": {
                   "properties": {
                     "heap_max_in_bytes": {
@@ -2178,9 +1073,6 @@
                     },
                     "heap_used_in_bytes": {
                       "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2191,34 +1083,6 @@
             },
             "logstash": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "batch_size": {
-                      "type": "long"
-                    },
-                    "workers": {
-                      "type": "short"
-                    }
-                  }
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -2233,9 +1097,6 @@
                   "properties": {
                     "cpu": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -2253,9 +1114,6 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
@@ -2284,25 +1142,13 @@
             },
             "pipelines": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "in": {
-                      "type": "long"
-                    },
                     "out": {
                       "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2314,9 +1160,6 @@
                 },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
@@ -2328,29 +1171,8 @@
                     }
                   }
                 },
-                "reloads": {
-                  "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "vertices": {
                   "properties": {
-                    "double_gauges": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
@@ -2363,22 +1185,11 @@
                     "id": {
                       "type": "keyword"
                     },
-                    "long_counters": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "pipeline_ephemeral_id": {
                       "type": "keyword"
                     },
                     "queue_push_duration_in_millis": {
-                      "type": "long"
+                      "type": "float"
                     }
                   },
                   "type": "nested"
@@ -2394,12 +1205,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -2407,50 +1212,24 @@
               "properties": {
                 "events_count": {
                   "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
                 }
               }
             },
             "timestamp": {
               "type": "date"
-            },
-            "workers": {
-              "type": "short"
             }
           }
         },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_mb/mappings.json b/x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_mb/mappings.json
index ea9313fb87b6e..f8c55c60c4984 100644
--- a/x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_mb/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_mb/mappings.json
@@ -9,105 +9,6 @@
       "properties": {
         "beats_state": {
           "properties": {
-            "beat": {
-              "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "properties": {
-                "beat": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword"
-                    },
-                    "hostname": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "build": {
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "input": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "module": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "output": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "service": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -118,12 +19,6 @@
           "properties": {
             "beat": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
                 "type": {
                   "type": "keyword"
                 },
@@ -139,146 +34,19 @@
               "properties": {
                 "apm-server": {
                   "properties": {
-                    "decoder": {
-                      "properties": {
-                        "deflate": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "gzip": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "missing-content-length": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reader": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            },
-                            "size": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "uncompressed": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    },
                     "processor": {
                       "properties": {
                         "error": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "errors": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
                         "metric": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "sourcemap": {
-                          "properties": {
-                            "counter": {
-                              "type": "long"
-                            },
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
@@ -291,40 +59,8 @@
                         },
                         "transaction": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "frames": {
-                              "type": "long"
-                            },
-                            "spans": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "transactions": {
-                              "type": "long"
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         }
@@ -332,17 +68,6 @@
                     },
                     "server": {
                       "properties": {
-                        "concurrent": {
-                          "properties": {
-                            "wait": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "request": {
                           "properties": {
                             "count": {
@@ -363,9 +88,6 @@
                                 "concurrency": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                },
                                 "decode": {
                                   "type": "long"
                                 },
@@ -400,9 +122,6 @@
                                 "accepted": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                },
                                 "ok": {
                                   "type": "long"
                                 }
@@ -418,65 +137,17 @@
                   "properties": {
                     "cpu": {
                       "properties": {
-                        "system": {
-                          "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "total": {
                           "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            },
                             "value": {
                               "type": "long"
                             }
                           }
-                        },
-                        "user": {
-                          "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
                         }
                       }
                     },
                     "handles": {
                       "properties": {
-                        "limit": {
-                          "properties": {
-                            "hard": {
-                              "type": "long"
-                            },
-                            "soft": {
-                              "type": "long"
-                            }
-                          }
-                        },
                         "open": {
                           "type": "long"
                         }
@@ -486,13 +157,6 @@
                       "properties": {
                         "ephemeral_id": {
                           "type": "keyword"
-                        },
-                        "uptime": {
-                          "properties": {
-                            "ms": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     },
@@ -516,26 +180,6 @@
                 },
                 "libbeat": {
                   "properties": {
-                    "config": {
-                      "properties": {
-                        "module": {
-                          "properties": {
-                            "running": {
-                              "type": "long"
-                            },
-                            "starts": {
-                              "type": "long"
-                            },
-                            "stops": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reloads": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "output": {
                       "properties": {
                         "events": {
@@ -546,21 +190,12 @@
                             "active": {
                               "type": "long"
                             },
-                            "batches": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
-                            "duplicates": {
-                              "type": "long"
-                            },
                             "failed": {
                               "type": "long"
                             },
-                            "toomany": {
-                              "type": "long"
-                            },
                             "total": {
                               "type": "long"
                             }
@@ -576,9 +211,6 @@
                             }
                           }
                         },
-                        "type": {
-                          "type": "keyword"
-                        },
                         "write": {
                           "properties": {
                             "bytes": {
@@ -593,23 +225,14 @@
                     },
                     "pipeline": {
                       "properties": {
-                        "clients": {
-                          "type": "long"
-                        },
                         "events": {
                           "properties": {
-                            "active": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
                             "failed": {
                               "type": "long"
                             },
-                            "filtered": {
-                              "type": "long"
-                            },
                             "published": {
                               "type": "long"
                             },
@@ -620,13 +243,6 @@
                               "type": "long"
                             }
                           }
-                        },
-                        "queue": {
-                          "properties": {
-                            "acked": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     }
@@ -644,19 +260,6 @@
                         },
                         "5": {
                           "type": "double"
-                        },
-                        "norm": {
-                          "properties": {
-                            "1": {
-                              "type": "double"
-                            },
-                            "15": {
-                              "type": "double"
-                            },
-                            "5": {
-                              "type": "double"
-                            }
-                          }
                         }
                       }
                     }
@@ -664,9 +267,6 @@
                 }
               }
             },
-            "tags": {
-              "type": "keyword"
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -676,25 +276,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
@@ -729,93 +320,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -825,132 +337,40 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
               "type": "keyword"
             },
             "primaries": {
-              "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "fielddata": {
+              "properties": {
+                "docs": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
+                    "count": {
                       "type": "long"
                     }
                   }
@@ -975,22 +395,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -998,66 +402,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1072,18 +420,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -1111,17 +449,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1134,17 +463,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1212,13 +532,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -1228,33 +541,13 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -1276,58 +569,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -1335,13 +580,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -1349,15 +587,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -1369,12 +601,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -1382,18 +608,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -1414,33 +630,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1490,13 +688,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -1545,15 +736,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -1563,9 +748,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1583,26 +765,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -1610,14 +776,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -1630,108 +790,51 @@
                 "cpu": {
                   "properties": {
                     "percent": {
-                      "type": "half_float"
-                    }
-                  }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
-                }
-              }
-            },
-            "thread_pool": {
-              "properties": {
-                "bulk": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "get": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
+                      "type": "half_float"
                     }
                   }
-                },
-                "index": {
+                }
+              }
+            },
+            "thread_pool": {
+              "properties": {
+                "bulk": {
                   "properties": {
                     "queue": {
                       "type": "integer"
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
-                "management": {
+                "get": {
                   "properties": {
                     "queue": {
                       "type": "integer"
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
-                "search": {
+                "index": {
                   "properties": {
                     "queue": {
                       "type": "integer"
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
-                "watcher": {
+                "search": {
                   "properties": {
                     "queue": {
                       "type": "integer"
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1760,12 +863,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -1773,22 +870,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
@@ -1828,93 +912,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -1924,112 +929,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -2044,16 +967,6 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
                     "index_time_in_millis": {
@@ -2074,22 +987,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -2097,66 +994,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2171,18 +1012,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -2210,17 +1041,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2233,17 +1055,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2308,32 +1121,15 @@
         "indices_stats": {
           "properties": {
             "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
-                        "index_total": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
                       "properties": {
-                        "query_time_in_millis": {
+                        "index_time_in_millis": {
                           "type": "long"
                         },
-                        "query_total": {
+                        "index_total": {
                           "type": "long"
                         }
                       }
@@ -2342,18 +1138,8 @@
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -2375,58 +1161,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -2434,13 +1172,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -2448,15 +1179,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -2468,12 +1193,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -2481,18 +1200,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -2513,33 +1222,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2589,13 +1280,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -2644,15 +1328,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -2662,9 +1340,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -2682,26 +1357,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -2709,14 +1368,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -2732,12 +1385,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -2750,22 +1397,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2776,9 +1407,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2789,22 +1417,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2815,22 +1427,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2859,12 +1455,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -2872,22 +1462,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
@@ -2929,63 +1506,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "kibana_stats": {
           "properties": {
-            "cloud": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "region": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "zone": {
-                  "type": "keyword"
-                }
-              }
-            },
             "concurrent_connections": {
               "type": "long"
             },
             "kibana": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -3008,22 +1538,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -3038,12 +1552,6 @@
                       "properties": {
                         "size_limit": {
                           "type": "float"
-                        },
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
                         }
                       }
                     },
@@ -3051,9 +1559,6 @@
                       "type": "float"
                     }
                   }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -3062,9 +1567,6 @@
                 "disconnects": {
                   "type": "long"
                 },
-                "status_codes": {
-                  "type": "object"
-                },
                 "total": {
                   "type": "long"
                 }
@@ -3074,55 +1576,21 @@
               "properties": {
                 "average": {
                   "type": "float"
-                },
-                "max": {
-                  "type": "float"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "source_node": {
-          "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
+                },
+                "max": {
+                  "type": "float"
+                }
+              }
             },
             "timestamp": {
-              "format": "date_time",
               "type": "date"
             },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -3159,63 +1627,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "kibana_stats": {
           "properties": {
-            "cloud": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "region": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "zone": {
-                  "type": "keyword"
-                }
-              }
-            },
             "concurrent_connections": {
               "type": "long"
             },
             "kibana": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -3238,22 +1659,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -3268,12 +1673,6 @@
                       "properties": {
                         "size_limit": {
                           "type": "float"
-                        },
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
                         }
                       }
                     },
@@ -3281,9 +1680,6 @@
                       "type": "float"
                     }
                   }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -3292,9 +1688,6 @@
                 "disconnects": {
                   "type": "long"
                 },
-                "status_codes": {
-                  "type": "object"
-                },
                 "total": {
                   "type": "long"
                 }
@@ -3310,49 +1703,15 @@
                 }
               }
             },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "source_node": {
-          "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "timestamp": {
-              "format": "date_time",
               "type": "date"
             },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -3389,79 +1748,27 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "logstash_state": {
           "properties": {
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "pipeline": {
               "properties": {
-                "batch_size": {
-                  "type": "integer"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "format": {
-                  "type": "keyword"
-                },
                 "hash": {
                   "type": "keyword"
                 },
                 "id": {
                   "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false,
-                  "type": "object"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
                 }
               }
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
             }
           }
         },
         "logstash_stats": {
           "properties": {
-            "batch_size": {
-              "type": "integer"
-            },
             "events": {
               "properties": {
                 "duration_in_millis": {
                   "type": "long"
                 },
-                "filtered": {
-                  "type": "long"
-                },
                 "in": {
                   "type": "long"
                 },
@@ -3472,34 +1779,6 @@
             },
             "jvm": {
               "properties": {
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
                 "mem": {
                   "properties": {
                     "heap_max_in_bytes": {
@@ -3507,9 +1786,6 @@
                     },
                     "heap_used_in_bytes": {
                       "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "long"
                     }
                   }
                 },
@@ -3520,34 +1796,6 @@
             },
             "logstash": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "batch_size": {
-                      "type": "long"
-                    },
-                    "workers": {
-                      "type": "short"
-                    }
-                  }
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -3562,9 +1810,6 @@
                   "properties": {
                     "cpu": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -3582,9 +1827,6 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
@@ -3613,25 +1855,13 @@
             },
             "pipelines": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "in": {
-                      "type": "long"
-                    },
                     "out": {
                       "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
                     }
                   }
                 },
@@ -3643,9 +1873,6 @@
                 },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
@@ -3657,29 +1884,8 @@
                     }
                   }
                 },
-                "reloads": {
-                  "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "vertices": {
                   "properties": {
-                    "double_gauges": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
@@ -3692,22 +1898,11 @@
                     "id": {
                       "type": "keyword"
                     },
-                    "long_counters": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "pipeline_ephemeral_id": {
                       "type": "keyword"
                     },
                     "queue_push_duration_in_millis": {
-                      "type": "long"
+                      "type": "float"
                     }
                   },
                   "type": "nested"
@@ -3723,12 +1918,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -3736,50 +1925,24 @@
               "properties": {
                 "events_count": {
                   "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
                 }
               }
             },
             "timestamp": {
               "type": "date"
-            },
-            "workers": {
-              "type": "short"
             }
           }
         },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_exclusive_mb/mappings.json b/x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_exclusive_mb/mappings.json
index a3ddceca893c0..4f388b8834b7b 100644
--- a/x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_exclusive_mb/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_exclusive_mb/mappings.json
@@ -9,105 +9,6 @@
       "properties": {
         "beats_state": {
           "properties": {
-            "beat": {
-              "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "properties": {
-                "beat": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword"
-                    },
-                    "hostname": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "build": {
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "input": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "module": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "output": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "service": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -118,12 +19,6 @@
           "properties": {
             "beat": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
                 "type": {
                   "type": "keyword"
                 },
@@ -139,146 +34,19 @@
               "properties": {
                 "apm-server": {
                   "properties": {
-                    "decoder": {
-                      "properties": {
-                        "deflate": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "gzip": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "missing-content-length": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reader": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            },
-                            "size": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "uncompressed": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    },
                     "processor": {
                       "properties": {
                         "error": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "errors": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
                         "metric": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "sourcemap": {
-                          "properties": {
-                            "counter": {
-                              "type": "long"
-                            },
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
@@ -291,40 +59,8 @@
                         },
                         "transaction": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "frames": {
-                              "type": "long"
-                            },
-                            "spans": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "transactions": {
-                              "type": "long"
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         }
@@ -332,17 +68,6 @@
                     },
                     "server": {
                       "properties": {
-                        "concurrent": {
-                          "properties": {
-                            "wait": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "request": {
                           "properties": {
                             "count": {
@@ -363,9 +88,6 @@
                                 "concurrency": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                },
                                 "decode": {
                                   "type": "long"
                                 },
@@ -400,9 +122,6 @@
                                 "accepted": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                },
                                 "ok": {
                                   "type": "long"
                                 }
@@ -418,65 +137,17 @@
                   "properties": {
                     "cpu": {
                       "properties": {
-                        "system": {
-                          "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "total": {
                           "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            },
                             "value": {
                               "type": "long"
                             }
                           }
-                        },
-                        "user": {
-                          "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
                         }
                       }
                     },
                     "handles": {
                       "properties": {
-                        "limit": {
-                          "properties": {
-                            "hard": {
-                              "type": "long"
-                            },
-                            "soft": {
-                              "type": "long"
-                            }
-                          }
-                        },
                         "open": {
                           "type": "long"
                         }
@@ -486,13 +157,6 @@
                       "properties": {
                         "ephemeral_id": {
                           "type": "keyword"
-                        },
-                        "uptime": {
-                          "properties": {
-                            "ms": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     },
@@ -516,26 +180,6 @@
                 },
                 "libbeat": {
                   "properties": {
-                    "config": {
-                      "properties": {
-                        "module": {
-                          "properties": {
-                            "running": {
-                              "type": "long"
-                            },
-                            "starts": {
-                              "type": "long"
-                            },
-                            "stops": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reloads": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "output": {
                       "properties": {
                         "events": {
@@ -546,21 +190,12 @@
                             "active": {
                               "type": "long"
                             },
-                            "batches": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
-                            "duplicates": {
-                              "type": "long"
-                            },
                             "failed": {
                               "type": "long"
                             },
-                            "toomany": {
-                              "type": "long"
-                            },
                             "total": {
                               "type": "long"
                             }
@@ -576,9 +211,6 @@
                             }
                           }
                         },
-                        "type": {
-                          "type": "keyword"
-                        },
                         "write": {
                           "properties": {
                             "bytes": {
@@ -593,23 +225,14 @@
                     },
                     "pipeline": {
                       "properties": {
-                        "clients": {
-                          "type": "long"
-                        },
                         "events": {
                           "properties": {
-                            "active": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
                             "failed": {
                               "type": "long"
                             },
-                            "filtered": {
-                              "type": "long"
-                            },
                             "published": {
                               "type": "long"
                             },
@@ -620,13 +243,6 @@
                               "type": "long"
                             }
                           }
-                        },
-                        "queue": {
-                          "properties": {
-                            "acked": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     }
@@ -644,19 +260,6 @@
                         },
                         "5": {
                           "type": "double"
-                        },
-                        "norm": {
-                          "properties": {
-                            "1": {
-                              "type": "double"
-                            },
-                            "15": {
-                              "type": "double"
-                            },
-                            "5": {
-                              "type": "double"
-                            }
-                          }
                         }
                       }
                     }
@@ -664,9 +267,6 @@
                 }
               }
             },
-            "tags": {
-              "type": "keyword"
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -676,25 +276,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
@@ -714,108 +305,29 @@
         "format": "7",
         "number_of_replicas": "0",
         "number_of_shards": "1"
-      }
-    }
-  }
-}
-
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-    },
-    "index": ".monitoring-es-7-2019.04.09",
-    "mappings": {
-      "date_detection": false,
-      "dynamic": "false",
-      "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
+      }
+    }
+  }
+}
+
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+    },
+    "index": ".monitoring-es-7-2019.04.09",
+    "mappings": {
+      "date_detection": false,
+      "dynamic": "false",
+      "properties": {
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -825,112 +337,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -945,16 +375,6 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
                     "index_time_in_millis": {
@@ -975,22 +395,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -998,66 +402,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1072,18 +420,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -1111,17 +449,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1134,17 +463,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1212,13 +532,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -1228,105 +541,37 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "job_stats": {
-          "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "job_id": {
-              "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
                 }
               }
-            },
-            "state": {
+            }
+          }
+        },
+        "job_stats": {
+          "properties": {
+            "job_id": {
               "type": "keyword"
             }
           }
@@ -1335,13 +580,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -1349,15 +587,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -1369,12 +601,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -1382,18 +608,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -1414,33 +630,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1490,13 +688,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -1545,15 +736,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -1563,9 +748,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1583,26 +765,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -1610,14 +776,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -1633,12 +793,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -1651,22 +805,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1677,9 +815,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1690,22 +825,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1716,22 +835,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1760,12 +863,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -1773,22 +870,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
@@ -1828,93 +912,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -1924,112 +929,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -2039,17 +962,7 @@
               "properties": {
                 "docs": {
                   "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
+                    "count": {
                       "type": "long"
                     }
                   }
@@ -2074,22 +987,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -2097,66 +994,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2171,18 +1012,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -2210,17 +1041,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2233,17 +1055,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2311,13 +1124,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -2327,33 +1133,13 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -2375,58 +1161,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -2434,13 +1172,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -2448,15 +1179,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -2468,12 +1193,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -2481,18 +1200,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -2513,33 +1222,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2589,13 +1280,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -2644,15 +1328,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -2662,9 +1340,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -2682,26 +1357,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -2709,14 +1368,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -2732,12 +1385,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -2750,22 +1397,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2776,9 +1407,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2789,22 +1417,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -2814,23 +1426,7 @@
                       "type": "integer"
                     },
                     "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
+                      "type": "long"
                     }
                   }
                 },
@@ -2859,12 +1455,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -2872,22 +1462,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
@@ -2929,63 +1506,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "kibana_stats": {
           "properties": {
-            "cloud": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "region": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "zone": {
-                  "type": "keyword"
-                }
-              }
-            },
             "concurrent_connections": {
               "type": "long"
             },
             "kibana": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -3008,22 +1538,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -3038,12 +1552,6 @@
                       "properties": {
                         "size_limit": {
                           "type": "float"
-                        },
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
                         }
                       }
                     },
@@ -3051,9 +1559,6 @@
                       "type": "float"
                     }
                   }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -3062,9 +1567,6 @@
                 "disconnects": {
                   "type": "long"
                 },
-                "status_codes": {
-                  "type": "object"
-                },
                 "total": {
                   "type": "long"
                 }
@@ -3080,49 +1582,15 @@
                 }
               }
             },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "source_node": {
-          "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "timestamp": {
-              "format": "date_time",
               "type": "date"
             },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -3159,79 +1627,27 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "logstash_state": {
           "properties": {
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "pipeline": {
               "properties": {
-                "batch_size": {
-                  "type": "integer"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "format": {
-                  "type": "keyword"
-                },
                 "hash": {
                   "type": "keyword"
                 },
                 "id": {
                   "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false,
-                  "type": "object"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
                 }
               }
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
             }
           }
         },
         "logstash_stats": {
           "properties": {
-            "batch_size": {
-              "type": "integer"
-            },
             "events": {
               "properties": {
                 "duration_in_millis": {
                   "type": "long"
                 },
-                "filtered": {
-                  "type": "long"
-                },
                 "in": {
                   "type": "long"
                 },
@@ -3242,34 +1658,6 @@
             },
             "jvm": {
               "properties": {
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
                 "mem": {
                   "properties": {
                     "heap_max_in_bytes": {
@@ -3277,9 +1665,6 @@
                     },
                     "heap_used_in_bytes": {
                       "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "long"
                     }
                   }
                 },
@@ -3290,34 +1675,6 @@
             },
             "logstash": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "batch_size": {
-                      "type": "long"
-                    },
-                    "workers": {
-                      "type": "short"
-                    }
-                  }
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -3332,9 +1689,6 @@
                   "properties": {
                     "cpu": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -3352,9 +1706,6 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
@@ -3383,25 +1734,13 @@
             },
             "pipelines": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "in": {
-                      "type": "long"
-                    },
                     "out": {
                       "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
                     }
                   }
                 },
@@ -3413,9 +1752,6 @@
                 },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
@@ -3427,29 +1763,8 @@
                     }
                   }
                 },
-                "reloads": {
-                  "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "vertices": {
                   "properties": {
-                    "double_gauges": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
@@ -3462,22 +1777,11 @@
                     "id": {
                       "type": "keyword"
                     },
-                    "long_counters": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "pipeline_ephemeral_id": {
                       "type": "keyword"
                     },
                     "queue_push_duration_in_millis": {
-                      "type": "long"
+                      "type": "float"
                     }
                   },
                   "type": "nested"
@@ -3493,12 +1797,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -3506,50 +1804,24 @@
               "properties": {
                 "events_count": {
                   "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
                 }
               }
             },
             "timestamp": {
               "type": "date"
-            },
-            "workers": {
-              "type": "short"
             }
           }
         },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_mb/mappings.json b/x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_mb/mappings.json
index adbd44d7281b6..03f954f92dd33 100644
--- a/x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_mb/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_mb/mappings.json
@@ -9,105 +9,6 @@
       "properties": {
         "beats_state": {
           "properties": {
-            "beat": {
-              "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "properties": {
-                "beat": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword"
-                    },
-                    "hostname": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "build": {
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "input": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "module": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "output": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "service": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -118,12 +19,6 @@
           "properties": {
             "beat": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
                 "type": {
                   "type": "keyword"
                 },
@@ -139,146 +34,19 @@
               "properties": {
                 "apm-server": {
                   "properties": {
-                    "decoder": {
-                      "properties": {
-                        "deflate": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "gzip": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "missing-content-length": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reader": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            },
-                            "size": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "uncompressed": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    },
                     "processor": {
                       "properties": {
                         "error": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "errors": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
                         "metric": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "sourcemap": {
-                          "properties": {
-                            "counter": {
-                              "type": "long"
-                            },
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
@@ -291,40 +59,8 @@
                         },
                         "transaction": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "frames": {
-                              "type": "long"
-                            },
-                            "spans": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "transactions": {
-                              "type": "long"
-                            },
                             "transformations": {
                               "type": "long"
-                            },
-                            "validation": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "errors": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         }
@@ -332,17 +68,6 @@
                     },
                     "server": {
                       "properties": {
-                        "concurrent": {
-                          "properties": {
-                            "wait": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "request": {
                           "properties": {
                             "count": {
@@ -363,9 +88,6 @@
                                 "concurrency": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                },
                                 "decode": {
                                   "type": "long"
                                 },
@@ -400,9 +122,6 @@
                                 "accepted": {
                                   "type": "long"
                                 },
-                                "count": {
-                                  "type": "long"
-                                },
                                 "ok": {
                                   "type": "long"
                                 }
@@ -418,65 +137,17 @@
                   "properties": {
                     "cpu": {
                       "properties": {
-                        "system": {
-                          "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "total": {
                           "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            },
                             "value": {
                               "type": "long"
                             }
                           }
-                        },
-                        "user": {
-                          "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
                         }
                       }
                     },
                     "handles": {
                       "properties": {
-                        "limit": {
-                          "properties": {
-                            "hard": {
-                              "type": "long"
-                            },
-                            "soft": {
-                              "type": "long"
-                            }
-                          }
-                        },
                         "open": {
                           "type": "long"
                         }
@@ -486,13 +157,6 @@
                       "properties": {
                         "ephemeral_id": {
                           "type": "keyword"
-                        },
-                        "uptime": {
-                          "properties": {
-                            "ms": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     },
@@ -516,26 +180,6 @@
                 },
                 "libbeat": {
                   "properties": {
-                    "config": {
-                      "properties": {
-                        "module": {
-                          "properties": {
-                            "running": {
-                              "type": "long"
-                            },
-                            "starts": {
-                              "type": "long"
-                            },
-                            "stops": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reloads": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "output": {
                       "properties": {
                         "events": {
@@ -546,21 +190,12 @@
                             "active": {
                               "type": "long"
                             },
-                            "batches": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
-                            "duplicates": {
-                              "type": "long"
-                            },
                             "failed": {
                               "type": "long"
                             },
-                            "toomany": {
-                              "type": "long"
-                            },
                             "total": {
                               "type": "long"
                             }
@@ -576,9 +211,6 @@
                             }
                           }
                         },
-                        "type": {
-                          "type": "keyword"
-                        },
                         "write": {
                           "properties": {
                             "bytes": {
@@ -592,24 +224,15 @@
                       }
                     },
                     "pipeline": {
-                      "properties": {
-                        "clients": {
-                          "type": "long"
-                        },
+                      "properties": {
                         "events": {
                           "properties": {
-                            "active": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
                             "failed": {
                               "type": "long"
                             },
-                            "filtered": {
-                              "type": "long"
-                            },
                             "published": {
                               "type": "long"
                             },
@@ -620,13 +243,6 @@
                               "type": "long"
                             }
                           }
-                        },
-                        "queue": {
-                          "properties": {
-                            "acked": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     }
@@ -644,19 +260,6 @@
                         },
                         "5": {
                           "type": "double"
-                        },
-                        "norm": {
-                          "properties": {
-                            "1": {
-                              "type": "double"
-                            },
-                            "15": {
-                              "type": "double"
-                            },
-                            "5": {
-                              "type": "double"
-                            }
-                          }
                         }
                       }
                     }
@@ -664,9 +267,6 @@
                 }
               }
             },
-            "tags": {
-              "type": "keyword"
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -676,25 +276,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
@@ -729,93 +320,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -825,112 +337,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -945,16 +375,6 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
                     "index_time_in_millis": {
@@ -975,22 +395,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -998,66 +402,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1072,18 +420,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -1111,17 +449,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1134,17 +463,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1209,32 +529,15 @@
         "indices_stats": {
           "properties": {
             "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
-                        "index_total": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
                       "properties": {
-                        "query_time_in_millis": {
+                        "index_time_in_millis": {
                           "type": "long"
                         },
-                        "query_total": {
+                        "index_total": {
                           "type": "long"
                         }
                       }
@@ -1243,18 +546,8 @@
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -1276,58 +569,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -1335,13 +580,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -1349,15 +587,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -1369,12 +601,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -1382,18 +608,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -1414,33 +630,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1490,13 +688,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -1545,15 +736,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -1563,9 +748,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1583,26 +765,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -1610,14 +776,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -1633,12 +793,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -1651,22 +805,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1677,9 +815,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1690,22 +825,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1716,22 +835,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1760,12 +863,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -1773,22 +870,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
@@ -1830,63 +914,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "kibana_stats": {
           "properties": {
-            "cloud": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "region": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "zone": {
-                  "type": "keyword"
-                }
-              }
-            },
             "concurrent_connections": {
               "type": "long"
             },
             "kibana": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -1909,22 +946,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -1939,12 +960,6 @@
                       "properties": {
                         "size_limit": {
                           "type": "float"
-                        },
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
                         }
                       }
                     },
@@ -1952,9 +967,6 @@
                       "type": "float"
                     }
                   }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -1963,9 +975,6 @@
                 "disconnects": {
                   "type": "long"
                 },
-                "status_codes": {
-                  "type": "object"
-                },
                 "total": {
                   "type": "long"
                 }
@@ -1975,55 +984,21 @@
               "properties": {
                 "average": {
                   "type": "float"
-                },
-                "max": {
-                  "type": "float"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "source_node": {
-          "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
+                },
+                "max": {
+                  "type": "float"
+                }
+              }
             },
             "timestamp": {
-              "format": "date_time",
               "type": "date"
             },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -2060,63 +1035,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "kibana_stats": {
           "properties": {
-            "cloud": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "region": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "zone": {
-                  "type": "keyword"
-                }
-              }
-            },
             "concurrent_connections": {
               "type": "long"
             },
             "kibana": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -2139,22 +1067,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -2169,12 +1081,6 @@
                       "properties": {
                         "size_limit": {
                           "type": "float"
-                        },
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
                         }
                       }
                     },
@@ -2182,9 +1088,6 @@
                       "type": "float"
                     }
                   }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
@@ -2193,9 +1096,6 @@
                 "disconnects": {
                   "type": "long"
                 },
-                "status_codes": {
-                  "type": "object"
-                },
                 "total": {
                   "type": "long"
                 }
@@ -2211,49 +1111,15 @@
                 }
               }
             },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "source_node": {
-          "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "timestamp": {
-              "format": "date_time",
               "type": "date"
             },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
         },
@@ -2290,79 +1156,27 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "logstash_state": {
           "properties": {
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
             "pipeline": {
               "properties": {
-                "batch_size": {
-                  "type": "integer"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "format": {
-                  "type": "keyword"
-                },
                 "hash": {
                   "type": "keyword"
                 },
                 "id": {
                   "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false,
-                  "type": "object"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
                 }
               }
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
             }
           }
         },
         "logstash_stats": {
           "properties": {
-            "batch_size": {
-              "type": "integer"
-            },
             "events": {
               "properties": {
                 "duration_in_millis": {
                   "type": "long"
                 },
-                "filtered": {
-                  "type": "long"
-                },
                 "in": {
                   "type": "long"
                 },
@@ -2373,34 +1187,6 @@
             },
             "jvm": {
               "properties": {
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
                 "mem": {
                   "properties": {
                     "heap_max_in_bytes": {
@@ -2408,9 +1194,6 @@
                     },
                     "heap_used_in_bytes": {
                       "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2421,34 +1204,6 @@
             },
             "logstash": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "batch_size": {
-                      "type": "long"
-                    },
-                    "workers": {
-                      "type": "short"
-                    }
-                  }
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
-                  "type": "keyword"
-                },
                 "uuid": {
                   "type": "keyword"
                 },
@@ -2463,9 +1218,6 @@
                   "properties": {
                     "cpu": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -2483,9 +1235,6 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
@@ -2514,25 +1263,13 @@
             },
             "pipelines": {
               "properties": {
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "in": {
-                      "type": "long"
-                    },
                     "out": {
                       "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
                     }
                   }
                 },
@@ -2544,9 +1281,6 @@
                 },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
@@ -2558,29 +1292,8 @@
                     }
                   }
                 },
-                "reloads": {
-                  "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "vertices": {
                   "properties": {
-                    "double_gauges": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
@@ -2593,22 +1306,11 @@
                     "id": {
                       "type": "keyword"
                     },
-                    "long_counters": {
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      },
-                      "type": "nested"
-                    },
                     "pipeline_ephemeral_id": {
                       "type": "keyword"
                     },
                     "queue_push_duration_in_millis": {
-                      "type": "long"
+                      "type": "float"
                     }
                   },
                   "type": "nested"
@@ -2624,12 +1326,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -2637,50 +1333,24 @@
               "properties": {
                 "events_count": {
                   "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
                 }
               }
             },
             "timestamp": {
               "type": "date"
-            },
-            "workers": {
-              "type": "short"
             }
           }
         },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-basic-beats/mappings.json b/x-pack/test/functional/es_archives/monitoring/singlecluster-basic-beats/mappings.json
index 212391b038477..ba08a3d9f2460 100644
--- a/x-pack/test/functional/es_archives/monitoring/singlecluster-basic-beats/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/singlecluster-basic-beats/mappings.json
@@ -7,105 +7,6 @@
       "properties": {
         "beats_state": {
           "properties": {
-            "beat": {
-              "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "properties": {
-                "beat": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "hostname": {
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "build": {
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "input": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "module": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "output": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "service": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -116,12 +17,6 @@
           "properties": {
             "beat": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
                 "type": {
                   "type": "keyword"
                 },
@@ -135,108 +30,40 @@
             },
             "metrics": {
               "properties": {
-                "beat": {
+                "apm-server": {
                   "properties": {
-                    "cpu": {
+                    "processor": {
                       "properties": {
-                        "system": {
+                        "error": {
                           "properties": {
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
-                        "total": {
+                        "metric": {
                           "properties": {
-                            "value": {
-                              "type": "long"
-                            },
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
-                        "user": {
+                        "span": {
                           "properties": {
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
-                        }
-                      }
-                    },
-                    "info": {
-                      "properties": {
-                        "ephemeral_id": {
-                          "type": "keyword"
                         },
-                        "uptime": {
+                        "transaction": {
                           "properties": {
-                            "ms": {
+                            "transformations": {
                               "type": "long"
                             }
                           }
                         }
                       }
                     },
-                    "memstats": {
-                      "properties": {
-                        "gc_next": {
-                          "type": "long"
-                        },
-                        "memory_alloc": {
-                          "type": "long"
-                        },
-                        "memory_total": {
-                          "type": "long"
-                        },
-                        "rss": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "handles": {
-                      "properties": {
-                        "open": {
-                          "type": "long"
-                        },
-                        "limit": {
-                          "properties": {
-                            "hard": {
-                              "type": "long"
-                            },
-                            "soft": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "apm-server": {
-                  "properties": {
                     "server": {
                       "properties": {
                         "request": {
@@ -246,17 +73,6 @@
                             }
                           }
                         },
-                        "concurrent": {
-                          "properties": {
-                            "wait": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "response": {
                           "properties": {
                             "count": {
@@ -264,53 +80,47 @@
                             },
                             "errors": {
                               "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "toolarge": {
+                                "closed": {
                                   "type": "long"
                                 },
-                                "validate": {
+                                "concurrency": {
                                   "type": "long"
                                 },
-                                "ratelimit": {
+                                "decode": {
                                   "type": "long"
                                 },
-                                "queue": {
+                                "forbidden": {
                                   "type": "long"
                                 },
-                                "closed": {
+                                "internal": {
                                   "type": "long"
                                 },
-                                "forbidden": {
+                                "method": {
                                   "type": "long"
                                 },
-                                "concurrency": {
+                                "queue": {
                                   "type": "long"
                                 },
-                                "unauthorized": {
+                                "ratelimit": {
                                   "type": "long"
                                 },
-                                "internal": {
+                                "toolarge": {
                                   "type": "long"
                                 },
-                                "decode": {
+                                "unauthorized": {
                                   "type": "long"
                                 },
-                                "method": {
+                                "validate": {
                                   "type": "long"
                                 }
                               }
                             },
                             "valid": {
                               "properties": {
-                                "ok": {
-                                  "type": "long"
-                                },
                                 "accepted": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "ok": {
                                   "type": "long"
                                 }
                               }
@@ -318,296 +128,109 @@
                           }
                         }
                       }
-                    },
-                    "decoder": {
+                    }
+                  }
+                },
+                "beat": {
+                  "properties": {
+                    "cpu": {
                       "properties": {
-                        "deflate": {
+                        "total": {
                           "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
+                            "value": {
                               "type": "long"
                             }
                           }
+                        }
+                      }
+                    },
+                    "handles": {
+                      "properties": {
+                        "open": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "info": {
+                      "properties": {
+                        "ephemeral_id": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "memstats": {
+                      "properties": {
+                        "gc_next": {
+                          "type": "long"
+                        },
+                        "memory_alloc": {
+                          "type": "long"
+                        },
+                        "memory_total": {
+                          "type": "long"
                         },
-                        "gzip": {
+                        "rss": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "libbeat": {
+                  "properties": {
+                    "output": {
+                      "properties": {
+                        "events": {
                           "properties": {
-                            "content-length": {
+                            "acked": {
                               "type": "long"
                             },
-                            "count": {
+                            "active": {
                               "type": "long"
-                            }
-                          }
-                        },
-                        "uncompressed": {
-                          "properties": {
-                            "content-length": {
+                            },
+                            "dropped": {
                               "type": "long"
                             },
-                            "count": {
+                            "failed": {
+                              "type": "long"
+                            },
+                            "total": {
                               "type": "long"
                             }
                           }
                         },
-                        "reader": {
+                        "read": {
                           "properties": {
-                            "size": {
+                            "bytes": {
                               "type": "long"
                             },
-                            "count": {
+                            "errors": {
                               "type": "long"
                             }
                           }
                         },
-                        "missing-content-length": {
+                        "write": {
                           "properties": {
-                            "count": {
+                            "bytes": {
+                              "type": "long"
+                            },
+                            "errors": {
                               "type": "long"
                             }
                           }
                         }
                       }
                     },
-                    "processor": {
-                      "properties": {
-                        "metric": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "sourcemap": {
-                          "properties": {
-                            "counter": {
-                              "type": "long"
-                            },
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "transaction": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            },
-                            "transactions": {
-                              "type": "long"
-                            },
-                            "spans": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "error": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            },
-                            "errors": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "span": {
-                          "properties": {
-                            "transformations": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "libbeat": {
-                  "properties": {
-                    "config": {
-                      "properties": {
-                        "module": {
-                          "properties": {
-                            "running": {
-                              "type": "long"
-                            },
-                            "starts": {
-                              "type": "long"
-                            },
-                            "stops": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reloads": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "output": {
+                    "pipeline": {
                       "properties": {
                         "events": {
                           "properties": {
-                            "acked": {
-                              "type": "long"
-                            },
-                            "active": {
-                              "type": "long"
-                            },
-                            "batches": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
-                            "duplicates": {
-                              "type": "long"
-                            },
                             "failed": {
                               "type": "long"
                             },
-                            "total": {
-                              "type": "long"
-                            },
-                            "toomany": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "read": {
-                          "properties": {
-                            "bytes": {
-                              "type": "long"
-                            },
-                            "errors": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "type": {
-                          "type": "keyword"
-                        },
-                        "write": {
-                          "properties": {
-                            "bytes": {
-                              "type": "long"
-                            },
-                            "errors": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "pipeline": {
-                      "properties": {
-                        "clients": {
-                          "type": "long"
-                        },
-                        "events": {
-                          "properties": {
-                            "active": {
-                              "type": "long"
-                            },
-                            "dropped": {
-                              "type": "long"
-                            },
-                            "failed": {
-                              "type": "long"
-                            },
-                            "filtered": {
-                              "type": "long"
-                            },
                             "published": {
                               "type": "long"
                             },
@@ -618,13 +241,6 @@
                               "type": "long"
                             }
                           }
-                        },
-                        "queue": {
-                          "properties": {
-                            "acked": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     }
@@ -637,24 +253,11 @@
                         "1": {
                           "type": "double"
                         },
-                        "5": {
-                          "type": "double"
-                        },
                         "15": {
                           "type": "double"
                         },
-                        "norm": {
-                          "properties": {
-                            "1": {
-                              "type": "double"
-                            },
-                            "5": {
-                              "type": "double"
-                            },
-                            "15": {
-                              "type": "double"
-                            }
-                          }
+                        "5": {
+                          "type": "double"
                         }
                       }
                     }
@@ -662,9 +265,6 @@
                 }
               }
             },
-            "tags": {
-              "type": "keyword"
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -674,25 +274,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
@@ -727,95 +318,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -823,86 +340,40 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
-                "memory": {
-                  "properties": {
-                    "heap": {
-                      "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
-                        "size_limit": {
-                          "type": "float"
-                        }
-                      }
-                    },
-                    "resident_set_size_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
                 "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
+                  "type": "float"
                 },
-                "https": {
+                "memory": {
                   "properties": {
-                    "total": {
-                      "type": "long"
+                    "heap": {
+                      "properties": {
+                        "size_limit": {
+                          "type": "float"
+                        }
+                      }
+                    },
+                    "resident_set_size_in_bytes": {
+                      "type": "float"
                     }
                   }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -910,9 +381,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -926,10 +394,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -953,115 +435,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -1076,29 +490,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -1113,44 +510,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -1159,42 +521,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -1203,36 +535,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -1251,14 +566,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -1267,24 +580,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -1294,41 +598,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -1337,68 +641,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1419,15 +747,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1435,15 +754,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1462,116 +772,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1587,16 +878,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -1608,12 +893,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -1623,12 +902,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -1638,71 +911,10 @@
                 }
               }
             },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
             "thread_pool": {
               "properties": {
                 "bulk": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1713,9 +925,6 @@
                 },
                 "get": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1726,22 +935,6 @@
                 },
                 "index": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1752,22 +945,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1790,246 +967,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-green-gold/mappings.json b/x-pack/test/functional/es_archives/monitoring/singlecluster-green-gold/mappings.json
index bd411ee5178e2..702f8731a31ca 100644
--- a/x-pack/test/functional/es_archives/monitoring/singlecluster-green-gold/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/singlecluster-green-gold/mappings.json
@@ -1,7 +1,8 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-kibana-6-2017.08.23",
     "mappings": {
       "dynamic": false,
@@ -9,95 +10,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -105,47 +32,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -155,36 +63,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -192,9 +73,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -208,10 +86,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -230,29 +122,15 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-alerts-6",
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -274,6 +152,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
@@ -292,7 +185,8 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-logstash-6-2017.08.23",
     "mappings": {
       "dynamic": false,
@@ -300,83 +194,25 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
-        "logstash_stats": {
-          "type": "object",
+        "logstash_state": {
           "properties": {
-            "logstash": {
+            "pipeline": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "version": {
+                "hash": {
                   "type": "keyword"
                 },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
+                "id": {
                   "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "workers": {
-                      "type": "short"
-                    },
-                    "batch_size": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
-            },
+            }
+          }
+        },
+        "logstash_stats": {
+          "properties": {
             "events": {
               "properties": {
-                "filtered": {
+                "duration_in_millis": {
                   "type": "long"
                 },
                 "in": {
@@ -384,210 +220,120 @@
                 },
                 "out": {
                   "type": "long"
-                },
-                "duration_in_millis": {
-                  "type": "long"
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "jvm": {
               "properties": {
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
                 "uptime_in_millis": {
                   "type": "long"
+                }
+              }
+            },
+            "logstash": {
+              "properties": {
+                "uuid": {
+                  "type": "keyword"
                 },
-                "gc": {
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "os": {
+              "properties": {
+                "cgroup": {
                   "properties": {
-                    "collectors": {
+                    "cpu": {
                       "properties": {
-                        "old": {
+                        "stat": {
                           "properties": {
-                            "collection_count": {
+                            "number_of_elapsed_periods": {
                               "type": "long"
                             },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
+                            "number_of_times_throttled": {
                               "type": "long"
                             },
-                            "collection_time_in_millis": {
+                            "time_throttled_nanos": {
                               "type": "long"
                             }
                           }
                         }
                       }
-                    }
-                  }
-                },
-                "mem": {
-                  "properties": {
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_in_bytes": {
-                      "type": "long"
                     },
-                    "heap_used_percent": {
-                      "type": "long"
+                    "cpuacct": {
+                      "properties": {
+                        "usage_nanos": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
-                }
-              }
-            },
-            "os": {
-              "properties": {
+                },
                 "cpu": {
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "1m": {
+                        "15m": {
                           "type": "half_float"
                         },
-                        "5m": {
+                        "1m": {
                           "type": "half_float"
                         },
-                        "15m": {
+                        "5m": {
                           "type": "half_float"
                         }
                       }
                     }
                   }
-                },
-                "cgroup": {
-                  "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "cpu": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "stat": {
-                          "properties": {
-                            "number_of_elapsed_periods": {
-                              "type": "long"
-                            },
-                            "number_of_times_throttled": {
-                              "type": "long"
-                            },
-                            "time_throttled_nanos": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "process": {
-              "properties": {
-                "cpu": {
-                  "properties": {
-                    "percent": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
-                }
-              }
-            },
-            "queue": {
-              "properties": {
-                "events_count": {
-                  "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
                 }
               }
             },
             "pipelines": {
-              "type": "nested",
               "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
-                    "in": {
-                      "type": "long"
-                    },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "out": {
-                      "type": "long"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "queue_push_duration_in_millis": {
+                    "out": {
                       "type": "long"
                     }
                   }
                 },
+                "hash": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
                     "queue_size_in_bytes": {
                       "type": "long"
+                    },
+                    "type": {
+                      "type": "keyword"
                     }
                   }
                 },
                 "vertices": {
-                  "type": "nested",
                   "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "pipeline_ephemeral_id": {
-                      "type": "keyword"
+                    "duration_in_millis": {
+                      "type": "long"
                     },
                     "events_in": {
                       "type": "long"
@@ -595,111 +341,63 @@
                     "events_out": {
                       "type": "long"
                     },
-                    "duration_in_millis": {
-                      "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
+                    "id": {
+                      "type": "keyword"
                     },
-                    "long_counters": {
-                      "type": "nested",
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      }
+                    "pipeline_ephemeral_id": {
+                      "type": "keyword"
                     },
-                    "double_gauges": {
-                      "type": "nested",
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      }
+                    "queue_push_duration_in_millis": {
+                      "type": "float"
                     }
-                  }
-                },
-                "reloads": {
+                  },
+                  "type": "nested"
+                }
+              },
+              "type": "nested"
+            },
+            "process": {
+              "properties": {
+                "cpu": {
                   "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
+                    "percent": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "workers": {
-              "type": "short"
+            "queue": {
+              "properties": {
+                "events_count": {
+                  "type": "long"
+                }
+              }
             },
-            "batch_size": {
-              "type": "integer"
+            "timestamp": {
+              "type": "date"
             }
           }
         },
-        "logstash_state": {
+        "metricset": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "pipeline": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
-                },
-                "batch_size": {
-                  "type": "integer"
-                },
-                "format": {
-                  "type": "keyword"
-                },
-                "version": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
                   "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false
                 }
-              }
+              },
+              "type": "text"
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -718,121 +416,54 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
+    "aliases": {
+    },
     "index": ".monitoring-es-6-2017.08.23",
     "mappings": {
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
+            }
+          }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -847,29 +478,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -884,44 +498,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -930,42 +509,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -974,36 +523,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -1022,14 +554,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -1038,24 +568,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -1065,41 +586,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -1108,68 +629,92 @@
             }
           }
         },
-        "cluster_stats": {
-          "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
-            }
-          }
-        },
-        "cluster_state": {
-          "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
-            }
-          }
-        },
-        "node_stats": {
+        "indices_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "_all": {
               "properties": {
-                "docs": {
+                "primaries": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "job_stats": {
+          "properties": {
+            "job_id": {
+              "type": "keyword"
+            }
+          }
+        },
+        "node_stats": {
+          "properties": {
+            "fs": {
+              "properties": {
+                "io_stats": {
+                  "properties": {
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1190,15 +735,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1206,15 +742,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1233,116 +760,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1358,16 +866,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -1379,12 +881,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -1394,12 +890,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -1409,71 +899,10 @@
                 }
               }
             },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
             "thread_pool": {
               "properties": {
                 "bulk": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1484,9 +913,6 @@
                 },
                 "get": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1497,22 +923,6 @@
                 },
                 "index": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1523,22 +933,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1561,246 +955,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-green-platinum/mappings.json b/x-pack/test/functional/es_archives/monitoring/singlecluster-green-platinum/mappings.json
index 0cae1b02ccaca..640b6f07f3470 100644
--- a/x-pack/test/functional/es_archives/monitoring/singlecluster-green-platinum/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/singlecluster-green-platinum/mappings.json
@@ -8,95 +8,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -104,47 +30,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -154,36 +61,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -191,9 +71,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -207,10 +84,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -235,105 +126,6 @@
       "properties": {
         "beats_state": {
           "properties": {
-            "beat": {
-              "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "properties": {
-                "beat": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "hostname": {
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "build": {
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "input": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "module": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "output": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "service": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -344,12 +136,6 @@
           "properties": {
             "beat": {
               "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
                 "type": {
                   "type": "keyword"
                 },
@@ -363,128 +149,49 @@
             },
             "metrics": {
               "properties": {
-                "beat": {
+                "apm-server": {
                   "properties": {
-                    "cpu": {
+                    "processor": {
                       "properties": {
-                        "system": {
+                        "error": {
                           "properties": {
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
-                        "total": {
+                        "metric": {
                           "properties": {
-                            "value": {
-                              "type": "long"
-                            },
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
                         },
-                        "user": {
+                        "span": {
                           "properties": {
-                            "ticks": {
+                            "transformations": {
                               "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
                             }
                           }
-                        }
-                      }
-                    },
-                    "info": {
-                      "properties": {
-                        "ephemeral_id": {
-                          "type": "keyword"
                         },
-                        "uptime": {
+                        "transaction": {
                           "properties": {
-                            "ms": {
+                            "transformations": {
                               "type": "long"
                             }
                           }
                         }
                       }
                     },
-                    "memstats": {
-                      "properties": {
-                        "gc_next": {
-                          "type": "long"
-                        },
-                        "memory_alloc": {
-                          "type": "long"
-                        },
-                        "memory_total": {
-                          "type": "long"
-                        },
-                        "rss": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "handles": {
+                    "server": {
                       "properties": {
-                        "open": {
-                          "type": "long"
-                        },
-                        "limit": {
+                        "request": {
                           "properties": {
-                            "hard": {
-                              "type": "long"
-                            },
-                            "soft": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "apm-server": {
-                  "properties": {
-                    "server": {
-                      "properties": {
-                        "request": {
-                          "properties": {
-                            "count": {
+                            "count": {
                               "type": "long"
                             }
                           }
                         },
-                        "concurrent": {
-                          "properties": {
-                            "wait": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
                         "response": {
                           "properties": {
                             "count": {
@@ -492,53 +199,47 @@
                             },
                             "errors": {
                               "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "toolarge": {
+                                "closed": {
                                   "type": "long"
                                 },
-                                "validate": {
+                                "concurrency": {
                                   "type": "long"
                                 },
-                                "ratelimit": {
+                                "decode": {
                                   "type": "long"
                                 },
-                                "queue": {
+                                "forbidden": {
                                   "type": "long"
                                 },
-                                "closed": {
+                                "internal": {
                                   "type": "long"
                                 },
-                                "forbidden": {
+                                "method": {
                                   "type": "long"
                                 },
-                                "concurrency": {
+                                "queue": {
                                   "type": "long"
                                 },
-                                "unauthorized": {
+                                "ratelimit": {
                                   "type": "long"
                                 },
-                                "internal": {
+                                "toolarge": {
                                   "type": "long"
                                 },
-                                "decode": {
+                                "unauthorized": {
                                   "type": "long"
                                 },
-                                "method": {
+                                "validate": {
                                   "type": "long"
                                 }
                               }
                             },
                             "valid": {
                               "properties": {
-                                "ok": {
-                                  "type": "long"
-                                },
                                 "accepted": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "ok": {
                                   "type": "long"
                                 }
                               }
@@ -546,195 +247,49 @@
                           }
                         }
                       }
-                    },
-                    "decoder": {
+                    }
+                  }
+                },
+                "beat": {
+                  "properties": {
+                    "cpu": {
                       "properties": {
-                        "deflate": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "gzip": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "uncompressed": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reader": {
-                          "properties": {
-                            "size": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "missing-content-length": {
+                        "total": {
                           "properties": {
-                            "count": {
+                            "value": {
                               "type": "long"
                             }
                           }
                         }
                       }
                     },
-                    "processor": {
+                    "handles": {
                       "properties": {
-                        "metric": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "sourcemap": {
-                          "properties": {
-                            "counter": {
-                              "type": "long"
-                            },
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
+                        "open": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "info": {
+                      "properties": {
+                        "ephemeral_id": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "memstats": {
+                      "properties": {
+                        "gc_next": {
+                          "type": "long"
                         },
-                        "transaction": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            },
-                            "transactions": {
-                              "type": "long"
-                            },
-                            "spans": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            }
-                          }
+                        "memory_alloc": {
+                          "type": "long"
                         },
-                        "error": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            },
-                            "errors": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            }
-                          }
+                        "memory_total": {
+                          "type": "long"
                         },
-                        "span": {
-                          "properties": {
-                            "transformations": {
-                              "type": "long"
-                            }
-                          }
+                        "rss": {
+                          "type": "long"
                         }
                       }
                     }
@@ -742,26 +297,6 @@
                 },
                 "libbeat": {
                   "properties": {
-                    "config": {
-                      "properties": {
-                        "module": {
-                          "properties": {
-                            "running": {
-                              "type": "long"
-                            },
-                            "starts": {
-                              "type": "long"
-                            },
-                            "stops": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "reloads": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "output": {
                       "properties": {
                         "events": {
@@ -772,23 +307,14 @@
                             "active": {
                               "type": "long"
                             },
-                            "batches": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
-                            "duplicates": {
-                              "type": "long"
-                            },
                             "failed": {
                               "type": "long"
                             },
                             "total": {
                               "type": "long"
-                            },
-                            "toomany": {
-                              "type": "long"
                             }
                           }
                         },
@@ -802,9 +328,6 @@
                             }
                           }
                         },
-                        "type": {
-                          "type": "keyword"
-                        },
                         "write": {
                           "properties": {
                             "bytes": {
@@ -819,23 +342,14 @@
                     },
                     "pipeline": {
                       "properties": {
-                        "clients": {
-                          "type": "long"
-                        },
                         "events": {
                           "properties": {
-                            "active": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
                             "failed": {
                               "type": "long"
                             },
-                            "filtered": {
-                              "type": "long"
-                            },
                             "published": {
                               "type": "long"
                             },
@@ -846,13 +360,6 @@
                               "type": "long"
                             }
                           }
-                        },
-                        "queue": {
-                          "properties": {
-                            "acked": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     }
@@ -865,24 +372,11 @@
                         "1": {
                           "type": "double"
                         },
-                        "5": {
-                          "type": "double"
-                        },
                         "15": {
                           "type": "double"
                         },
-                        "norm": {
-                          "properties": {
-                            "1": {
-                              "type": "double"
-                            },
-                            "5": {
-                              "type": "double"
-                            },
-                            "15": {
-                              "type": "double"
-                            }
-                          }
+                        "5": {
+                          "type": "double"
                         }
                       }
                     }
@@ -890,9 +384,6 @@
                 }
               }
             },
-            "tags": {
-              "type": "keyword"
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -902,25 +393,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },
@@ -953,115 +435,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -1076,29 +490,64 @@
                     }
                   }
                 },
-                "fielddata": {
+                "indexing": {
                   "properties": {
-                    "memory_size_in_bytes": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "evictions": {
+                    "index_total": {
+                      "type": "long"
+                    },
+                    "throttle_time_in_millis": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "merges": {
+                  "properties": {
+                    "total_size_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
                 },
+                "segments": {
+                  "properties": {
+                    "count": {
+                      "type": "integer"
+                    }
+                  }
+                },
                 "store": {
                   "properties": {
                     "size_in_bytes": {
                       "type": "long"
                     }
                   }
+                }
+              }
+            },
+            "total": {
+              "properties": {
+                "fielddata": {
+                  "properties": {
+                    "memory_size_in_bytes": {
+                      "type": "long"
+                    }
+                  }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -1117,14 +566,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -1133,24 +580,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -1160,176 +598,85 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
-            },
-            "total": {
+            }
+          }
+        },
+        "indices_stats": {
+          "properties": {
+            "_all": {
               "properties": {
-                "docs": {
+                "primaries": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
-                "fielddata": {
+                "total": {
                   "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
                     },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "indexing": {
-                  "properties": {
-                    "index_total": {
-                      "type": "long"
-                    },
-                    "index_time_in_millis": {
-                      "type": "long"
-                    },
-                    "throttle_time_in_millis": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "merges": {
-                  "properties": {
-                    "total_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "segments": {
-                  "properties": {
-                    "count": {
-                      "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "refresh": {
-                  "properties": {
-                    "total_time_in_millis": {
-                      "type": "long"
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 }
@@ -1337,68 +684,49 @@
             }
           }
         },
-        "cluster_stats": {
-          "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
-            }
-          }
-        },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1419,15 +747,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1435,15 +754,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -1462,116 +772,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -1587,95 +878,21 @@
                         }
                       }
                     },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "cpu": {
-                  "properties": {
-                    "load_average": {
+                    "cpuacct": {
                       "properties": {
-                        "1m": {
-                          "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
+                        "usage_nanos": {
+                          "type": "long"
                         }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "process": {
-              "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "cpu": {
-                  "properties": {
-                    "percent": {
-                      "type": "half_float"
-                    }
-                  }
-                }
-              }
-            },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
+                      }
+                    }
+                  }
+                },
+                "cpu": {
+                  "properties": {
+                    "load_average": {
+                      "properties": {
+                        "1m": {
+                          "type": "half_float"
                         }
                       }
                     }
@@ -1683,26 +900,21 @@
                 }
               }
             },
-            "thread_pool": {
+            "process": {
               "properties": {
-                "bulk": {
+                "cpu": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
+                    "percent": {
+                      "type": "half_float"
                     }
                   }
-                },
-                "generic": {
+                }
+              }
+            },
+            "thread_pool": {
+              "properties": {
+                "bulk": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1713,9 +925,6 @@
                 },
                 "get": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1726,22 +935,6 @@
                 },
                 "index": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1752,22 +945,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1790,246 +967,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -2052,24 +1024,9 @@
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -2091,6 +1048,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-green-trial-two-nodes-one-cgrouped/mappings.json b/x-pack/test/functional/es_archives/monitoring/singlecluster-green-trial-two-nodes-one-cgrouped/mappings.json
index babf4398a8502..6e6847a5fe30b 100644
--- a/x-pack/test/functional/es_archives/monitoring/singlecluster-green-trial-two-nodes-one-cgrouped/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/singlecluster-green-trial-two-nodes-one-cgrouped/mappings.json
@@ -8,95 +8,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -104,47 +30,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -154,36 +61,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -191,9 +71,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -207,10 +84,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -234,115 +125,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -357,29 +180,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -394,44 +200,9 @@
                     }
                   }
                 },
-                "query_cache": {
+                "refresh": {
                   "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -440,42 +211,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -484,36 +225,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -532,14 +256,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -548,24 +270,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -575,41 +288,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -618,68 +331,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -700,15 +437,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -716,15 +444,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -743,116 +462,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -868,16 +568,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -889,12 +583,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -904,12 +592,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -919,71 +601,10 @@
                 }
               }
             },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
             "thread_pool": {
               "properties": {
                 "bulk": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -994,9 +615,6 @@
                 },
                 "get": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1007,22 +625,6 @@
                 },
                 "index": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1033,22 +635,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1071,246 +657,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-red-platinum/mappings.json b/x-pack/test/functional/es_archives/monitoring/singlecluster-red-platinum/mappings.json
index b835ca4fdaf65..115d2fff4a4ac 100644
--- a/x-pack/test/functional/es_archives/monitoring/singlecluster-red-platinum/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/singlecluster-red-platinum/mappings.json
@@ -6,115 +6,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -129,29 +61,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -166,44 +81,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -212,42 +92,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -256,36 +106,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -304,14 +137,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -320,24 +151,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -347,41 +169,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -390,68 +212,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -472,15 +318,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -488,15 +325,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -515,116 +343,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -640,16 +449,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -661,12 +464,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -676,413 +473,106 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
                       "type": "half_float"
                     }
-                  }
-                }
-              }
-            },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "thread_pool": {
-              "properties": {
-                "bulk": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "get": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "index": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "write": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "index_recovery": {
-          "type": "object"
-        },
-        "shard": {
-          "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
-            "index": {
-              "type": "keyword"
-            },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
-            "node": {
-              "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
-            },
-            "state": {
-              "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "ccr_stats": {
-          "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
-              "type": "keyword"
-            },
-            "follower_index": {
-              "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
+                  }
+                }
+              }
             },
-            "read_exceptions": {
-              "type": "nested",
+            "thread_pool": {
               "properties": {
-                "from_seq_no": {
-                  "type": "long"
+                "bulk": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 },
-                "retries": {
-                  "type": "integer"
+                "get": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 },
-                "exception": {
-                  "type": "object",
+                "index": {
                   "properties": {
-                    "type": {
-                      "type": "keyword"
+                    "queue": {
+                      "type": "integer"
                     },
-                    "reason": {
-                      "type": "text"
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "search": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
                     }
                   }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
                 },
-                "reason": {
-                  "type": "text"
+                "write": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 }
               }
             }
           }
         },
-        "ccr_auto_follow_stats": {
+        "shard": {
           "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
+            "index": {
+              "type": "keyword"
             },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
+            "node": {
+              "type": "keyword"
             },
-            "number_of_successful_follow_indices": {
-              "type": "long"
+            "primary": {
+              "type": "boolean"
             },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
+            "state": {
+              "type": "keyword"
+            }
+          }
+        },
+        "source_node": {
+          "properties": {
+            "name": {
+              "type": "keyword"
             },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
+            "uuid": {
+              "type": "keyword"
             }
           }
+        },
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1107,95 +597,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -1203,47 +619,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -1253,36 +650,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -1290,9 +660,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -1306,10 +673,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1331,24 +712,9 @@
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -1370,6 +736,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-three-nodes-shard-relocation/mappings.json b/x-pack/test/functional/es_archives/monitoring/singlecluster-three-nodes-shard-relocation/mappings.json
index d1101b9fb4659..f8edb978c0add 100644
--- a/x-pack/test/functional/es_archives/monitoring/singlecluster-three-nodes-shard-relocation/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/singlecluster-three-nodes-shard-relocation/mappings.json
@@ -8,95 +8,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -104,47 +30,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -154,36 +61,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -191,9 +71,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -207,10 +84,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -232,24 +123,9 @@
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -271,6 +147,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
@@ -295,83 +186,25 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
-        "logstash_stats": {
-          "type": "object",
+        "logstash_state": {
           "properties": {
-            "logstash": {
+            "pipeline": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "http_address": {
-                  "type": "keyword"
-                },
-                "version": {
+                "hash": {
                   "type": "keyword"
                 },
-                "snapshot": {
-                  "type": "boolean"
-                },
-                "status": {
+                "id": {
                   "type": "keyword"
-                },
-                "pipeline": {
-                  "properties": {
-                    "workers": {
-                      "type": "short"
-                    },
-                    "batch_size": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
-            },
+            }
+          }
+        },
+        "logstash_stats": {
+          "properties": {
             "events": {
               "properties": {
-                "filtered": {
+                "duration_in_millis": {
                   "type": "long"
                 },
                 "in": {
@@ -379,48 +212,11 @@
                 },
                 "out": {
                   "type": "long"
-                },
-                "duration_in_millis": {
-                  "type": "long"
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "jvm": {
               "properties": {
-                "uptime_in_millis": {
-                  "type": "long"
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
                 "mem": {
                   "properties": {
                     "heap_max_in_bytes": {
@@ -428,50 +224,30 @@
                     },
                     "heap_used_in_bytes": {
                       "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "long"
                     }
                   }
-                }
-              }
+                },
+                "uptime_in_millis": {
+                  "type": "long"
+                }
+              }
             },
-            "os": {
+            "logstash": {
               "properties": {
-                "cpu": {
-                  "properties": {
-                    "load_average": {
-                      "properties": {
-                        "1m": {
-                          "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
-                        }
-                      }
-                    }
-                  }
+                "uuid": {
+                  "type": "keyword"
                 },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "os": {
+              "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -486,103 +262,70 @@
                           }
                         }
                       }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "usage_nanos": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
-                }
-              }
-            },
-            "process": {
-              "properties": {
+                },
                 "cpu": {
                   "properties": {
-                    "percent": {
-                      "type": "long"
+                    "load_average": {
+                      "properties": {
+                        "15m": {
+                          "type": "half_float"
+                        },
+                        "1m": {
+                          "type": "half_float"
+                        },
+                        "5m": {
+                          "type": "half_float"
+                        }
+                      }
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
-                }
-              }
-            },
-            "reloads": {
-              "properties": {
-                "failures": {
-                  "type": "long"
-                },
-                "successes": {
-                  "type": "long"
-                }
-              }
-            },
-            "queue": {
-              "properties": {
-                "events_count": {
-                  "type": "long"
-                },
-                "type": {
-                  "type": "keyword"
                 }
               }
             },
             "pipelines": {
-              "type": "nested",
               "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
                 "events": {
                   "properties": {
-                    "in": {
-                      "type": "long"
-                    },
-                    "filtered": {
-                      "type": "long"
-                    },
-                    "out": {
-                      "type": "long"
-                    },
                     "duration_in_millis": {
                       "type": "long"
                     },
-                    "queue_push_duration_in_millis": {
+                    "out": {
                       "type": "long"
                     }
                   }
                 },
+                "hash": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
                 "queue": {
                   "properties": {
-                    "events_count": {
-                      "type": "long"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    },
                     "max_queue_size_in_bytes": {
                       "type": "long"
                     },
                     "queue_size_in_bytes": {
                       "type": "long"
+                    },
+                    "type": {
+                      "type": "keyword"
                     }
                   }
                 },
                 "vertices": {
-                  "type": "nested",
                   "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "pipeline_ephemeral_id": {
-                      "type": "keyword"
+                    "duration_in_millis": {
+                      "type": "long"
                     },
                     "events_in": {
                       "type": "long"
@@ -590,111 +333,63 @@
                     "events_out": {
                       "type": "long"
                     },
-                    "duration_in_millis": {
-                      "type": "long"
-                    },
-                    "queue_push_duration_in_millis": {
-                      "type": "long"
+                    "id": {
+                      "type": "keyword"
                     },
-                    "long_counters": {
-                      "type": "nested",
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "long"
-                        }
-                      }
+                    "pipeline_ephemeral_id": {
+                      "type": "keyword"
                     },
-                    "double_gauges": {
-                      "type": "nested",
-                      "properties": {
-                        "name": {
-                          "type": "keyword"
-                        },
-                        "value": {
-                          "type": "double"
-                        }
-                      }
+                    "queue_push_duration_in_millis": {
+                      "type": "float"
                     }
-                  }
-                },
-                "reloads": {
+                  },
+                  "type": "nested"
+                }
+              },
+              "type": "nested"
+            },
+            "process": {
+              "properties": {
+                "cpu": {
                   "properties": {
-                    "failures": {
-                      "type": "long"
-                    },
-                    "successes": {
+                    "percent": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "workers": {
-              "type": "short"
+            "queue": {
+              "properties": {
+                "events_count": {
+                  "type": "long"
+                }
+              }
             },
-            "batch_size": {
-              "type": "integer"
+            "timestamp": {
+              "type": "date"
             }
           }
         },
-        "logstash_state": {
+        "metricset": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "http_address": {
-              "type": "keyword"
-            },
-            "ephemeral_id": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
-            },
-            "snapshot": {
-              "type": "boolean"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "pipeline": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "hash": {
-                  "type": "keyword"
-                },
-                "ephemeral_id": {
-                  "type": "keyword"
-                },
-                "workers": {
-                  "type": "short"
-                },
-                "batch_size": {
-                  "type": "integer"
-                },
-                "format": {
-                  "type": "keyword"
-                },
-                "version": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
                   "type": "keyword"
-                },
-                "representation": {
-                  "enabled": false
                 }
-              }
+              },
+              "type": "text"
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -717,115 +412,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -840,29 +467,64 @@
                     }
                   }
                 },
-                "fielddata": {
+                "indexing": {
                   "properties": {
-                    "memory_size_in_bytes": {
+                    "index_time_in_millis": {
+                      "type": "long"
+                    },
+                    "index_total": {
                       "type": "long"
                     },
-                    "evictions": {
+                    "throttle_time_in_millis": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "merges": {
+                  "properties": {
+                    "total_size_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "segments": {
+                  "properties": {
+                    "count": {
+                      "type": "integer"
+                    }
+                  }
+                },
                 "store": {
                   "properties": {
                     "size_in_bytes": {
                       "type": "long"
                     }
                   }
+                }
+              }
+            },
+            "total": {
+              "properties": {
+                "fielddata": {
+                  "properties": {
+                    "memory_size_in_bytes": {
+                      "type": "long"
+                    }
+                  }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -881,14 +543,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -897,24 +557,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -924,79 +575,144 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
-            },
-            "total": {
+            }
+          }
+        },
+        "indices_stats": {
+          "properties": {
+            "_all": {
               "properties": {
-                "docs": {
+                "primaries": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
-                "fielddata": {
+                "total": {
                   "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
                     },
-                    "evictions": {
-                      "type": "long"
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "job_stats": {
+          "properties": {
+            "job_id": {
+              "type": "keyword"
+            }
+          }
+        },
+        "node_stats": {
+          "properties": {
+            "fs": {
+              "properties": {
+                "io_stats": {
+                  "properties": {
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
-                "store": {
+                "total": {
                   "properties": {
-                    "size_in_bytes": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
+                "fielddata": {
+                  "properties": {
+                    "memory_size_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -1004,51 +720,26 @@
                     }
                   }
                 },
-                "merges": {
+                "query_cache": {
                   "properties": {
-                    "total_size_in_bytes": {
+                    "memory_size_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "query_cache": {
+                "request_cache": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
-                "request_cache": {
+                "search": {
                   "properties": {
-                    "memory_size_in_bytes": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -1058,178 +749,19 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
                     "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
                     "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "refresh": {
-                  "properties": {
-                    "total_time_in_millis": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
-            }
-          }
-        },
-        "cluster_state": {
-          "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
-            }
-          }
-        },
-        "node_stats": {
-          "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
-              "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
                     },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "indexing": {
-                  "properties": {
-                    "index_time_in_millis": {
-                      "type": "long"
-                    },
-                    "index_total": {
-                      "type": "long"
-                    },
-                    "throttle_time_in_millis": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "segments": {
-                  "properties": {
-                    "count": {
-                      "type": "integer"
                     },
                     "memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
                     "points_memory_in_bytes": {
@@ -1241,232 +773,125 @@
                     "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
                     "version_map_memory_in_bytes": {
                       "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
-              "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
-                  "properties": {
-                    "total": {
-                      "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
-                        "write_kilobytes": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "os": {
+            "jvm": {
               "properties": {
-                "cgroup": {
+                "gc": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "cpu": {
+                    "collectors": {
                       "properties": {
-                        "cfs_quota_micros": {
-                          "type": "long"
-                        },
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "stat": {
+                        "old": {
                           "properties": {
-                            "number_of_elapsed_periods": {
+                            "collection_count": {
                               "type": "long"
                             },
-                            "number_of_times_throttled": {
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
+                        },
+                        "young": {
+                          "properties": {
+                            "collection_count": {
                               "type": "long"
                             },
-                            "time_throttled_nanos": {
+                            "collection_time_in_millis": {
                               "type": "long"
                             }
                           }
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "cpu": {
-                  "properties": {
-                    "load_average": {
-                      "properties": {
-                        "1m": {
-                          "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
-                        }
-                      }
                     }
                   }
-                }
-              }
-            },
-            "process": {
-              "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
                 },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "cpu": {
-                  "properties": {
-                    "percent": {
-                      "type": "half_float"
-                    }
-                  }
-                }
-              }
-            },
-            "jvm": {
-              "properties": {
                 "mem": {
                   "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
                     "heap_used_in_bytes": {
                       "type": "long"
                     },
                     "heap_used_percent": {
                       "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
                     }
                   }
-                },
-                "gc": {
+                }
+              }
+            },
+            "node_id": {
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "cgroup": {
                   "properties": {
-                    "collectors": {
+                    "cpu": {
                       "properties": {
-                        "young": {
+                        "cfs_quota_micros": {
+                          "type": "long"
+                        },
+                        "stat": {
                           "properties": {
-                            "collection_count": {
+                            "number_of_elapsed_periods": {
                               "type": "long"
                             },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
+                            "number_of_times_throttled": {
                               "type": "long"
                             },
-                            "collection_time_in_millis": {
+                            "time_throttled_nanos": {
                               "type": "long"
                             }
                           }
                         }
                       }
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "usage_nanos": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "cpu": {
+                  "properties": {
+                    "load_average": {
+                      "properties": {
+                        "1m": {
+                          "type": "half_float"
+                        }
+                      }
                     }
                   }
                 }
               }
             },
-            "thread_pool": {
+            "process": {
               "properties": {
-                "bulk": {
+                "cpu": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
+                    "percent": {
+                      "type": "half_float"
                     }
                   }
-                },
-                "generic": {
+                }
+              }
+            },
+            "thread_pool": {
+              "properties": {
+                "bulk": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1477,9 +902,6 @@
                 },
                 "get": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1490,22 +912,6 @@
                 },
                 "index": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1516,22 +922,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -1554,246 +944,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-basic/mappings.json b/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-basic/mappings.json
index ce8427c5cd657..0715e68298b16 100644
--- a/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-basic/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-basic/mappings.json
@@ -6,115 +6,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -129,29 +61,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -166,44 +81,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -212,42 +92,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -256,36 +106,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -304,14 +137,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -320,24 +151,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -347,41 +169,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -390,68 +212,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -472,15 +318,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -488,15 +325,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -515,116 +343,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -640,16 +449,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -661,12 +464,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -676,12 +473,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -691,71 +482,10 @@
                 }
               }
             },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
             "thread_pool": {
               "properties": {
                 "bulk": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -766,9 +496,6 @@
                 },
                 "get": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -779,22 +506,6 @@
                 },
                 "index": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -805,22 +516,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -843,246 +538,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1104,24 +594,9 @@
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -1143,6 +618,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-platinum--with-10-alerts/mappings.json b/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-platinum--with-10-alerts/mappings.json
index 07ba8e2f5b814..c1552898816b7 100644
--- a/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-platinum--with-10-alerts/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-platinum--with-10-alerts/mappings.json
@@ -6,115 +6,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -129,29 +61,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -166,44 +81,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -212,42 +92,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -256,36 +106,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -304,14 +137,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -320,24 +151,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -347,41 +169,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -390,68 +212,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -472,15 +318,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -488,15 +325,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -515,116 +343,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -640,16 +449,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -661,12 +464,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -676,413 +473,106 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
                       "type": "half_float"
                     }
-                  }
-                }
-              }
-            },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "thread_pool": {
-              "properties": {
-                "bulk": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "get": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "index": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "write": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "index_recovery": {
-          "type": "object"
-        },
-        "shard": {
-          "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
-            "index": {
-              "type": "keyword"
-            },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
-            "node": {
-              "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
-            },
-            "state": {
-              "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "ccr_stats": {
-          "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
-              "type": "keyword"
-            },
-            "follower_index": {
-              "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
+                  }
+                }
+              }
             },
-            "read_exceptions": {
-              "type": "nested",
+            "thread_pool": {
               "properties": {
-                "from_seq_no": {
-                  "type": "long"
+                "bulk": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 },
-                "retries": {
-                  "type": "integer"
+                "get": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 },
-                "exception": {
-                  "type": "object",
+                "index": {
                   "properties": {
-                    "type": {
-                      "type": "keyword"
+                    "queue": {
+                      "type": "integer"
                     },
-                    "reason": {
-                      "type": "text"
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "search": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
                     }
                   }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
                 },
-                "reason": {
-                  "type": "text"
+                "write": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 }
               }
             }
           }
         },
-        "ccr_auto_follow_stats": {
+        "shard": {
           "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
+            "index": {
+              "type": "keyword"
             },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
+            "node": {
+              "type": "keyword"
             },
-            "number_of_successful_follow_indices": {
-              "type": "long"
+            "primary": {
+              "type": "boolean"
             },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
+            "state": {
+              "type": "keyword"
+            }
+          }
+        },
+        "source_node": {
+          "properties": {
+            "name": {
+              "type": "keyword"
             },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
+            "uuid": {
+              "type": "keyword"
             }
           }
+        },
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1104,24 +594,9 @@
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -1143,6 +618,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
@@ -1167,95 +657,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -1263,47 +679,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -1313,36 +710,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -1350,9 +720,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -1366,10 +733,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-platinum/mappings.json b/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-platinum/mappings.json
index 07ba8e2f5b814..c1552898816b7 100644
--- a/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-platinum/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/singlecluster-yellow-platinum/mappings.json
@@ -6,115 +6,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -129,29 +61,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -166,44 +81,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -212,42 +92,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -256,36 +106,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -304,14 +137,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -320,24 +151,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -347,41 +169,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -390,68 +212,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -472,15 +318,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -488,15 +325,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -515,116 +343,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -640,16 +449,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -661,12 +464,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -676,413 +473,106 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
                       "type": "half_float"
                     }
-                  }
-                }
-              }
-            },
-            "jvm": {
-              "properties": {
-                "mem": {
-                  "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
-                    },
-                    "heap_used_percent": {
-                      "type": "half_float"
-                    },
-                    "heap_max_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "gc": {
-                  "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "thread_pool": {
-              "properties": {
-                "bulk": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "get": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "index": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "write": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "index_recovery": {
-          "type": "object"
-        },
-        "shard": {
-          "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
-            "index": {
-              "type": "keyword"
-            },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
-            "node": {
-              "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
-            },
-            "state": {
-              "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "ccr_stats": {
-          "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
-              "type": "keyword"
-            },
-            "follower_index": {
-              "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
+                  }
+                }
+              }
             },
-            "read_exceptions": {
-              "type": "nested",
+            "thread_pool": {
               "properties": {
-                "from_seq_no": {
-                  "type": "long"
+                "bulk": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 },
-                "retries": {
-                  "type": "integer"
+                "get": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 },
-                "exception": {
-                  "type": "object",
+                "index": {
                   "properties": {
-                    "type": {
-                      "type": "keyword"
+                    "queue": {
+                      "type": "integer"
                     },
-                    "reason": {
-                      "type": "text"
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "search": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
                     }
                   }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
                 },
-                "reason": {
-                  "type": "text"
+                "write": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
+                    },
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
                 }
               }
             }
           }
         },
-        "ccr_auto_follow_stats": {
+        "shard": {
           "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
+            "index": {
+              "type": "keyword"
             },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
+            "node": {
+              "type": "keyword"
             },
-            "number_of_successful_follow_indices": {
-              "type": "long"
+            "primary": {
+              "type": "boolean"
             },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
+            "state": {
+              "type": "keyword"
+            }
+          }
+        },
+        "source_node": {
+          "properties": {
+            "name": {
+              "type": "keyword"
             },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
+            "uuid": {
+              "type": "keyword"
             }
           }
+        },
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1104,24 +594,9 @@
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -1143,6 +618,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
@@ -1167,95 +657,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -1263,47 +679,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -1313,36 +710,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
-                }
-              }
-            },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -1350,9 +720,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -1366,10 +733,24 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
+            "timestamp": {
+              "type": "date"
+            },
+            "usage": {
+              "properties": {
+                "index": {
+                  "type": "keyword"
+                }
+              }
             }
           }
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
diff --git a/x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes/mappings.json b/x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes/mappings.json
index 7b75f0d15292d..d709a40befe3e 100644
--- a/x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes/mappings.json
@@ -8,96 +8,14 @@
       "date_detection": false,
       "dynamic": "false",
       "properties": {
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "auto_followed_clusters": {
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            },
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "properties": {
-                "auto_follow_exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                }
-              },
-              "type": "nested"
-            }
-          }
-        },
         "ccr_stats": {
           "properties": {
-            "bytes_read": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "properties": {
-                "reason": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "follower_aliases_version": {
-              "type": "long"
-            },
             "follower_global_checkpoint": {
               "type": "long"
             },
             "follower_index": {
               "type": "keyword"
             },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
             "leader_global_checkpoint": {
               "type": "long"
             },
@@ -107,112 +25,30 @@
             "leader_max_seq_no": {
               "type": "long"
             },
-            "operations_read": {
-              "type": "long"
-            },
             "operations_written": {
               "type": "long"
             },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "properties": {
-                "exception": {
-                  "properties": {
-                    "reason": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                }
-              },
-              "type": "nested"
-            },
             "remote_cluster": {
               "type": "keyword"
             },
             "shard_id": {
               "type": "integer"
             },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
             "time_since_last_read_millis": {
               "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
             }
           }
         },
         "cluster_state": {
           "properties": {
-            "master_node": {
-              "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
             "nodes_hash": {
               "type": "integer"
-            },
-            "shards": {
-              "type": "object"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "cluster_stats": {
-          "properties": {
-            "indices": {
-              "type": "object"
-            },
-            "nodes": {
-              "type": "object"
             }
           }
         },
         "cluster_uuid": {
           "type": "keyword"
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "index_stats": {
           "properties": {
             "index": {
@@ -227,16 +63,6 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
                     "index_time_in_millis": {
@@ -257,22 +83,6 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "refresh": {
                   "properties": {
                     "total_time_in_millis": {
@@ -280,66 +90,10 @@
                     }
                   }
                 },
-                "request_cache": {
-                  "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
-                  "properties": {
-                    "query_time_in_millis": {
-                      "type": "long"
-                    },
-                    "query_total": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "segments": {
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
@@ -354,18 +108,8 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -393,17 +137,8 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -416,17 +151,8 @@
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -494,13 +220,6 @@
               "properties": {
                 "primaries": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
                         "index_time_in_millis": {
@@ -510,33 +229,13 @@
                           "type": "long"
                         }
                       }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_time_in_millis": {
-                          "type": "long"
-                        },
-                        "query_total": {
-                          "type": "long"
-                        }
-                      }
                     }
                   }
                 },
                 "total": {
                   "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "indexing": {
                       "properties": {
-                        "index_time_in_millis": {
-                          "type": "long"
-                        },
                         "index_total": {
                           "type": "long"
                         }
@@ -558,58 +257,10 @@
             }
           }
         },
-        "interval_ms": {
-          "type": "long"
-        },
         "job_stats": {
           "properties": {
-            "data_counts": {
-              "properties": {
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "input_bytes": {
-                  "type": "long"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                }
-              }
-            },
             "job_id": {
               "type": "keyword"
-            },
-            "model_size_stats": {
-              "properties": {
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                },
-                "model_bytes": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "state": {
-              "type": "keyword"
             }
           }
         },
@@ -617,13 +268,6 @@
           "properties": {
             "fs": {
               "properties": {
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
                 "io_stats": {
                   "properties": {
                     "total": {
@@ -631,15 +275,9 @@
                         "operations": {
                           "type": "long"
                         },
-                        "read_kilobytes": {
-                          "type": "long"
-                        },
                         "read_operations": {
                           "type": "long"
                         },
-                        "write_kilobytes": {
-                          "type": "long"
-                        },
                         "write_operations": {
                           "type": "long"
                         }
@@ -651,12 +289,6 @@
                   "properties": {
                     "available_in_bytes": {
                       "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "total_in_bytes": {
-                      "type": "long"
                     }
                   }
                 }
@@ -664,18 +296,8 @@
             },
             "indices": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
                     }
@@ -696,33 +318,15 @@
                 },
                 "query_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "request_cache": {
                   "properties": {
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -772,13 +376,6 @@
                       "type": "long"
                     }
                   }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
                 }
               }
             },
@@ -827,15 +424,9 @@
                 }
               }
             },
-            "mlockall": {
-              "type": "boolean"
-            },
             "node_id": {
               "type": "keyword"
             },
-            "node_master": {
-              "type": "boolean"
-            },
             "os": {
               "properties": {
                 "cgroup": {
@@ -845,9 +436,6 @@
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -865,26 +453,10 @@
                     },
                     "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "usage_nanos": {
                           "type": "long"
                         }
                       }
-                    },
-                    "memory": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
-                        }
-                      }
                     }
                   }
                 },
@@ -892,14 +464,8 @@
                   "properties": {
                     "load_average": {
                       "properties": {
-                        "15m": {
-                          "type": "half_float"
-                        },
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -915,12 +481,6 @@
                       "type": "half_float"
                     }
                   }
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
-                "open_file_descriptors": {
-                  "type": "long"
                 }
               }
             },
@@ -933,22 +493,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -959,9 +503,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -972,22 +513,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -998,22 +523,6 @@
                     },
                     "rejected": {
                       "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    },
-                    "threads": {
-                      "type": "integer"
                     }
                   }
                 },
@@ -1042,12 +551,6 @@
             "primary": {
               "type": "boolean"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "state": {
               "type": "keyword"
             }
@@ -1055,22 +558,9 @@
         },
         "source_node": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
               "type": "keyword"
             },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
             "uuid": {
               "type": "keyword"
             }
diff --git a/x-pack/test/functional/es_archives/monitoring/standalone_cluster/mappings.json b/x-pack/test/functional/es_archives/monitoring/standalone_cluster/mappings.json
index e1b952ef647d9..9ad3eef67cbd3 100644
--- a/x-pack/test/functional/es_archives/monitoring/standalone_cluster/mappings.json
+++ b/x-pack/test/functional/es_archives/monitoring/standalone_cluster/mappings.json
@@ -6,115 +6,47 @@
       "date_detection": false,
       "dynamic": false,
       "properties": {
-        "cluster_uuid": {
-          "type": "keyword"
-        },
-        "state_uuid": {
-          "type": "keyword"
-        },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
+        "ccr_stats": {
           "properties": {
-            "uuid": {
-              "type": "keyword"
+            "follower_global_checkpoint": {
+              "type": "long"
             },
-            "host": {
+            "follower_index": {
               "type": "keyword"
             },
-            "transport_address": {
-              "type": "keyword"
+            "leader_global_checkpoint": {
+              "type": "long"
             },
-            "ip": {
+            "leader_index": {
               "type": "keyword"
             },
-            "name": {
+            "leader_max_seq_no": {
+              "type": "long"
+            },
+            "operations_written": {
+              "type": "long"
+            },
+            "remote_cluster": {
               "type": "keyword"
             },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
+            "shard_id": {
+              "type": "integer"
+            },
+            "time_since_last_read_millis": {
+              "type": "long"
             }
           }
         },
-        "indices_stats": {
+        "cluster_state": {
           "properties": {
-            "_all": {
-              "properties": {
-                "primaries": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "total": {
-                  "properties": {
-                    "docs": {
-                      "properties": {
-                        "count": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "indexing": {
-                      "properties": {
-                        "index_total": {
-                          "type": "long"
-                        },
-                        "index_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "search": {
-                      "properties": {
-                        "query_total": {
-                          "type": "long"
-                        },
-                        "query_time_in_millis": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+            "nodes_hash": {
+              "type": "integer"
             }
           }
         },
+        "cluster_uuid": {
+          "type": "keyword"
+        },
         "index_stats": {
           "properties": {
             "index": {
@@ -129,29 +61,12 @@
                     }
                   }
                 },
-                "fielddata": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -166,44 +81,9 @@
                     }
                   }
                 },
-                "query_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "request_cache": {
-                  "properties": {
-                    "memory_size_in_bytes": {
-                      "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "search": {
+                "refresh": {
                   "properties": {
-                    "query_total": {
-                      "type": "long"
-                    },
-                    "query_time_in_millis": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -212,42 +92,12 @@
                   "properties": {
                     "count": {
                       "type": "integer"
-                    },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "points_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "stored_fields_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "term_vectors_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "norms_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "doc_values_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "index_writer_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "version_map_memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "fixed_bit_set_memory_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -256,36 +106,19 @@
             },
             "total": {
               "properties": {
-                "docs": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    }
-                  }
-                },
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
-                      "type": "long"
                     }
                   }
                 },
                 "indexing": {
                   "properties": {
-                    "index_total": {
+                    "index_time_in_millis": {
                       "type": "long"
                     },
-                    "index_time_in_millis": {
+                    "index_total": {
                       "type": "long"
                     },
                     "throttle_time_in_millis": {
@@ -304,14 +137,12 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
+                    }
+                  }
+                },
+                "refresh": {
+                  "properties": {
+                    "total_time_in_millis": {
                       "type": "long"
                     }
                   }
@@ -320,24 +151,15 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
                 "search": {
                   "properties": {
-                    "query_total": {
+                    "query_time_in_millis": {
                       "type": "long"
                     },
-                    "query_time_in_millis": {
+                    "query_total": {
                       "type": "long"
                     }
                   }
@@ -347,41 +169,41 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "terms_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "norms_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 },
-                "refresh": {
+                "store": {
                   "properties": {
-                    "total_time_in_millis": {
+                    "size_in_bytes": {
                       "type": "long"
                     }
                   }
@@ -390,68 +212,92 @@
             }
           }
         },
-        "cluster_stats": {
+        "indices_stats": {
           "properties": {
-            "nodes": {
-              "type": "object"
-            },
-            "indices": {
-              "type": "object"
+            "_all": {
+              "properties": {
+                "primaries": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_time_in_millis": {
+                          "type": "long"
+                        },
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "total": {
+                  "properties": {
+                    "indexing": {
+                      "properties": {
+                        "index_total": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "search": {
+                      "properties": {
+                        "query_time_in_millis": {
+                          "type": "long"
+                        },
+                        "query_total": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
             }
           }
         },
-        "cluster_state": {
+        "job_stats": {
           "properties": {
-            "version": {
-              "type": "long"
-            },
-            "nodes_hash": {
-              "type": "integer"
-            },
-            "master_node": {
-              "type": "keyword"
-            },
-            "state_uuid": {
-              "type": "keyword"
-            },
-            "status": {
+            "job_id": {
               "type": "keyword"
-            },
-            "nodes": {
-              "type": "object"
-            },
-            "shards": {
-              "type": "object"
             }
           }
         },
         "node_stats": {
           "properties": {
-            "node_id": {
-              "type": "keyword"
-            },
-            "node_master": {
-              "type": "boolean"
-            },
-            "mlockall": {
-              "type": "boolean"
-            },
-            "indices": {
+            "fs": {
               "properties": {
-                "docs": {
+                "io_stats": {
                   "properties": {
-                    "count": {
-                      "type": "long"
+                    "total": {
+                      "properties": {
+                        "operations": {
+                          "type": "long"
+                        },
+                        "read_operations": {
+                          "type": "long"
+                        },
+                        "write_operations": {
+                          "type": "long"
+                        }
+                      }
                     }
                   }
                 },
+                "total": {
+                  "properties": {
+                    "available_in_bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "indices": {
+              "properties": {
                 "fielddata": {
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
                     }
                   }
                 },
@@ -472,15 +318,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -488,15 +325,6 @@
                   "properties": {
                     "memory_size_in_bytes": {
                       "type": "long"
-                    },
-                    "evictions": {
-                      "type": "long"
-                    },
-                    "hit_count": {
-                      "type": "long"
-                    },
-                    "miss_count": {
-                      "type": "long"
                     }
                   }
                 },
@@ -515,116 +343,97 @@
                     "count": {
                       "type": "integer"
                     },
-                    "memory_in_bytes": {
-                      "type": "long"
-                    },
-                    "terms_memory_in_bytes": {
+                    "doc_values_memory_in_bytes": {
                       "type": "long"
                     },
-                    "points_memory_in_bytes": {
+                    "fixed_bit_set_memory_in_bytes": {
                       "type": "long"
                     },
-                    "stored_fields_memory_in_bytes": {
+                    "index_writer_memory_in_bytes": {
                       "type": "long"
                     },
-                    "term_vectors_memory_in_bytes": {
+                    "memory_in_bytes": {
                       "type": "long"
                     },
                     "norms_memory_in_bytes": {
                       "type": "long"
                     },
-                    "doc_values_memory_in_bytes": {
+                    "points_memory_in_bytes": {
                       "type": "long"
                     },
-                    "index_writer_memory_in_bytes": {
+                    "stored_fields_memory_in_bytes": {
                       "type": "long"
                     },
-                    "version_map_memory_in_bytes": {
+                    "term_vectors_memory_in_bytes": {
                       "type": "long"
                     },
-                    "fixed_bit_set_memory_in_bytes": {
+                    "terms_memory_in_bytes": {
                       "type": "long"
-                    }
-                  }
-                },
-                "store": {
-                  "properties": {
-                    "size_in_bytes": {
+                    },
+                    "version_map_memory_in_bytes": {
                       "type": "long"
                     }
                   }
                 }
               }
             },
-            "fs": {
+            "jvm": {
               "properties": {
-                "total": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "long"
-                    },
-                    "free_in_bytes": {
-                      "type": "long"
-                    },
-                    "available_in_bytes": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "data": {
-                  "properties": {
-                    "spins": {
-                      "type": "boolean"
-                    }
-                  }
-                },
-                "io_stats": {
+                "gc": {
                   "properties": {
-                    "total": {
+                    "collectors": {
                       "properties": {
-                        "operations": {
-                          "type": "long"
-                        },
-                        "read_operations": {
-                          "type": "long"
-                        },
-                        "write_operations": {
-                          "type": "long"
-                        },
-                        "read_kilobytes": {
-                          "type": "long"
+                        "old": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         },
-                        "write_kilobytes": {
-                          "type": "long"
+                        "young": {
+                          "properties": {
+                            "collection_count": {
+                              "type": "long"
+                            },
+                            "collection_time_in_millis": {
+                              "type": "long"
+                            }
+                          }
                         }
                       }
                     }
                   }
+                },
+                "mem": {
+                  "properties": {
+                    "heap_max_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_in_bytes": {
+                      "type": "long"
+                    },
+                    "heap_used_percent": {
+                      "type": "half_float"
+                    }
+                  }
                 }
               }
             },
+            "node_id": {
+              "type": "keyword"
+            },
             "os": {
               "properties": {
                 "cgroup": {
                   "properties": {
-                    "cpuacct": {
-                      "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "usage_nanos": {
-                          "type": "long"
-                        }
-                      }
-                    },
                     "cpu": {
                       "properties": {
                         "cfs_quota_micros": {
                           "type": "long"
                         },
-                        "control_group": {
-                          "type": "keyword"
-                        },
                         "stat": {
                           "properties": {
                             "number_of_elapsed_periods": {
@@ -640,16 +449,10 @@
                         }
                       }
                     },
-                    "memory": {
+                    "cpuacct": {
                       "properties": {
-                        "control_group": {
-                          "type": "keyword"
-                        },
-                        "limit_in_bytes": {
-                          "type": "keyword"
-                        },
-                        "usage_in_bytes": {
-                          "type": "keyword"
+                        "usage_nanos": {
+                          "type": "long"
                         }
                       }
                     }
@@ -661,12 +464,6 @@
                       "properties": {
                         "1m": {
                           "type": "half_float"
-                        },
-                        "5m": {
-                          "type": "half_float"
-                        },
-                        "15m": {
-                          "type": "half_float"
                         }
                       }
                     }
@@ -676,12 +473,6 @@
             },
             "process": {
               "properties": {
-                "open_file_descriptors": {
-                  "type": "long"
-                },
-                "max_file_descriptors": {
-                  "type": "long"
-                },
                 "cpu": {
                   "properties": {
                     "percent": {
@@ -691,110 +482,30 @@
                 }
               }
             },
-            "jvm": {
+            "thread_pool": {
               "properties": {
-                "mem": {
+                "bulk": {
                   "properties": {
-                    "heap_used_in_bytes": {
-                      "type": "long"
+                    "queue": {
+                      "type": "integer"
                     },
-                    "heap_used_percent": {
-                      "type": "half_float"
+                    "rejected": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "get": {
+                  "properties": {
+                    "queue": {
+                      "type": "integer"
                     },
-                    "heap_max_in_bytes": {
+                    "rejected": {
                       "type": "long"
                     }
                   }
                 },
-                "gc": {
+                "index": {
                   "properties": {
-                    "collectors": {
-                      "properties": {
-                        "young": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "old": {
-                          "properties": {
-                            "collection_count": {
-                              "type": "long"
-                            },
-                            "collection_time_in_millis": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "thread_pool": {
-              "properties": {
-                "bulk": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "generic": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "get": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "index": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "management": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -805,22 +516,6 @@
                 },
                 "search": {
                   "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
-                    "queue": {
-                      "type": "integer"
-                    },
-                    "rejected": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "watcher": {
-                  "properties": {
-                    "threads": {
-                      "type": "integer"
-                    },
                     "queue": {
                       "type": "integer"
                     },
@@ -843,246 +538,41 @@
             }
           }
         },
-        "index_recovery": {
-          "type": "object"
-        },
         "shard": {
           "properties": {
-            "state": {
-              "type": "keyword"
-            },
-            "primary": {
-              "type": "boolean"
-            },
             "index": {
               "type": "keyword"
             },
-            "relocating_node": {
-              "type": "keyword"
-            },
-            "shard": {
-              "type": "long"
-            },
             "node": {
               "type": "keyword"
-            }
-          }
-        },
-        "job_stats": {
-          "properties": {
-            "job_id": {
-              "type": "keyword"
+            },
+            "primary": {
+              "type": "boolean"
             },
             "state": {
               "type": "keyword"
-            },
-            "data_counts": {
-              "properties": {
-                "input_bytes": {
-                  "type": "long"
-                },
-                "processed_record_count": {
-                  "type": "long"
-                },
-                "empty_bucket_count": {
-                  "type": "long"
-                },
-                "sparse_bucket_count": {
-                  "type": "long"
-                },
-                "bucket_count": {
-                  "type": "long"
-                },
-                "earliest_record_timestamp": {
-                  "type": "date"
-                },
-                "latest_record_timestamp": {
-                  "type": "date"
-                }
-              }
-            },
-            "model_size_stats": {
-              "properties": {
-                "model_bytes": {
-                  "type": "long"
-                },
-                "bucket_allocation_failures_count": {
-                  "type": "long"
-                }
-              }
-            },
-            "node": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                }
-              }
             }
           }
         },
-        "ccr_stats": {
+        "source_node": {
           "properties": {
-            "remote_cluster": {
-              "type": "keyword"
-            },
-            "leader_index": {
+            "name": {
               "type": "keyword"
             },
-            "follower_index": {
+            "uuid": {
               "type": "keyword"
-            },
-            "shard_id": {
-              "type": "integer"
-            },
-            "leader_global_checkpoint": {
-              "type": "long"
-            },
-            "leader_max_seq_no": {
-              "type": "long"
-            },
-            "follower_global_checkpoint": {
-              "type": "long"
-            },
-            "follower_max_seq_no": {
-              "type": "long"
-            },
-            "last_requested_seq_no": {
-              "type": "long"
-            },
-            "outstanding_read_requests": {
-              "type": "long"
-            },
-            "outstanding_write_requests": {
-              "type": "long"
-            },
-            "write_buffer_operation_count": {
-              "type": "long"
-            },
-            "write_buffer_size_in_bytes": {
-              "type": "long"
-            },
-            "follower_mapping_version": {
-              "type": "long"
-            },
-            "follower_settings_version": {
-              "type": "long"
-            },
-            "total_read_time_millis": {
-              "type": "long"
-            },
-            "total_read_remote_exec_time_millis": {
-              "type": "long"
-            },
-            "successful_read_requests": {
-              "type": "long"
-            },
-            "failed_read_requests": {
-              "type": "long"
-            },
-            "operations_read": {
-              "type": "long"
-            },
-            "bytes_read": {
-              "type": "long"
-            },
-            "total_write_time_millis": {
-              "type": "long"
-            },
-            "successful_write_requests": {
-              "type": "long"
-            },
-            "failed_write_requests": {
-              "type": "long"
-            },
-            "operations_written": {
-              "type": "long"
-            },
-            "read_exceptions": {
-              "type": "nested",
-              "properties": {
-                "from_seq_no": {
-                  "type": "long"
-                },
-                "retries": {
-                  "type": "integer"
-                },
-                "exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "time_since_last_read_millis": {
-              "type": "long"
-            },
-            "fatal_exception": {
-              "type": "object",
-              "properties": {
-                "type": {
-                  "type": "keyword"
-                },
-                "reason": {
-                  "type": "text"
-                }
-              }
             }
           }
         },
-        "ccr_auto_follow_stats": {
-          "properties": {
-            "number_of_failed_follow_indices": {
-              "type": "long"
-            },
-            "number_of_failed_remote_cluster_state_requests": {
-              "type": "long"
-            },
-            "number_of_successful_follow_indices": {
-              "type": "long"
-            },
-            "recent_auto_follow_errors": {
-              "type": "nested",
-              "properties": {
-                "leader_index": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "long"
-                },
-                "auto_follow_exception": {
-                  "type": "object",
-                  "properties": {
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "auto_followed_clusters": {
-              "type": "nested",
-              "properties": {
-                "cluster_name": {
-                  "type": "keyword"
-                },
-                "time_since_last_check_millis": {
-                  "type": "long"
-                },
-                "last_seen_metadata_version": {
-                  "type": "long"
-                }
-              }
-            }
-          }
+        "state_uuid": {
+          "type": "keyword"
+        },
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
         }
       }
     },
@@ -1104,24 +594,9 @@
     "mappings": {
       "dynamic": false,
       "properties": {
-        "timestamp": {
-          "type": "date"
-        },
-        "update_timestamp": {
-          "type": "date"
-        },
-        "resolved_timestamp": {
-          "type": "date"
-        },
-        "prefix": {
-          "type": "text"
-        },
         "message": {
           "type": "text"
         },
-        "suffix": {
-          "type": "text"
-        },
         "metadata": {
           "properties": {
             "cluster_uuid": {
@@ -1143,6 +618,21 @@
               "type": "keyword"
             }
           }
+        },
+        "prefix": {
+          "type": "text"
+        },
+        "resolved_timestamp": {
+          "type": "date"
+        },
+        "suffix": {
+          "type": "text"
+        },
+        "timestamp": {
+          "type": "date"
+        },
+        "update_timestamp": {
+          "type": "date"
         }
       }
     },
@@ -1167,95 +657,21 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "timestamp": {
-          "type": "date",
-          "format": "date_time"
-        },
-        "interval_ms": {
-          "type": "long"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "source_node": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            },
-            "host": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date",
-              "format": "date_time"
-            }
-          }
-        },
         "kibana_stats": {
           "properties": {
+            "concurrent_connections": {
+              "type": "long"
+            },
             "kibana": {
               "properties": {
-                "uuid": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "transport_address": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                },
-                "snapshot": {
-                  "type": "boolean"
-                },
                 "status": {
                   "type": "keyword"
                 },
-                "statuses": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "state": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "cloud": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "vm_type": {
-                  "type": "keyword"
-                },
-                "region": {
+                "uuid": {
                   "type": "keyword"
                 },
-                "zone": {
+                "version": {
                   "type": "keyword"
-                },
-                "metadata": {
-                  "type": "object"
                 }
               }
             },
@@ -1263,47 +679,28 @@
               "properties": {
                 "load": {
                   "properties": {
-                    "1m": {
+                    "15m": {
                       "type": "half_float"
                     },
-                    "5m": {
+                    "1m": {
                       "type": "half_float"
                     },
-                    "15m": {
+                    "5m": {
                       "type": "half_float"
                     }
                   }
-                },
-                "memory": {
-                  "properties": {
-                    "total_in_bytes": {
-                      "type": "float"
-                    },
-                    "free_in_bytes": {
-                      "type": "float"
-                    },
-                    "used_in_bytes": {
-                      "type": "float"
-                    }
-                  }
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
             "process": {
               "properties": {
+                "event_loop_delay": {
+                  "type": "float"
+                },
                 "memory": {
                   "properties": {
                     "heap": {
                       "properties": {
-                        "total_in_bytes": {
-                          "type": "float"
-                        },
-                        "used_in_bytes": {
-                          "type": "float"
-                        },
                         "size_limit": {
                           "type": "float"
                         }
@@ -1313,36 +710,9 @@
                       "type": "float"
                     }
                   }
-                },
-                "event_loop_delay": {
-                  "type": "float"
-                },
-                "uptime_in_millis": {
-                  "type": "long"
                 }
               }
             },
-            "sockets": {
-              "properties": {
-                "http": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "https": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "timestamp": {
-              "type": "date"
-            },
             "requests": {
               "properties": {
                 "disconnects": {
@@ -1350,9 +720,6 @@
                 },
                 "total": {
                   "type": "long"
-                },
-                "status_codes": {
-                  "type": "object"
                 }
               }
             },
@@ -1366,531 +733,164 @@
                 }
               }
             },
-            "concurrent_connections": {
-              "type": "long"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "codec": "best_compression",
-        "format": "6",
-        "number_of_replicas": "1",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
-{
-  "type": "index",
-  "value": {
-    "index": ".monitoring-beats-6-2019.02.04",
-    "mappings": {
-      "dynamic": false,
-      "properties": {
-        "beats_state": {
-          "properties": {
-            "beat": {
-              "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
+            "timestamp": {
+              "type": "date"
             },
-            "state": {
+            "usage": {
               "properties": {
-                "beat": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "host": {
-                  "properties": {
-                    "architecture": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "hostname": {
-                      "type": "keyword"
-                    },
-                    "os": {
-                      "properties": {
-                        "build": {
-                          "type": "keyword"
-                        },
-                        "family": {
-                          "type": "keyword"
-                        },
-                        "platform": {
-                          "type": "keyword"
-                        },
-                        "version": {
-                          "type": "keyword"
-                        }
-                      }
-                    }
-                  }
-                },
-                "input": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "module": {
-                  "properties": {
-                    "count": {
-                      "type": "long"
-                    },
-                    "names": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "output": {
-                  "properties": {
-                    "name": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "service": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "name": {
-                      "type": "keyword"
-                    },
-                    "version": {
-                      "type": "keyword"
-                    }
-                  }
+                "index": {
+                  "type": "keyword"
                 }
               }
-            },
-            "timestamp": {
-              "format": "date_time",
-              "type": "date"
             }
           }
         },
-        "beats_stats": {
-          "properties": {
-            "beat": {
-              "properties": {
-                "host": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "uuid": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "metrics": {
-              "properties": {
-                "beat": {
-                  "properties": {
-                    "cpu": {
-                      "properties": {
-                        "system": {
-                          "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "total": {
-                          "properties": {
-                            "value": {
-                              "type": "long"
-                            },
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "user": {
-                          "properties": {
-                            "ticks": {
-                              "type": "long"
-                            },
-                            "time": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "info": {
-                      "properties": {
-                        "ephemeral_id": {
-                          "type": "keyword"
-                        },
-                        "uptime": {
-                          "properties": {
-                            "ms": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "memstats": {
-                      "properties": {
-                        "gc_next": {
-                          "type": "long"
-                        },
-                        "memory_alloc": {
-                          "type": "long"
-                        },
-                        "memory_total": {
-                          "type": "long"
-                        },
-                        "rss": {
-                          "type": "long"
-                        }
-                      }
-                    },
-                    "handles": {
-                      "properties": {
-                        "open": {
-                          "type": "long"
-                        },
-                        "limit": {
-                          "properties": {
-                            "hard": {
-                              "type": "long"
-                            },
-                            "soft": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "apm-server": {
-                  "properties": {
-                    "server": {
-                      "properties": {
-                        "request": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "concurrent": {
-                          "properties": {
-                            "wait": {
-                              "properties": {
-                                "ms": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "response": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            },
-                            "errors": {
-                              "properties": {
-                                "count": {
-                                  "type": "long"
-                                },
-                                "toolarge": {
-                                  "type": "long"
-                                },
-                                "validate": {
-                                  "type": "long"
-                                },
-                                "ratelimit": {
-                                  "type": "long"
-                                },
-                                "queue": {
-                                  "type": "long"
-                                },
-                                "closed": {
-                                  "type": "long"
-                                },
-                                "forbidden": {
-                                  "type": "long"
-                                },
-                                "concurrency": {
-                                  "type": "long"
-                                },
-                                "unauthorized": {
-                                  "type": "long"
-                                },
-                                "internal": {
-                                  "type": "long"
-                                },
-                                "decode": {
-                                  "type": "long"
-                                },
-                                "method": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "valid": {
-                              "properties": {
-                                "ok": {
-                                  "type": "long"
-                                },
-                                "accepted": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "decoder": {
+        "timestamp": {
+          "format": "date_time",
+          "type": "date"
+        },
+        "type": {
+          "type": "keyword"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "codec": "best_compression",
+        "format": "6",
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
+
+{
+  "type": "index",
+  "value": {
+    "index": ".monitoring-beats-6-2019.02.04",
+    "mappings": {
+      "dynamic": false,
+      "properties": {
+        "beats_state": {
+          "properties": {
+            "timestamp": {
+              "format": "date_time",
+              "type": "date"
+            }
+          }
+        },
+        "beats_stats": {
+          "properties": {
+            "beat": {
+              "properties": {
+                "type": {
+                  "type": "keyword"
+                },
+                "uuid": {
+                  "type": "keyword"
+                },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "metrics": {
+              "properties": {
+                "apm-server": {
+                  "properties": {
+                    "processor": {
                       "properties": {
-                        "deflate": {
-                          "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "gzip": {
+                        "error": {
                           "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
+                            "transformations": {
                               "type": "long"
                             }
                           }
                         },
-                        "uncompressed": {
+                        "metric": {
                           "properties": {
-                            "content-length": {
-                              "type": "long"
-                            },
-                            "count": {
+                            "transformations": {
                               "type": "long"
                             }
                           }
                         },
-                        "reader": {
+                        "span": {
                           "properties": {
-                            "size": {
-                              "type": "long"
-                            },
-                            "count": {
+                            "transformations": {
                               "type": "long"
                             }
                           }
                         },
-                        "missing-content-length": {
+                        "transaction": {
                           "properties": {
-                            "count": {
+                            "transformations": {
                               "type": "long"
                             }
                           }
                         }
                       }
                     },
-                    "processor": {
+                    "server": {
                       "properties": {
-                        "metric": {
+                        "request": {
                           "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
-                                  "type": "long"
-                                },
-                                "count": {
-                                  "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
+                            "count": {
                               "type": "long"
                             }
                           }
                         },
-                        "sourcemap": {
+                        "response": {
                           "properties": {
-                            "counter": {
+                            "count": {
                               "type": "long"
                             },
-                            "decoding": {
+                            "errors": {
                               "properties": {
-                                "errors": {
+                                "closed": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "concurrency": {
                                   "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
+                                },
+                                "decode": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "forbidden": {
                                   "type": "long"
-                                }
-                              }
-                            }
-                          }
-                        },
-                        "transaction": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
+                                },
+                                "internal": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "method": {
                                   "type": "long"
-                                }
-                              }
-                            },
-                            "validation": {
-                              "properties": {
-                                "errors": {
+                                },
+                                "queue": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "ratelimit": {
                                   "type": "long"
-                                }
-                              }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            },
-                            "transactions": {
-                              "type": "long"
-                            },
-                            "spans": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "error": {
-                          "properties": {
-                            "decoding": {
-                              "properties": {
-                                "errors": {
+                                },
+                                "toolarge": {
+                                  "type": "long"
+                                },
+                                "unauthorized": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "validate": {
                                   "type": "long"
                                 }
                               }
                             },
-                            "validation": {
+                            "valid": {
                               "properties": {
-                                "errors": {
+                                "accepted": {
                                   "type": "long"
                                 },
-                                "count": {
+                                "ok": {
                                   "type": "long"
                                 }
                               }
-                            },
-                            "transformations": {
-                              "type": "long"
-                            },
-                            "errors": {
-                              "type": "long"
-                            },
-                            "stacktraces": {
-                              "type": "long"
-                            },
-                            "frames": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "span": {
-                          "properties": {
-                            "transformations": {
-                              "type": "long"
                             }
                           }
                         }
@@ -1898,28 +898,53 @@
                     }
                   }
                 },
-                "libbeat": {
+                "beat": {
                   "properties": {
-                    "config": {
+                    "cpu": {
                       "properties": {
-                        "module": {
+                        "total": {
                           "properties": {
-                            "running": {
-                              "type": "long"
-                            },
-                            "starts": {
-                              "type": "long"
-                            },
-                            "stops": {
+                            "value": {
                               "type": "long"
                             }
                           }
-                        },
-                        "reloads": {
+                        }
+                      }
+                    },
+                    "handles": {
+                      "properties": {
+                        "open": {
                           "type": "long"
                         }
                       }
                     },
+                    "info": {
+                      "properties": {
+                        "ephemeral_id": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "memstats": {
+                      "properties": {
+                        "gc_next": {
+                          "type": "long"
+                        },
+                        "memory_alloc": {
+                          "type": "long"
+                        },
+                        "memory_total": {
+                          "type": "long"
+                        },
+                        "rss": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "libbeat": {
+                  "properties": {
                     "output": {
                       "properties": {
                         "events": {
@@ -1930,23 +955,14 @@
                             "active": {
                               "type": "long"
                             },
-                            "batches": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
-                            "duplicates": {
-                              "type": "long"
-                            },
                             "failed": {
                               "type": "long"
                             },
                             "total": {
                               "type": "long"
-                            },
-                            "toomany": {
-                              "type": "long"
                             }
                           }
                         },
@@ -1960,9 +976,6 @@
                             }
                           }
                         },
-                        "type": {
-                          "type": "keyword"
-                        },
                         "write": {
                           "properties": {
                             "bytes": {
@@ -1977,23 +990,14 @@
                     },
                     "pipeline": {
                       "properties": {
-                        "clients": {
-                          "type": "long"
-                        },
                         "events": {
                           "properties": {
-                            "active": {
-                              "type": "long"
-                            },
                             "dropped": {
                               "type": "long"
                             },
                             "failed": {
                               "type": "long"
                             },
-                            "filtered": {
-                              "type": "long"
-                            },
                             "published": {
                               "type": "long"
                             },
@@ -2004,13 +1008,6 @@
                               "type": "long"
                             }
                           }
-                        },
-                        "queue": {
-                          "properties": {
-                            "acked": {
-                              "type": "long"
-                            }
-                          }
                         }
                       }
                     }
@@ -2023,24 +1020,11 @@
                         "1": {
                           "type": "double"
                         },
-                        "5": {
-                          "type": "double"
-                        },
                         "15": {
                           "type": "double"
                         },
-                        "norm": {
-                          "properties": {
-                            "1": {
-                              "type": "double"
-                            },
-                            "5": {
-                              "type": "double"
-                            },
-                            "15": {
-                              "type": "double"
-                            }
-                          }
+                        "5": {
+                          "type": "double"
                         }
                       }
                     }
@@ -2048,9 +1032,6 @@
                 }
               }
             },
-            "tags": {
-              "type": "keyword"
-            },
             "timestamp": {
               "format": "date_time",
               "type": "date"
@@ -2060,25 +1041,16 @@
         "cluster_uuid": {
           "type": "keyword"
         },
-        "interval_ms": {
-          "type": "long"
-        },
-        "source_node": {
+        "metricset": {
           "properties": {
-            "host": {
-              "type": "keyword"
-            },
-            "ip": {
-              "type": "keyword"
-            },
             "name": {
-              "type": "keyword"
-            },
-            "transport_address": {
-              "type": "keyword"
-            },
-            "uuid": {
-              "type": "keyword"
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
             }
           }
         },

From ee73c59f8c5940ad38b9057298c47e98ddb1c038 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Mon, 31 Aug 2020 11:01:38 -0600
Subject: [PATCH 144/148] Upgrade EUI to v28.2.0 (#75700)

* eui to v28.0.0

* eui to 28.2.0

* euiselectableoptions type update

* targeted nohoist

* src snapshot updates

* x-pack snapshot updates

* strong -> mark

* upgrade @elastic/charts to v21.0.1

* strong -> mark

* fix charts version merge

* maps -> add_field_tooltip_popover type update

* snapshot update

* Fix gridline visibility

Co-authored-by: Justin Kambic <justin.kambic@elastic.co>

Co-authored-by: nickofthyme <nick.ryan.partridge@gmail.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Justin Kambic <justin.kambic@elastic.co>
---
 package.json                                  |   9 +-
 packages/kbn-ui-shared-deps/package.json      |   4 +-
 .../collapsible_nav.test.tsx.snap             |  14 +
 .../header/__snapshots__/header.test.tsx.snap |   2 +
 .../__snapshots__/agg.test.tsx.snap           |   2 +
 .../__snapshots__/area_decorator.test.js.snap |   1 -
 .../__snapshots__/bar_decorator.test.js.snap  |   1 -
 .../timeseries/decorators/area_decorator.js   |   4 +-
 .../decorators/area_decorator.test.js         |   2 +-
 .../timeseries/decorators/bar_decorator.js    |   4 +-
 .../decorators/bar_decorator.test.js          |   2 +-
 .../visualizations/views/timeseries/index.js  |  17 +-
 .../model/__snapshots__/charts.test.js.snap   |   4 +-
 .../views/timeseries/model/charts.js          |   2 +-
 .../views/timeseries/utils/theme.test.ts      |   8 +-
 .../views/timeseries/utils/theme.ts           |  20 +-
 .../value_axes_panel.test.tsx.snap            |   4 +
 .../value_axis_options.test.tsx.snap          |   2 +
 .../plugins/kbn_tp_run_pipeline/package.json  |   2 +-
 .../kbn_sample_panel_action/package.json      |   2 +-
 .../kbn_tp_custom_visualizations/package.json |   2 +-
 x-pack/package.json                           |   2 +-
 .../__snapshots__/Stackframe.test.tsx.snap    |   2 +
 .../__snapshots__/settings.test.tsx.snap      |   6 +-
 .../pie_visualization/render_function.tsx     |   2 +-
 .../__snapshots__/xy_expression.test.tsx.snap | 220 +++++++-
 .../xy_visualization/xy_config_panel.test.tsx |   7 +-
 .../xy_visualization/xy_config_panel.tsx      |   7 +-
 .../xy_visualization/xy_expression.test.tsx   | 108 +++-
 .../public/xy_visualization/xy_expression.tsx |  38 +-
 .../add_tooltip_field_popover.tsx             |  10 +-
 .../__snapshots__/view.test.js.snap           |   2 +
 .../__snapshots__/ccr_shard.test.js.snap      |   2 +
 .../components/app/section/apm/index.tsx      |   2 +-
 .../components/app/section/logs/index.tsx     |   2 +-
 .../components/app/section/uptime/index.tsx   |   2 +-
 .../cypress/screens/search_bar.ts             |   2 +-
 .../common/components/charts/areachart.tsx    |  17 +-
 .../common/components/charts/barchart.tsx     |  17 +-
 .../__snapshots__/index.test.tsx.snap         |  23 +
 .../modal_all_errors.test.tsx.snap            |   2 +
 .../__snapshots__/index.test.tsx.snap         |   8 +
 .../__snapshots__/index.test.tsx.snap         |   6 +
 .../fields_browser/field_name.test.tsx        |   2 +-
 .../note_card_body.test.tsx.snap              |  23 +
 .../__snapshots__/donut_chart.test.tsx.snap   |  57 ++-
 yarn.lock                                     | 476 +++++++++++++++++-
 47 files changed, 1004 insertions(+), 149 deletions(-)

diff --git a/package.json b/package.json
index b8cf2e1e27774..5c95f538a00e1 100644
--- a/package.json
+++ b/package.json
@@ -117,7 +117,10 @@
       "**/@types/*/**",
       "**/grunt-*",
       "**/grunt-*/**",
-      "x-pack/typescript"
+      "x-pack/typescript",
+      "@elastic/eui/rehype-react",
+      "@elastic/eui/remark-rehype",
+      "@elastic/eui/remark-rehype/**"
     ]
   },
   "dependencies": {
@@ -125,7 +128,7 @@
     "@babel/register": "^7.10.5",
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.9.0-rc.2",
-    "@elastic/eui": "27.4.1",
+    "@elastic/eui": "28.2.0",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "^2.5.0",
     "@elastic/request-crypto": "1.1.4",
@@ -227,7 +230,7 @@
     "@babel/parser": "^7.11.2",
     "@babel/types": "^7.11.0",
     "@elastic/apm-rum": "^5.5.0",
-    "@elastic/charts": "19.8.1",
+    "@elastic/charts": "21.0.1",
     "@elastic/ems-client": "7.9.3",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
index 531513481b1d4..0067228f1c1f3 100644
--- a/packages/kbn-ui-shared-deps/package.json
+++ b/packages/kbn-ui-shared-deps/package.json
@@ -9,8 +9,8 @@
     "kbn:watch": "node scripts/build --dev --watch"
   },
   "dependencies": {
-    "@elastic/charts": "19.8.1",
-    "@elastic/eui": "27.4.1",
+    "@elastic/charts": "21.0.1",
+    "@elastic/eui": "28.2.0",
     "@elastic/numeral": "^2.5.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/monaco": "1.0.0",
diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index fe959e570ab98..79beaf79068ef 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -650,6 +650,8 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
               data-test-subj="collapsibleNavGroup-recentlyViewed"
               id="mockId"
               initialIsOpen={true}
+              isLoading={false}
+              isLoadingMessage={false}
               onToggle={[Function]}
               paddingSize="none"
             >
@@ -901,6 +903,8 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                   data-test-subj="collapsibleNavGroup-kibana"
                   id="mockId"
                   initialIsOpen={true}
+                  isLoading={false}
+                  isLoadingMessage={false}
                   onToggle={[Function]}
                   paddingSize="none"
                 >
@@ -1188,6 +1192,8 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                   data-test-subj="collapsibleNavGroup-observability"
                   id="mockId"
                   initialIsOpen={true}
+                  isLoading={false}
+                  isLoadingMessage={false}
                   onToggle={[Function]}
                   paddingSize="none"
                 >
@@ -1436,6 +1442,8 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                   data-test-subj="collapsibleNavGroup-securitySolution"
                   id="mockId"
                   initialIsOpen={true}
+                  isLoading={false}
+                  isLoadingMessage={false}
                   onToggle={[Function]}
                   paddingSize="none"
                 >
@@ -1636,6 +1644,8 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                   data-test-subj="collapsibleNavGroup-management"
                   id="mockId"
                   initialIsOpen={true}
+                  isLoading={false}
+                  isLoadingMessage={false}
                   onToggle={[Function]}
                   paddingSize="none"
                 >
@@ -2624,6 +2634,8 @@ exports[`CollapsibleNav renders the default nav 2`] = `
               data-test-subj="collapsibleNavGroup-recentlyViewed"
               id="mockId"
               initialIsOpen={true}
+              isLoading={false}
+              isLoadingMessage={false}
               onToggle={[Function]}
               paddingSize="none"
             >
@@ -3305,6 +3317,8 @@ exports[`CollapsibleNav renders the default nav 3`] = `
               data-test-subj="collapsibleNavGroup-recentlyViewed"
               id="mockId"
               initialIsOpen={true}
+              isLoading={false}
+              isLoadingMessage={false}
               onToggle={[Function]}
               paddingSize="none"
             >
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index f101c30a1241b..3aabd2a1127dc 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -9265,6 +9265,8 @@ exports[`Header renders 3`] = `
                   data-test-subj="collapsibleNavGroup-recentlyViewed"
                   id="mockId"
                   initialIsOpen={true}
+                  isLoading={false}
+                  isLoadingMessage={false}
                   onToggle={[Function]}
                   paddingSize="none"
                 >
diff --git a/src/plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap b/src/plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
index 5200fee45d6b3..2a521bc01219c 100644
--- a/src/plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
+++ b/src/plugins/vis_default_editor/public/components/__snapshots__/agg.test.tsx.snap
@@ -33,6 +33,8 @@ exports[`DefaultEditorAgg component should init with the default set of props 1`
   }
   id="visEditorAggAccordion1"
   initialIsOpen={true}
+  isLoading={false}
+  isLoadingMessage={false}
   onToggle={[Function]}
   paddingSize="none"
 >
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap
index 6506b838ff288..7ded8e2254aa9 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/__snapshots__/area_decorator.test.js.snap
@@ -42,7 +42,6 @@ exports[`src/legacy/core_plugins/metrics/public/visualizations/views/timeseries/
   histogramModeAlignment="center"
   id="61ca57f1-469d-11e7-af02-69e470af7417:Rome"
   name="Rome"
-  stackAsPercentage={false}
   timeZone="local"
   xAccessor={0}
   xScaleType="time"
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap
index c337c0dc77a2f..02c7fd811e583 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/__snapshots__/bar_decorator.test.js.snap
@@ -34,7 +34,6 @@ exports[`src/legacy/core_plugins/metrics/public/visualizations/views/timeseries/
   histogramModeAlignment="center"
   id="61ca57f1-469d-11e7-af02-69e470af7417:Rome"
   name="Rome"
-  stackAsPercentage={false}
   timeZone="local"
   xAccessor={0}
   xScaleType="time"
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/area_decorator.js b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/area_decorator.js
index 0afe773266a61..300af551e5020 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/area_decorator.js
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/area_decorator.js
@@ -32,7 +32,7 @@ export function AreaSeriesDecorator({
   lines,
   color,
   stackAccessors,
-  stackAsPercentage,
+  stackMode,
   points,
   xScaleType,
   yScaleType,
@@ -60,7 +60,7 @@ export function AreaSeriesDecorator({
     y1AccessorFormat,
     y0AccessorFormat,
     stackAccessors,
-    stackAsPercentage,
+    stackMode,
     xScaleType,
     yScaleType,
     timeZone,
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/area_decorator.test.js b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/area_decorator.test.js
index 80ffcaa66c7a0..1fa88ff4b991f 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/area_decorator.test.js
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/area_decorator.test.js
@@ -43,7 +43,7 @@ describe('src/legacy/core_plugins/metrics/public/visualizations/views/timeseries
         [1557003600000, 9],
       ],
       hideInLegend: false,
-      stackAsPercentage: false,
+      stackMode: undefined,
       seriesId: '61ca57f1-469d-11e7-af02-69e470af7417:Rome',
       seriesGroupId: 'yaxis_main_group',
       name: 'Rome',
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/bar_decorator.js b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/bar_decorator.js
index c979920caac6d..239f1d4f1838e 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/bar_decorator.js
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/bar_decorator.js
@@ -32,7 +32,7 @@ export function BarSeriesDecorator({
   bars,
   color,
   stackAccessors,
-  stackAsPercentage,
+  stackMode,
   xScaleType,
   yScaleType,
   timeZone,
@@ -59,7 +59,7 @@ export function BarSeriesDecorator({
     y1AccessorFormat,
     y0AccessorFormat,
     stackAccessors,
-    stackAsPercentage,
+    stackMode,
     xScaleType,
     yScaleType,
     timeZone,
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/bar_decorator.test.js b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/bar_decorator.test.js
index ab33524fc5b77..94ec53b887dda 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/bar_decorator.test.js
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/decorators/bar_decorator.test.js
@@ -33,7 +33,7 @@ describe('src/legacy/core_plugins/metrics/public/visualizations/views/timeseries
         [1557003600000, 9],
       ],
       hideInLegend: false,
-      stackAsPercentage: false,
+      stackMode: undefined,
       seriesId: '61ca57f1-469d-11e7-af02-69e470af7417:Rome',
       seriesGroupId: 'yaxis_main_group',
       name: 'Rome',
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js
index 6b5d84dc56981..5f0cc5188b1fd 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/index.js
@@ -29,6 +29,7 @@ import {
   AnnotationDomainTypes,
   LineAnnotation,
   TooltipType,
+  StackMode,
 } from '@elastic/charts';
 import { EuiIcon } from '@elastic/eui';
 import { getTimezone } from '../../../lib/get_timezone';
@@ -197,7 +198,7 @@ export const TimeSeries = ({
                 bars={bars}
                 color={finalColor}
                 stackAccessors={stackAccessors}
-                stackAsPercentage={isPercentage}
+                stackMode={isPercentage ? StackMode.Percentage : undefined}
                 xScaleType={xScaleType}
                 yScaleType={yScaleType}
                 timeZone={timeZone}
@@ -222,7 +223,7 @@ export const TimeSeries = ({
                 lines={lines}
                 color={finalColor}
                 stackAccessors={stackAccessors}
-                stackAsPercentage={isPercentage}
+                stackMode={isPercentage ? StackMode.Percentage : undefined}
                 points={points}
                 xScaleType={xScaleType}
                 yScaleType={yScaleType}
@@ -248,8 +249,10 @@ export const TimeSeries = ({
           position={position}
           domain={domain}
           hide={hide}
-          showGridLines={showGrid}
-          gridLineStyle={GRID_LINE_CONFIG}
+          gridLine={{
+            ...GRID_LINE_CONFIG,
+            visible: showGrid,
+          }}
           tickFormat={tickFormatter}
         />
       ))}
@@ -259,8 +262,10 @@ export const TimeSeries = ({
         position={Position.Bottom}
         title={xAxisLabel}
         tickFormat={xAxisFormatter}
-        showGridLines={showGrid}
-        gridLineStyle={GRID_LINE_CONFIG}
+        gridLine={{
+          ...GRID_LINE_CONFIG,
+          visible: showGrid,
+        }}
       />
     </Chart>
   );
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/model/__snapshots__/charts.test.js.snap b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/model/__snapshots__/charts.test.js.snap
index 541265c05057a..4acb3985320da 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/model/__snapshots__/charts.test.js.snap
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/model/__snapshots__/charts.test.js.snap
@@ -14,7 +14,7 @@ Object {
     "seriesId": [Function],
     "sortIndex": [Function],
     "stackAccessors": [Function],
-    "stackAsPercentage": [Function],
+    "stackMode": [Function],
     "timeZone": [Function],
     "useDefaultGroupDomain": [Function],
     "xScaleType": [Function],
@@ -31,7 +31,7 @@ Object {
     "seriesId": [Function],
     "sortIndex": [Function],
     "stackAccessors": [Function],
-    "stackAsPercentage": [Function],
+    "stackMode": [Function],
     "timeZone": [Function],
     "useDefaultGroupDomain": [Function],
     "xScaleType": [Function],
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/model/charts.js b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/model/charts.js
index b14b84dcd1fe4..29b1e9f4f20e3 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/model/charts.js
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/model/charts.js
@@ -30,7 +30,7 @@ const Chart = {
   data: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.number)).isRequired,
   hideInLegend: PropTypes.bool.isRequired,
   color: PropTypes.string.isRequired,
-  stackAsPercentage: PropTypes.bool.isRequired,
+  stackMode: PropTypes.oneOf(['percentage', 'wiggle', 'silhouette']),
   stackAccessors: PropTypes.arrayOf(PropTypes.number),
   xScaleType: PropTypes.string,
   yScaleType: PropTypes.string,
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.test.ts b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.test.ts
index d7e6560a8dc97..8e96037b9947d 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.test.ts
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.test.ts
@@ -33,14 +33,12 @@ describe('TSVB theme', () => {
   });
   it('should return a highcontrast color theme for a different background', () => {
     // red use a near full-black color
-    expect(getBaseTheme(LIGHT_THEME, 'red').axes.axisTitleStyle.fill).toEqual('rgb(23,23,23)');
+    expect(getBaseTheme(LIGHT_THEME, 'red').axes.axisTitle.fill).toEqual('rgb(23,23,23)');
 
     // violet increased the text color to full white for higer contrast
-    expect(getBaseTheme(LIGHT_THEME, '#ba26ff').axes.axisTitleStyle.fill).toEqual(
-      'rgb(255,255,255)'
-    );
+    expect(getBaseTheme(LIGHT_THEME, '#ba26ff').axes.axisTitle.fill).toEqual('rgb(255,255,255)');
 
     // light yellow, prefer the LIGHT_THEME fill color because already with a good contrast
-    expect(getBaseTheme(LIGHT_THEME, '#fff49f').axes.axisTitleStyle.fill).toEqual('#333');
+    expect(getBaseTheme(LIGHT_THEME, '#fff49f').axes.axisTitle.fill).toEqual('#333');
   });
 });
diff --git a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.ts b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.ts
index 0e13fd7ef68f9..030c54fec888c 100644
--- a/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.ts
+++ b/src/plugins/vis_type_timeseries/public/application/visualizations/views/timeseries/utils/theme.ts
@@ -109,27 +109,27 @@ export function getBaseTheme(baseTheme: Theme, bgColor?: string | null): Theme {
   const mainTheme = bgLuminosity <= 0.179 ? DARK_THEME : LIGHT_THEME;
   const color = findBestContrastColor(
     bgColor,
-    LIGHT_THEME.axes.axisTitleStyle.fill,
-    DARK_THEME.axes.axisTitleStyle.fill
+    LIGHT_THEME.axes.axisTitle.fill,
+    DARK_THEME.axes.axisTitle.fill
   );
   return {
     ...mainTheme,
     axes: {
       ...mainTheme.axes,
-      axisTitleStyle: {
-        ...mainTheme.axes.axisTitleStyle,
+      axisTitle: {
+        ...mainTheme.axes.axisTitle,
         fill: color,
       },
-      tickLabelStyle: {
-        ...mainTheme.axes.tickLabelStyle,
+      tickLabel: {
+        ...mainTheme.axes.tickLabel,
         fill: color,
       },
-      axisLineStyle: {
-        ...mainTheme.axes.axisLineStyle,
+      axisLine: {
+        ...mainTheme.axes.axisLine,
         stroke: color,
       },
-      tickLineStyle: {
-        ...mainTheme.axes.tickLineStyle,
+      tickLine: {
+        ...mainTheme.axes.tickLine,
         stroke: color,
       },
     },
diff --git a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
index ab3e273f99c05..ed7ae45eed3a5 100644
--- a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
@@ -83,6 +83,8 @@ exports[`ValueAxesPanel component should init with the default set of props 1`]
     }
     id="yAxisAccordionValueAxis-1"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     key="ValueAxis-1"
     paddingSize="none"
   >
@@ -264,6 +266,8 @@ exports[`ValueAxesPanel component should init with the default set of props 1`]
     }
     id="yAxisAccordionValueAxis-2"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     key="ValueAxis-2"
     paddingSize="none"
   >
diff --git a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
index 36f5480e85406..c4142fb487b6a 100644
--- a/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
@@ -124,6 +124,8 @@ exports[`ValueAxisOptions component should init with the default set of props 1`
     className="visEditorSidebar__section visEditorSidebar__collapsible"
     id="yAxisOptionsAccordionValueAxis-1"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     paddingSize="none"
   >
     <EuiSpacer
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
index 37837747a69dd..7f3744c16397a 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "27.4.1",
+    "@elastic/eui": "28.2.0",
     "@kbn/plugin-helpers": "1.0.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
index 0e1a0b550ca15..acb0cf67ac5c7 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "27.4.1",
+    "@elastic/eui": "28.2.0",
     "react": "^16.12.0",
     "typescript": "4.0.2"
   }
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
index ebf0e046eca4c..ff84c25400af0 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "27.4.1",
+    "@elastic/eui": "28.2.0",
     "@kbn/plugin-helpers": "1.0.0",
     "react": "^16.12.0",
     "typescript": "4.0.2"
diff --git a/x-pack/package.json b/x-pack/package.json
index d49188b29481b..f25fe7e3418ae 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -276,7 +276,7 @@
     "@babel/runtime": "^7.11.2",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.9.3",
-    "@elastic/eui": "27.4.1",
+    "@elastic/eui": "28.2.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.0",
diff --git a/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap b/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
index 1bfeb020a2ab5..f87cc62d7809d 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/__test__/__snapshots__/Stackframe.test.tsx.snap
@@ -163,6 +163,8 @@ exports[`Stackframe when stackframe has source lines should render correctly 1`]
     }
     id="test"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     paddingSize="none"
   >
     <div
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
index 75e132863e47e..c4917539cbeda 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
@@ -6,7 +6,6 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
     data-eui="EuiFocusTrap"
   >
     <div
-      aria-describedby="generated-id"
       aria-live="assertive"
       aria-modal="true"
       class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle"
@@ -97,7 +96,6 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
     data-eui="EuiFocusTrap"
   >
     <div
-      aria-describedby="generated-id"
       aria-live="assertive"
       aria-modal="true"
       class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-isOpen euiPopover__panel-withTitle"
@@ -341,7 +339,6 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
     data-eui="EuiFocusTrap"
   >
     <div
-      aria-describedby="generated-id"
       aria-live="assertive"
       aria-modal="true"
       class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle"
@@ -432,7 +429,6 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
     data-eui="EuiFocusTrap"
   >
     <div
-      aria-describedby="generated-id"
       aria-live="assertive"
       aria-modal="true"
       class="euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-isOpen euiPopover__panel-withTitle"
@@ -605,4 +601,4 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
 </div>
 `;
 
-exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle\\" aria-live=\\"assertive\\" role=\\"dialog\\" aria-modal=\\"true\\" aria-describedby=\\"generated-id\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiPopoverTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"play\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenuItem__text\\">Auto Play</span><div data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></div></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"boxesHorizontal\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenuItem__text\\">Toolbar</span><div data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></div></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><div data-euiicon-type=\\"cross\\" class=\\"euiSwitch__icon\\"></div><div data-euiicon-type=\\"check\\" class=\\"euiSwitch__icon euiSwitch__icon--checked\\"></div></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div></div>"`;
+exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle\\" aria-live=\\"assertive\\" role=\\"dialog\\" aria-modal=\\"true\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiPopoverTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"play\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenuItem__text\\">Auto Play</span><div data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></div></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"boxesHorizontal\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenuItem__text\\">Toolbar</span><div data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></div></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><div data-euiicon-type=\\"cross\\" class=\\"euiSwitch__icon\\"></div><div data-euiicon-type=\\"check\\" class=\\"euiSwitch__icon euiSwitch__icon--checked\\"></div></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div></div>"`;
diff --git a/x-pack/plugins/lens/public/pie_visualization/render_function.tsx b/x-pack/plugins/lens/public/pie_visualization/render_function.tsx
index 79986986b217d..4e813494d7d32 100644
--- a/x-pack/plugins/lens/public/pie_visualization/render_function.tsx
+++ b/x-pack/plugins/lens/public/pie_visualization/render_function.tsx
@@ -161,7 +161,7 @@ export function PieComponent(
       // to account for in outer labels
       // This does not handle non-dashboard embeddables, which are allowed to
       // have different backgrounds.
-      textColor: chartTheme.axes?.axisTitleStyle?.fill,
+      textColor: chartTheme.axes?.axisTitle?.fill,
     },
     sectorLineStroke: chartTheme.lineSeriesStyle?.point?.fill,
     sectorLineWidth: 1.5,
diff --git a/x-pack/plugins/lens/public/xy_visualization/__snapshots__/xy_expression.test.tsx.snap b/x-pack/plugins/lens/public/xy_visualization/__snapshots__/xy_expression.test.tsx.snap
index f0c233b44a285..79d3528eef4c4 100644
--- a/x-pack/plugins/lens/public/xy_visualization/__snapshots__/xy_expression.test.tsx.snap
+++ b/x-pack/plugins/lens/public/xy_visualization/__snapshots__/xy_expression.test.tsx.snap
@@ -20,23 +20,47 @@ exports[`xy_expression XYChart component it renders area 1`] = `
     }
   />
   <Connect(SpecInstance)
-    gridLineStyle={
+    gridLine={
       Object {
         "strokeWidth": 2,
+        "visible": true,
       }
     }
     id="x"
     position="bottom"
-    showGridLines={true}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": true,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="c"
   />
   <Connect(SpecInstance)
+    gridLine={
+      Object {
+        "visible": false,
+      }
+    }
     groupId="left"
     id="left"
     key="left"
     position="left"
-    showGridLines={false}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": false,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="a"
   />
@@ -151,23 +175,47 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
     }
   />
   <Connect(SpecInstance)
-    gridLineStyle={
+    gridLine={
       Object {
         "strokeWidth": 2,
+        "visible": true,
       }
     }
     id="x"
     position="bottom"
-    showGridLines={true}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": true,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="c"
   />
   <Connect(SpecInstance)
+    gridLine={
+      Object {
+        "visible": false,
+      }
+    }
     groupId="left"
     id="left"
     key="left"
     position="left"
-    showGridLines={false}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": false,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="a"
   />
@@ -272,23 +320,47 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
     }
   />
   <Connect(SpecInstance)
-    gridLineStyle={
+    gridLine={
       Object {
         "strokeWidth": 2,
+        "visible": true,
       }
     }
     id="x"
     position="left"
-    showGridLines={true}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": true,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="c"
   />
   <Connect(SpecInstance)
+    gridLine={
+      Object {
+        "visible": false,
+      }
+    }
     groupId="left"
     id="left"
     key="left"
     position="bottom"
-    showGridLines={false}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": false,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="a"
   />
@@ -393,23 +465,47 @@ exports[`xy_expression XYChart component it renders line 1`] = `
     }
   />
   <Connect(SpecInstance)
-    gridLineStyle={
+    gridLine={
       Object {
         "strokeWidth": 2,
+        "visible": true,
       }
     }
     id="x"
     position="bottom"
-    showGridLines={true}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": true,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="c"
   />
   <Connect(SpecInstance)
+    gridLine={
+      Object {
+        "visible": false,
+      }
+    }
     groupId="left"
     id="left"
     key="left"
     position="left"
-    showGridLines={false}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": false,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="a"
   />
@@ -524,23 +620,47 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
     }
   />
   <Connect(SpecInstance)
-    gridLineStyle={
+    gridLine={
       Object {
         "strokeWidth": 2,
+        "visible": true,
       }
     }
     id="x"
     position="bottom"
-    showGridLines={true}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": true,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="c"
   />
   <Connect(SpecInstance)
+    gridLine={
+      Object {
+        "visible": false,
+      }
+    }
     groupId="left"
     id="left"
     key="left"
     position="left"
-    showGridLines={false}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": false,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="a"
   />
@@ -563,6 +683,11 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
       ]
     }
     enableHistogramMode={false}
+    fit={
+      Object {
+        "type": "none",
+      }
+    }
     groupId="left"
     id="d-a"
     key="0-0"
@@ -606,6 +731,11 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
       ]
     }
     enableHistogramMode={false}
+    fit={
+      Object {
+        "type": "none",
+      }
+    }
     groupId="left"
     id="d-b"
     key="0-1"
@@ -653,23 +783,47 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
     }
   />
   <Connect(SpecInstance)
-    gridLineStyle={
+    gridLine={
       Object {
         "strokeWidth": 2,
+        "visible": true,
       }
     }
     id="x"
     position="bottom"
-    showGridLines={true}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": true,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="c"
   />
   <Connect(SpecInstance)
+    gridLine={
+      Object {
+        "visible": false,
+      }
+    }
     groupId="left"
     id="left"
     key="left"
     position="left"
-    showGridLines={false}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": false,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="a"
   />
@@ -782,23 +936,47 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
     }
   />
   <Connect(SpecInstance)
-    gridLineStyle={
+    gridLine={
       Object {
         "strokeWidth": 2,
+        "visible": true,
       }
     }
     id="x"
     position="left"
-    showGridLines={true}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": true,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="c"
   />
   <Connect(SpecInstance)
+    gridLine={
+      Object {
+        "visible": false,
+      }
+    }
     groupId="left"
     id="left"
     key="left"
     position="bottom"
-    showGridLines={false}
+    style={
+      Object {
+        "axisTitle": Object {
+          "visible": true,
+        },
+        "tickLabel": Object {
+          "visible": false,
+        },
+      }
+    }
     tickFormat={[Function]}
     title="a"
   />
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.test.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.test.tsx
index 31ba1bc83d970..e80bb22c04a69 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.test.tsx
@@ -107,7 +107,7 @@ describe('XY Config panels', () => {
       expect(component.find(EuiSuperSelect).prop('valueOfSelected')).toEqual('Carry');
     });
 
-    it('should disable the select if there is no unstacked area or line series', () => {
+    it('should disable the select if there is no area or line series', () => {
       const state = testState();
       const component = shallow(
         <XyToolbar
@@ -115,10 +115,7 @@ describe('XY Config panels', () => {
           setState={jest.fn()}
           state={{
             ...state,
-            layers: [
-              { ...state.layers[0], seriesType: 'bar' },
-              { ...state.layers[0], seriesType: 'area_stacked' },
-            ],
+            layers: [{ ...state.layers[0], seriesType: 'bar' }],
             fittingFunction: 'Carry',
           }}
         />
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx
index d64eb9451a50e..a2488d123e13a 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx
@@ -135,8 +135,8 @@ export function XyToolbar(props: VisualizationToolbarProps<State>) {
   const { frame, state, setState } = props;
 
   const [open, setOpen] = useState(false);
-  const hasNonBarSeries = state?.layers.some(
-    (layer) => layer.seriesType === 'line' || layer.seriesType === 'area'
+  const hasNonBarSeries = state?.layers.some(({ seriesType }) =>
+    ['area_stacked', 'area', 'line'].includes(seriesType)
   );
 
   const [xAxisTitle, setXAxisTitle] = useState(state?.xTitle);
@@ -261,8 +261,7 @@ export function XyToolbar(props: VisualizationToolbarProps<State>) {
             content={
               !hasNonBarSeries &&
               i18n.translate('xpack.lens.xyChart.fittingDisabledHelpText', {
-                defaultMessage:
-                  'This setting only applies to line charts and unstacked area charts.',
+                defaultMessage: 'This setting only applies to line and area charts.',
               })
             }
           >
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_expression.test.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_expression.test.tsx
index ba1ff6a1df030..c9c27193c437e 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_expression.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_expression.test.tsx
@@ -1414,7 +1414,7 @@ describe('xy_expression', () => {
       expect(convertSpy).toHaveBeenCalledWith('I');
     });
 
-    test('it should not pass the formatter function to the x axis if the visibility of the tick labels is off', () => {
+    test('it should set the tickLabel visibility on the x axis if the tick labels is hidden', () => {
       const { data, args } = sampleArgs();
 
       args.tickLabelsVisibilitySettings = { x: false, y: true, type: 'lens_xy_tickLabelsConfig' };
@@ -1432,15 +1432,94 @@ describe('xy_expression', () => {
         />
       );
 
-      const tickFormatter = instance.find(Axis).first().prop('tickFormat');
+      const axisStyle = instance.find(Axis).first().prop('style');
 
-      if (!tickFormatter) {
-        throw new Error('tickFormatter prop not found');
-      }
+      expect(axisStyle).toMatchObject({
+        tickLabel: {
+          visible: false,
+        },
+      });
+    });
 
-      tickFormatter('I');
+    test('it should set the tickLabel visibility on the y axis if the tick labels is hidden', () => {
+      const { data, args } = sampleArgs();
+
+      args.tickLabelsVisibilitySettings = { x: true, y: false, type: 'lens_xy_tickLabelsConfig' };
 
-      expect(convertSpy).toHaveBeenCalledTimes(0);
+      const instance = shallow(
+        <XYChart
+          data={{ ...data }}
+          args={{ ...args }}
+          formatFactory={getFormatSpy}
+          timeZone="UTC"
+          chartsThemeService={chartsThemeService}
+          histogramBarTarget={50}
+          onClickValue={onClickValue}
+          onSelectRange={onSelectRange}
+        />
+      );
+
+      const axisStyle = instance.find(Axis).at(1).prop('style');
+
+      expect(axisStyle).toMatchObject({
+        tickLabel: {
+          visible: false,
+        },
+      });
+    });
+
+    test('it should set the tickLabel visibility on the x axis if the tick labels is shown', () => {
+      const { data, args } = sampleArgs();
+
+      args.tickLabelsVisibilitySettings = { x: true, y: true, type: 'lens_xy_tickLabelsConfig' };
+
+      const instance = shallow(
+        <XYChart
+          data={{ ...data }}
+          args={{ ...args }}
+          formatFactory={getFormatSpy}
+          timeZone="UTC"
+          chartsThemeService={chartsThemeService}
+          histogramBarTarget={50}
+          onClickValue={onClickValue}
+          onSelectRange={onSelectRange}
+        />
+      );
+
+      const axisStyle = instance.find(Axis).first().prop('style');
+
+      expect(axisStyle).toMatchObject({
+        tickLabel: {
+          visible: true,
+        },
+      });
+    });
+
+    test('it should set the tickLabel visibility on the y axis if the tick labels is shown', () => {
+      const { data, args } = sampleArgs();
+
+      args.tickLabelsVisibilitySettings = { x: false, y: true, type: 'lens_xy_tickLabelsConfig' };
+
+      const instance = shallow(
+        <XYChart
+          data={{ ...data }}
+          args={{ ...args }}
+          formatFactory={getFormatSpy}
+          timeZone="UTC"
+          chartsThemeService={chartsThemeService}
+          histogramBarTarget={50}
+          onClickValue={onClickValue}
+          onSelectRange={onSelectRange}
+        />
+      );
+
+      const axisStyle = instance.find(Axis).at(1).prop('style');
+
+      expect(axisStyle).toMatchObject({
+        tickLabel: {
+          visible: true,
+        },
+      });
     });
 
     test('it should remove invalid rows', () => {
@@ -1766,8 +1845,7 @@ describe('xy_expression', () => {
       expect(component.find(BarSeries).prop('fit')).toEqual(undefined);
       expect(component.find(AreaSeries).at(0).prop('fit')).toEqual({ type: Fit.Carry });
       expect(component.find(AreaSeries).at(0).prop('stackAccessors')).toEqual([]);
-      // stacked area series doesn't get the fit prop
-      expect(component.find(AreaSeries).at(1).prop('fit')).toEqual(undefined);
+      expect(component.find(AreaSeries).at(1).prop('fit')).toEqual({ type: Fit.Carry });
       expect(component.find(AreaSeries).at(1).prop('stackAccessors')).toEqual(['c']);
     });
 
@@ -1831,7 +1909,13 @@ describe('xy_expression', () => {
         />
       );
 
-      expect(component.find(Axis).at(0).prop('title')).toEqual(undefined);
+      const axisStyle = component.find(Axis).first().prop('style');
+
+      expect(axisStyle).toMatchObject({
+        axisTitle: {
+          visible: false,
+        },
+      });
     });
 
     test('it should show the X axis gridlines if the setting is on', () => {
@@ -1852,7 +1936,9 @@ describe('xy_expression', () => {
         />
       );
 
-      expect(component.find(Axis).at(0).prop('showGridLines')).toBeTruthy();
+      expect(component.find(Axis).at(0).prop('gridLine')).toMatchObject({
+        visible: true,
+      });
     });
   });
 });
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_expression.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_expression.tsx
index 2037a3dbe6623..31873228fb394 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_expression.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_expression.tsx
@@ -420,11 +420,21 @@ export function XYChart({
       <Axis
         id="x"
         position={shouldRotate ? Position.Left : Position.Bottom}
-        title={showXAxisTitle ? xTitle : undefined}
-        showGridLines={gridlinesVisibilitySettings?.x}
-        gridLineStyle={{ strokeWidth: 2 }}
+        title={xTitle}
+        gridLine={{
+          visible: gridlinesVisibilitySettings?.x,
+          strokeWidth: 2,
+        }}
         hide={filteredLayers[0].hide}
-        tickFormat={tickLabelsVisibilitySettings?.x ? (d) => xAxisFormatter.convert(d) : () => ''}
+        tickFormat={(d) => xAxisFormatter.convert(d)}
+        style={{
+          tickLabel: {
+            visible: tickLabelsVisibilitySettings?.x,
+          },
+          axisTitle: {
+            visible: showXAxisTitle,
+          },
+        }}
       />
 
       {yAxesConfiguration.map((axis, index) => (
@@ -433,10 +443,20 @@ export function XYChart({
           id={axis.groupId}
           groupId={axis.groupId}
           position={axis.position}
-          title={showYAxisTitle ? getYAxesTitles(axis.series, index) : undefined}
-          showGridLines={gridlinesVisibilitySettings?.y}
+          title={getYAxesTitles(axis.series, index)}
+          gridLine={{
+            visible: gridlinesVisibilitySettings?.y,
+          }}
           hide={filteredLayers[0].hide}
-          tickFormat={tickLabelsVisibilitySettings?.y ? (d) => axis.formatter.convert(d) : () => ''}
+          tickFormat={(d) => axis.formatter.convert(d)}
+          style={{
+            tickLabel: {
+              visible: tickLabelsVisibilitySettings?.y,
+            },
+            axisTitle: {
+              visible: showYAxisTitle,
+            },
+          }}
         />
       ))}
 
@@ -529,7 +549,9 @@ export function XYChart({
             case 'bar_horizontal_stacked':
               return <BarSeries key={index} {...seriesProps} />;
             case 'area_stacked':
-              return <AreaSeries key={index} {...seriesProps} />;
+              return (
+                <AreaSeries key={index} {...seriesProps} fit={getFitOptions(fittingFunction)} />
+              );
             case 'area':
               return (
                 <AreaSeries key={index} {...seriesProps} fit={getFitOptions(fittingFunction)} />
diff --git a/x-pack/plugins/maps/public/components/tooltip_selector/add_tooltip_field_popover.tsx b/x-pack/plugins/maps/public/components/tooltip_selector/add_tooltip_field_popover.tsx
index cbeb4e79a38d7..7e18088444129 100644
--- a/x-pack/plugins/maps/public/components/tooltip_selector/add_tooltip_field_popover.tsx
+++ b/x-pack/plugins/maps/public/components/tooltip_selector/add_tooltip_field_popover.tsx
@@ -27,6 +27,8 @@ export type FieldProps = {
   name: string;
 };
 
+type FieldOptions = Array<EuiSelectableOption<{ value: string }>>;
+
 function sortByLabel(a: EuiSelectableOption, b: EuiSelectableOption): number {
   return a.label.localeCompare(b.label);
 }
@@ -66,7 +68,7 @@ interface Props {
 interface State {
   isPopoverOpen: boolean;
   checkedFields: string[];
-  options?: EuiSelectableOption[];
+  options?: FieldOptions;
   prevFields?: FieldProps[];
   prevSelectedFields?: FieldProps[];
 }
@@ -105,13 +107,15 @@ export class AddTooltipFieldPopover extends Component<Props, State> {
     });
   };
 
-  _onSelect = (options: EuiSelectableOption[]) => {
+  _onSelect = (selectableOptions: EuiSelectableOption[]) => {
+    // EUI team to remove casting: https://github.com/elastic/eui/issues/3966
+    const options = selectableOptions as FieldOptions;
     const checkedFields: string[] = options
       .filter((option) => {
         return option.checked === 'on';
       })
       .map((option) => {
-        return option.value as string;
+        return option.value!;
       });
 
     this.setState({
diff --git a/x-pack/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap b/x-pack/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
index b005e3ca6b17d..99cad61d6b2b4 100644
--- a/x-pack/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
+++ b/x-pack/plugins/maps/public/connected_components/layer_panel/__snapshots__/view.test.js.snap
@@ -57,6 +57,8 @@ exports[`LayerPanel is rendered 1`] = `
           buttonContent="Source details"
           id="accordion1"
           initialIsOpen={false}
+          isLoading={false}
+          isLoadingMessage={false}
           paddingSize="none"
         >
           <EuiText
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
index c2ee498d7189d..e35d2ba6108f5 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/ccr_shard/__snapshots__/ccr_shard.test.js.snap
@@ -142,6 +142,8 @@ exports[`CcrShard that it renders normally 1`] = `
       }
       id="ccrLatestStat"
       initialIsOpen={false}
+      isLoading={false}
+      isLoadingMessage={false}
       paddingSize="l"
     >
       <EuiTitle
diff --git a/x-pack/plugins/observability/public/components/app/section/apm/index.tsx b/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
index a1d51ffda6afd..b635c2c68b926 100644
--- a/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/apm/index.tsx
@@ -112,7 +112,7 @@ export function APMSection({ absoluteTime, relativeTime, bucketSize }: Props) {
             <Axis
               id="y-axis"
               position={Position.Left}
-              showGridLines
+              gridLine={{ visible: true }}
               tickFormat={(value) => `${formatTpm(value)} tpm`}
             />
             <Axis id="x-axis" position={Position.Bottom} tickFormat={formatter} />
diff --git a/x-pack/plugins/observability/public/components/app/section/logs/index.tsx b/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
index aa1dc1640125e..343611294bc45 100644
--- a/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/logs/index.tsx
@@ -150,7 +150,7 @@ export function LogsSection({ absoluteTime, relativeTime, bucketSize }: Props) {
                 />
                 <Axis
                   id="y-axis"
-                  showGridLines
+                  gridLine={{ visible: true }}
                   position={Position.Left}
                   tickFormat={(d: number) => numeral(d).format('0a')}
                 />
diff --git a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
index cfb06af3224c7..5c23c7a065b5e 100644
--- a/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
+++ b/x-pack/plugins/observability/public/components/app/section/uptime/index.tsx
@@ -182,7 +182,7 @@ function UptimeBarSeries({
       />
       <Axis
         id="y-axis"
-        showGridLines
+        gridLine={{ visible: true }}
         position={Position.Left}
         tickFormat={(x: any) => numeral(x).format('0a')}
       />
diff --git a/x-pack/plugins/security_solution/cypress/screens/search_bar.ts b/x-pack/plugins/security_solution/cypress/screens/search_bar.ts
index 07e9de137826c..d2838292b04f0 100644
--- a/x-pack/plugins/security_solution/cypress/screens/search_bar.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/search_bar.ts
@@ -14,7 +14,7 @@ export const ADD_FILTER_FORM_FIELD_INPUT =
   '[data-test-subj="filterFieldSuggestionList"] input[data-test-subj="comboBoxSearchInput"]';
 
 export const ADD_FILTER_FORM_FIELD_OPTION = (value: string) =>
-  `[data-test-subj="comboBoxOptionsList filterFieldSuggestionList-optionsList"] button[title="${value}"] strong`;
+  `[data-test-subj="comboBoxOptionsList filterFieldSuggestionList-optionsList"] button[title="${value}"] mark`;
 
 export const ADD_FILTER_FORM_OPERATOR_FIELD =
   '[data-test-subj="filterOperatorList"] input[data-test-subj="comboBoxSearchInput"]';
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/areachart.tsx b/x-pack/plugins/security_solution/public/common/components/charts/areachart.tsx
index b503d63553835..45c20b8903281 100644
--- a/x-pack/plugins/security_solution/public/common/components/charts/areachart.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/charts/areachart.tsx
@@ -110,10 +110,23 @@ export const AreaChartBaseComponent = ({
           position={Position.Bottom}
           showOverlappingTicks={false}
           tickFormat={xTickFormatter}
-          tickSize={0}
+          style={{
+            tickLine: {
+              visible: false,
+            },
+          }}
         />
 
-        <Axis id={yAxisId} position={Position.Left} tickSize={0} tickFormat={yTickFormatter} />
+        <Axis
+          id={yAxisId}
+          position={Position.Left}
+          style={{
+            tickLine: {
+              visible: false,
+            },
+          }}
+          tickFormat={yTickFormatter}
+        />
       </Chart>
     </div>
   ) : null;
diff --git a/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx b/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
index cafb0095431f1..80fc1b4597081 100644
--- a/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/charts/barchart.tsx
@@ -98,11 +98,24 @@ export const BarChartBaseComponent = ({
         id={xAxisId}
         position={Position.Bottom}
         showOverlappingTicks={false}
-        tickSize={tickSize}
+        style={{
+          tickLine: {
+            size: tickSize,
+          },
+        }}
         tickFormat={xTickFormatter}
       />
 
-      <Axis id={yAxisId} position={Position.Left} tickSize={tickSize} tickFormat={yTickFormatter} />
+      <Axis
+        id={yAxisId}
+        position={Position.Left}
+        style={{
+          tickLine: {
+            size: tickSize,
+          },
+        }}
+        tickFormat={yTickFormatter}
+      />
     </Chart>
   ) : null;
 };
diff --git a/x-pack/plugins/security_solution/public/common/components/paginated_table/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/paginated_table/__snapshots__/index.test.tsx.snap
index 3b8ef69892cc0..9724e36f045e4 100644
--- a/x-pack/plugins/security_solution/public/common/components/paginated_table/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/paginated_table/__snapshots__/index.test.tsx.snap
@@ -24,6 +24,7 @@ exports[`Paginated Table Component rendering it renders the default load more ta
             "size": "64px",
           },
         },
+        "browserDefaultFontSize": "16px",
         "euiAnimSlightBounce": "cubic-bezier(0.34, 1.61, 0.7, 1)",
         "euiAnimSlightResistance": "cubic-bezier(0.694, 0.0482, 0.335, 1)",
         "euiAnimSpeedExtraFast": "90ms",
@@ -434,6 +435,28 @@ exports[`Paginated Table Component rendering it renders the default load more ta
         "euiScrollBarCorner": "6px",
         "euiSelectableListItemBorder": "1px solid #202128",
         "euiSelectableListItemPadding": "4px 12px",
+        "euiSelectableTemplateSitewideTypes": Object {
+          "application": Object {
+            "color": "#6092c0",
+            "font-weight": 500,
+          },
+          "article": Object {
+            "color": "#9777bc",
+            "font-weight": 500,
+          },
+          "case": Object {
+            "color": "#e7664c",
+            "font-weight": 500,
+          },
+          "deployment": Object {
+            "color": "#54b399",
+            "font-weight": 500,
+          },
+          "platform": Object {
+            "color": "#d6bf57",
+            "font-weight": 500,
+          },
+        },
         "euiShadowColor": "#000000",
         "euiShadowColorLarge": "#000000",
         "euiSize": "16px",
diff --git a/x-pack/plugins/security_solution/public/common/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
index b9cb5f3c83d03..f7924f37d2c17 100644
--- a/x-pack/plugins/security_solution/public/common/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/toasters/__snapshots__/modal_all_errors.test.tsx.snap
@@ -26,6 +26,8 @@ exports[`Modal all errors rendering it renders the default all errors modal when
         data-test-subj="modal-all-errors-accordion"
         id="accordion1"
         initialIsOpen={true}
+        isLoading={false}
+        isLoadingMessage={false}
         key="id-super-id-0"
         paddingSize="none"
       >
diff --git a/x-pack/plugins/security_solution/public/overview/components/overview_host_stats/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/overview/components/overview_host_stats/__snapshots__/index.test.tsx.snap
index 8d4de5b90fae9..23732e88ba1f9 100644
--- a/x-pack/plugins/security_solution/public/overview/components/overview_host_stats/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/overview/components/overview_host_stats/__snapshots__/index.test.tsx.snap
@@ -40,6 +40,8 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
     buttonContentClassName="accordion-button"
     id="host-stat-accordion-groupauditbeat"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     paddingSize="none"
   >
     <styled.div>
@@ -273,6 +275,8 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
     buttonContentClassName="accordion-button"
     id="host-stat-accordion-groupendgame"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     paddingSize="none"
   >
     <styled.div>
@@ -538,6 +542,8 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
     buttonContentClassName="accordion-button"
     id="host-stat-accordion-groupfilebeat"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     paddingSize="none"
   >
     <styled.div>
@@ -611,6 +617,8 @@ exports[`Overview Host Stat Data rendering it renders the default OverviewHostSt
     buttonContentClassName="accordion-button"
     id="host-stat-accordion-groupwinlogbeat"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     paddingSize="none"
   >
     <styled.div>
diff --git a/x-pack/plugins/security_solution/public/overview/components/overview_network_stats/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/overview/components/overview_network_stats/__snapshots__/index.test.tsx.snap
index f6060fc060958..167866ef3c606 100644
--- a/x-pack/plugins/security_solution/public/overview/components/overview_network_stats/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/overview/components/overview_network_stats/__snapshots__/index.test.tsx.snap
@@ -40,6 +40,8 @@ exports[`Overview Network Stat Data rendering it renders the default OverviewNet
     buttonContentClassName="accordion-button"
     id="network-stat-accordion-groupauditbeat"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     paddingSize="none"
   >
     <styled.div>
@@ -113,6 +115,8 @@ exports[`Overview Network Stat Data rendering it renders the default OverviewNet
     buttonContentClassName="accordion-button"
     id="network-stat-accordion-groupfilebeat"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     paddingSize="none"
   >
     <styled.div>
@@ -314,6 +318,8 @@ exports[`Overview Network Stat Data rendering it renders the default OverviewNet
     buttonContentClassName="accordion-button"
     id="network-stat-accordion-grouppacketbeat"
     initialIsOpen={false}
+    isLoading={false}
+    isLoadingMessage={false}
     paddingSize="none"
   >
     <styled.div>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_name.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_name.test.tsx
index 2e48215a89473..90f4444562c5a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_name.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_name.test.tsx
@@ -66,6 +66,6 @@ describe('FieldName', () => {
       </TestProviders>
     );
 
-    expect(wrapper.find('strong').first().text()).toEqual(highlight);
+    expect(wrapper.find('mark').first().text()).toEqual(highlight);
   });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap
index 6d2f35750d8b1..9c0a9b26f5332 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/notes/note_card/__snapshots__/note_card_body.test.tsx.snap
@@ -24,6 +24,7 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
             "size": "64px",
           },
         },
+        "browserDefaultFontSize": "16px",
         "euiAnimSlightBounce": "cubic-bezier(0.34, 1.61, 0.7, 1)",
         "euiAnimSlightResistance": "cubic-bezier(0.694, 0.0482, 0.335, 1)",
         "euiAnimSpeedExtraFast": "90ms",
@@ -434,6 +435,28 @@ exports[`NoteCardBody renders correctly against snapshot 1`] = `
         "euiScrollBarCorner": "6px",
         "euiSelectableListItemBorder": "1px solid #202128",
         "euiSelectableListItemPadding": "4px 12px",
+        "euiSelectableTemplateSitewideTypes": Object {
+          "application": Object {
+            "color": "#6092c0",
+            "font-weight": 500,
+          },
+          "article": Object {
+            "color": "#9777bc",
+            "font-weight": 500,
+          },
+          "case": Object {
+            "color": "#e7664c",
+            "font-weight": 500,
+          },
+          "deployment": Object {
+            "color": "#54b399",
+            "font-weight": 500,
+          },
+          "platform": Object {
+            "color": "#d6bf57",
+            "font-weight": 500,
+          },
+        },
         "euiShadowColor": "#000000",
         "euiShadowColorLarge": "#000000",
         "euiSize": "16px",
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
index cf80d2de38b3f..261f3a016d4db 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
@@ -44,18 +44,23 @@ exports[`DonutChart component passes correct props without errors for valid prop
             },
           },
           "axes": Object {
-            "axisLineStyle": Object {
+            "axisLine": Object {
               "stroke": "#eaeaea",
               "strokeWidth": 1,
+              "visible": true,
             },
-            "axisTitleStyle": Object {
+            "axisTitle": Object {
               "fill": "#333",
               "fontFamily": "sans-serif",
               "fontSize": 12,
               "fontStyle": "bold",
-              "padding": 8,
+              "padding": Object {
+                "inner": 8,
+                "outer": 0,
+              },
+              "visible": true,
             },
-            "gridLineStyle": Object {
+            "gridLine": Object {
               "horizontal": Object {
                 "dash": Array [
                   0,
@@ -64,7 +69,7 @@ exports[`DonutChart component passes correct props without errors for valid prop
                 "opacity": 1,
                 "stroke": "#D3DAE6",
                 "strokeWidth": 1,
-                "visible": true,
+                "visible": false,
               },
               "vertical": Object {
                 "dash": Array [
@@ -74,17 +79,30 @@ exports[`DonutChart component passes correct props without errors for valid prop
                 "opacity": 1,
                 "stroke": "#D3DAE6",
                 "strokeWidth": 1,
-                "visible": true,
+                "visible": false,
               },
             },
-            "tickLabelStyle": Object {
+            "tickLabel": Object {
+              "alignment": Object {
+                "horizontal": "near",
+                "vertical": "near",
+              },
               "fill": "#777",
               "fontFamily": "sans-serif",
               "fontSize": 10,
               "fontStyle": "normal",
-              "padding": 4,
+              "offset": Object {
+                "reference": "local",
+                "x": 0,
+                "y": 0,
+              },
+              "padding": 0,
+              "rotation": 0,
+              "visible": true,
             },
-            "tickLineStyle": Object {
+            "tickLine": Object {
+              "padding": 10,
+              "size": 10,
               "stroke": "#eaeaea",
               "strokeWidth": 1,
               "visible": true,
@@ -164,6 +182,7 @@ exports[`DonutChart component passes correct props without errors for valid prop
           },
           "legend": Object {
             "horizontalHeight": 64,
+            "margin": 0,
             "spacingBuffer": 10,
             "verticalWidth": 200,
           },
@@ -217,17 +236,20 @@ exports[`DonutChart component passes correct props without errors for valid prop
             },
           },
           "axes": Object {
-            "axisLineStyle": Object {
+            "axisLine": Object {
               "stroke": "rgba(238, 240, 243, 1)",
             },
-            "axisTitleStyle": Object {
+            "axisTitle": Object {
               "fill": "rgba(52, 55, 65, 1)",
               "fontFamily": "'Inter UI', -apple-system, BlinkMacSystemFont,
   'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
               "fontSize": 12,
-              "padding": 10,
+              "padding": Object {
+                "inner": 10,
+                "outer": 0,
+              },
             },
-            "gridLineStyle": Object {
+            "gridLine": Object {
               "horizontal": Object {
                 "dash": Array [
                   0,
@@ -249,14 +271,17 @@ exports[`DonutChart component passes correct props without errors for valid prop
                 "visible": true,
               },
             },
-            "tickLabelStyle": Object {
+            "tickLabel": Object {
               "fill": "rgba(105, 112, 125, 1)",
               "fontFamily": "'Inter UI', -apple-system, BlinkMacSystemFont,
   'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'",
               "fontSize": 10,
-              "padding": 8,
+              "padding": Object {
+                "inner": 10,
+                "outer": 8,
+              },
             },
-            "tickLineStyle": Object {
+            "tickLine": Object {
               "stroke": "rgba(238, 240, 243, 1)",
               "strokeWidth": 1,
               "visible": false,
diff --git a/yarn.lock b/yarn.lock
index 0d8ae918f27dc..bd02196e48796 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1144,10 +1144,10 @@
   dependencies:
     "@elastic/apm-rum-core" "^5.6.0"
 
-"@elastic/charts@19.8.1":
-  version "19.8.1"
-  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-19.8.1.tgz#27653823911c26e4703c73588367473215beaf0f"
-  integrity sha512-vONCrcZ8bZ+C16+bKLoLyNrMC/b2UvYNoPbYcnB5XYAg5a68finvXEcWD6Y+qa7GLaO2CMe5J9eSjLWXHHDmLg==
+"@elastic/charts@21.0.1":
+  version "21.0.1"
+  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-21.0.1.tgz#1e8be5303d0c7d53d7ccfcfa121ef68164ae200f"
+  integrity sha512-KMJE2JNwoy021Rvhgu1wiga0FVCa0u4NlFVUSR+h+G010KLarc+c9yUKBTG8v/nZ6ijBtuOLCjjU9OCWXYfxvA==
   dependencies:
     "@popperjs/core" "^2.4.0"
     chroma-js "^2.1.0"
@@ -1229,10 +1229,10 @@
     tabbable "^1.1.0"
     uuid "^3.1.0"
 
-"@elastic/eui@27.4.1":
-  version "27.4.1"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-27.4.1.tgz#9803f6f6c6997c769720381f521e5319ef07a599"
-  integrity sha512-eGztErFlvkwI4BFxDs6tFBGFiN15NQdJdRHvSi5caOQFGabuR8XCRNUWcNFHlwKVJaDaGsJRuwbbSLh9XdWubQ==
+"@elastic/eui@28.2.0":
+  version "28.2.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-28.2.0.tgz#0c89c7adc27d4ac918191af8237a2634a26d0637"
+  integrity sha512-ovVkwbwcJLs87ycaof5pyTGjpuPH2sN38k2e+c3IiZjoeGAqWZJouptQguoKYglCyayxoBUV3TAE82m+qyxCnA==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.116"
@@ -1241,6 +1241,7 @@
     "@types/react-input-autosize" "^2.0.2"
     "@types/react-virtualized-auto-sizer" "^1.0.0"
     "@types/react-window" "^1.8.1"
+    "@types/vfile-message" "^2.0.0"
     chroma-js "^2.0.4"
     classnames "^2.2.5"
     highlight.js "^9.12.0"
@@ -1251,15 +1252,25 @@
     prop-types "^15.6.0"
     react-ace "^7.0.5"
     react-beautiful-dnd "^13.0.0"
-    react-focus-on "^3.4.1"
+    react-dropzone "^10.2.1"
+    react-focus-on "^3.5.0"
     react-input-autosize "^2.2.2"
     react-is "~16.3.0"
     react-virtualized-auto-sizer "^1.0.2"
     react-window "^1.8.5"
+    rehype-raw "^4.0.1"
+    rehype-react "^6.0.0"
+    rehype-stringify "^6.0.1"
+    remark-emoji "^2.1.0"
+    remark-highlight.js "^5.2.0"
+    remark-parse "^7.0.2"
+    remark-rehype "^7.0.0"
     resize-observer-polyfill "^1.5.0"
     tabbable "^3.0.0"
     text-diff "^1.0.1"
+    unified "^8.4.2"
     uuid "^3.1.0"
+    vfile "^4.1.1"
 
 "@elastic/filesaver@1.1.2":
   version "1.1.2"
@@ -2182,6 +2193,13 @@
     vfile "^4.0.0"
     vfile-reporter "^5.1.1"
 
+"@mapbox/hast-util-table-cell-style@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.1.3.tgz#5b7166ae01297d72216932b245e4b2f0b642dca6"
+  integrity sha512-QsEsh5YaDvHoMQ2YHdvZy2iDnU3GgKVBTcHf6cILyoWDZtPSdlG444pL/ioPYO/GpXSfODBb9sefEetfC4v9oA==
+  dependencies:
+    unist-util-visit "^1.3.0"
+
 "@mapbox/jsonlint-lines-primitives@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234"
@@ -4149,6 +4167,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/mdast@^3.0.0":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
+  integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==
+  dependencies:
+    "@types/unist" "*"
+
 "@types/memoize-one@^4.1.0":
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/@types/memoize-one/-/memoize-one-4.1.1.tgz#41dd138a4335b5041f7d8fc038f9d593d88b3369"
@@ -4831,7 +4856,7 @@
   dependencies:
     "@types/undertaker-registry" "*"
 
-"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
+"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
@@ -4863,6 +4888,13 @@
     "@types/node" "*"
     "@types/unist" "*"
 
+"@types/vfile-message@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/vfile-message/-/vfile-message-2.0.0.tgz#690e46af0fdfc1f9faae00cd049cc888957927d5"
+  integrity sha512-GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw==
+  dependencies:
+    vfile-message "*"
+
 "@types/vfile@^3.0.0":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@types/vfile/-/vfile-3.0.2.tgz#19c18cd232df11ce6fa6ad80259bc86c366b09b9"
@@ -6575,6 +6607,11 @@ attr-accept@^1.1.3:
   dependencies:
     core-js "^2.5.0"
 
+attr-accept@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.1.tgz#89b48de019ed4342f1865626b4389c666b3ed231"
+  integrity sha512-GpefLMsbH5ojNgfTW+OBin2xKzuHfyeNA+qCktzZojBhbA/lPZdCFMWdwk5ajb989Ok7ZT+EADqvW3TAFNMjhA==
+
 autobind-decorator@^1.3.4:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/autobind-decorator/-/autobind-decorator-1.4.3.tgz#4c96ffa77b10622ede24f110f5dbbf56691417d1"
@@ -8138,10 +8175,10 @@ catbox@10.x.x:
     hoek "5.x.x"
     joi "13.x.x"
 
-ccount@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.3.tgz#f1cec43f332e2ea5a569fd46f9f5bde4e6102aff"
-  integrity sha512-Jt9tIBkRc9POUof7QA/VwWd+58fKkEEfI+/t1/eOlxKM7ZhrczNzMFefge7Ai+39y1pR/pP6cI19guHy3FSLmw==
+ccount@^1.0.0, ccount@^1.0.3:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
+  integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==
 
 center-align@^0.1.1:
   version "0.1.3"
@@ -8268,6 +8305,11 @@ change-emitter@^0.1.2:
   resolved "https://registry.yarnpkg.com/change-emitter/-/change-emitter-0.1.6.tgz#e8b2fe3d7f1ab7d69a32199aff91ea6931409515"
   integrity sha1-6LL+PX8at9aaMhma/5HqaTFAlRU=
 
+character-entities-html4@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-1.1.4.tgz#0e64b0a3753ddbf1fdc044c5fd01d0199a02e125"
+  integrity sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==
+
 character-entities-legacy@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz#f40779df1a101872bb510a3d295e1fccf147202f"
@@ -8826,6 +8868,11 @@ coffeescript@~1.10.0:
   resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.10.0.tgz#e7aa8301917ef621b35d8a39f348dcdd1db7e33e"
   integrity sha1-56qDAZF+9iGzXYo580jc3R234z4=
 
+collapse-white-space@^1.0.0:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.6.tgz#e63629c0016665792060dbbeb79c42239d2c5287"
+  integrity sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==
+
 collapse-white-space@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/collapse-white-space/-/collapse-white-space-1.0.3.tgz#4b906f670e5a963a87b76b0e1689643341b6023c"
@@ -8983,6 +9030,11 @@ comma-separated-tokens@^1.0.0:
   dependencies:
     trim "0.0.1"
 
+comma-separated-tokens@^1.0.1:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz#632b80b6117867a158f1080ad498b2fbe7e3f5ea"
+  integrity sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==
+
 commander@2, commander@2.19.0, commander@^2.11.0, commander@^2.12.2:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -10606,6 +10658,13 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
+detab@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.3.tgz#33e5dd74d230501bd69985a0d2b9a3382699a130"
+  integrity sha512-Up8P0clUVwq0FnFjDclzZsy9PadzRn5FFxrr47tQQvMHqyiFYVbpH8oXDzWtF0Q7pYy3l+RPmtBl+BsFF6wH0A==
+  dependencies:
+    repeat-string "^1.5.4"
+
 detect-conflict@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/detect-conflict/-/detect-conflict-1.0.1.tgz#088657a66a961c05019db7c4230883b1c6b4176e"
@@ -11303,6 +11362,11 @@ emojis-list@^3.0.0:
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
+emoticon@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/emoticon/-/emoticon-3.2.0.tgz#c008ca7d7620fac742fe1bf4af8ff8fed154ae7f"
+  integrity sha512-SNujglcLTTg+lDAcApPNgEdudaqQFiAbJCqzjNxJkvN9vAwCGi0uu8IUVvx+f16h+V44KCY6Y2yboroc9pilHg==
+
 emotion-theming@^10.0.19:
   version "10.0.27"
   resolved "https://registry.yarnpkg.com/emotion-theming/-/emotion-theming-10.0.27.tgz#1887baaec15199862c89b1b984b79806f2b9ab10"
@@ -12743,7 +12807,7 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.0"
 
-fault@^1.0.2:
+fault@^1.0.0, fault@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13"
   integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==
@@ -12872,6 +12936,13 @@ file-saver@^1.3.8:
   resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
   integrity sha512-spKHSBQIxxS81N/O21WmuXA2F6wppUCsutpzenOeZzOCCJ5gEfcbqJP983IrpLXzYmXnMUa6J03SubcNPdKrlg==
 
+file-selector@^0.1.12:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.1.12.tgz#fe726547be219a787a9dcc640575a04a032b1fd0"
+  integrity sha512-Kx7RTzxyQipHuiqyZGf+Nz4vY9R1XGxuQl/hLoJwq+J4avk/9wxxgZyHKtbyIPJmbD4A66DWGYfyykWNpcYutQ==
+  dependencies:
+    tslib "^1.9.0"
+
 file-sync-cmp@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz#a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b"
@@ -15004,6 +15075,31 @@ hasha@^5.0.0:
     is-stream "^2.0.0"
     type-fest "^0.8.0"
 
+hast-to-hyperscript@^7.0.0:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-7.0.4.tgz#7c4c037d9a8ea19b0a3fdb676a26448ad922353d"
+  integrity sha512-vmwriQ2H0RPS9ho4Kkbf3n3lY436QKLq6VaGA1pzBh36hBi3tm1DO9bR+kaJIbpT10UqaANDkMjxvjVfr+cnOA==
+  dependencies:
+    comma-separated-tokens "^1.0.0"
+    property-information "^5.3.0"
+    space-separated-tokens "^1.0.0"
+    style-to-object "^0.2.1"
+    unist-util-is "^3.0.0"
+    web-namespaces "^1.1.2"
+
+hast-to-hyperscript@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/hast-to-hyperscript/-/hast-to-hyperscript-9.0.0.tgz#768fb557765fe28749169c885056417342d71e83"
+  integrity sha512-NJvMYU3GlMLs7hN3CRbsNlMzusVNkYBogVWDGybsuuVQ336gFLiD+q9qtFZT2meSHzln3pNISZWTASWothMSMg==
+  dependencies:
+    "@types/unist" "^2.0.3"
+    comma-separated-tokens "^1.0.0"
+    property-information "^5.3.0"
+    space-separated-tokens "^1.0.0"
+    style-to-object "^0.3.0"
+    unist-util-is "^4.0.0"
+    web-namespaces "^1.0.0"
+
 hast-util-from-parse5@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-5.0.0.tgz#a505a05766e0f96e389bfb0b1dd809eeefcef47b"
@@ -15015,11 +15111,62 @@ hast-util-from-parse5@^5.0.0:
     web-namespaces "^1.1.2"
     xtend "^4.0.1"
 
+hast-util-is-element@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-1.0.4.tgz#059090a05cc02e275df1ad02caf8cb422fcd2e02"
+  integrity sha512-NFR6ljJRvDcyPP5SbV7MyPBgF47X3BsskLnmw1U34yL+X6YC0MoBx9EyMg8Jtx4FzGH95jw8+c1VPLHaRA0wDQ==
+
 hast-util-parse-selector@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.1.tgz#4ddbae1ae12c124e3eb91b581d2556441766f0ab"
   integrity sha512-Xyh0v+nHmQvrOqop2Jqd8gOdyQtE8sIP9IQf7mlVDqp924W4w/8Liuguk2L2qei9hARnQSG2m+wAOCxM7npJVw==
 
+hast-util-raw@^5.0.0:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/hast-util-raw/-/hast-util-raw-5.0.2.tgz#62288f311ec2f35e066a30d5e0277f963ad43a67"
+  integrity sha512-3ReYQcIHmzSgMq8UrDZHFL0oGlbuVGdLKs8s/Fe8BfHFAyZDrdv1fy/AGn+Fim8ZuvAHcJ61NQhVMtyfHviT/g==
+  dependencies:
+    hast-util-from-parse5 "^5.0.0"
+    hast-util-to-parse5 "^5.0.0"
+    html-void-elements "^1.0.0"
+    parse5 "^5.0.0"
+    unist-util-position "^3.0.0"
+    web-namespaces "^1.0.0"
+    xtend "^4.0.0"
+    zwitch "^1.0.0"
+
+hast-util-to-html@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-6.1.0.tgz#86bcd19c3bd46af456984f8f34db16298c2b10b0"
+  integrity sha512-IlC+LG2HGv0Y8js3wqdhg9O2sO4iVpRDbHOPwXd7qgeagpGsnY49i8yyazwqS35RA35WCzrBQE/n0M6GG/ewxA==
+  dependencies:
+    ccount "^1.0.0"
+    comma-separated-tokens "^1.0.1"
+    hast-util-is-element "^1.0.0"
+    hast-util-whitespace "^1.0.0"
+    html-void-elements "^1.0.0"
+    property-information "^5.2.0"
+    space-separated-tokens "^1.0.0"
+    stringify-entities "^2.0.0"
+    unist-util-is "^3.0.0"
+    xtend "^4.0.1"
+
+hast-util-to-parse5@^5.0.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/hast-util-to-parse5/-/hast-util-to-parse5-5.1.2.tgz#09d27bee9ba9348ea05a6cfcc44e02f9083969b6"
+  integrity sha512-ZgYLJu9lYknMfsBY0rBV4TJn2xiwF1fXFFjbP6EE7S0s5mS8LIKBVWzhA1MeIs1SWW6GnnE4In6c3kPb+CWhog==
+  dependencies:
+    hast-to-hyperscript "^7.0.0"
+    property-information "^5.0.0"
+    web-namespaces "^1.0.0"
+    xtend "^4.0.0"
+    zwitch "^1.0.0"
+
+hast-util-whitespace@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz#e4fe77c4a9ae1cb2e6c25e02df0043d0164f6e41"
+  integrity sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A==
+
 hastscript@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-5.0.0.tgz#fee10382c1bc4ba3f1be311521d368c047d2c43a"
@@ -15072,6 +15219,11 @@ highlight.js@^9.12.0, highlight.js@~9.12.0:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
   integrity sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4=
 
+highlight.js@~10.1.0:
+  version "10.1.2"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.1.2.tgz#c20db951ba1c22c055010648dfffd7b2a968e00c"
+  integrity sha512-Q39v/Mn5mfBlMff9r+zzA+gWxRsCRKwEMvYTiisLr/XUiFI/4puWt0Ojdko3R3JCNWGdOWaA5g/Yxqa23kC5AA==
+
 highlight.js@~9.13.0:
   version "9.13.1"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz#054586d53a6863311168488a0f58d6c505ce641e"
@@ -15221,6 +15373,11 @@ html-to-react@^1.3.4:
     lodash.camelcase "^4.3.0"
     ramda "^0.26"
 
+html-void-elements@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-1.0.5.tgz#ce9159494e86d95e45795b166c2021c2cfca4483"
+  integrity sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==
+
 html-webpack-plugin@^4.0.0-beta.2:
   version "4.0.0-beta.5"
   resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz#2c53083c1151bfec20479b1f8aaf0039e77b5513"
@@ -15740,6 +15897,11 @@ ini@^1.2.0, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
+inline-style-parser@0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
+  integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
+
 inline-style-prefixer@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/inline-style-prefixer/-/inline-style-prefixer-4.0.2.tgz#d390957d26f281255fe101da863158ac6eb60911"
@@ -16190,6 +16352,11 @@ is-decimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.1.tgz#f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82"
   integrity sha1-9ftqlJlq2ejjdh+/vQkfH8qMToI=
 
+is-decimal@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
+  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
+
 is-descriptor@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
@@ -16517,6 +16684,11 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
+is-plain-obj@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
 is-plain-object@2.0.4, is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -18803,6 +18975,11 @@ lodash.throttle@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
+lodash.toarray@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
+  integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE=
+
 lodash.unescape@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
@@ -18992,6 +19169,14 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
+lowlight@^1.2.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.14.0.tgz#83ebc143fec0f9e6c0d3deffe01be129ce56b108"
+  integrity sha512-N2E7zTM7r1CwbzwspPxJvmjAbxljCPThTFawEX2Z7+P3NGrrvY54u8kyU16IY4qWfoVIxY8SYCS8jTkuG7TqYA==
+  dependencies:
+    fault "^1.0.0"
+    highlight.js "~10.1.0"
+
 lowlight@~1.11.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.11.0.tgz#1304d83005126d4e8b1dc0f07981e9b689ec2efc"
@@ -19280,6 +19465,30 @@ mdast-add-list-metadata@1.0.1:
   dependencies:
     unist-util-visit-parents "1.1.2"
 
+mdast-util-definitions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-3.0.1.tgz#06af6c49865fc63d6d7d30125569e2f7ae3d0a86"
+  integrity sha512-BAv2iUm/e6IK/b2/t+Fx69EL/AGcq/IG2S+HxHjDJGfLJtd6i9SZUS76aC9cig+IEucsqxKTR0ot3m933R3iuA==
+  dependencies:
+    unist-util-visit "^2.0.0"
+
+mdast-util-to-hast@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-9.1.0.tgz#6ef121dd3cd3b006bf8650b1b9454da0faf79ffe"
+  integrity sha512-Akl2Vi9y9cSdr19/Dfu58PVwifPXuFt1IrHe7l+Crme1KvgUT+5z+cHLVcQVGCiNTZZcdqjnuv9vPkGsqWytWA==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    "@types/unist" "^2.0.3"
+    collapse-white-space "^1.0.0"
+    detab "^2.0.0"
+    mdast-util-definitions "^3.0.0"
+    mdurl "^1.0.0"
+    trim-lines "^1.0.0"
+    unist-builder "^2.0.0"
+    unist-util-generated "^1.0.0"
+    unist-util-position "^3.0.0"
+    unist-util-visit "^2.0.0"
+
 mdn-data@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
@@ -19290,7 +19499,7 @@ mdn-data@2.0.6:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978"
   integrity sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==
 
-mdurl@^1.0.1:
+mdurl@^1.0.0, mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
   integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=
@@ -20348,6 +20557,13 @@ node-dir@^0.1.10:
   dependencies:
     minimatch "^3.0.2"
 
+node-emoji@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.10.0.tgz#8886abd25d9c7bb61802a658523d1f8d2a89b2da"
+  integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==
+  dependencies:
+    lodash.toarray "^4.4.0"
+
 node-environment-flags@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
@@ -22647,6 +22863,13 @@ property-information@^5.0.0, property-information@^5.0.1:
   dependencies:
     xtend "^4.0.1"
 
+property-information@^5.2.0, property-information@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.5.0.tgz#4dc075d493061a82e2b7d096f406e076ed859943"
+  integrity sha512-RgEbCx2HLa1chNgvChcx+rrCWD0ctBmGSE0M7lVm1yyv4UbvbrWoXp/BkVLZefzjrRBGW8/Js6uh/BnlHXFyjA==
+  dependencies:
+    xtend "^4.0.0"
+
 proto-list@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
@@ -23276,6 +23499,15 @@ react-draggable@^4.0.3:
     classnames "^2.2.5"
     prop-types "^15.6.0"
 
+react-dropzone@^10.2.1:
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-10.2.2.tgz#67b4db7459589a42c3b891a82eaf9ade7650b815"
+  integrity sha512-U5EKckXVt6IrEyhMMsgmHQiWTGLudhajPPG77KFSvgsMqNEHSyGpqWvOMc5+DhEah/vH4E1n+J5weBNLd5VtyA==
+  dependencies:
+    attr-accept "^2.0.0"
+    file-selector "^0.1.12"
+    prop-types "^15.7.2"
+
 react-dropzone@^4.2.9:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-4.3.0.tgz#facdd7db16509772633c9f5200621ac01aa6706f"
@@ -23314,14 +23546,14 @@ react-focus-lock@^2.1.0, react-focus-lock@^2.3.1:
     use-callback-ref "^1.2.1"
     use-sidecar "^1.0.1"
 
-react-focus-on@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/react-focus-on/-/react-focus-on-3.4.1.tgz#e184f3c44185e341598c5d9d44b2987ad459b240"
-  integrity sha512-KGRIl0iAu+1k1dcX7eQCXF5ZR/nl+XyXN5Ukw/OY80vLaK2b6vDzNqnX0HdYbY5xSUhIRUvMWEzSsdEyPjvk/Q==
+react-focus-on@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/react-focus-on/-/react-focus-on-3.5.0.tgz#3cdebbefee26a083976e1700ba75f7377040f7f1"
+  integrity sha512-RqGAHOxhRAaMSVHIN5IpY7YL6AJkD/DMa/+iPDV7aB6XWRQfg3v2q35egIZgMWP2xhXaRVai3B80dpVWyj4Rcw==
   dependencies:
     aria-hidden "^1.1.1"
     react-focus-lock "^2.3.1"
-    react-remove-scroll "^2.3.0"
+    react-remove-scroll "^2.4.0"
     react-style-singleton "^2.1.0"
     use-callback-ref "^1.2.3"
     use-sidecar "^1.0.1"
@@ -23534,10 +23766,10 @@ react-remove-scroll-bar@^2.1.0:
     react-style-singleton "^2.1.0"
     tslib "^1.0.0"
 
-react-remove-scroll@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.3.0.tgz#3af06fe2f7130500704b676cdef94452c08fe593"
-  integrity sha512-UqVimLeAe+5EHXKfsca081hAkzg3WuDmoT9cayjBegd6UZVhlTEchleNp9J4TMGkb/ftLve7ARB5Wph+HJ7A5g==
+react-remove-scroll@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/react-remove-scroll/-/react-remove-scroll-2.4.0.tgz#190c16eb508c5927595935499e8f5dd9ab0e75cf"
+  integrity sha512-BZIO3GaEs0Or1OhA5C//n1ibUP1HdjJmqUVUsOCMxwoIpaCocbB9TFKwHOkBa/nyYy3slirqXeiPYGwdSDiseA==
   dependencies:
     react-remove-scroll-bar "^2.1.0"
     react-style-singleton "^2.1.0"
@@ -24471,6 +24703,29 @@ rehype-parse@^6.0.0:
     parse5 "^5.0.0"
     xtend "^4.0.1"
 
+rehype-raw@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/rehype-raw/-/rehype-raw-4.0.2.tgz#5d3191689df96c8c651ce5f51a6c668d2c07b9c8"
+  integrity sha512-xQt94oXfDaO7sK9mJBtsZXkjW/jm6kArCoYN+HqKZ51O19AFHlp3Xa5UfZZ2tJkbpAZzKtgVUYvnconk9IsFuA==
+  dependencies:
+    hast-util-raw "^5.0.0"
+
+rehype-react@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/rehype-react/-/rehype-react-6.1.0.tgz#95f8c936eea2159f92adfbf58e5e90be86a97cbf"
+  integrity sha512-hQ4DSGOJKA1a87Ei4fJtSHzopbfgoHkwjWMCFpLrcVR5+AIyCOtHy4oQcpGF11kTZOU6oKmJ9UKzO/JpI/XZWA==
+  dependencies:
+    "@mapbox/hast-util-table-cell-style" "^0.1.3"
+    hast-to-hyperscript "^9.0.0"
+
+rehype-stringify@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/rehype-stringify/-/rehype-stringify-6.0.1.tgz#b6aa9f84d5276c5d247c62fc1ea15983a35a4575"
+  integrity sha512-JfEPRDD4DiG7jet4md7sY07v6ACeb2x+9HWQtRPm2iA6/ic31hCv1SNBUtpolJASxQ/D8gicXiviW4TJKEMPKQ==
+  dependencies:
+    hast-util-to-html "^6.0.0"
+    xtend "^4.0.0"
+
 relateurl@0.2.x:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
@@ -24495,6 +24750,23 @@ release-zalgo@^1.0.0:
   dependencies:
     es6-error "^4.0.1"
 
+remark-emoji@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/remark-emoji/-/remark-emoji-2.1.0.tgz#69165d1181b98a54ad5d9ef811003d53d7ebc7db"
+  integrity sha512-lDddGsxXURV01WS9WAiS9rO/cedO1pvr9tahtLhr6qCGFhHG4yZSJW3Ha4Nw9Uk1hLNmUBtPC0+m45Ms+xEitg==
+  dependencies:
+    emoticon "^3.2.0"
+    node-emoji "^1.10.0"
+    unist-util-visit "^2.0.2"
+
+remark-highlight.js@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/remark-highlight.js/-/remark-highlight.js-5.2.0.tgz#6d8d22085e0c76573744b7e3706fc232269f5b02"
+  integrity sha512-5tCr1CfdXDYzR8HCAnohlr1rK8DjUTFxEZdr+QEul5o13+EOEt5RrO8U6Znf8Faj5rVLcMJtxLPq6hHrZFo33A==
+  dependencies:
+    lowlight "^1.2.0"
+    unist-util-visit "^1.0.0"
+
 remark-parse@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-5.0.0.tgz#4c077f9e499044d1d5c13f80d7a98cf7b9285d95"
@@ -24516,6 +24788,34 @@ remark-parse@^5.0.0:
     vfile-location "^2.0.0"
     xtend "^4.0.1"
 
+remark-parse@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-7.0.2.tgz#41e7170d9c1d96c3d32cf1109600a9ed50dba7cf"
+  integrity sha512-9+my0lQS80IQkYXsMA8Sg6m9QfXYJBnXjWYN5U+kFc5/n69t+XZVXU/ZBYr3cYH8FheEGf1v87rkFDhJ8bVgMA==
+  dependencies:
+    collapse-white-space "^1.0.2"
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-whitespace-character "^1.0.0"
+    is-word-character "^1.0.0"
+    markdown-escapes "^1.0.0"
+    parse-entities "^1.1.0"
+    repeat-string "^1.5.4"
+    state-toggle "^1.0.0"
+    trim "0.0.1"
+    trim-trailing-lines "^1.0.0"
+    unherit "^1.0.4"
+    unist-util-remove-position "^1.0.0"
+    vfile-location "^2.0.0"
+    xtend "^4.0.1"
+
+remark-rehype@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-7.0.0.tgz#8e106e49806c69b2e9523b76d24965119e2da67b"
+  integrity sha512-uqQ/VbaTdxyu/da6npHAso6hA00cMqhA3a59RziQdOLN2KEIkPykAVy52IcmZEVTuauXO0VtpxkyCey4phtHzQ==
+  dependencies:
+    mdast-util-to-hast "^9.1.0"
+
 remedial@^1.0.7:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/remedial/-/remedial-1.0.8.tgz#a5e4fd52a0e4956adbaf62da63a5a46a78c578a0"
@@ -26631,6 +26931,17 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
+stringify-entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-2.0.0.tgz#fa7ca6614b355fb6c28448140a20c4ede7462827"
+  integrity sha512-fqqhZzXyAM6pGD9lky/GOPq6V4X0SeTAFBl0iXb/BzOegl40gpf/bV3QQP7zULNYvjr6+Dx8SCaDULjVoOru0A==
+  dependencies:
+    character-entities-html4 "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.2"
+    is-hexadecimal "^1.0.0"
+
 stringify-object@3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.2.tgz#9853052e5a88fb605a44cd27445aa257ad7ffbcd"
@@ -26800,6 +27111,20 @@ style-loader@^1.1.3:
     loader-utils "^1.2.3"
     schema-utils "^2.6.4"
 
+style-to-object@^0.2.1:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.2.3.tgz#afcf42bc03846b1e311880c55632a26ad2780bcb"
+  integrity sha512-1d/k4EY2N7jVLOqf2j04dTc37TPOv/hHxZmvpg8Pdh8UYydxeu/C1W1U4vD8alzf5V2Gt7rLsmkr4dxAlDm9ng==
+  dependencies:
+    inline-style-parser "0.1.1"
+
+style-to-object@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46"
+  integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==
+  dependencies:
+    inline-style-parser "0.1.1"
+
 styled-components@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.1.0.tgz#2e3985b54f461027e1c91af3229e1c2530872a4e"
@@ -27804,6 +28129,11 @@ treeify@^1.0.1, treeify@^1.1.0:
   resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8"
   integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==
 
+trim-lines@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.3.tgz#839514be82428fd9e7ec89e35081afe8f6f93115"
+  integrity sha512-E0ZosSWYK2mkSu+KEtQ9/KqarVjA9HztOSX+9FDdNacRAq29RRV6ZQNgob3iuW8Htar9vAfEa6yyt5qBAHZDBA==
+
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -28319,6 +28649,17 @@ unified@^7.1.0:
     vfile "^3.0.0"
     x-is-string "^0.1.0"
 
+unified@^8.4.2:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-8.4.2.tgz#13ad58b4a437faa2751a4a4c6a16f680c500fff1"
+  integrity sha512-JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA==
+  dependencies:
+    bail "^1.0.0"
+    extend "^3.0.0"
+    is-plain-obj "^2.0.0"
+    trough "^1.0.0"
+    vfile "^4.0.0"
+
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -28370,11 +28711,36 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
+unist-builder@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-builder/-/unist-builder-2.0.3.tgz#77648711b5d86af0942f334397a33c5e91516436"
+  integrity sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==
+
+unist-util-generated@^1.0.0:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.5.tgz#1e903e68467931ebfaea386dae9ea253628acd42"
+  integrity sha512-1TC+NxQa4N9pNdayCYA1EGUOCAO0Le3fVp7Jzns6lnua/mYgwHo0tz5WUAfrdpNch1RZLHc61VZ1SDgrtNXLSw==
+
 unist-util-is@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-2.1.1.tgz#0c312629e3f960c66e931e812d3d80e77010947b"
   integrity sha1-DDEmKeP5YMZukx6BLT2A53AQlHs=
 
+unist-util-is@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-3.0.0.tgz#d9e84381c2468e82629e4a5be9d7d05a2dd324cd"
+  integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
+
+unist-util-is@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.2.tgz#c7d1341188aa9ce5b3cff538958de9895f14a5de"
+  integrity sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==
+
+unist-util-position@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47"
+  integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==
+
 unist-util-remove-position@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz#5a85c1555fc1ba0c101b86707d15e50fa4c871bb"
@@ -28399,6 +28765,28 @@ unist-util-visit-parents@1.1.2:
   resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-1.1.2.tgz#f6e3afee8bdbf961c0e6f028ea3c0480028c3d06"
   integrity sha512-yvo+MMLjEwdc3RhhPYSximset7rwjMrdt9E41Smmvg25UQIenzrN83cRnF1JMzoMi9zZOQeYXHSDf7p+IQkW3Q==
 
+unist-util-visit-parents@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz#25e43e55312166f3348cae6743588781d112c1e9"
+  integrity sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==
+  dependencies:
+    unist-util-is "^3.0.0"
+
+unist-util-visit-parents@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz#4dd262fb9dcfe44f297d53e882fc6ff3421173d5"
+  integrity sha512-0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^4.0.0"
+
+unist-util-visit@^1.0.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.4.1.tgz#4724aaa8486e6ee6e26d7ff3c8685960d560b1e3"
+  integrity sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==
+  dependencies:
+    unist-util-visit-parents "^2.0.0"
+
 unist-util-visit@^1.1.0, unist-util-visit@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-1.3.0.tgz#41ca7c82981fd1ce6c762aac397fc24e35711444"
@@ -28406,6 +28794,15 @@ unist-util-visit@^1.1.0, unist-util-visit@^1.3.0:
   dependencies:
     unist-util-is "^2.1.1"
 
+unist-util-visit@^2.0.0, unist-util-visit@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c"
+  integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-is "^4.0.0"
+    unist-util-visit-parents "^3.0.0"
+
 universal-user-agent@^2.0.0, universal-user-agent@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-2.0.3.tgz#9f6f09f9cc33de867bb720d84c08069b14937c6c"
@@ -29179,6 +29576,14 @@ vfile-location@^2.0.0:
   resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.2.tgz#d3675c59c877498e492b4756ff65e4af1a752255"
   integrity sha1-02dcWch3SY5JK0dW/2Xkrxp1IlU=
 
+vfile-message@*:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
+  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
 vfile-message@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-1.0.0.tgz#a6adb0474ea400fa25d929f1d673abea6a17e359"
@@ -29247,6 +29652,17 @@ vfile@^4.0.0:
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
+vfile@^4.1.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.0.tgz#26c78ac92eb70816b01d4565e003b7e65a2a0e01"
+  integrity sha512-a/alcwCvtuc8OX92rqqo7PflxiCgXRFjdyoGVuYV+qbgCb0GgZJRvIgCD4+U/Kl1yhaRsaTwksF88xbPyGsgpw==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    is-buffer "^2.0.0"
+    replace-ext "1.0.0"
+    unist-util-stringify-position "^2.0.0"
+    vfile-message "^2.0.0"
+
 vinyl-file@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"
@@ -29492,6 +29908,11 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+web-namespaces@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec"
+  integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==
+
 web-namespaces@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.2.tgz#c8dc267ab639505276bae19e129dbd6ae72b22b4"
@@ -30666,3 +31087,8 @@ zlib@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zlib/-/zlib-1.0.5.tgz#6e7c972fc371c645a6afb03ab14769def114fcc0"
   integrity sha1-bnyXL8NxxkWmr7A6sUdp3vEU/MA=
+
+zwitch@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
+  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==

From 20cb8161cae7aca8815b9648e36182f20108e551 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Mon, 31 Aug 2020 10:06:30 -0700
Subject: [PATCH 145/148] [ML] Remove "Are you sure" from filter lists (#76180)

---
 .../delete_filter_list_modal.test.js.snap       | 17 ++---------------
 .../delete_filter_list_modal.js                 | 15 ++-------------
 .../translations/translations/ja-JP.json        |  1 -
 .../translations/translations/zh-CN.json        |  1 -
 4 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap b/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap
index c7c7b7dd9858b..61893c0c0fd42 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/__snapshots__/delete_filter_list_modal.test.js.snap
@@ -110,7 +110,7 @@ exports[`DeleteFilterListModal renders modal after clicking delete button 1`] =
       onConfirm={[Function]}
       title={
         <FormattedMessage
-          defaultMessage="Delete {selectedFilterListsLength, plural, one {{selectedFilterId}} other {# filter lists}}"
+          defaultMessage="Delete {selectedFilterListsLength, plural, one {{selectedFilterId}} other {# filter lists}}?"
           id="xpack.ml.settings.filterLists.deleteFilterListModal.modalTitle"
           values={
             Object {
@@ -120,20 +120,7 @@ exports[`DeleteFilterListModal renders modal after clicking delete button 1`] =
           }
         />
       }
-    >
-      <p>
-        <FormattedMessage
-          defaultMessage="Are you sure you want to delete
-{selectedFilterListsLength, plural, one {this filter list} other {these filter lists}}"
-          id="xpack.ml.settings.filterLists.deleteFilterListModal.deleteWarningMessage"
-          values={
-            Object {
-              "selectedFilterListsLength": 2,
-            }
-          }
-        />
-      </p>
-    </EuiConfirmModal>
+    />
   </EuiOverlayMask>
 </div>
 `;
diff --git a/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/delete_filter_list_modal.js b/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/delete_filter_list_modal.js
index 7f8bf06ecb8a3..99cd14063e86a 100644
--- a/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/delete_filter_list_modal.js
+++ b/x-pack/plugins/ml/public/application/settings/filter_lists/components/delete_filter_list_modal/delete_filter_list_modal.js
@@ -58,7 +58,7 @@ export class DeleteFilterListModal extends Component {
       const title = (
         <FormattedMessage
           id="xpack.ml.settings.filterLists.deleteFilterListModal.modalTitle"
-          defaultMessage="Delete {selectedFilterListsLength, plural, one {{selectedFilterId}} other {# filter lists}}"
+          defaultMessage="Delete {selectedFilterListsLength, plural, one {{selectedFilterId}} other {# filter lists}}?"
           values={{
             selectedFilterListsLength: selectedFilterLists.length,
             selectedFilterId: !!selectedFilterLists.length && selectedFilterLists[0].filter_id,
@@ -86,18 +86,7 @@ export class DeleteFilterListModal extends Component {
             }
             buttonColor="danger"
             defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
-          >
-            <p>
-              <FormattedMessage
-                id="xpack.ml.settings.filterLists.deleteFilterListModal.deleteWarningMessage"
-                defaultMessage="Are you sure you want to delete
-{selectedFilterListsLength, plural, one {this filter list} other {these filter lists}}"
-                values={{
-                  selectedFilterListsLength: selectedFilterLists.length,
-                }}
-              />
-            </p>
-          </EuiConfirmModal>
+          />
         </EuiOverlayMask>
       );
     }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 07b646df74b9f..83dac4912d4ac 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -12397,7 +12397,6 @@
     "xpack.ml.settings.filterLists.deleteFilterListModal.cancelButtonLabel": "キャンセル",
     "xpack.ml.settings.filterLists.deleteFilterListModal.confirmButtonLabel": "削除",
     "xpack.ml.settings.filterLists.deleteFilterListModal.deleteButtonLabel": "削除",
-    "xpack.ml.settings.filterLists.deleteFilterListModal.deleteWarningMessage": "{selectedFilterListsLength, plural, one {このフィルダー} other {これらのフィルター}}を削除してよろしいですか？",
     "xpack.ml.settings.filterLists.deleteFilterListModal.modalTitle": "{selectedFilterListsLength, plural, one {{selectedFilterId}} other {# フィルターリスト}}の削除",
     "xpack.ml.settings.filterLists.deleteFilterLists.deletingErrorMessage": "フィルターリスト {filterListId} の削除中にエラーが発生しました。{respMessage}",
     "xpack.ml.settings.filterLists.deleteFilterLists.deletingNotificationMessage": "{filterListsToDeleteLength, plural, one {{filterListToDeleteId}} other {# フィルターリスト}}を削除しています",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index ffd7d0cfb0f87..8b3a1941f450a 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -12401,7 +12401,6 @@
     "xpack.ml.settings.filterLists.deleteFilterListModal.cancelButtonLabel": "取消",
     "xpack.ml.settings.filterLists.deleteFilterListModal.confirmButtonLabel": "删除",
     "xpack.ml.settings.filterLists.deleteFilterListModal.deleteButtonLabel": "删除",
-    "xpack.ml.settings.filterLists.deleteFilterListModal.deleteWarningMessage": "是否确定要删除{selectedFilterListsLength, plural, one {此筛选列表} other {这些筛选列表}}",
     "xpack.ml.settings.filterLists.deleteFilterListModal.modalTitle": "删除 {selectedFilterListsLength, plural, one {{selectedFilterId}} other {# 个筛选列表}}",
     "xpack.ml.settings.filterLists.deleteFilterLists.deletingErrorMessage": "删除筛选列表 {filterListId} 时出错。{respMessage}",
     "xpack.ml.settings.filterLists.deleteFilterLists.deletingNotificationMessage": "正在删除 {filterListsToDeleteLength, plural, one {{filterListToDeleteId}} other {# 个筛选列表}}",

From 047c608e940905b120995e825a618796e66511ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= <patryk.kopycinski@elastic.co>
Date: Mon, 31 Aug 2020 19:30:07 +0200
Subject: [PATCH 146/148] [Security Solution] Refactor FirstLastSeenHost to use
 Search Strategy (#76252)

---
 .../security_solution/hosts/all/index.ts      |  35 ++++
 .../security_solution/hosts/common/index.ts   |  95 +++++++++++
 .../hosts/first_last_seen/index.ts            |  17 ++
 .../security_solution/hosts/index.ts          |  78 +--------
 .../security_solution/hosts/overview/index.ts |  22 +++
 .../security_solution/index.ts                |  15 +-
 .../first_last_seen_host/index.test.tsx       |  81 +++++----
 .../components/first_last_seen_host/index.tsx |  86 +++++-----
 .../containers/hosts/first_last_seen/index.ts |  88 ----------
 .../hosts/first_last_seen/index.tsx           | 139 +++++++++++++++
 .../containers/hosts/first_last_seen/mock.ts  |  53 ------
 .../hosts/first_last_seen/translations.ts     |  21 +++
 .../public/hosts/containers/hosts/index.tsx   |   5 +-
 .../containers/hosts/overview/_index.tsx      | 159 ++++++++++++++++++
 .../containers/hosts/overview/translations.ts |  21 +++
 .../pages/navigation/hosts_query_tab_body.tsx |   3 +-
 .../components/host_overview/index.tsx        |   4 +-
 .../factory/hosts/all/helpers.ts              |  81 +++++++++
 .../factory/hosts/all/index.ts                |  62 +++++++
 .../query.all_hosts.dsl.ts}                   |   0
 .../security_solution/factory/hosts/index.ts  |  83 +--------
 .../factory/hosts/last_first_seen/index.ts    |  41 +++++
 .../query.last_first_seen_host.dsl.ts         |   6 +-
 .../factory/hosts/overview/helpers.ts         |  85 ++++++++++
 .../factory/hosts/overview/index.ts           |  40 +++++
 .../query.host_overview.dsl.ts}               |   4 +-
 26 files changed, 945 insertions(+), 379 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts
 create mode 100644 x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/common/index.ts
 create mode 100644 x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts
 create mode 100644 x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts
 delete mode 100644 x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.ts
 create mode 100644 x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx
 delete mode 100644 x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/mock.ts
 create mode 100644 x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/translations.ts
 create mode 100644 x-pack/plugins/security_solution/public/hosts/containers/hosts/overview/_index.tsx
 create mode 100644 x-pack/plugins/security_solution/public/hosts/containers/hosts/overview/translations.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/helpers.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/{dsl/query.hosts.dsl.ts => all/query.all_hosts.dsl.ts} (100%)
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/{dsl => last_first_seen}/query.last_first_seen_host.dsl.ts (80%)
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/helpers.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts
 rename x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/{dsl/query.detail_host.dsl.ts => overview/query.host_overview.dsl.ts} (91%)

diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts
new file mode 100644
index 0000000000000..cd8a58d03d30c
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/all/index.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+
+import { HostItem } from '../common';
+import {
+  CursorType,
+  Inspect,
+  Maybe,
+  PageInfoPaginated,
+  RequestOptionsPaginated,
+  SortField,
+} from '../..';
+
+export interface HostsEdges {
+  node: HostItem;
+
+  cursor: CursorType;
+}
+
+export interface HostsStrategyResponse extends IEsSearchResponse {
+  edges: HostsEdges[];
+  totalCount: number;
+  pageInfo: PageInfoPaginated;
+  inspect?: Maybe<Inspect>;
+}
+
+export interface HostsRequestOptions extends RequestOptionsPaginated {
+  sort: SortField;
+  defaultIndex: string[];
+}
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/common/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/common/index.ts
new file mode 100644
index 0000000000000..fb4fd762a86bf
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/common/index.ts
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CloudEcs } from '../../../../ecs/cloud';
+import { HostEcs, OsEcs } from '../../../../ecs/host';
+import { Maybe, SearchHit, TotalValue } from '../..';
+
+export enum HostPolicyResponseActionStatus {
+  success = 'success',
+  failure = 'failure',
+  warning = 'warning',
+}
+
+export interface EndpointFields {
+  endpointPolicy?: Maybe<string>;
+  sensorVersion?: Maybe<string>;
+  policyStatus?: Maybe<HostPolicyResponseActionStatus>;
+}
+
+export interface HostItem {
+  _id?: Maybe<string>;
+  cloud?: Maybe<CloudEcs>;
+  endpoint?: Maybe<EndpointFields>;
+  host?: Maybe<HostEcs>;
+  lastSeen?: Maybe<string>;
+}
+
+export interface HostValue {
+  value: number;
+  value_as_string: string;
+}
+
+export interface HostBucketItem {
+  key: string;
+  doc_count: number;
+  timestamp: HostValue;
+}
+
+export interface HostBuckets {
+  buckets: HostBucketItem[];
+}
+
+export interface HostOsHitsItem {
+  hits: {
+    total: TotalValue | number;
+    max_score: number | null;
+    hits: Array<{
+      _source: { host: { os: Maybe<OsEcs> } };
+      sort?: [number];
+      _index?: string;
+      _type?: string;
+      _id?: string;
+      _score?: number | null;
+    }>;
+  };
+}
+
+export interface HostAggEsItem {
+  cloud_instance_id?: HostBuckets;
+  cloud_machine_type?: HostBuckets;
+  cloud_provider?: HostBuckets;
+  cloud_region?: HostBuckets;
+  firstSeen?: HostValue;
+  host_architecture?: HostBuckets;
+  host_id?: HostBuckets;
+  host_ip?: HostBuckets;
+  host_mac?: HostBuckets;
+  host_name?: HostBuckets;
+  host_os_name?: HostBuckets;
+  host_os_version?: HostBuckets;
+  host_type?: HostBuckets;
+  key?: string;
+  lastSeen?: HostValue;
+  os?: HostOsHitsItem;
+}
+
+export interface HostEsData extends SearchHit {
+  sort: string[];
+  aggregations: {
+    host_count: {
+      value: number;
+    };
+    host_data: {
+      buckets: HostAggEsItem[];
+    };
+  };
+}
+
+export interface HostAggEsData extends SearchHit {
+  sort: string[];
+  aggregations: HostAggEsItem;
+}
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts
new file mode 100644
index 0000000000000..93a5c0582fb96
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/first_last_seen/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import { Inspect, Maybe, RequestOptionsPaginated } from '../..';
+
+export interface HostFirstLastSeenRequestOptions extends Partial<RequestOptionsPaginated> {
+  hostName: string;
+}
+export interface HostFirstLastSeenStrategyResponse extends IEsSearchResponse {
+  inspect?: Maybe<Inspect>;
+  firstSeen?: Maybe<string>;
+  lastSeen?: Maybe<string>;
+}
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/index.ts
index 3a0942d2decb8..a27899e454074 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/index.ts
@@ -4,81 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IEsSearchResponse } from '../../../../../../../src/plugins/data/common';
-import { CloudEcs } from '../../../ecs/cloud';
-import { HostEcs } from '../../../ecs/host';
-
-import {
-  CursorType,
-  Inspect,
-  Maybe,
-  PageInfoPaginated,
-  RequestOptionsPaginated,
-  SortField,
-  TimerangeInput,
-} from '..';
+export * from './all';
+export * from './common';
+export * from './overview';
+export * from './first_last_seen';
 
 export enum HostsQueries {
   hosts = 'hosts',
   hostOverview = 'hostOverview',
-}
-
-export enum HostPolicyResponseActionStatus {
-  success = 'success',
-  failure = 'failure',
-  warning = 'warning',
-}
-
-export interface EndpointFields {
-  endpointPolicy?: Maybe<string>;
-
-  sensorVersion?: Maybe<string>;
-
-  policyStatus?: Maybe<HostPolicyResponseActionStatus>;
-}
-
-export interface HostItem {
-  _id?: Maybe<string>;
-
-  cloud?: Maybe<CloudEcs>;
-
-  endpoint?: Maybe<EndpointFields>;
-
-  host?: Maybe<HostEcs>;
-
-  lastSeen?: Maybe<string>;
-}
-
-export interface HostsEdges {
-  node: HostItem;
-
-  cursor: CursorType;
-}
-
-export interface HostsStrategyResponse extends IEsSearchResponse {
-  edges: HostsEdges[];
-
-  totalCount: number;
-
-  pageInfo: PageInfoPaginated;
-
-  inspect?: Maybe<Inspect>;
-}
-
-export interface HostOverviewStrategyResponse extends IEsSearchResponse, HostItem {
-  inspect?: Maybe<Inspect>;
-}
-
-export interface HostsRequestOptions extends RequestOptionsPaginated {
-  sort: SortField;
-  defaultIndex: string[];
-}
-
-export interface HostLastFirstSeenRequestOptions extends Partial<RequestOptionsPaginated> {
-  hostName: string;
-}
-
-export interface HostOverviewRequestOptions extends HostLastFirstSeenRequestOptions {
-  fields: string[];
-  timerange: TimerangeInput;
+  firstLastSeen = 'firstLastSeen',
 }
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts
new file mode 100644
index 0000000000000..bc797e7a03fb8
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/overview/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+
+import { HostItem } from '../common';
+import { Inspect, Maybe, RequestOptionsPaginated, TimerangeInput } from '../..';
+
+export interface HostOverviewStrategyResponse extends IEsSearchResponse {
+  hostOverview: HostItem;
+  inspect?: Maybe<Inspect>;
+}
+
+export interface HostOverviewRequestOptions extends Partial<RequestOptionsPaginated> {
+  hostName: string;
+  skip?: boolean;
+  timerange: TimerangeInput;
+  inspect?: Maybe<Inspect>;
+}
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
index a188eb7619e6b..073b96e400f5c 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/index.ts
@@ -4,11 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IEsSearchRequest } from '../../../../../../src/plugins/data/common';
+import { IEsSearchRequest, IEsSearchResponse } from '../../../../../../src/plugins/data/common';
 import { ESQuery } from '../../typed_json';
 import {
   HostOverviewStrategyResponse,
   HostOverviewRequestOptions,
+  HostFirstLastSeenStrategyResponse,
+  HostFirstLastSeenRequestOptions,
   HostsQueries,
   HostsRequestOptions,
   HostsStrategyResponse,
@@ -18,6 +20,13 @@ export type Maybe<T> = T | null;
 
 export type FactoryQueryTypes = HostsQueries;
 
+export type SearchHit = IEsSearchResponse<object>['rawResponse']['hits']['hits'][0];
+
+export interface TotalValue {
+  value: number;
+  relation: string;
+}
+
 export interface Inspect {
   dsl: string[];
   response: string[];
@@ -100,10 +109,14 @@ export type StrategyResponseType<T extends FactoryQueryTypes> = T extends HostsQ
   ? HostsStrategyResponse
   : T extends HostsQueries.hostOverview
   ? HostOverviewStrategyResponse
+  : T extends HostsQueries.firstLastSeen
+  ? HostFirstLastSeenStrategyResponse
   : never;
 
 export type StrategyRequestType<T extends FactoryQueryTypes> = T extends HostsQueries.hosts
   ? HostsRequestOptions
   : T extends HostsQueries.hostOverview
   ? HostOverviewRequestOptions
+  : T extends HostsQueries.firstLastSeen
+  ? HostFirstLastSeenRequestOptions
   : never;
diff --git a/x-pack/plugins/security_solution/public/hosts/components/first_last_seen_host/index.test.tsx b/x-pack/plugins/security_solution/public/hosts/components/first_last_seen_host/index.test.tsx
index a2f53be721816..606b43c6508fb 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/first_last_seen_host/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/first_last_seen_host/index.test.tsx
@@ -4,18 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { cloneDeep } from 'lodash/fp';
 import React from 'react';
-import { MockedProvider } from 'react-apollo/test-utils';
 
 // we don't have the types for waitFor just yet, so using "as waitFor" until when we do
 import { render, act, wait as waitFor } from '@testing-library/react';
 
-import { mockFirstLastSeenHostQuery } from '../../containers/hosts/first_last_seen/mock';
+import { useFirstLastSeenHost } from '../../containers/hosts/first_last_seen';
 import { TestProviders } from '../../../common/mock';
-
 import { FirstLastSeenHost, FirstLastSeenHostType } from '.';
 
+const MOCKED_RESPONSE = {
+  firstSeen: '2019-04-08T16:09:40.692Z',
+  lastSeen: '2019-04-08T18:35:45.064Z',
+};
+
+jest.mock('../../containers/hosts/first_last_seen');
+const useFirstLastSeenHostMock = useFirstLastSeenHost as jest.Mock;
+useFirstLastSeenHostMock.mockReturnValue([false, MOCKED_RESPONSE]);
+
 describe('FirstLastSeen Component', () => {
   const firstSeen = 'Apr 8, 2019 @ 16:09:40.692';
   const lastSeen = 'Apr 8, 2019 @ 18:35:45.064';
@@ -31,11 +37,10 @@ describe('FirstLastSeen Component', () => {
   });
 
   test('Loading', async () => {
+    useFirstLastSeenHostMock.mockReturnValue([true, MOCKED_RESPONSE]);
     const { container } = render(
       <TestProviders>
-        <MockedProvider mocks={mockFirstLastSeenHostQuery} addTypename={false}>
-          <FirstLastSeenHost hostname="kibana-siem" type={FirstLastSeenHostType.FIRST_SEEN} />
-        </MockedProvider>
+        <FirstLastSeenHost hostName="kibana-siem" type={FirstLastSeenHostType.FIRST_SEEN} />
       </TestProviders>
     );
     expect(container.innerHTML).toBe(
@@ -44,11 +49,10 @@ describe('FirstLastSeen Component', () => {
   });
 
   test('First Seen', async () => {
+    useFirstLastSeenHostMock.mockReturnValue([false, MOCKED_RESPONSE]);
     const { container } = render(
       <TestProviders>
-        <MockedProvider mocks={mockFirstLastSeenHostQuery} addTypename={false}>
-          <FirstLastSeenHost hostname="kibana-siem" type={FirstLastSeenHostType.FIRST_SEEN} />
-        </MockedProvider>
+        <FirstLastSeenHost hostName="kibana-siem" type={FirstLastSeenHostType.FIRST_SEEN} />
       </TestProviders>
     );
 
@@ -62,11 +66,10 @@ describe('FirstLastSeen Component', () => {
   });
 
   test('Last Seen', async () => {
+    useFirstLastSeenHostMock.mockReturnValue([false, MOCKED_RESPONSE]);
     const { container } = render(
       <TestProviders>
-        <MockedProvider mocks={mockFirstLastSeenHostQuery} addTypename={false}>
-          <FirstLastSeenHost hostname="kibana-siem" type={FirstLastSeenHostType.LAST_SEEN} />
-        </MockedProvider>
+        <FirstLastSeenHost hostName="kibana-siem" type={FirstLastSeenHostType.LAST_SEEN} />
       </TestProviders>
     );
     await act(() =>
@@ -79,13 +82,16 @@ describe('FirstLastSeen Component', () => {
   });
 
   test('First Seen is empty but not Last Seen', async () => {
-    const badDateTime = cloneDeep(mockFirstLastSeenHostQuery);
-    badDateTime[0].result.data!.source.HostFirstLastSeen.firstSeen = null;
+    useFirstLastSeenHostMock.mockReturnValue([
+      false,
+      {
+        ...MOCKED_RESPONSE,
+        firstSeen: null,
+      },
+    ]);
     const { container } = render(
       <TestProviders>
-        <MockedProvider mocks={badDateTime} addTypename={false}>
-          <FirstLastSeenHost hostname="kibana-siem" type={FirstLastSeenHostType.LAST_SEEN} />
-        </MockedProvider>
+        <FirstLastSeenHost hostName="kibana-siem" type={FirstLastSeenHostType.LAST_SEEN} />
       </TestProviders>
     );
 
@@ -99,13 +105,16 @@ describe('FirstLastSeen Component', () => {
   });
 
   test('Last Seen is empty but not First Seen', async () => {
-    const badDateTime = cloneDeep(mockFirstLastSeenHostQuery);
-    badDateTime[0].result.data!.source.HostFirstLastSeen.lastSeen = null;
+    useFirstLastSeenHostMock.mockReturnValue([
+      false,
+      {
+        ...MOCKED_RESPONSE,
+        lastSeen: null,
+      },
+    ]);
     const { container } = render(
       <TestProviders>
-        <MockedProvider mocks={badDateTime} addTypename={false}>
-          <FirstLastSeenHost hostname="kibana-siem" type={FirstLastSeenHostType.FIRST_SEEN} />
-        </MockedProvider>
+        <FirstLastSeenHost hostName="kibana-siem" type={FirstLastSeenHostType.FIRST_SEEN} />
       </TestProviders>
     );
 
@@ -119,13 +128,16 @@ describe('FirstLastSeen Component', () => {
   });
 
   test('First Seen With a bad date time string', async () => {
-    const badDateTime = cloneDeep(mockFirstLastSeenHostQuery);
-    badDateTime[0].result.data!.source.HostFirstLastSeen.firstSeen = 'something-invalid';
+    useFirstLastSeenHostMock.mockReturnValue([
+      false,
+      {
+        ...MOCKED_RESPONSE,
+        firstSeen: 'something-invalid',
+      },
+    ]);
     const { container } = render(
       <TestProviders>
-        <MockedProvider mocks={badDateTime} addTypename={false}>
-          <FirstLastSeenHost hostname="kibana-siem" type={FirstLastSeenHostType.FIRST_SEEN} />
-        </MockedProvider>
+        <FirstLastSeenHost hostName="kibana-siem" type={FirstLastSeenHostType.FIRST_SEEN} />
       </TestProviders>
     );
     await act(() =>
@@ -136,13 +148,16 @@ describe('FirstLastSeen Component', () => {
   });
 
   test('Last Seen With a bad date time string', async () => {
-    const badDateTime = cloneDeep(mockFirstLastSeenHostQuery);
-    badDateTime[0].result.data!.source.HostFirstLastSeen.lastSeen = 'something-invalid';
+    useFirstLastSeenHostMock.mockReturnValue([
+      false,
+      {
+        ...MOCKED_RESPONSE,
+        lastSeen: 'something-invalid',
+      },
+    ]);
     const { container } = render(
       <TestProviders>
-        <MockedProvider mocks={badDateTime} addTypename={false}>
-          <FirstLastSeenHost hostname="kibana-siem" type={FirstLastSeenHostType.LAST_SEEN} />
-        </MockedProvider>
+        <FirstLastSeenHost hostName="kibana-siem" type={FirstLastSeenHostType.LAST_SEEN} />
       </TestProviders>
     );
     await act(() =>
diff --git a/x-pack/plugins/security_solution/public/hosts/components/first_last_seen_host/index.tsx b/x-pack/plugins/security_solution/public/hosts/components/first_last_seen_host/index.tsx
index 579c3311cf732..a1b72fb39069c 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/first_last_seen_host/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/first_last_seen_host/index.tsx
@@ -5,10 +5,9 @@
  */
 
 import { EuiIcon, EuiLoadingSpinner, EuiText, EuiToolTip } from '@elastic/eui';
-import React from 'react';
-import { ApolloConsumer } from 'react-apollo';
+import React, { useMemo } from 'react';
 
-import { useFirstLastSeenHostQuery } from '../../containers/hosts/first_last_seen';
+import { useFirstLastSeenHost } from '../../containers/hosts/first_last_seen';
 import { getEmptyTagValue } from '../../../common/components/empty_value';
 import { FormattedRelativePreferenceDate } from '../../../common/components/formatted_date';
 
@@ -17,49 +16,48 @@ export enum FirstLastSeenHostType {
   LAST_SEEN = 'last-seen',
 }
 
-export const FirstLastSeenHost = React.memo<{ hostname: string; type: FirstLastSeenHostType }>(
-  ({ hostname, type }) => {
+interface FirstLastSeenHostProps {
+  hostName: string;
+  type: FirstLastSeenHostType;
+}
+
+export const FirstLastSeenHost = React.memo<FirstLastSeenHostProps>(({ hostName, type }) => {
+  const [loading, { firstSeen, lastSeen, errorMessage }] = useFirstLastSeenHost({
+    hostName,
+  });
+  const valueSeen = useMemo(
+    () => (type === FirstLastSeenHostType.FIRST_SEEN ? firstSeen : lastSeen),
+    [firstSeen, lastSeen, type]
+  );
+
+  if (errorMessage != null) {
     return (
-      <ApolloConsumer>
-        {(client) => {
-          /* eslint-disable-next-line react-hooks/rules-of-hooks */
-          const { loading, firstSeen, lastSeen, errorMessage } = useFirstLastSeenHostQuery(
-            hostname,
-            'default',
-            client
-          );
-          if (errorMessage != null) {
-            return (
-              <EuiToolTip
-                position="top"
-                content={errorMessage}
-                data-test-subj="firstLastSeenErrorToolTip"
-                aria-label={`firstLastSeenError-${type}`}
-                id={`firstLastSeenError-${hostname}-${type}`}
-              >
-                <EuiIcon aria-describedby={`firstLastSeenError-${hostname}-${type}`} type="alert" />
-              </EuiToolTip>
-            );
-          }
-          const valueSeen = type === FirstLastSeenHostType.FIRST_SEEN ? firstSeen : lastSeen;
-          return (
-            <>
-              {loading && <EuiLoadingSpinner size="m" />}
-              {!loading && valueSeen != null && new Date(valueSeen).toString() === 'Invalid Date'
-                ? valueSeen
-                : !loading &&
-                  valueSeen != null && (
-                    <EuiText size="s">
-                      <FormattedRelativePreferenceDate value={`${valueSeen}`} />
-                    </EuiText>
-                  )}
-              {!loading && valueSeen == null && getEmptyTagValue()}
-            </>
-          );
-        }}
-      </ApolloConsumer>
+      <EuiToolTip
+        position="top"
+        content={errorMessage}
+        data-test-subj="firstLastSeenErrorToolTip"
+        aria-label={`firstLastSeenError-${type}`}
+        id={`firstLastSeenError-${hostName}-${type}`}
+      >
+        <EuiIcon aria-describedby={`firstLastSeenError-${hostName}-${type}`} type="alert" />
+      </EuiToolTip>
     );
   }
-);
+
+  return (
+    <>
+      {loading && <EuiLoadingSpinner size="m" />}
+      {!loading && valueSeen != null && new Date(valueSeen).toString() === 'Invalid Date'
+        ? valueSeen
+        : !loading &&
+          valueSeen != null && (
+            <EuiText size="s">
+              <FormattedRelativePreferenceDate value={`${valueSeen}`} />
+            </EuiText>
+          )}
+      {!loading && valueSeen == null && getEmptyTagValue()}
+    </>
+  );
+});
 
 FirstLastSeenHost.displayName = 'FirstLastSeenHost';
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.ts b/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.ts
deleted file mode 100644
index 65e379b5ba2d8..0000000000000
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import ApolloClient from 'apollo-client';
-import { get } from 'lodash/fp';
-import React, { useEffect, useState } from 'react';
-
-import { DEFAULT_INDEX_KEY } from '../../../../../common/constants';
-import { useUiSetting$ } from '../../../../common/lib/kibana';
-import { GetHostFirstLastSeenQuery } from '../../../../graphql/types';
-import { inputsModel } from '../../../../common/store';
-import { QueryTemplateProps } from '../../../../common/containers/query_template';
-import { useWithSource } from '../../../../common/containers/source';
-import { HostFirstLastSeenGqlQuery } from './first_last_seen.gql_query';
-
-export interface FirstLastSeenHostArgs {
-  id: string;
-  errorMessage: string;
-  firstSeen: Date;
-  lastSeen: Date;
-  loading: boolean;
-  refetch: inputsModel.Refetch;
-}
-
-export interface OwnProps extends QueryTemplateProps {
-  children: (args: FirstLastSeenHostArgs) => React.ReactNode;
-  hostName: string;
-}
-
-export function useFirstLastSeenHostQuery<TCache = object>(
-  hostName: string,
-  sourceId: string,
-  apolloClient: ApolloClient<TCache>
-) {
-  const [loading, updateLoading] = useState(false);
-  const [firstSeen, updateFirstSeen] = useState<Date | null>(null);
-  const [lastSeen, updateLastSeen] = useState<Date | null>(null);
-  const [errorMessage, updateErrorMessage] = useState<string | null>(null);
-  const [defaultIndex] = useUiSetting$<string[]>(DEFAULT_INDEX_KEY);
-  const { docValueFields } = useWithSource(sourceId);
-
-  async function fetchFirstLastSeenHost(signal: AbortSignal) {
-    updateLoading(true);
-    return apolloClient
-      .query<GetHostFirstLastSeenQuery.Query, GetHostFirstLastSeenQuery.Variables>({
-        query: HostFirstLastSeenGqlQuery,
-        fetchPolicy: 'cache-first',
-        variables: {
-          sourceId,
-          hostName,
-          defaultIndex,
-          docValueFields,
-        },
-        context: {
-          fetchOptions: {
-            signal,
-          },
-        },
-      })
-      .then(
-        (result) => {
-          updateLoading(false);
-          updateFirstSeen(get('data.source.HostFirstLastSeen.firstSeen', result));
-          updateLastSeen(get('data.source.HostFirstLastSeen.lastSeen', result));
-          updateErrorMessage(null);
-        },
-        (error) => {
-          updateLoading(false);
-          updateFirstSeen(null);
-          updateLastSeen(null);
-          updateErrorMessage(error.message);
-        }
-      );
-  }
-
-  useEffect(() => {
-    const abortCtrl = new AbortController();
-    const signal = abortCtrl.signal;
-    fetchFirstLastSeenHost(signal);
-    return () => abortCtrl.abort();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return { firstSeen, lastSeen, loading, errorMessage };
-}
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx
new file mode 100644
index 0000000000000..3a93b1ee46e7b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/index.tsx
@@ -0,0 +1,139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import deepEqual from 'fast-deep-equal';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import { DEFAULT_INDEX_KEY } from '../../../../../common/constants';
+
+import { useKibana } from '../../../../common/lib/kibana';
+import {
+  HostsQueries,
+  HostFirstLastSeenRequestOptions,
+  HostFirstLastSeenStrategyResponse,
+} from '../../../../../common/search_strategy/security_solution';
+import { useWithSource } from '../../../../common/containers/source';
+
+import * as i18n from './translations';
+import { AbortError } from '../../../../../../../../src/plugins/data/common';
+
+const ID = 'firstLastSeenHostQuery';
+
+export interface FirstLastSeenHostArgs {
+  id: string;
+  errorMessage: string | null;
+  firstSeen?: string | null;
+  lastSeen?: string | null;
+}
+interface UseHostFirstLastSeen {
+  hostName: string;
+}
+
+export const useFirstLastSeenHost = ({
+  hostName,
+}: UseHostFirstLastSeen): [boolean, FirstLastSeenHostArgs] => {
+  const { docValueFields } = useWithSource('default');
+  const { data, notifications, uiSettings } = useKibana().services;
+  const abortCtrl = useRef(new AbortController());
+  const defaultIndex = uiSettings.get<string[]>(DEFAULT_INDEX_KEY);
+  const [loading, setLoading] = useState(false);
+  const [firstLastSeenHostRequest, setFirstLastSeenHostRequest] = useState<
+    HostFirstLastSeenRequestOptions
+  >({
+    defaultIndex,
+    docValueFields: docValueFields ?? [],
+    factoryQueryType: HostsQueries.firstLastSeen,
+    hostName,
+  });
+
+  const [firstLastSeenHostResponse, setFirstLastSeenHostResponse] = useState<FirstLastSeenHostArgs>(
+    {
+      firstSeen: null,
+      lastSeen: null,
+      errorMessage: null,
+      id: ID,
+    }
+  );
+
+  const firstLastSeenHostSearch = useCallback(
+    (request: HostFirstLastSeenRequestOptions) => {
+      let didCancel = false;
+      const asyncSearch = async () => {
+        abortCtrl.current = new AbortController();
+        setLoading(true);
+
+        const searchSubscription$ = data.search
+          .search<HostFirstLastSeenRequestOptions, HostFirstLastSeenStrategyResponse>(request, {
+            strategy: 'securitySolutionSearchStrategy',
+            signal: abortCtrl.current.signal,
+          })
+          .subscribe({
+            next: (response) => {
+              if (!response.isPartial && !response.isRunning) {
+                if (!didCancel) {
+                  setLoading(false);
+                  setFirstLastSeenHostResponse((prevResponse) => ({
+                    ...prevResponse,
+                    errorMessage: null,
+                    firstSeen: response.firstSeen,
+                    lastSeen: response.lastSeen,
+                  }));
+                }
+                searchSubscription$.unsubscribe();
+              } else if (response.isPartial && !response.isRunning) {
+                if (!didCancel) {
+                  setLoading(false);
+                }
+                // TODO: Make response error status clearer
+                notifications.toasts.addWarning(i18n.ERROR_FIRST_LAST_SEEN_HOST);
+                searchSubscription$.unsubscribe();
+              }
+            },
+            error: (msg) => {
+              if (!(msg instanceof AbortError)) {
+                setFirstLastSeenHostResponse((prevResponse) => ({
+                  ...prevResponse,
+                  errorMessage: msg,
+                }));
+                notifications.toasts.addDanger({
+                  title: i18n.FAIL_FIRST_LAST_SEEN_HOST,
+                  text: msg.message,
+                });
+              }
+            },
+          });
+      };
+      abortCtrl.current.abort();
+      asyncSearch();
+      return () => {
+        didCancel = true;
+        abortCtrl.current.abort();
+      };
+    },
+    [data.search, notifications.toasts]
+  );
+
+  useEffect(() => {
+    setFirstLastSeenHostRequest((prevRequest) => {
+      const myRequest = {
+        ...prevRequest,
+        defaultIndex,
+        docValueFields: docValueFields ?? [],
+        hostName,
+      };
+      if (!deepEqual(prevRequest, myRequest)) {
+        return myRequest;
+      }
+      return prevRequest;
+    });
+  }, [defaultIndex, docValueFields, hostName]);
+
+  useEffect(() => {
+    firstLastSeenHostSearch(firstLastSeenHostRequest);
+  }, [firstLastSeenHostRequest, firstLastSeenHostSearch]);
+
+  return [loading, firstLastSeenHostResponse];
+};
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/mock.ts b/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/mock.ts
deleted file mode 100644
index 7f1b3d97eb525..0000000000000
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/mock.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { DEFAULT_INDEX_PATTERN } from '../../../../../common/constants';
-import { GetHostFirstLastSeenQuery } from '../../../../graphql/types';
-
-import { HostFirstLastSeenGqlQuery } from './first_last_seen.gql_query';
-
-interface MockedProvidedQuery {
-  request: {
-    query: GetHostFirstLastSeenQuery.Query;
-    variables: GetHostFirstLastSeenQuery.Variables;
-  };
-  result: {
-    data?: {
-      source: {
-        id: string;
-        HostFirstLastSeen: {
-          firstSeen: string | null;
-          lastSeen: string | null;
-        };
-      };
-    };
-    errors?: [{ message: string }];
-  };
-}
-export const mockFirstLastSeenHostQuery: MockedProvidedQuery[] = [
-  {
-    request: {
-      query: HostFirstLastSeenGqlQuery,
-      variables: {
-        sourceId: 'default',
-        hostName: 'kibana-siem',
-        defaultIndex: DEFAULT_INDEX_PATTERN,
-        docValueFields: [],
-      },
-    },
-    result: {
-      data: {
-        source: {
-          id: 'default',
-          HostFirstLastSeen: {
-            firstSeen: '2019-04-08T16:09:40.692Z',
-            lastSeen: '2019-04-08T18:35:45.064Z',
-          },
-        },
-      },
-    },
-  },
-];
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/translations.ts b/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/translations.ts
new file mode 100644
index 0000000000000..1e0a4ad237897
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/first_last_seen/translations.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const ERROR_FIRST_LAST_SEEN_HOST = i18n.translate(
+  'xpack.securitySolution.firstLastSeenHost.errorSearchDescription',
+  {
+    defaultMessage: `An error has occurred on first last seen host search`,
+  }
+);
+
+export const FAIL_FIRST_LAST_SEEN_HOST = i18n.translate(
+  'xpack.securitySolution.firstLastSeenHost.failSearchDescription',
+  {
+    defaultMessage: `Failed to run search on first last seen host`,
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
index 346de9f87313f..6e1ebbfd1e7bb 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
@@ -47,6 +47,7 @@ interface UseAllHost {
   docValueFields?: DocValueFields[];
   filterQuery?: ESTermQuery | string;
   endDate: string;
+  skip?: boolean;
   startDate: string;
   type: hostsModel.HostsType;
 }
@@ -55,6 +56,7 @@ export const useAllHost = ({
   docValueFields,
   filterQuery,
   endDate,
+  skip = false,
   startDate,
   type,
 }: UseAllHost): [boolean, HostsArgs] => {
@@ -189,7 +191,7 @@ export const useAllHost = ({
           field: sortField,
         },
       };
-      if (!deepEqual(prevRequest, myRequest)) {
+      if (!skip && !deepEqual(prevRequest, myRequest)) {
         return myRequest;
       }
       return prevRequest;
@@ -202,6 +204,7 @@ export const useAllHost = ({
     endDate,
     filterQuery,
     limit,
+    skip,
     startDate,
     sortField,
   ]);
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/overview/_index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/overview/_index.tsx
new file mode 100644
index 0000000000000..f766f068f099f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/overview/_index.tsx
@@ -0,0 +1,159 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+// REPLACE WHEN HOST ENDPOINT DATA IS AVAILABLE
+
+import deepEqual from 'fast-deep-equal';
+import { noop } from 'lodash/fp';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import { DEFAULT_INDEX_KEY } from '../../../../../common/constants';
+import { inputsModel } from '../../../../common/store';
+import { useKibana } from '../../../../common/lib/kibana';
+import {
+  HostItem,
+  HostsQueries,
+  HostOverviewRequestOptions,
+  HostOverviewStrategyResponse,
+} from '../../../../../common/search_strategy/security_solution/hosts';
+
+import * as i18n from './translations';
+import { AbortError } from '../../../../../../../../src/plugins/data/common';
+
+const ID = 'hostOverviewQuery';
+
+export interface HostOverviewArgs {
+  id: string;
+  inspect: inputsModel.InspectQuery;
+  hostOverview: HostItem;
+  refetch: inputsModel.Refetch;
+  startDate: string;
+  endDate: string;
+}
+
+interface UseHostOverview {
+  id?: string;
+  hostName: string;
+  endDate: string;
+  skip?: boolean;
+  startDate: string;
+}
+
+export const useHostOverview = ({
+  endDate,
+  hostName,
+  skip = false,
+  startDate,
+  id = ID,
+}: UseHostOverview): [boolean, HostOverviewArgs] => {
+  const { data, notifications, uiSettings } = useKibana().services;
+  const refetch = useRef<inputsModel.Refetch>(noop);
+  const abortCtrl = useRef(new AbortController());
+  const defaultIndex = uiSettings.get<string[]>(DEFAULT_INDEX_KEY);
+  const [loading, setLoading] = useState(false);
+  const [hostOverviewRequest, setHostOverviewRequest] = useState<HostOverviewRequestOptions>({
+    defaultIndex,
+    hostName,
+    factoryQueryType: HostsQueries.hostOverview,
+    timerange: {
+      interval: '12h',
+      from: startDate,
+      to: endDate,
+    },
+  });
+
+  const [hostOverviewResponse, setHostOverviewResponse] = useState<HostOverviewArgs>({
+    endDate,
+    hostOverview: {},
+    id: ID,
+    inspect: {
+      dsl: [],
+      response: [],
+    },
+    refetch: refetch.current,
+    startDate,
+  });
+
+  const hostOverviewSearch = useCallback(
+    (request: HostOverviewRequestOptions) => {
+      let didCancel = false;
+      const asyncSearch = async () => {
+        abortCtrl.current = new AbortController();
+        setLoading(true);
+
+        const searchSubscription$ = data.search
+          .search<HostOverviewRequestOptions, HostOverviewStrategyResponse>(request, {
+            strategy: 'securitySolutionSearchStrategy',
+            signal: abortCtrl.current.signal,
+          })
+          .subscribe({
+            next: (response) => {
+              if (!response.isPartial && !response.isRunning) {
+                if (!didCancel) {
+                  setLoading(false);
+                  setHostOverviewResponse((prevResponse) => ({
+                    ...prevResponse,
+                    hostOverview: response.hostOverview,
+                    inspect: response.inspect ?? prevResponse.inspect,
+                    refetch: refetch.current,
+                  }));
+                }
+                searchSubscription$.unsubscribe();
+              } else if (response.isPartial && !response.isRunning) {
+                if (!didCancel) {
+                  setLoading(false);
+                }
+                // TODO: Make response error status clearer
+                notifications.toasts.addWarning(i18n.ERROR_HOST_OVERVIEW);
+                searchSubscription$.unsubscribe();
+              }
+            },
+            error: (msg) => {
+              if (!(msg instanceof AbortError)) {
+                notifications.toasts.addDanger({
+                  title: i18n.FAIL_HOST_OVERVIEW,
+                  text: msg.message,
+                });
+              }
+            },
+          });
+      };
+      abortCtrl.current.abort();
+      asyncSearch();
+      refetch.current = asyncSearch;
+      return () => {
+        didCancel = true;
+        abortCtrl.current.abort();
+      };
+    },
+    [data.search, notifications.toasts]
+  );
+
+  useEffect(() => {
+    setHostOverviewRequest((prevRequest) => {
+      const myRequest = {
+        ...prevRequest,
+        defaultIndex,
+        hostName,
+        timerange: {
+          interval: '12h',
+          from: startDate,
+          to: endDate,
+        },
+      };
+      if (!skip && !deepEqual(prevRequest, myRequest)) {
+        return myRequest;
+      }
+      return prevRequest;
+    });
+  }, [defaultIndex, endDate, hostName, startDate, skip]);
+
+  useEffect(() => {
+    hostOverviewSearch(hostOverviewRequest);
+  }, [hostOverviewRequest, hostOverviewSearch]);
+
+  return [loading, hostOverviewResponse];
+};
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/overview/translations.ts b/x-pack/plugins/security_solution/public/hosts/containers/hosts/overview/translations.ts
new file mode 100644
index 0000000000000..e3fa319e70cc1
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/overview/translations.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const ERROR_HOST_OVERVIEW = i18n.translate(
+  'xpack.securitySolution.overviewHost.errorSearchDescription',
+  {
+    defaultMessage: `An error has occurred on host overview search`,
+  }
+);
+
+export const FAIL_HOST_OVERVIEW = i18n.translate(
+  'xpack.securitySolution.overviewHost.failSearchDescription',
+  {
+    defaultMessage: `Failed to run search on host overview`,
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/navigation/hosts_query_tab_body.tsx b/x-pack/plugins/security_solution/public/hosts/pages/navigation/hosts_query_tab_body.tsx
index 5232dcfd88189..f8dcf9635c053 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/navigation/hosts_query_tab_body.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/navigation/hosts_query_tab_body.tsx
@@ -27,7 +27,8 @@ export const HostsQueryTabBody = ({
   const [
     loading,
     { hosts, totalCount, pageInfo, loadPage, id, inspect, isInspected, refetch },
-  ] = useAllHost({ docValueFields, endDate, filterQuery, startDate, type });
+  ] = useAllHost({ docValueFields, endDate, filterQuery, skip, startDate, type });
+
   return (
     <HostsTableManage
       deleteQuery={deleteQuery}
diff --git a/x-pack/plugins/security_solution/public/overview/components/host_overview/index.tsx b/x-pack/plugins/security_solution/public/overview/components/host_overview/index.tsx
index c7aba6fcc8a5b..08f3f01bc99f6 100644
--- a/x-pack/plugins/security_solution/public/overview/components/host_overview/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/host_overview/index.tsx
@@ -91,7 +91,7 @@ export const HostOverview = React.memo<HostSummaryProps>(
           description:
             data.host != null && data.host.name && data.host.name.length ? (
               <FirstLastSeenHost
-                hostname={data.host.name[0]}
+                hostName={data.host.name[0]}
                 type={FirstLastSeenHostType.FIRST_SEEN}
               />
             ) : (
@@ -103,7 +103,7 @@ export const HostOverview = React.memo<HostSummaryProps>(
           description:
             data.host != null && data.host.name && data.host.name.length ? (
               <FirstLastSeenHost
-                hostname={data.host.name[0]}
+                hostName={data.host.name[0]}
                 type={FirstLastSeenHostType.LAST_SEEN}
               />
             ) : (
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/helpers.ts
new file mode 100644
index 0000000000000..5c29d2747f68d
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/helpers.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { set } from '@elastic/safer-lodash-set/fp';
+import { get, has, head } from 'lodash/fp';
+import { HostsEdges } from '../../../../../../common/search_strategy/security_solution/hosts';
+import { hostFieldsMap } from '../../../../../lib/ecs_fields';
+
+import { HostAggEsItem, HostBuckets, HostValue } from '../../../../../lib/hosts/types';
+
+const HOSTS_FIELDS = ['_id', 'lastSeen', 'host.id', 'host.name', 'host.os.name', 'host.os.version'];
+
+export const formatHostEdgesData = (bucket: HostAggEsItem): HostsEdges =>
+  HOSTS_FIELDS.reduce<HostsEdges>(
+    (flattenedFields, fieldName) => {
+      const hostId = get('key', bucket);
+      flattenedFields.node._id = hostId || null;
+      flattenedFields.cursor.value = hostId || '';
+      const fieldValue = getHostFieldValue(fieldName, bucket);
+      if (fieldValue != null) {
+        return set(
+          `node.${fieldName}`,
+          Array.isArray(fieldValue) ? fieldValue : [fieldValue],
+          flattenedFields
+        );
+      }
+      return flattenedFields;
+    },
+    {
+      node: {},
+      cursor: {
+        value: '',
+        tiebreaker: null,
+      },
+    } as HostsEdges
+  );
+
+const getHostFieldValue = (fieldName: string, bucket: HostAggEsItem): string | string[] | null => {
+  const aggField = hostFieldsMap[fieldName]
+    ? hostFieldsMap[fieldName].replace(/\./g, '_')
+    : fieldName.replace(/\./g, '_');
+  if (
+    [
+      'host.ip',
+      'host.mac',
+      'cloud.instance.id',
+      'cloud.machine.type',
+      'cloud.provider',
+      'cloud.region',
+    ].includes(fieldName) &&
+    has(aggField, bucket)
+  ) {
+    const data: HostBuckets = get(aggField, bucket);
+    return data.buckets.map((obj) => obj.key);
+  } else if (has(`${aggField}.buckets`, bucket)) {
+    return getFirstItem(get(`${aggField}`, bucket));
+  } else if (has(aggField, bucket)) {
+    const valueObj: HostValue = get(aggField, bucket);
+    return valueObj.value_as_string;
+  } else if (['host.name', 'host.os.name', 'host.os.version'].includes(fieldName)) {
+    switch (fieldName) {
+      case 'host.name':
+        return get('key', bucket) || null;
+      case 'host.os.name':
+        return get('os.hits.hits[0]._source.host.os.name', bucket) || null;
+      case 'host.os.version':
+        return get('os.hits.hits[0]._source.host.os.version', bucket) || null;
+    }
+  }
+  return null;
+};
+
+const getFirstItem = (data: HostBuckets): string | null => {
+  const firstItem = head(data.buckets);
+  if (firstItem == null) {
+    return null;
+  }
+  return firstItem.key;
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts
new file mode 100644
index 0000000000000..d4c2214b98645
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/index.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getOr } from 'lodash/fp';
+
+import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
+import {
+  HostAggEsItem,
+  HostsStrategyResponse,
+  HostsQueries,
+  HostsRequestOptions,
+} from '../../../../../../common/search_strategy/security_solution/hosts';
+
+import { inspectStringifyObject } from '../../../../../utils/build_query';
+import { SecuritySolutionFactory } from '../../types';
+import { buildHostsQuery } from './query.all_hosts.dsl';
+import { formatHostEdgesData } from './helpers';
+
+export const allHosts: SecuritySolutionFactory<HostsQueries.hosts> = {
+  buildDsl: (options: HostsRequestOptions) => {
+    if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
+      throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
+    }
+    return buildHostsQuery(options);
+  },
+  parse: async (
+    options: HostsRequestOptions,
+    response: IEsSearchResponse<unknown>
+  ): Promise<HostsStrategyResponse> => {
+    const { activePage, cursorStart, fakePossibleCount, querySize } = options.pagination;
+    const totalCount = getOr(0, 'aggregations.host_count.value', response.rawResponse);
+    const buckets: HostAggEsItem[] = getOr(
+      [],
+      'aggregations.host_data.buckets',
+      response.rawResponse
+    );
+    const hostsEdges = buckets.map((bucket) => formatHostEdgesData(bucket));
+    const fakeTotalCount = fakePossibleCount <= totalCount ? fakePossibleCount : totalCount;
+    const edges = hostsEdges.splice(cursorStart, querySize - cursorStart);
+    const inspect = {
+      dsl: [inspectStringifyObject(buildHostsQuery(options))],
+      response: [inspectStringifyObject(response)],
+    };
+    const showMorePagesIndicator = totalCount > fakeTotalCount;
+
+    return {
+      ...response,
+      inspect,
+      edges,
+      totalCount,
+      pageInfo: {
+        activePage: activePage ? activePage : 0,
+        fakeTotalCount,
+        showMorePagesIndicator,
+      },
+    };
+  },
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.hosts.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
similarity index 100%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.hosts.dsl.ts
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/index.ts
index 443e524d71ca3..34676fc1932fe 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/index.ts
@@ -4,89 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { get, getOr } from 'lodash/fp';
-
-import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
-
-import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../common/constants';
 import { FactoryQueryTypes } from '../../../../../common/search_strategy/security_solution';
-import {
-  HostsStrategyResponse,
-  HostOverviewStrategyResponse,
-  HostsQueries,
-  HostsRequestOptions,
-  HostOverviewRequestOptions,
-} from '../../../../../common/search_strategy/security_solution/hosts';
+import { HostsQueries } from '../../../../../common/search_strategy/security_solution/hosts';
 
-// TO DO need to move all this types in common
-import { HostAggEsData, HostAggEsItem } from '../../../../lib/hosts/types';
-
-import { inspectStringifyObject } from '../../../../utils/build_query';
 import { SecuritySolutionFactory } from '../types';
-import { buildHostOverviewQuery } from './dsl/query.detail_host.dsl';
-import { buildHostsQuery } from './dsl/query.hosts.dsl';
-import { formatHostEdgesData, formatHostItem } from './helpers';
-
-export const allHosts: SecuritySolutionFactory<HostsQueries.hosts> = {
-  buildDsl: (options: HostsRequestOptions) => {
-    if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
-      throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
-    }
-    return buildHostsQuery(options);
-  },
-  parse: async (
-    options: HostsRequestOptions,
-    response: IEsSearchResponse<unknown>
-  ): Promise<HostsStrategyResponse> => {
-    const { activePage, cursorStart, fakePossibleCount, querySize } = options.pagination;
-    const totalCount = getOr(0, 'aggregations.host_count.value', response.rawResponse);
-    const buckets: HostAggEsItem[] = getOr(
-      [],
-      'aggregations.host_data.buckets',
-      response.rawResponse
-    );
-    const hostsEdges = buckets.map((bucket) => formatHostEdgesData(bucket));
-    const fakeTotalCount = fakePossibleCount <= totalCount ? fakePossibleCount : totalCount;
-    const edges = hostsEdges.splice(cursorStart, querySize - cursorStart);
-    const inspect = {
-      dsl: [inspectStringifyObject(buildHostsQuery(options))],
-      response: [inspectStringifyObject(response)],
-    };
-    const showMorePagesIndicator = totalCount > fakeTotalCount;
-
-    return {
-      ...response,
-      inspect,
-      edges,
-      totalCount,
-      pageInfo: {
-        activePage: activePage ? activePage : 0,
-        fakeTotalCount,
-        showMorePagesIndicator,
-      },
-    };
-  },
-};
-
-export const overviewHost: SecuritySolutionFactory<HostsQueries.hostOverview> = {
-  buildDsl: (options: HostOverviewRequestOptions) => {
-    return buildHostOverviewQuery(options);
-  },
-  parse: async (
-    options: HostOverviewRequestOptions,
-    response: IEsSearchResponse<HostAggEsData>
-  ): Promise<HostOverviewStrategyResponse> => {
-    const aggregations: HostAggEsItem = get('aggregations', response.rawResponse) || {};
-    const inspect = {
-      dsl: [inspectStringifyObject(buildHostOverviewQuery(options))],
-      response: [inspectStringifyObject(response)],
-    };
-    const formattedHostItem = formatHostItem(aggregations);
-    return { ...response, inspect, _id: options.hostName, ...formattedHostItem };
-  },
-};
+import { allHosts } from './all';
+import { overviewHost } from './overview';
+import { firstLastSeenHost } from './last_first_seen';
 
 export const hostsFactory: Record<HostsQueries, SecuritySolutionFactory<FactoryQueryTypes>> = {
   [HostsQueries.hosts]: allHosts,
   [HostsQueries.hostOverview]: overviewHost,
+  [HostsQueries.firstLastSeen]: firstLastSeenHost,
 };
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts
new file mode 100644
index 0000000000000..56895583c2ae9
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/index.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { get } from 'lodash/fp';
+
+import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import {
+  HostAggEsData,
+  HostAggEsItem,
+  HostFirstLastSeenStrategyResponse,
+  HostsQueries,
+  HostFirstLastSeenRequestOptions,
+} from '../../../../../../common/search_strategy/security_solution/hosts';
+
+import { inspectStringifyObject } from '../../../../../utils/build_query';
+import { SecuritySolutionFactory } from '../../types';
+import { buildFirstLastSeenHostQuery } from './query.last_first_seen_host.dsl';
+
+export const firstLastSeenHost: SecuritySolutionFactory<HostsQueries.firstLastSeen> = {
+  buildDsl: (options: HostFirstLastSeenRequestOptions) => buildFirstLastSeenHostQuery(options),
+  parse: async (
+    options: HostFirstLastSeenRequestOptions,
+    response: IEsSearchResponse<HostAggEsData>
+  ): Promise<HostFirstLastSeenStrategyResponse> => {
+    const aggregations: HostAggEsItem = get('aggregations', response.rawResponse) || {};
+    const inspect = {
+      dsl: [inspectStringifyObject(buildFirstLastSeenHostQuery(options))],
+      response: [inspectStringifyObject(response)],
+    };
+
+    return {
+      ...response,
+      inspect,
+      firstSeen: get('firstSeen.value_as_string', aggregations),
+      lastSeen: get('lastSeen.value_as_string', aggregations),
+    };
+  },
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.last_first_seen_host.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/query.last_first_seen_host.dsl.ts
similarity index 80%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.last_first_seen_host.dsl.ts
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/query.last_first_seen_host.dsl.ts
index b57bbd2960e4f..2c65f62b258a9 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.last_first_seen_host.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/last_first_seen/query.last_first_seen_host.dsl.ts
@@ -6,13 +6,13 @@
 
 import { isEmpty } from 'lodash/fp';
 import { ISearchRequestParams } from '../../../../../../../../../src/plugins/data/common';
-import { HostLastFirstSeenRequestOptions } from '../../../../../../common/search_strategy/security_solution';
+import { HostFirstLastSeenRequestOptions } from '../../../../../../common/search_strategy/security_solution/hosts';
 
-export const buildLastFirstSeenHostQuery = ({
+export const buildFirstLastSeenHostQuery = ({
   hostName,
   defaultIndex,
   docValueFields,
-}: HostLastFirstSeenRequestOptions): ISearchRequestParams => {
+}: HostFirstLastSeenRequestOptions): ISearchRequestParams => {
   const filter = [{ term: { 'host.name': hostName } }];
 
   const dslQuery = {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/helpers.ts
new file mode 100644
index 0000000000000..c7b0d8acc8782
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/helpers.ts
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { set } from '@elastic/safer-lodash-set/fp';
+import { get, has, head } from 'lodash/fp';
+import { HostItem } from '../../../../../../common/search_strategy/security_solution/hosts';
+import { hostFieldsMap } from '../../../../../lib/ecs_fields';
+
+import { HostAggEsItem, HostBuckets, HostValue } from '../../../../../lib/hosts/types';
+
+export const HOST_FIELDS = [
+  '_id',
+  'host.architecture',
+  'host.id',
+  'host.ip',
+  'host.id',
+  'host.mac',
+  'host.name',
+  'host.os.family',
+  'host.os.name',
+  'host.os.platform',
+  'host.os.version',
+  'host.type',
+  'cloud.instance.id',
+  'cloud.machine.type',
+  'cloud.provider',
+  'cloud.region',
+  'endpoint.endpointPolicy',
+  'endpoint.policyStatus',
+  'endpoint.sensorVersion',
+];
+
+export const formatHostItem = (bucket: HostAggEsItem): HostItem =>
+  HOST_FIELDS.reduce<HostItem>((flattenedFields, fieldName) => {
+    const fieldValue = getHostFieldValue(fieldName, bucket);
+    if (fieldValue != null) {
+      return set(fieldName, fieldValue, flattenedFields);
+    }
+    return flattenedFields;
+  }, {});
+
+const getHostFieldValue = (fieldName: string, bucket: HostAggEsItem): string | string[] | null => {
+  const aggField = hostFieldsMap[fieldName]
+    ? hostFieldsMap[fieldName].replace(/\./g, '_')
+    : fieldName.replace(/\./g, '_');
+  if (
+    [
+      'host.ip',
+      'host.mac',
+      'cloud.instance.id',
+      'cloud.machine.type',
+      'cloud.provider',
+      'cloud.region',
+    ].includes(fieldName) &&
+    has(aggField, bucket)
+  ) {
+    const data: HostBuckets = get(aggField, bucket);
+    return data.buckets.map((obj) => obj.key);
+  } else if (has(`${aggField}.buckets`, bucket)) {
+    return getFirstItem(get(`${aggField}`, bucket));
+  } else if (has(aggField, bucket)) {
+    const valueObj: HostValue = get(aggField, bucket);
+    return valueObj.value_as_string;
+  } else if (['host.name', 'host.os.name', 'host.os.version'].includes(fieldName)) {
+    switch (fieldName) {
+      case 'host.name':
+        return get('key', bucket) || null;
+      case 'host.os.name':
+        return get('os.hits.hits[0]._source.host.os.name', bucket) || null;
+      case 'host.os.version':
+        return get('os.hits.hits[0]._source.host.os.version', bucket) || null;
+    }
+  }
+  return null;
+};
+
+const getFirstItem = (data: HostBuckets): string | null => {
+  const firstItem = head(data.buckets);
+  if (firstItem == null) {
+    return null;
+  }
+  return firstItem.key;
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts
new file mode 100644
index 0000000000000..8bdda9ef895b2
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/index.ts
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { get } from 'lodash/fp';
+
+import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import {
+  HostAggEsData,
+  HostAggEsItem,
+  HostOverviewStrategyResponse,
+  HostsQueries,
+  HostOverviewRequestOptions,
+} from '../../../../../../common/search_strategy/security_solution/hosts';
+
+import { inspectStringifyObject } from '../../../../../utils/build_query';
+import { SecuritySolutionFactory } from '../../types';
+import { buildHostOverviewQuery } from './query.host_overview.dsl';
+import { formatHostItem } from './helpers';
+
+export const overviewHost: SecuritySolutionFactory<HostsQueries.hostOverview> = {
+  buildDsl: (options: HostOverviewRequestOptions) => {
+    return buildHostOverviewQuery(options);
+  },
+  parse: async (
+    options: HostOverviewRequestOptions,
+    response: IEsSearchResponse<HostAggEsData>
+  ): Promise<HostOverviewStrategyResponse> => {
+    const aggregations: HostAggEsItem = get('aggregations', response.rawResponse) || {};
+    const inspect = {
+      dsl: [inspectStringifyObject(buildHostOverviewQuery(options))],
+      response: [inspectStringifyObject(response)],
+    };
+    const formattedHostItem = formatHostItem(aggregations);
+
+    return { ...response, inspect, hostOverview: formattedHostItem };
+  },
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.detail_host.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.host_overview.dsl.ts
similarity index 91%
rename from x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.detail_host.dsl.ts
rename to x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.host_overview.dsl.ts
index 5c5dec92a5100..913bc90df04be 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/dsl/query.detail_host.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/overview/query.host_overview.dsl.ts
@@ -9,14 +9,14 @@ import { HostOverviewRequestOptions } from '../../../../../../common/search_stra
 import { cloudFieldsMap, hostFieldsMap } from '../../../../../lib/ecs_fields';
 import { buildFieldsTermAggregation } from '../../../../../lib/hosts/helpers';
 import { reduceFields } from '../../../../../utils/build_query/reduce_fields';
+import { HOST_FIELDS } from './helpers';
 
 export const buildHostOverviewQuery = ({
-  fields,
   hostName,
   defaultIndex,
   timerange: { from, to },
 }: HostOverviewRequestOptions): ISearchRequestParams => {
-  const esFields = reduceFields(fields, { ...hostFieldsMap, ...cloudFieldsMap });
+  const esFields = reduceFields(HOST_FIELDS, { ...hostFieldsMap, ...cloudFieldsMap });
 
   const filter = [
     { term: { 'host.name': hostName } },

From 78262467e05770c0e3b5d6fd8093ee8f6eaf629b Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Mon, 31 Aug 2020 13:39:56 -0400
Subject: [PATCH 147/148] Handle cloud test failures (#74162)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../apps/monitoring/enable_monitoring/index.js        |  7 +++++--
 x-pack/test/functional/apps/monitoring/time_filter.js | 11 +++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js b/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
index fefad214736e6..70f7e0559d034 100644
--- a/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
+++ b/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
@@ -10,6 +10,7 @@ export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['monitoring', 'common', 'header']);
   const esSupertest = getService('esSupertest');
   const noData = getService('monitoringNoData');
+  const testSubjects = getService('testSubjects');
   const clusterOverview = getService('monitoringClusterOverview');
   const retry = getService('retry');
 
@@ -46,8 +47,10 @@ export default function ({ getService, getPageObjects }) {
       });
 
       // Here we are checking that once Monitoring is enabled,
-      //it moves on to the cluster overview page.
-      await retry.try(async () => {
+      // it moves on to the cluster overview page.
+      await retry.tryForTime(10000, async () => {
+        // Click the refresh button
+        await testSubjects.click('querySubmitButton');
         expect(await clusterOverview.isOnClusterOverview()).to.be(true);
       });
     });
diff --git a/x-pack/test/functional/apps/monitoring/time_filter.js b/x-pack/test/functional/apps/monitoring/time_filter.js
index 11557d995218e..127c7d8889bc4 100644
--- a/x-pack/test/functional/apps/monitoring/time_filter.js
+++ b/x-pack/test/functional/apps/monitoring/time_filter.js
@@ -7,8 +7,6 @@
 import expect from '@kbn/expect';
 import { getLifecycleMethods } from './_get_lifecycle_methods';
 
-const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-
 export default function ({ getService, getPageObjects }) {
   const PageObjects = getPageObjects(['header', 'timePicker']);
   const testSubjects = getService('testSubjects');
@@ -36,12 +34,9 @@ export default function ({ getService, getPageObjects }) {
       expect(isLoading).to.be(true);
     });
 
-    it('should send another request when changing the time picker', async () => {
-      /**
-       * TODO: The value should either be removed or lowered after:
-       * https://github.com/elastic/kibana/issues/72997 is resolved
-       */
-      await delay(3000);
+    // TODO: [cr] I'm not sure this test is any better than the above one, we might need to rely solely on unit tests
+    // for this functionality
+    it.skip('should send another request when changing the time picker', async () => {
       await PageObjects.timePicker.setAbsoluteRange(
         'Aug 15, 2016 @ 21:00:00.000',
         'Aug 16, 2016 @ 00:00:00.000'

From 0068c87d6fe7713351acbf42080faa09ff73ef15 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Mon, 31 Aug 2020 20:13:06 +0100
Subject: [PATCH 148/148] chore(NA): add elastic prefix to eslint-config-kibana
 (#76059)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .eslintignore                                               | 2 +-
 .../getting-started/running-kibana-advanced.asciidoc        | 2 +-
 .../.eslintrc.js                                            | 0
 .../.gitignore                                              | 0
 .../.npmignore                                              | 0
 .../README.md                                               | 2 +-
 .../javascript.js                                           | 0
 .../jest.js                                                 | 0
 .../package.json                                            | 6 +++---
 .../react.js                                                | 0
 .../restricted_globals.js                                   | 0
 .../typescript.js                                           | 0
 packages/kbn-pm/README.md                                   | 2 +-
 13 files changed, 7 insertions(+), 7 deletions(-)
 rename packages/{eslint-config-kibana => elastic-eslint-config-kibana}/.eslintrc.js (100%)
 rename packages/{eslint-config-kibana => elastic-eslint-config-kibana}/.gitignore (100%)
 rename packages/{eslint-config-kibana => elastic-eslint-config-kibana}/.npmignore (100%)
 rename packages/{eslint-config-kibana => elastic-eslint-config-kibana}/README.md (94%)
 rename packages/{eslint-config-kibana => elastic-eslint-config-kibana}/javascript.js (100%)
 rename packages/{eslint-config-kibana => elastic-eslint-config-kibana}/jest.js (100%)
 rename packages/{eslint-config-kibana => elastic-eslint-config-kibana}/package.json (89%)
 rename packages/{eslint-config-kibana => elastic-eslint-config-kibana}/react.js (100%)
 rename packages/{eslint-config-kibana => elastic-eslint-config-kibana}/restricted_globals.js (100%)
 rename packages/{eslint-config-kibana => elastic-eslint-config-kibana}/typescript.js (100%)

diff --git a/.eslintignore b/.eslintignore
index 972c818d791bf..93c69b4f9b207 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -39,7 +39,7 @@ target
 /x-pack/legacy/plugins/maps/public/vendor/**
 
 # package overrides
-/packages/eslint-config-kibana
+/packages/elastic-eslint-config-kibana
 /packages/kbn-interpreter/src/common/lib/grammar.js
 /packages/kbn-plugin-generator/template
 /packages/kbn-pm/dist
diff --git a/docs/developer/getting-started/running-kibana-advanced.asciidoc b/docs/developer/getting-started/running-kibana-advanced.asciidoc
index 44897184f88f2..277e52a3dc8e9 100644
--- a/docs/developer/getting-started/running-kibana-advanced.asciidoc
+++ b/docs/developer/getting-started/running-kibana-advanced.asciidoc
@@ -48,7 +48,7 @@ If you’re installing dependencies and seeing an error that looks
 something like
 
 ....
-Unsupported URL Type: link:packages/eslint-config-kibana
+Unsupported URL Type: link:packages/elastic-eslint-config-kibana
 ....
 
 you’re likely running `npm`. To install dependencies in {kib} you
diff --git a/packages/eslint-config-kibana/.eslintrc.js b/packages/elastic-eslint-config-kibana/.eslintrc.js
similarity index 100%
rename from packages/eslint-config-kibana/.eslintrc.js
rename to packages/elastic-eslint-config-kibana/.eslintrc.js
diff --git a/packages/eslint-config-kibana/.gitignore b/packages/elastic-eslint-config-kibana/.gitignore
similarity index 100%
rename from packages/eslint-config-kibana/.gitignore
rename to packages/elastic-eslint-config-kibana/.gitignore
diff --git a/packages/eslint-config-kibana/.npmignore b/packages/elastic-eslint-config-kibana/.npmignore
similarity index 100%
rename from packages/eslint-config-kibana/.npmignore
rename to packages/elastic-eslint-config-kibana/.npmignore
diff --git a/packages/eslint-config-kibana/README.md b/packages/elastic-eslint-config-kibana/README.md
similarity index 94%
rename from packages/eslint-config-kibana/README.md
rename to packages/elastic-eslint-config-kibana/README.md
index 68c1639b834a5..2049440cd8ff7 100644
--- a/packages/eslint-config-kibana/README.md
+++ b/packages/elastic-eslint-config-kibana/README.md
@@ -1,4 +1,4 @@
-# eslint-config-kibana
+# elastic-eslint-config-kibana
 
 The eslint config used by the kibana team
 
diff --git a/packages/eslint-config-kibana/javascript.js b/packages/elastic-eslint-config-kibana/javascript.js
similarity index 100%
rename from packages/eslint-config-kibana/javascript.js
rename to packages/elastic-eslint-config-kibana/javascript.js
diff --git a/packages/eslint-config-kibana/jest.js b/packages/elastic-eslint-config-kibana/jest.js
similarity index 100%
rename from packages/eslint-config-kibana/jest.js
rename to packages/elastic-eslint-config-kibana/jest.js
diff --git a/packages/eslint-config-kibana/package.json b/packages/elastic-eslint-config-kibana/package.json
similarity index 89%
rename from packages/eslint-config-kibana/package.json
rename to packages/elastic-eslint-config-kibana/package.json
index 4ec3bcdfd7c05..a4bb8d5449ee8 100644
--- a/packages/eslint-config-kibana/package.json
+++ b/packages/elastic-eslint-config-kibana/package.json
@@ -5,15 +5,15 @@
   "main": ".eslintrc.js",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/elastic/eslint-config-kibana.git"
+    "url": "git+https://github.com/elastic/kibana.git"
   },
   "keywords": [],
   "author": "Spencer Alger <email@spalger.com>",
   "license": "Apache-2.0",
   "bugs": {
-    "url": "https://github.com/elastic/kibana/tree/master/packages/eslint-config-kibana"
+    "url": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana"
   },
-  "homepage": "https://github.com/elastic/kibana/tree/master/packages/eslint-config-kibana",
+  "homepage": "https://github.com/elastic/kibana/tree/master/packages/elastic-eslint-config-kibana",
   "peerDependencies": {
     "@typescript-eslint/eslint-plugin": "^3.10.0",
     "@typescript-eslint/parser": "^3.10.0",
diff --git a/packages/eslint-config-kibana/react.js b/packages/elastic-eslint-config-kibana/react.js
similarity index 100%
rename from packages/eslint-config-kibana/react.js
rename to packages/elastic-eslint-config-kibana/react.js
diff --git a/packages/eslint-config-kibana/restricted_globals.js b/packages/elastic-eslint-config-kibana/restricted_globals.js
similarity index 100%
rename from packages/eslint-config-kibana/restricted_globals.js
rename to packages/elastic-eslint-config-kibana/restricted_globals.js
diff --git a/packages/eslint-config-kibana/typescript.js b/packages/elastic-eslint-config-kibana/typescript.js
similarity index 100%
rename from packages/eslint-config-kibana/typescript.js
rename to packages/elastic-eslint-config-kibana/typescript.js
diff --git a/packages/kbn-pm/README.md b/packages/kbn-pm/README.md
index 05405e7b98374..c169b5c75e178 100644
--- a/packages/kbn-pm/README.md
+++ b/packages/kbn-pm/README.md
@@ -19,7 +19,7 @@ From a plugin perspective there are two different types of Kibana dependencies:
 runtime and static dependencies. Runtime dependencies are things that are
 instantiated at runtime and that are injected into the plugin, for example
 config and elasticsearch clients. Static dependencies are those dependencies
-that we want to `import`. `eslint-config-kibana` is one example of this, and
+that we want to `import`. `elastic-eslint-config-kibana` is one example of this, and
 it's actually needed because eslint requires it to be a separate package. But we
 also have dependencies like `datemath`, `flot`, `eui` and others that we
 control, but where we want to `import` them in plugins instead of injecting them